- Add support for mysql and postgresql

PR:		ports/73285
Submitted by:	Yuri Y. Bushmelev <jay-dev@simcom.ru>
Approved by:	maintainer timeout (billf; 13 months)

- Add runtime dependency on python, three commands are in fact python scripts

PR:		ports/88475
Submitted by:	Larry Rosenman <ler@lerctr.org>
Approved by:	maintainer timeout (billf; 1 month)

- Remove unused patch file

3 files changed, 35 insertions, 20 deletions

diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index f22bd99158d6..adf49e924be4 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -7,12 +7,14 @@
 
 PORTNAME=	flow-tools
 PORTVERSION=	0.68
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.eng.oar.net/pub/flow-tools/
 
 MAINTAINER=	billf@FreeBSD.org
 COMMENT=	Suite of tools and library to work with netflow data
 
+USE_PYTHON_RUN=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--localstatedir=${PREFIX}
@@ -25,8 +27,17 @@ MAN1=	flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1	\
 	flow-tag.1 flow-tools.1	flow-tools-examples.1 		\
 	flow-xlate.1 flow-rptfmt.1 flow-log2rrd.1 flow-rpt2rrd.1
 
+.if defined(WITH_PGSQL)
+CONFIGURE_ARGS+=--with-pgsql=${PREFIX}
+USE_PGSQL=	yes
+.endif
+
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+=--with-mysql=${PREFIX}
+USE_MYSQL=	yes
+.endif
+
 post-patch:
-	${TOUCH} -r ${WRKSRC}/configure.in.orig ${WRKSRC}/configure.in
 	${REINPLACE_CMD}\
 	 -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \
 	 -e 's|@localstatedir@/cfg/|${PREFIX}/etc/flow-tools/|' \
diff --git a/net-mgmt/flow-tools/files/patch-configure b/net-mgmt/flow-tools/files/patch-configure
index 9d41c0c397aa..a2d8a508418c 100644
--- a/net-mgmt/flow-tools/files/patch-configure
+++ b/net-mgmt/flow-tools/files/patch-configure
@@ -1,14 +1,29 @@
-
-$FreeBSD$
-
---- configure.orig
-+++ configure
-@@ -1674,7 +1674,7 @@
-           ac_config_headers="$ac_config_headers lib/ftconfig.h:lib/ftconfig.h.in"
+--- configure.orig	Wed May 11 16:15:55 2005
++++ configure	Fri Dec  9 15:30:02 2005
+@@ -1662,7 +1662,7 @@
+ 
  
  
 -CFLAGS="-g -Wall"
-+CFLAGS="-g -Wall -fPIC"
++CFLAGS="-fPIC"
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
+@@ -3345,7 +3345,7 @@
+ 
+ 
+ if test "x$WHERE_PGSQL" != "x"; then
+-  LIBS="-L$WHERE_PGSQL/lib/pgsql"
++  LIBS="-L$WHERE_PGSQL/lib"
+   echo "$as_me:$LINENO: checking for PQsetdbLogin in -lpq" >&5
+ echo $ECHO_N "checking for PQsetdbLogin in -lpq... $ECHO_C" >&6
+ if test "${ac_cv_lib_pq_PQsetdbLogin+set}" = set; then
+@@ -3402,7 +3402,7 @@
+ echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
+ if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
+ 
+-      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include/pgsql"
++      PGSQLCFLAGS="-L$WHERE_PGSQL/lib -I$WHERE_PGSQL/include"
+       PGSQLLIB="-lpq"
+       cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PGSQL 1
diff --git a/net-mgmt/flow-tools/files/patch-configure.in b/net-mgmt/flow-tools/files/patch-configure.in
deleted file mode 100644
index 0c1b20b87bf8..000000000000
--- a/net-mgmt/flow-tools/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Tue Jun  7 22:41:51 2005
-+++ configure.in	Tue Jun  7 22:42:25 2005
-@@ -6,7 +6,7 @@
- AM_INIT_AUTOMAKE(flow-tools, 0.68)
- AM_CONFIG_HEADER(lib/ftconfig.h:lib/ftconfig.h.in) 
- 
--CFLAGS="-g -Wall"
-+dnl CFLAGS="-g -Wall"
- 
- dnl Checks for programs.
- AC_PROG_CC