From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:03 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9BA69280 for ; Tue, 9 Oct 2012 22:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 736F68FC1D for ; Tue, 9 Oct 2012 22:30:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MU3At041959 for ; Tue, 9 Oct 2012 22:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MU3dV041958; Tue, 9 Oct 2012 22:30:03 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:03 GMT Resent-Message-Id: <201210092230.q99MU3dV041958@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 633CF6B6 for ; Tue, 9 Oct 2012 18:38:06 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 331DA8FC16 for ; Tue, 9 Oct 2012 18:38:06 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99Ic6kQ056239 for ; Tue, 9 Oct 2012 18:38:06 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q99Ic6FI056238; Tue, 9 Oct 2012 18:38:06 GMT (envelope-from nobody) Message-Id: <201210091838.q99Ic6FI056238@red.freebsd.org> Date: Tue, 9 Oct 2012 18:38:06 GMT From: Gabor Pali To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172517: [net-mgmt/flowd] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:03 -0000 X-List-Received-Date: Tue, 09 Oct 2012 22:30:03 -0000 >Number: 172517 >Category: ports >Synopsis: [net-mgmt/flowd] OptionsNG Conversion >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 09 22:30:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gabor Pali >Release: n/a >Organization: The FreeBSD Project >Environment: n/a >Description: - Convert options for OptionsNG format >How-To-Repeat: >Fix: See the attached patch. Patch attached with submission follows: diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile index 10e0f3b..61c2ac8 100644 --- a/net-mgmt/flowd/Makefile +++ b/net-mgmt/flowd/Makefile @@ -15,8 +15,11 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ MAINTAINER= janos.mohacsi@bsd.hu COMMENT= The flowd is a small, fast, and secure NetFlow collector -OPTIONS= PERL "Install flowd perl module" on \ - PYTHON "Install flowd Python support" off +OPTIONS_DEFINE= PERL PYTHON +OPTIONS_DEFAULT= PERL + +PERL_DESC= Install flowd perl module +PYTHON_DESC= Install flowd Python support .include @@ -31,7 +34,7 @@ FLOWD_USER= _flowd USERS= ${FLOWD_USER} GROUPS= ${FLOWD_USER} -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3= Flowd.3 @@ -39,7 +42,7 @@ MAN3= Flowd.3 PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes PLIST_SUB+= WITH_PYTHON="" INSTALLS_EGGINFO= yes @@ -49,13 +52,13 @@ PLIST_SUB+= WITH_PYTHON="@comment " pre-extract: @${ECHO_MSG} "" -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} @${ECHO_MSG} "Build with perl bindings." .else @${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL" .endif @${ECHO_MSG} "" -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} @${ECHO_MSG} "Build with Python bindings." .else @${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON." @@ -69,12 +72,12 @@ post-patch: ${WRKSRC}/tools/wormsuspects.pl post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif -.if defined(WITH_PERL) +.if ${PORT_OPTIONS:MPERL} cd ${WRKSRC}/Flowd-perl && \ ${PERL} Makefile.PL INSTALLSITEMAN3DIR=${MAN3PREFIX}/man/man3 PREFIX=${PREFIX} && \ ${GMAKE} && \ @@ -82,13 +85,13 @@ post-install: -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} cd ${WRKSRC} && \ ${PYTHON_CMD} setup.py build && \ ${PYTHON_CMD} setup.py install .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR} @( cd ${WRKSRC}/tools && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/ ) .endif >Release-Note: >Audit-Trail: >Unformatted: