From owner-svn-ports-all@freebsd.org Thu Aug 18 03:32:34 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04F7FBBD378; Thu, 18 Aug 2016 03:32:34 +0000 (UTC) (envelope-from cy@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 mx1.freebsd.org (Postfix) with ESMTPS id B7B6D1D70; Thu, 18 Aug 2016 03:32:33 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7I3WWdp062986; Thu, 18 Aug 2016 03:32:32 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7I3WWTr062985; Thu, 18 Aug 2016 03:32:32 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201608180332.u7I3WWTr062985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 18 Aug 2016 03:32:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420381 - head/sysutils/syslog-ng37 X-SVN-Group: ports-head 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.22 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: Thu, 18 Aug 2016 03:32:34 -0000 Author: cy Date: Thu Aug 18 03:32:32 2016 New Revision: 420381 URL: https://svnweb.freebsd.org/changeset/ports/420381 Log: Switch to options helpers. Modified: head/sysutils/syslog-ng37/Makefile Modified: head/sysutils/syslog-ng37/Makefile ============================================================================== --- head/sysutils/syslog-ng37/Makefile Thu Aug 18 03:15:08 2016 (r420380) +++ head/sysutils/syslog-ng37/Makefile Thu Aug 18 03:32:32 2016 (r420381) @@ -57,79 +57,45 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE --disable-linux-caps \ --datadir=${PREFIX}/share/syslog-ng/ -.include - CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" -.if ${PORT_OPTIONS:MTCP_WRAPPERS} -CONFIGURE_ARGS+= --enable-tcp-wrapper -.else -CONFIGURE_ARGS+= --disable-tcp-wrapper -.endif +TCP_WRAPPERS_CONFIGURE_ENABLE= tcp-wrapper -.if ${PORT_OPTIONS:MSPOOF} -LIB_DEPENDS+= libnet.so:net/libnet -CONFIGURE_ARGS+= --enable-spoof-source -.else -CONFIGURE_ARGS+= --disable-spoof-source -.endif +SPOOF_CONFIGURE_ENABLE= spoof-source +SPOOF_LIB_DEPENDS= libnet.so:net/libnet -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +IPV6_CONFIGURE_ENABLE= ipv6 -.if ${PORT_OPTIONS:MGEOIP} -CONFIGURE_ARGS+= --enable-geoip -LIB_DEPENDS+= libGeoIP.so:net/GeoIP -CONFIGURE_ENV+= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" -PLIST_FILES+= lib/syslog-ng/libgeoip-plugin.so -.else -CONFIGURE_ARGS+= --disable-geoip -.endif - -.if ${PORT_OPTIONS:MREDIS} -CONFIGURE_ARGS+= --enable-redis -LIB_DEPENDS+= libhiredis.so:databases/hiredis -PLIST_FILES+= lib/syslog-ng/libredis.so -.else -CONFIGURE_ARGS+= --disable-redis -.endif - -.if ${PORT_OPTIONS:MSMTP} -CONFIGURE_ARGS+= --with-libesmtp=/usr/local/ -LIB_DEPENDS+= libesmtp.so:mail/libesmtp -PLIST_FILES+= lib/syslog-ng/libafsmtp.so -.else -CONFIGURE_ARGS+= --disable-smtp -.endif - -.if ${PORT_OPTIONS:MSQL} -LIB_DEPENDS+= libdbi.so:databases/libdbi -CONFIGURE_ENV+= LIBDBI_LIBS="-ldbi" -CONFIGURE_ARGS+= --enable-sql -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES+= lib/syslog-ng/libafsql.so -.else -CONFIGURE_ARGS+= --disable-sql -.endif - -.if ${PORT_OPTIONS:MJSON} -LIB_DEPENDS+= libjson-c.so:devel/json-c -CONFIGURE_ARGS+= --enable-json -PLIST_FILES+= lib/syslog-ng/libjson-plugin.so -.else -CONFIGURE_ARGS+= --disable-json -.endif - -.if ${PORT_OPTIONS:MJAVA} -CONFIGURE_ARGS+= --enable-java -USE_JAVA= yes -BUILD_DEPENDS+= gradle:devel/gradle -BUILD_DEPENDS+= bash:shells/bash -PLIST_FILES+= lib/syslog-ng/libmod-java.so \ +GEOIP_CONFIGURE_ENABLE= geoip +GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP +GEOIP_CONFIGURE_ENV= GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP" +GEOIP_PLIST_FILES= lib/syslog-ng/libgeoip-plugin.so + +REDIS_CONFIGURE_ENABLE= redis +REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis +REDIS_PLIST_FILES= lib/syslog-ng/libredis.so + +SMTP_CONFIGURE_ON= --with-libesmtp=/usr/local/ +SMTP_CONFIGURE_OFF= --disable-smtp +SMTP_LIB_DEPENDS= libesmtp.so:mail/libesmtp +SMTP_PLIST_FILES= lib/syslog-ng/libafsmtp.so + +MSQL_CONFIGURE_ENABLE= sql +MSQL_LIB_DEPENDS= libdbi.so:databases/libdbi +MSQL_CONFIGURE_ENV= LIBDBI_LIBS="-ldbi" +MSQL_LDFLAGS= -L${LOCALBASE}/lib +MSQL_PLIST_FILES= lib/syslog-ng/libafsql.so + +JSON_CONFIGURE_ENABLE= json +JSON_LIB_DEPENDS= libjson-c.so:devel/json-c +JSON_PLIST_FILES= lib/syslog-ng/libjson-plugin.so + +JAVA_CONFIGURE_ENABLE= java +JAVA_USE_JAVA= yes +JAVA_BUILD_DEPENDS= gradle:devel/gradle +JAVA_BUILD_DEPENDS= bash:shells/bash +JAVA_PLIST_FILES= lib/syslog-ng/libmod-java.so \ lib/syslog-ng/java-modules/syslog-ng-core.jar \ lib/syslog-ng/java-modules/log4j-1.2.16.jar \ lib/syslog-ng/java-modules/elastic.jar \ @@ -139,17 +105,13 @@ PLIST_FILES+= lib/syslog-ng/libmod-jav lib/syslog-ng/java-modules/hdfs.jar \ lib/syslog-ng/java-modules/syslog-ng-common.jar \ lib/syslog-ng/java-modules/dummy.jar -.else -CONFIGURE_ARGS+= --disable-java -.endif -.if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+= --enable-python --with-python=2.7 -USES+= python:2.7 -PLIST_FILES+= lib/syslog-ng/libmod-python.so -.else -CONFIGURE_ARGS+= --disable-python -.endif +PYTHON_CONFIGURE_ON= --enable-python --with-python=2.7 +PYTHON_CONFIGURE_OFF= --disable-python +PYTHON_USES= python:2.7 +PYTHON_PLIST_FILES= lib/syslog-ng/libmod-python.so + +.include post-patch: @${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist @@ -172,4 +134,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \ ${STAGEDIR}${PREFIX}/include/syslog-ng/ -.include +.include