svn commit: r334443 - head/net-mgmt/flow-tools-ng

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Wed Nov 20 19:12:47 2013
New Revision: 334443
URL: http://svnweb.freebsd.org/changeset/ports/334443

Log:
  - Add LICENSE
  - Convert to new options framework
  - Convert to new options helper
  - While I'm here, sort PLIST
  
  PR:		ports/184115
  Submitted by:	Muhammad Moinur Rahman <5u623l20 at gmail.com>
  Approved by:	Volodymyr Kostyrko <c.kworr at gmail.com> (maintainer)

Modified:
  head/net-mgmt/flow-tools-ng/Makefile   (contents, props changed)
  head/net-mgmt/flow-tools-ng/pkg-plist   (contents, props changed)

Modified: head/net-mgmt/flow-tools-ng/Makefile
==============================================================================
--- head/net-mgmt/flow-tools-ng/Makefile	Wed Nov 20 19:10:14 2013	(r334442)
+++ head/net-mgmt/flow-tools-ng/Makefile	Wed Nov 20 19:12:47 2013	(r334443)
@@ -10,6 +10,19 @@ PKGNAMESUFFIX=	-ng
 MAINTAINER=	c.kworr at gmail.com
 COMMENT=	Suite of tools and library to work with netflow data
 
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	MYSQL OPENSSL PGSQL
+PGSQL_CONFIGURE_OFF=	--without-postgresql
+PGSQL_CONFIGURE_ON=	--with-postgresql
+PGSQL_USE=		PGSQL=yes
+MYSQL_CONFIGURE_OFF=	--without-mysql
+MYSQL_CONFIGURE_ON=	--with-mysql="${PREFIX}"
+MYSQL_USE=		MYSQL=yes
+OPENSSL_CONFIGURE_OFF=	--without-openssl
+OPENSSL_CONFIGURE_ON=	--with-openssl="${OPENSSLBASE}"
+OPENSSL_USE=		OPENSSL=yes
+
 CONFLICTS=	flow-tools-[0-9]*
 
 USE_PYTHON_RUN=	yes
@@ -44,28 +57,8 @@ FLOW_CAPTURE_UID=	174
 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/|' \

Modified: head/net-mgmt/flow-tools-ng/pkg-plist
==============================================================================
--- head/net-mgmt/flow-tools-ng/pkg-plist	Wed Nov 20 19:10:14 2013	(r334442)
+++ head/net-mgmt/flow-tools-ng/pkg-plist	Wed Nov 20 19:12:47 2013	(r334443)
@@ -1,44 +1,44 @@
 bin/flow-capture
 bin/flow-cat
-bin/flow-stat
-bin/flow-print
 bin/flow-dscan
-bin/flow-send
-bin/flow-receive
-bin/flow-gen
 bin/flow-expire
-bin/flow-filter
 bin/flow-export
+bin/flow-fanout
+bin/flow-filter
+bin/flow-gen
 bin/flow-header
-bin/flow-split
-bin/flow-xlate
-bin/flow-merge
 bin/flow-import
-bin/flow-fanout
-bin/flow-tag
+bin/flow-log2rrd
+bin/flow-mask
+bin/flow-merge
 bin/flow-nfilter
+bin/flow-print
+bin/flow-receive
 bin/flow-report
-bin/flow-mask
-bin/flow-log2rrd
-bin/flow-rptfmt
 bin/flow-rpt2rrd
-etc/flow-tools/map.cfg
-etc/flow-tools/tag.cfg
+bin/flow-rptfmt
+bin/flow-send
+bin/flow-split
+bin/flow-stat
+bin/flow-tag
+bin/flow-xlate
+etc/flow-tools/asn.sym
 etc/flow-tools/filter.cfg
-etc/flow-tools/stat.cfg
-etc/flow-tools/mask.cfg
-etc/flow-tools/xlate.cfg
 etc/flow-tools/ip-prot.sym
 etc/flow-tools/ip-type.sym
-etc/flow-tools/tcp-port.sym
-etc/flow-tools/asn.sym
+etc/flow-tools/map.cfg
+etc/flow-tools/mask.cfg
+etc/flow-tools/stat.cfg
+etc/flow-tools/tag.cfg
 etc/flow-tools/tag.sym
+etc/flow-tools/tcp-port.sym
+etc/flow-tools/xlate.cfg
 include/ftlib.h
 include/ftqueue.h
-lib/libft.so.0
-lib/libft.so
-lib/libft.la
 lib/libft.a
+lib/libft.la
+lib/libft.so
+lib/libft.so.0
 %%DATADIR%%/asn2c
 %%DATADIR%%/gasn
 %%DATADIR%%/gprot