Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Feb 2018 15:19:57 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461065 - head/net-mgmt/flow-tools
Message-ID:  <201802061519.w16FJvtr026369@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Feb  6 15:19:57 2018
New Revision: 461065
URL: https://svnweb.freebsd.org/changeset/ports/461065

Log:
  - Fix shebangs
  - Switch to options helpers
  - Add missing USES=ssl for WITH=OPENSSL case
  - Fix manpage installation by using MANPREFIX
  
  Approved by:	portmgr blanket

Modified:
  head/net-mgmt/flow-tools/Makefile

Modified: head/net-mgmt/flow-tools/Makefile
==============================================================================
--- head/net-mgmt/flow-tools/Makefile	Tue Feb  6 15:18:38 2018	(r461064)
+++ head/net-mgmt/flow-tools/Makefile	Tue Feb  6 15:19:57 2018	(r461065)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flow-tools
 PORTVERSION=	0.68
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
@@ -14,7 +14,8 @@ PORTSCOUT=	skipv:0.411
 
 OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
 
-USES=		python:run
+USES=		python:run shebangfix
+SHEBANG_FILES=	bin/flow-*
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--localstatedir="${PREFIX}"
@@ -37,22 +38,13 @@ FLOW_CAPTURE_UID=	174
 FLOW_CAPTURE_GID=	174
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
-.include <bsd.port.options.mk>
+PGSQL_CONFIGURE_ON=	--with-pgsql="${LOCALBASE}"
+PGSQL_USES=		pgsql
+MYSQL_CONFIGURE_ON=	--with-mysql="${LOCALBASE}"
+MYSQL_USES=		mysql
+OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
+OPENSSL_USES=		ssl
 
-.if ${PORT_OPTIONS:MPGSQL}
-CONFIGURE_ARGS+=--with-pgsql="${PREFIX}"
-USES+=		pgsql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-CONFIGURE_ARGS+=--with-mysql="${PREFIX}"
-USE_MYSQL=	yes
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
-.endif
-
 post-patch:
 	${REINPLACE_CMD}\
 	 -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \
@@ -60,6 +52,6 @@ post-patch:
 	  ${WRKSRC}/docs/flow-*.1.in ${WRKSRC}/docs/flow-*.html.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802061519.w16FJvtr026369>