Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Nov 2013 16:42:08 +0600 (BDT)
From:      Muhammad Moinur Rahman <5u623l20@gmail.com>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        c.kworr@gmail.com
Subject:   ports/184115: [PATCH] net-mgmt/flow-tools-ng: new OPTIONS framework
Message-ID:  <201311201042.rAKAg8Br021205@bofh.1asiacom.net>
Resent-Message-ID: <201311201050.rAKAo0LP009381@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184115
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/flow-tools-ng: new OPTIONS framework
>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 Nov 20 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Muhammad Moinur Rahman
>Release:        FreeBSD 11.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD bofh.1asiacom.net 11.0-CURRENT FreeBSD 11.0-CURRENT #3 r257540: Tue Nov  5 18:47:37
>Description:
[DESCRIBE CHANGES]
- Added support for new OPTIONS framework

For Committer's reference:
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/84i386-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/84amd64-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/92i386-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/92amd64-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/10b3i386-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/10b3amd64-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/11i386-default.log
http://pdr.s.ubze.ro/bulk/latest-per-pkg/flow-tools-ng/0.68.5.1/11amd64-default.log

Port maintainer (c.kworr@gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- flow-tools-ng-0.68.5.1.patch begins here ---
diff -ruN /usr/ports//net-mgmt/flow-tools-ng/Makefile ./Makefile
--- /usr/ports//net-mgmt/flow-tools-ng/Makefile	2013-09-21 04:24:43.000000000 +0600
+++ ./Makefile	2013-11-20 16:13:36.000000000 +0600
@@ -1,5 +1,5 @@
 # Created by: @BABOLO <.@babolo.ru>
-# $FreeBSD: net-mgmt/flow-tools-ng/Makefile 327757 2013-09-20 22:24:43Z bapt $
+# $FreeBSD: head/net-mgmt/flow-tools-ng/Makefile 327757 2013-09-20 22:24:43Z bapt $
 
 PORTNAME=	flow-tools
 PORTVERSION=	0.68.5.1
@@ -10,6 +10,22 @@
 MAINTAINER=	c.kworr@gmail.com
 COMMENT=	Suite of tools and library to work with netflow data
 
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
+
+PGSQL_CONFIGURE_ON=	--with-postgresql
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+PGSQL_USE=	PGSQL=	yes
+
+MYSQL_CONFIGURE_ON=	--with-mysql="${PREFIX}"
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_USE=	MYSQL=	yes
+
+OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
+OPENSSL_CONFIGURE_OFF=	--without-openssl
+OPENSSL_USE=	OPENSSL=	yes
+
 CONFLICTS=	flow-tools-[0-9]*
 
 USE_PYTHON_RUN=	yes
@@ -44,28 +60,8 @@
 FLOW_CAPTURE_GID=	174
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
-.if defined(WITH_PGSQL)
-CONFIGURE_ARGS+=--with-postgresql
-USE_PGSQL=	yes
-.else
-CONFIGURE_ARGS+=--without-postgresql
-.endif
-
-.if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--with-mysql="${PREFIX}"
-USE_MYSQL=	yes
-.else
-CONFIGURE_ARGS+=--without-mysql
-.endif
-
-.if defined(WITH_OPENSSL)
-USE_OPENSSL=	Yes
-CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
-.else
-CONFIGURE_ARGS+=--without-openssl
-.endif
-
 NO_STAGE=	yes
+
 post-patch:
 	@${REINPLACE_CMD}\
 	 -e 's|@sysconfdir@/sym/|${PREFIX}/share/flow-tools/|' \
diff -ruN /usr/ports//net-mgmt/flow-tools-ng/files/flow_capture.in ./files/flow_capture.in
--- /usr/ports//net-mgmt/flow-tools-ng/files/flow_capture.in	2012-07-14 20:29:18.000000000 +0600
+++ ./files/flow_capture.in	2013-11-06 02:03:34.000000000 +0600
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: net-mgmt/flow-tools-ng/files/flow_capture.in 300897 2012-07-14 14:29:18Z beat $
+# $FreeBSD: head/net-mgmt/flow-tools-ng/files/flow_capture.in 300897 2012-07-14 14:29:18Z beat $
 #
 
 # PROVIDE: flow_capture
diff -ruN /usr/ports//net-mgmt/flow-tools-ng/files/flow_fanout.in ./files/flow_fanout.in
--- /usr/ports//net-mgmt/flow-tools-ng/files/flow_fanout.in	2012-07-14 20:29:18.000000000 +0600
+++ ./files/flow_fanout.in	2013-11-06 02:03:34.000000000 +0600
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: net-mgmt/flow-tools-ng/files/flow_fanout.in 300897 2012-07-14 14:29:18Z beat $
+# $FreeBSD: head/net-mgmt/flow-tools-ng/files/flow_fanout.in 300897 2012-07-14 14:29:18Z beat $
 #
 
 # PROVIDE: flow_fanout
diff -ruN /usr/ports//net-mgmt/flow-tools-ng/files/pkg-deinstall.in ./files/pkg-deinstall.in
--- /usr/ports//net-mgmt/flow-tools-ng/files/pkg-deinstall.in	2012-07-14 20:29:18.000000000 +0600
+++ ./files/pkg-deinstall.in	2013-11-06 02:03:34.000000000 +0600
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: net-mgmt/flow-tools-ng/files/pkg-deinstall.in 300897 2012-07-14 14:29:18Z beat $
+# $FreeBSD: head/net-mgmt/flow-tools-ng/files/pkg-deinstall.in 300897 2012-07-14 14:29:18Z beat $
 #
 
 PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
diff -ruN /usr/ports//net-mgmt/flow-tools-ng/files/pkg-install.in ./files/pkg-install.in
--- /usr/ports//net-mgmt/flow-tools-ng/files/pkg-install.in	2012-07-14 20:29:18.000000000 +0600
+++ ./files/pkg-install.in	2013-11-06 02:03:34.000000000 +0600
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: net-mgmt/flow-tools-ng/files/pkg-install.in 300897 2012-07-14 14:29:18Z beat $
+# $FreeBSD: head/net-mgmt/flow-tools-ng/files/pkg-install.in 300897 2012-07-14 14:29:18Z beat $
 #
 
 PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin
--- flow-tools-ng-0.68.5.1.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311201042.rAKAg8Br021205>