From owner-svn-ports-head@FreeBSD.ORG Sat Jan 10 11:26:37 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6911331E; Sat, 10 Jan 2015 11:26:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 55597A2F; Sat, 10 Jan 2015 11:26:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0ABQb93086425; Sat, 10 Jan 2015 11:26:37 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0ABQbdS086424; Sat, 10 Jan 2015 11:26:37 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201501101126.t0ABQbdS086424@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sat, 10 Jan 2015 11:26:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376689 - head/net-mgmt/argus3-clients X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2015 11:26:37 -0000 Author: bofh Date: Sat Jan 10 11:26:36 2015 New Revision: 376689 URL: https://svnweb.freebsd.org/changeset/ports/376689 QAT: https://qat.redports.org/buildarchive/r376689/ Log: net-mgmt/argus3-clients: Convert to OPTIONSNG - Pass Maintainership - Wrap conditional DOCS installation PR: 196550 Differential Revision: https://reviews.freebsd.org/D1479 Submitted by: pauls@utdallas.edu Approved by: marino(mentor) Modified: head/net-mgmt/argus3-clients/Makefile Modified: head/net-mgmt/argus3-clients/Makefile ============================================================================== --- head/net-mgmt/argus3-clients/Makefile Sat Jan 10 11:15:40 2015 (r376688) +++ head/net-mgmt/argus3-clients/Makefile Sat Jan 10 11:26:36 2015 (r376689) @@ -7,7 +7,7 @@ CATEGORIES= net-mgmt security MASTER_SITES= http://qosient.com/argus/src/ \ ftp://qosient.com/pub/argus/src/ -MAINTAINER= pauls@utdallas.edu +MAINTAINER= bofh@FreeBSD.org COMMENT= Client programs for the argus IP network transaction auditing tool LICENSE= GPLv3 @@ -16,30 +16,21 @@ CONFLICTS= argus-clients-2* argus-client OPTIONS_DEFINE= GEOIP MYSQL SASL DOCS OPTIONS_DEFAULT=MYSQL SASL +OPTIONS_SUB= yes +SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} +MYSQL_USE= MYSQL=yes +GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP +GEOIP_CONFIGURE_ON= --with-GeoIP=${LOCALBASE} USES= bison ncurses perl5 USE_CSTD= gnu89 +GNU_CONFIGURE= yes .include -GNU_CONFIGURE= true - .if ${PORT_OPTIONS:MSASL} PKGNAMESUFFIX+= -sasl -LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MGEOIP} -LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP -CONFIGURE_ARGS+= --with-GeoIP=${LOCALBASE} .endif do-install: @@ -59,15 +50,20 @@ do-install: .for i in rasql rasqlinsert rasqltimeindex ${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i .endfor +.for i in rasql.1 rasqlinsert.1 rasqltimeindex.1 + ${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1 +.endfor .endif .for i in radark ragraph rahosts raports ${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i .endfor +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}/${DOCSDIR}/ .for i in AUTHORS CHANGES CREDITS ChangeLog INSTALL \ MANIFEST README VERSION ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}/${DOCSDIR} .endfor +.endif .for i in ra.1 rabins.1 racluster.1 raconvert.1 racount.1 radump.1 raevent.1 \ rafilteraddr.1 ragraph.1 ragrep.1 rahisto.1 ralabel.1 ranonymize.1 \ rapath.1 rapolicy.1 rasort.1 rasplit.1 rastream.1 rastrip.1 @@ -79,17 +75,10 @@ do-install: .for i in radium.8 ${INSTALL_MAN} ${WRKSRC}/man/man8/$i ${STAGEDIR}/${PREFIX}/man/man8 .endfor -.if ${PORT_OPTIONS:MMYSQL} -.for i in rasql.1 rasqlinsert.1 rasqltimeindex.1 - ${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1 -.endfor -.endif - ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} .for i in Config Database Startup System ${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/$i .endfor - .for i in delegated-ipv4-latest excel.rc iana-address-file \ iana-ipv4-address iana-multicast-address iana-port-numbers \ racluster.conf radium.conf ragetcountrycodes.sh ralabel.conf \