From owner-svn-ports-all@freebsd.org Tue Feb 6 15:19:58 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E454EDFE29; Tue, 6 Feb 2018 15:19:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F29216E5D4; Tue, 6 Feb 2018 15:19:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ED99219930; Tue, 6 Feb 2018 15:19:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w16FJvn7026370; Tue, 6 Feb 2018 15:19:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w16FJvtr026369; Tue, 6 Feb 2018 15:19:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201802061519.w16FJvtr026369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 6 Feb 2018 15:19:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461065 - head/net-mgmt/flow-tools X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/net-mgmt/flow-tools X-SVN-Commit-Revision: 461065 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Feb 2018 15:19:58 -0000 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 +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