svn commit: r404774 - head/net-mgmt/collectd5
Jason Unovitch
junovitch at FreeBSD.org
Tue Dec 29 18:48:05 UTC 2015
Author: junovitch
Date: Tue Dec 29 18:48:03 2015
New Revision: 404774
URL: https://svnweb.freebsd.org/changeset/ports/404774
Log:
net-mgmt/collectd5: finish option helpers conversion
- Switch PERL and PYTHON options over and drop the bsd.port.options.mk
include following r404759's update to bsd.options.mk
PR: 204220
Submitted by: Krzysztof <ports at bsdserwis.com> (maintainer)
Modified:
head/net-mgmt/collectd5/Makefile
Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile Tue Dec 29 18:06:31 2015 (r404773)
+++ head/net-mgmt/collectd5/Makefile Tue Dec 29 18:48:03 2015 (r404774)
@@ -186,6 +186,10 @@ OPENLDAP_USE= openldap=yes
OPENLDAP_CONFIGURE_ENABLE= openldap
OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE}
+PERL_USES= perl5
+PERL_CONFIGURE_ENABLE= perl
+PERL_CONFIGURE_WITH= perl=${PERL} perl-bindings
+
PGSQL_USES= pgsql
PGSQL_CONFIGURE_ENABLE= postgresql
PGSQL_CONFIGURE_WITH= postgresql=${LOCALBASE} libpq
@@ -197,6 +201,10 @@ PING_LIB_DEPENDS= liboping.so:${PORTSDI
PING_CONFIGURE_ENABLE= ping
PING_CONFIGURE_WITH= liboping=${LOCALBASE}
+PYTHON_USES= python:2
+PYTHON_CONFIGURE_ENABLE= python
+PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
+
RABBITMQ_LIB_DEPENDS= librabbitmq.so:${PORTSDIR}/net/rabbitmq-c
RABBITMQ_CONFIGURE_ENABLE= rabbitmq
RABBITMQ_CONFIGURE_WITH= librabbitmq=${LOCALBASE}
@@ -313,26 +321,6 @@ CONFIGURE_ARGS+=--enable-aggregation \
INSTALL_TARGET= install-strip
SHEBANG_FILES= contrib/collection.cgi
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPERL}
-USES+= perl5
-CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl
-PLIST_SUB+= PERL=""
-.else
-CONFIGURE_ARGS+=--without-perl --without-perl-bindings --disable-perl
-PLIST_SUB+= PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+= python:2
-CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python
-PLIST_SUB+= PYTHON=""
-.else
-CONFIGURE_ARGS+=--without-python --disable-python
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
post-patch:
@${REINPLACE_CMD} 's/-Werror//' \
${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \
More information about the svn-ports-all
mailing list