aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Scheidell <scheidell@FreeBSD.org>2011-11-21 00:57:36 +0000
committerMichael Scheidell <scheidell@FreeBSD.org>2011-11-21 00:57:36 +0000
commit8d89aabf09539462369e723a747820c4b30035d9 (patch)
treea8606d742e54faf849bdf2b0a8cf5d42168f246a
parent439af2603d9237693ec95f2332551adfdf835ad1 (diff)
downloadports-8d89aabf09539462369e723a747820c4b30035d9.tar.gz
ports-8d89aabf09539462369e723a747820c4b30035d9.zip
PR: 16041
Submitted by: scheidell Approved by: maintainer (sylvio, implicit), gabor (mentor) Feature safe: Yes
Notes
Notes: svn path=/head/; revision=286138
-rw-r--r--net/ntop/Makefile22
-rw-r--r--net/ntop/files/patch-configure.in9
2 files changed, 19 insertions, 12 deletions
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 58dfbd71246c..c4dafedbff83 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -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 @@ CONFIGURE_ARGS= --localstatedir=${DBDIR} \
--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 @@ USE_RC_SUBR= ntop.sh
## 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=${LOCALBASE}
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 @@ CPPFLAGS+= -I${LOCALBASE}/include/libxml2 \
-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 --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in
index 46c9d46d8559..1d5a208e42bc 100644
--- a/net/ntop/files/patch-configure.in
+++ b/net/ntop/files/patch-configure.in
@@ -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