- Add openssl support [1]

- Fix rcNG script comment [2]
- Quoute variables in CONFIGURE_ARGS for space-safety
- Respect CFLAGS

Submitted by:	Dominik Brettnacher <domi@saargate.de> [1],
		Geoff Garside <geoff@geoffgarside.co.uk> [2]

5 files changed, 64 insertions, 8 deletions

diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile
index eb40154..2adb7e0 100644
--- a/net-mgmt/flow-tools/Makefile
+++ b/net-mgmt/flow-tools/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Suite of tools and library to work with netflow data
 
 USE_PYTHON_RUN=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--localstatedir=${PREFIX}
+CONFIGURE_ARGS+=--localstatedir="${PREFIX}"
 
 MAN1=	flow-capture.1 flow-cat.1 flow-dscan.1 flow-expire.1	\
 	flow-export.1 flow-fanout.1 flow-filter.1 flow-gen.1	\
@@ -40,15 +40,19 @@ FLOW_CAPTURE_GROUP=	flowtools
 FLOW_CAPTURE_PIDDIR=	${VARDIR}/run/flow-capture
 
 .if defined(WITH_PGSQL)
-CONFIGURE_ARGS+=--with-pgsql=${PREFIX}
+CONFIGURE_ARGS+=--with-pgsql="${PREFIX}"
 USE_PGSQL=	yes
 .endif
 
 .if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--with-mysql=${PREFIX}
+CONFIGURE_ARGS+=--with-mysql="${PREFIX}"
 USE_MYSQL=	yes
 .endif
 
+.if defined(WITH_OPENSSL)
+CONFIGURE_ARGS+=--with-openssl="${OPENSSLBASE}"
+.endif
+
 post-patch:
 	${REINPLACE_CMD}\
 	 -e 's|@localstatedir@/sym/|${PREFIX}/share/flow-tools/|' \
diff --git a/net-mgmt/flow-tools/files/flow_capture.in b/net-mgmt/flow-tools/files/flow_capture.in
index cfbad2a..856695d 100644
--- a/net-mgmt/flow-tools/files/flow_capture.in
+++ b/net-mgmt/flow-tools/files/flow_capture.in
@@ -11,7 +11,7 @@
 # Add the following line to /etc/rc.conf to enable flow-capture:
 # flow_capture_enable (bool):	Set it to "YES" to enable flow-capture daemon.
 #				Set to "NO" by default.
-# flow_tools_datadir (str):	Base flow data directory.
+# flow_capture_datadir (str):	Base flow data directory.
 #				Default is "/var/db/flows"
 # flow_capture_localip (str):	IP address to bind to
 #				Default to "0.0.0.0"
diff --git a/net-mgmt/flow-tools/files/patch-configure b/net-mgmt/flow-tools/files/patch-configure
index a2d8a50..141f5e9 100644
--- a/net-mgmt/flow-tools/files/patch-configure
+++ b/net-mgmt/flow-tools/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Wed May 11 16:15:55 2005
-+++ configure	Fri Dec  9 15:30:02 2005
+--- configure.orig	Wed May 11 18:15:55 2005
++++ configure	Wed Dec 20 01:34:55 2006
 @@ -1662,7 +1662,7 @@
  
  
@@ -9,7 +9,37 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3345,7 +3345,7 @@
+@@ -2254,7 +2254,6 @@
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+@@ -2299,21 +2298,6 @@
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+ echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+@@ -3345,7 +3329,7 @@
  
  
  if test "x$WHERE_PGSQL" != "x"; then
@@ -18,7 +48,7 @@
    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 @@
+@@ -3402,7 +3386,7 @@
  echo "${ECHO_T}$ac_cv_lib_pq_PQsetdbLogin" >&6
  if test $ac_cv_lib_pq_PQsetdbLogin = yes; then
  
diff --git a/net-mgmt/flow-tools/files/patch-lib_Makefile.in b/net-mgmt/flow-tools/files/patch-lib_Makefile.in
new file mode 100644
index 0000000..21aea46
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-lib_Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	Wed Dec 20 01:38:19 2006
++++ lib/Makefile.in	Wed Dec 20 01:38:25 2006
+@@ -91,7 +91,7 @@
+ 
+ #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
+ #AM_CFLAGS=-O2
+-AM_CFLAGS = -g -Wall
++#AM_CFLAGS = -g -Wall
+ 
+ DEFS = -I. -I$(srcdir)/lib
+ 
diff --git a/net-mgmt/flow-tools/files/patch-src_Makefile.in b/net-mgmt/flow-tools/files/patch-src_Makefile.in
new file mode 100644
index 0000000..7e414cb
--- /dev/null
+++ b/net-mgmt/flow-tools/files/patch-src_Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed Dec 20 01:37:38 2006
++++ src/Makefile.in	Wed Dec 20 01:37:57 2006
+@@ -97,7 +97,7 @@
+ 
+ #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs
+ #AM_CFLAGS=-O2
+-AM_CFLAGS = -g -Wall
++#AM_CFLAGS = -g -Wall
+ 
+ bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \
+         flow-send flow-receive flow-gen flow-expire \