ports/161041: net/ntop fix ./configure options, and fix python-config

[Michael Scheidell]

>Number:         161041
>Category:       ports
>Synopsis:       net/ntop fix ./configure options, and fix python-config
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 26 20:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Michael Scheidell
>Release:        amd 7.4
>Organization:
SECNAP Network Security Corp
>Environment:
uname -a
FreeBSD s7.4-RELEASE-p2 FreeBSD 7.4-RELEASE-p2 #1: Wed Aug 24 12:15:10 EDT 2011     admin at ht-amd-ghost.hackertrap.net:/usr/obj/usr/src/sys/ENTHACKER  amd64

>Description:
ports maintainers: this supersedes PR 161037
(error 400 was due to left over cookies in firefox)

this pr is for three things: fix configure options, fix python configure, add jumbo-frames.

#1, configure options changed from ntop 4.0 to ntop 4.1:
configure: creating ./config.status
config.status: creating Makefile
config.status: creating plugins/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: WARNING: unrecognized options: --disable-ipv6, --enable-i18n, --with-localedir

#2:fix configure/python (sed line broken, missing "")

checking for python-config... /usr/local/bin/python2.6
>How-To-Repeat:
configure and install ntop 4.1x.  watch configure output.

>Fix:
Add patch
#1, takes out --disable-ipv6, --enable-i18n, --with-localedir
#2, fixed sed from sed -e "s/-arch i386// | sed -e "
(you see problem, missing " before pipe)
#3, added config knob (default off) to enable jumbo frames.

note: I still can't figure out how to chown /var/db/ntop from a package :-)



Patch attached with submission follows:

diff -bBru /var/tmp/ntop/Makefile ../ntop/Makefile
--- /var/tmp/ntop/Makefile	2011-09-26 12:47:03.000000000 -0400
+++ ../ntop/Makefile	2011-09-26 16:13:22.000000000 -0400
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntop
 PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 #MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Stable
@@ -43,8 +43,6 @@
 		--with-gdbm-root=${LOCALBASE} \
 		--with-zlib-root=/usr \
 		--disable-snmp
-# we currently disable IPv6
-CONFIGURE_ARGS+=--disable-ipv6
 
 MAN8=		ntop.8
 
@@ -59,9 +57,9 @@
 ##    WITH_PCAP_PORT:     Use libpcap from ports.
 ##    WITH_XMLDUMP:       Enable XML Dump support.
 ##
-OPTIONS=	LOCALE "Enable locale (i18n) support." Off \
-		PCAP_PORT "Use libpcap from ports." Off \
-		XMLDUMP "Enable XML Dump support." Off
+OPTIONS=	PCAP_PORT "Use libpcap from ports." Off \
+		XMLDUMP "Enable XML Dump support." Off \
+		JUMBO_FRAMES "Jumbo Frames. Experimental." Off
 
 .include <bsd.port.pre.mk>
 
@@ -72,12 +70,6 @@
 CONFIGURE_ARGS+=	--with-pcap-root=/usr
 .endif
 
-.if defined(WITH_LOCALE) && !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	--enable-i18n \
-			--with-localedir=${LOCALBASE}/share/locale
-.endif
-
 .if defined(WITH_XMLDUMP)
 LIB_DEPENDS+=		gdome.8:${PORTSDIR}/textproc/gdome2
 CPPFLAGS+=		-I${LOCALBASE}/include/libxml2 \
@@ -86,6 +78,12 @@
 			-I${LOCALBASE}/include/glib-2.0
 .endif
 
+.if defined(WITH_JUMBO_FRAMES)
+CONFIGURE_ARGS+=        --enable-jumbo-frames
+# should set your mtu to 9000
+# see http://www.cyberciti.biz/faq/freebsd-jumbo-frames-networking-configration/
+.endif
+
 .if ${OSVERSION} < 700000
 BROKEN=		does not configure on 6.X
 .endif
diff -bBru /var/tmp/ntop/files/patch-configure.in ../ntop/files/patch-configure.in
--- /var/tmp/ntop/files/patch-configure.in	2011-02-11 08:34:49.000000000 -0500
+++ ../ntop/files/patch-configure.in	2011-09-26 15:54:18.000000000 -0400
@@ -11,6 +11,15 @@
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
+@@ -1480,7 +1480,7 @@
+ 
+     dnl remove unecessary path
+     dnl line below workaround for OSX 10.6 (Snow Leopard)/10.7 (Lion)
+-    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386// | sed -e "s/-arch ppc// | sed -e "s/-arch x86_64//"`
++    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+     INCS="${INCS} ${PYTHON_INCS}"
+ 
+ OLD_CFLAGS=$CFLAGS
 @@ -1815,8 +1815,6 @@
  else
     if test -f "3rd_party/GeoLiteCity.dat.gz"; then


>Release-Note:
>Audit-Trail:
>Unformatted:
 >>>> Unable to locate python-config: using workaround <<<<
 checking for python... (cached) /usr/local/bin/python2.6
 sed: 1: "s/-arch i386// | sed -e ...": bad flag in substitute command: '|'
 close failed in file object destructor:
 Error in sys.excepthook:
 
 #3, (hope you don't mind) took out i18n since its broken, added jumbo-frames.
 I don't be offended if you take out jumbo-frames, or put big warnings on it.