ports/178427: [net-mgmt/flow-tools] patch for moving to optionsng

[Ilya A. Arkhipov]

>Number:         178427
>Category:       ports
>Synopsis:       [net-mgmt/flow-tools] patch for moving to optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 08 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Ilya A. Arkhipov
>Release:        10.0-CURRENT
>Organization:
Rambler
>Environment:
FreeBSD mhome 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Thu Mar 29 18:04:50 UTC 2012     root at mhome:/usr/obj/usr/src/sys/MICROKERNEL  amd64
>Description:
[net-mgmt/flow-tools] patch for moving to optionsng
>How-To-Repeat:
install it ^_^
>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 <. at babolo.ru>
-#
-# $FreeBSD: ports/net-mgmt/flow-tools/Makefile,v 1.34 2012/11/17 06:00:31 svnexp Exp $
-#
+# Created by: @BABOLO <. at 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:

diff -Nru flow-tools_old/Makefile flow-tools/Makefile
--- 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 <. at babolo.ru>
-#
-# $FreeBSD: ports/net-mgmt/flow-tools/Makefile,v 1.34 2012/11/17 06:00:31 svnexp Exp $
-#
+# Created by: @BABOLO <. at 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
 


>Release-Note:
>Audit-Trail:
>Unformatted: