svn commit: r339454 - head/textproc/flex

[Johan van Selst]

Author: johans
Date: Sat Jan 11 20:46:59 2014
New Revision: 339454
URL: http://svnweb.freebsd.org/changeset/ports/339454

Log:
  Enable stage support + minor cleanups

Modified:
  head/textproc/flex/Makefile
  head/textproc/flex/pkg-plist

Modified: head/textproc/flex/Makefile
==============================================================================
--- head/textproc/flex/Makefile	Sat Jan 11 20:37:29 2014	(r339453)
+++ head/textproc/flex/Makefile	Sat Jan 11 20:46:59 2014	(r339454)
@@ -13,32 +13,19 @@ BUILD_DEPENDS=	help2man:${PORTSDIR}/misc
 		gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		bison
+USES=		bison gmake
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 # install flex header to its own dir to avoid conflict with system flex.
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex
 CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4
-USE_GMAKE=	yes
-MAN1=		flex.1
-INFO=		flex
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext iconv
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+INFO=		flex
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.else
-CONFIGURE_ARGS+=--docdir=${WRKSRC}
-.endif
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -Ee 's/tests//' \

Modified: head/textproc/flex/pkg-plist
==============================================================================
--- head/textproc/flex/pkg-plist	Sat Jan 11 20:37:29 2014	(r339453)
+++ head/textproc/flex/pkg-plist	Sat Jan 11 20:46:59 2014	(r339454)
@@ -3,6 +3,15 @@ bin/flex++
 include/flex/FlexLexer.h
 lib/libfl.a
 lib/libfl_pic.a
+man/man1/flex.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/ONEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.cvs
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/flex.pdf
 %%NLS%%share/locale/ca/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/da/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/de/LC_MESSAGES/flex.mo
@@ -21,3 +30,4 @@ lib/libfl_pic.a
 %%NLS%%share/locale/vi/LC_MESSAGES/flex.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/flex.mo
 @dirrm include/flex
+%%PORTDOCS%%@dirrm %%DOCSDIR%%