[50993] trunk/dports/net/ntop
markd at macports.org
markd at macports.org
Thu May 14 18:30:10 PDT 2009
Revision: 50993
http://trac.macports.org/changeset/50993
Author: markd at macports.org
Date: 2009-05-14 18:30:09 -0700 (Thu, 14 May 2009)
Log Message:
-----------
Disable bundled geoip because it installs outside the MP sandbox.
Modified Paths:
--------------
trunk/dports/net/ntop/Portfile
Added Paths:
-----------
trunk/dports/net/ntop/files/patch-external-geoip.diff
Modified: trunk/dports/net/ntop/Portfile
===================================================================
--- trunk/dports/net/ntop/Portfile 2009-05-15 00:53:38 UTC (rev 50992)
+++ trunk/dports/net/ntop/Portfile 2009-05-15 01:30:09 UTC (rev 50993)
@@ -4,6 +4,7 @@
name ntop
version 3.3.9
+revision 1
categories net
maintainers markd
description network traffic probe
@@ -12,9 +13,11 @@
usage, similar to what the popular top Unix command does.
homepage http://www.ntop.org/
-master_sites sourceforge
+master_sites sourceforge
checksums md5 0c22038e0f2aa003110437b5a5d5a6a5
+patchfiles patch-external-geoip.diff
+
depends_build port:gawk \
port:wget \
port:rrdtool
@@ -23,8 +26,11 @@
port:libpng \
port:gdbm
+patch.pre_args -p1
configure.cflags-append -I${prefix}/include
-configure.args --mandir=${prefix}/share/man
+configure.args --mandir=${prefix}/share/man \
+ --with-localedir=${prefix}/share/locale \
+ --with-rrd-home=${prefix}
use_autoconf yes
build.type gnu
Added: trunk/dports/net/ntop/files/patch-external-geoip.diff
===================================================================
--- trunk/dports/net/ntop/files/patch-external-geoip.diff (rev 0)
+++ trunk/dports/net/ntop/files/patch-external-geoip.diff 2009-05-15 01:30:09 UTC (rev 50993)
@@ -0,0 +1,116 @@
+diff -Nru ntop-3.3.9.orig/configure.in ntop-3.3.9/configure.in
+--- ntop-3.3.9.orig/configure.in 2009-02-18 21:04:10.000000000 +0000
++++ ntop-3.3.9/configure.in 2009-02-18 21:05:58.000000000 +0000
+@@ -1883,39 +1883,7 @@
+ fi
+
+ dnl> GeoIP (http://www.maxmind.com/)
+-if test -f "GeoIP.tar.gz"; then
+- echo "GeoIP already present on this machine"
+-else
+- wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
+- tar xvfz GeoIP.tar.gz
+- GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+- cd $GEO_DIR; ./configure; make; cd ..
+- # OSX Fix
+- GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
+- if test -f $GEO_DYLIB; then
+- ln -s $GEO_DYLIB .
+- fi
+-fi
+-
+-if test -f "GeoLiteCity.dat"; then
+- echo "GeoLiteCity.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+- gunzip GeoLiteCity.dat.gz
+-fi
+-
+-if test -f "GeoIPASNum.dat"; then
+- echo "GeoIPASNum.dat already present"
+-else
+- wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+- gunzip GeoIPASNum.dat.gz
+-fi
+-
+-
+-GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+-GEO_IP="$GEO_DIR/libGeoIP/"
+-CFLAGS="$CFLAGS -I$GEO_IP"
+-LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
++LDFLAGS="$LDFLAGS -lGeoIP"
+
+ dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+
+@@ -2080,7 +2048,6 @@
+ AC_SUBST(SO_VERSION_PATCH)
+ AC_SUBST(RRD_LIB)
+ AC_SUBST(RRD_INC)
+-AC_SUBST(GEO_DIR)
+
+ AC_CONFIG_FILES([Makefile])
+
+diff -Nru ntop-3.3.9.orig/initialize.c ntop-3.3.9/initialize.c
+--- ntop-3.3.9.orig/initialize.c 2008-12-03 22:00:22.000000000 +0000
++++ ntop-3.3.9/initialize.c 2009-02-18 21:04:44.000000000 +0000
+@@ -467,16 +467,15 @@
+ #endif
+
+ /* Initialize GeoIP databases */
+- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++ {
+ char path[256];
+
+ safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ "%s%c%s",
+- myGlobals.configFileDirs[i], CONST_PATH_SEP, GEO_IP_FILE);
++ myGlobals.dbPath, CONST_PATH_SEP, GEO_IP_FILE);
+ revertSlashIfWIN32(path, 0);
+ if((myGlobals.geo_ip_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ traceEvent(CONST_TRACE_INFO, "GeoIP: loaded config file %s", path);
+- break;
+ }
+ }
+
+@@ -485,16 +484,15 @@
+
+ /* *************************** */
+
+- for(i=0; myGlobals.configFileDirs[i] != NULL; i++) {
++ {
+ char path[256];
+
+ safe_snprintf(__FILE__, __LINE__, path, sizeof(path),
+ "%s%c%s",
+- myGlobals.configFileDirs[i], CONST_PATH_SEP, GEO_IP_ASN_FILE);
++ myGlobals.dbPath, CONST_PATH_SEP, GEO_IP_ASN_FILE);
+ revertSlashIfWIN32(path, 0);
+ if((myGlobals.geo_ip_asn_db = GeoIP_open(path, GEOIP_CHECK_CACHE)) != NULL) {
+ traceEvent(CONST_TRACE_INFO, "GeoIP: loaded ASN config file %s", path);
+- break;
+ }
+ }
+
+diff -Nru ntop-3.3.9.orig/Makefile.am ntop-3.3.9/Makefile.am
+--- ntop-3.3.9.orig/Makefile.am 2008-12-03 22:00:22.000000000 +0000
++++ ntop-3.3.9/Makefile.am 2009-02-18 21:05:33.000000000 +0000
+@@ -76,9 +76,7 @@
+ NTOPDATA = ntop-cert.pem \
+ $(ETTER_PASSIVE) \
+ oui.txt.gz \
+- specialMAC.txt.gz \
+- GeoIPASNum.dat \
+- GeoLiteCity.dat
++ specialMAC.txt.gz
+
+ NTOPHTML = html html/*.js html/*.html html/*.gif html/*.jpg html/*.ico html/*.png \
+ html/*.css html/*.dtd \
+@@ -270,8 +268,6 @@
+
+ install: install-recursive
+
+- cd @GEO_DIR@; make install
+-
+ @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
+
+ @echo ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090514/cbd7ef57/attachment.html>
More information about the macports-changes
mailing list