Date: Fri, 25 Sep 2020 17:16:30 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550057 - head/net-mgmt/flow-tools Message-ID: <202009251716.08PHGUhB060063@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Fri Sep 25 17:16:30 2020 New Revision: 550057 URL: https://svnweb.freebsd.org/changeset/ports/550057 Log: net-mgmt/flow-tools: Fix compilation when all options turned off - Remove python 2.7 dependency [1] [2] PR: 249388 [1] 249739 [2] Submitted by: vladimir.pushkar@gmail.com [1] Reported by: swills [2] Modified: head/net-mgmt/flow-tools/Makefile Modified: head/net-mgmt/flow-tools/Makefile ============================================================================== --- head/net-mgmt/flow-tools/Makefile Fri Sep 25 17:03:43 2020 (r550056) +++ head/net-mgmt/flow-tools/Makefile Fri Sep 25 17:16:30 2020 (r550057) @@ -4,7 +4,7 @@ PORTNAME= flow-tools PORTVERSION= 0.68.6 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= bofh@FreeBSD.org @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man -USES= autoreconf libtool:keepla python:2.7 shebangfix +USES= autoreconf libtool:keepla python:patch shebangfix USE_GITHUB= yes USE_LDCONFIG= yes USE_RC_SUBR= flow_capture flow_fanout @@ -38,14 +38,25 @@ FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture OPTIONS_DEFINE= MYSQL OPENSSL PGSQL +PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} +PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write + MYSQL_USES= mysql MYSQL_CONFIGURE_ON= --with-mysql="${LOCALBASE}" OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-openssl="${OPENSSLBASE}" PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgresql +PGSQL_CONFIGURE_OFF= --with-postgresql=no +.include <bsd.port.pre.mk> + +post-patch: +.if ${PYTHON_MAJOR_VER} >= 3 + ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/bin/flow-* +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libft.so.0.0.0 -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009251716.08PHGUhB060063>