[net-mgmt/flow-tools] patch for moving to optionsng Fix: --- flow-tools_old/Makefile 2013-05-08 22:40:08.662706573 +0400 +++ flow-tools/Makefile 2013-05-08 22:43:41.366707295 +0400 @@ -1,9 +1,5 @@ -# New ports collection makefile for: flow-tools -# Date created: 2000 Jul 25 -# Whom: @BABOLO <.@babolo.ru> -# -# $FreeBSD: ports/net-mgmt/flow-tools/Makefile,v 1.34 2012/11/17 06:00:31 svnexp Exp $ -# +# Created by: @BABOLO <.@babolo.ru> +# $FreeBSD$ PORTNAME= flow-tools PORTVERSION= 0.68 @@ -16,9 +12,10 @@ PORTSCOUT= skipv:0.411 -OPTIONS= MYSQL "Enable MySQL support" off \ - OPENSSL "Enable OpenSSL support" off \ - PGSQL "Enable PostgreSQL support" off +OPTIONS_DEFINE= MYSQL OPENSSL PGSQL +MYSQL_DESC= Enable MySQL support +OPENSSL_DESC= Enable OpenSSL support +PGSQL_DESC= Enable PostgreSQL support CONFLICTS= flow-tools-ng-[0-9]* @@ -54,17 +51,17 @@ .include <bsd.port.pre.mk> -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+=--with-pgsql="${PREFIX}" USE_PGSQL= yes .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+=--with-mysql="${PREFIX}" USE_MYSQL= yes .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" .endif Patch attached with submission follows: How-To-Repeat: install it ^_^
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Maintainer of net-mgmt/flow-tools, Please note that PR ports/178427 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/178427 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
Any particular reason that the shared descriptions can't be used in this case? OPTIONS_DEFINE= MYSQL PGSQL OPENSSL Thanks for the contribution! -jgh -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve
Noops. We can use the shared one. Thanks for pointing out. On Fri, May 10, 2013 at 5:24 AM, Jason Helfman <jgh@freebsd.org> wrote: > Any particular reason that the shared descriptions can't be used in this > case? > > OPTIONS_DEFINE= MYSQL PGSQL OPENSSL > > Thanks for the contribution! > -jgh > > -- > Jason Helfman | FreeBSD Committer > jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve >
Responsible Changed From-To: freebsd-ports-bugs->rene Take
Author: rene Date: Mon May 27 11:22:21 2013 New Revision: 319210 URL: http://svnweb.freebsd.org/changeset/ports/319210 Log: - Convert Makefile header - Convert to optionsNG PR: ports/178427 Submitted by: rum1cro@yandex.ru Approved by: maintainer (5u623l20@gmail.com) Modified: head/net-mgmt/flow-tools/Makefile (contents, props changed) Modified: head/net-mgmt/flow-tools/Makefile ============================================================================== --- head/net-mgmt/flow-tools/Makefile Mon May 27 11:14:56 2013 (r319209) +++ head/net-mgmt/flow-tools/Makefile Mon May 27 11:22:21 2013 (r319210) @@ -1,9 +1,5 @@ -# New ports collection makefile for: flow-tools -# Date created: 2000 Jul 25 -# Whom: @BABOLO <.@babolo.ru> -# +# Created by: @BABOLO <.@babolo.ru> # $FreeBSD$ -# PORTNAME= flow-tools PORTVERSION= 0.68 @@ -16,9 +12,7 @@ COMMENT= Suite of tools and library to w PORTSCOUT= skipv:0.411 -OPTIONS= MYSQL "Enable MySQL support" off \ - OPENSSL "Enable OpenSSL support" off \ - PGSQL "Enable PostgreSQL support" off +OPTIONS_DEFINE= MYSQL OPENSSL PGSQL CONFLICTS= flow-tools-ng-[0-9]* @@ -52,19 +46,19 @@ FLOW_CAPTURE_UID= 174 FLOW_CAPTURE_GID= 174 FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+=--with-pgsql="${PREFIX}" USE_PGSQL= yes .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} CONFIGURE_ARGS+=--with-mysql="${PREFIX}" USE_MYSQL= yes .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}" .endif @@ -85,4 +79,4 @@ post-install: @${SETENV} ${SCRIPTS_ENV} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.include <bsd.port.post.mk> +.include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, thanks