. Support STAGE

. Move USE_GMAKE to USES=gmake
. Move USE_BZIP2 to USES=tar:bzip2

Approved by:	portmgr (blanket)

2 files changed, 30 insertions, 22 deletions

diff --git a/net-mgmt/flow-tools-ng/Makefile b/net-mgmt/flow-tools-ng/Makefile
index 40073c5b012b..514939dbda14 100644
--- a/net-mgmt/flow-tools-ng/Makefile
+++ b/net-mgmt/flow-tools-ng/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-ng
 MAINTAINER=	c.kworr@gmail.com
 COMMENT=	Suite of tools and library to work with netflow data
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
 PGSQL_CONFIGURE_OFF=	--without-postgresql
@@ -25,21 +25,12 @@ OPENSSL_USE=		OPENSSL=yes
 
 CONFLICTS=	flow-tools-[0-9]*
 
+USES=		gmake tar:bzip2
 USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--localstatedir="${PREFIX}"
-USE_BZIP2=	Yes
-USE_GMAKE=	Yes
 USE_LDCONFIG=	Yes
 
-MAN1=	flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1	\
-	flow-export.1 flow-fanout.1 flow-filter.1 flow-gen.1	\
-	flow-header.1 flow-import.1 flow-mask.1 flow-merge.1	\
-	flow-nfilter.1 flow-print.1 flow-receive.1		\
-	flow-report.1 flow-send.1 flow-split.1 flow-stat.1	\
-	flow-tag.1 flow-tools.1	flow-tools-examples.1 		\
-	flow-xlate.1 flow-rptfmt.1 flow-log2rrd.1 flow-rpt2rrd.1
-
 SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \
 		FLOW_CAPTURE_USER="${FLOW_CAPTURE_USER}" \
@@ -57,8 +48,6 @@ FLOW_CAPTURE_UID=	174
 FLOW_CAPTURE_GID=	174
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
-NO_STAGE=	yes
-
 post-patch:
 	@${REINPLACE_CMD}\
 	 -e 's|@sysconfdir@/sym/|${PREFIX}/share/flow-tools/|' \
@@ -67,15 +56,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|!/bin/env|!/usr/bin/env|' \
 		${WRKSRC}/bin/* ${WRKSRC}/utils/*
 
-pre-su-install:
-	@${SETENV} ${SCRIPTS_ENV} \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-.for I in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/docs/${I} ${PREFIX}/man/man1/
-.endfor
-	@${SETENV} ${SCRIPTS_ENV} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libft.so.0
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/flow-tools-ng/pkg-plist b/net-mgmt/flow-tools-ng/pkg-plist
index 3178f879ff8b..ea57ae8655bc 100644
--- a/net-mgmt/flow-tools-ng/pkg-plist
+++ b/net-mgmt/flow-tools-ng/pkg-plist
@@ -39,6 +39,32 @@ lib/libft.a
 lib/libft.la
 lib/libft.so
 lib/libft.so.0
+man/man1/flow-capture.1.gz
+man/man1/flow-cat.1.gz
+man/man1/flow-dscan.1.gz
+man/man1/flow-expire.1.gz
+man/man1/flow-export.1.gz
+man/man1/flow-fanout.1.gz
+man/man1/flow-filter.1.gz
+man/man1/flow-gen.1.gz
+man/man1/flow-header.1.gz
+man/man1/flow-import.1.gz
+man/man1/flow-mask.1.gz
+man/man1/flow-merge.1.gz
+man/man1/flow-nfilter.1.gz
+man/man1/flow-print.1.gz
+man/man1/flow-receive.1.gz
+man/man1/flow-report.1.gz
+man/man1/flow-send.1.gz
+man/man1/flow-split.1.gz
+man/man1/flow-stat.1.gz
+man/man1/flow-tag.1.gz
+man/man1/flow-tools.1.gz
+man/man1/flow-tools-examples.1.gz
+man/man1/flow-xlate.1.gz
+man/man1/flow-rptfmt.1.gz
+man/man1/flow-log2rrd.1.gz
+man/man1/flow-rpt2rrd.1.gz
 %%DATADIR%%/asn2c
 %%DATADIR%%/gasn
 %%DATADIR%%/gprot