From a241cbcc33ec9b64e1a27c666d3d056c6541f42f Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 27 Jan 2014 13:35:10 +0000
Subject: [PATCH] Support stage Use options helpers

---
 devel/bison/Makefile  | 25 ++++++-------------------
 devel/bison/pkg-plist |  1 +
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 3d2a5638a4f3..6b93443c777f 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
+COMMENT=	Parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	m4>=1.4.16,1:${PORTSDIR}/devel/m4
@@ -24,34 +24,21 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--disable-yacc
 
-MAN1=		bison.1
 INFO=		bison
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 	@${REINPLACE_CMD} 's/MANS = yacc.1/MANS =/' ${WRKSRC}/doc/Makefile.in
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} 's/ install-exec-local//' ${WRKSRC}/lib/Makefile.in
-.endif
 
-.if ${PORT_OPTIONS:MEXAMPLES}
 PORTEXAMPLES=	calc++
 
 post-install:
-	${MKDIR} ${EXAMPLESDIR}/calc++
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/calc++
 	${INSTALL_DATA} ${WRKSRC}/examples/calc++/*.[chly]* \
-		${EXAMPLESDIR}/calc++
-.endif
+		${STAGEDIR}${EXAMPLESDIR}/calc++
 
 .include <bsd.port.mk>
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index a90a1c2938fa..8843d9da5335 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -1,4 +1,5 @@
 bin/bison
+man/man1/bison.1.gz
 share/aclocal/bison-i18n.m4
 %%DATADIR%%/README
 %%DATADIR%%/bison.m4