1 files changed, 19 insertions, 71 deletions
diff --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in
index 32b7fd41b6d2..46c9d46d8559 100644
--- a/net/ntop/files/patch-configure.in
+++ b/net/ntop/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2009-09-15 11:37:06.000000000 -0300
-+++ configure.in	2009-09-15 11:45:13.000000000 -0300
-@@ -621,8 +621,8 @@
+--- ./configure.in.orig	2011-02-02 10:41:10.000000000 +0100
++++ ./configure.in	2011-02-02 10:49:06.000000000 +0100
+@@ -582,8 +582,8 @@
  else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
@@ -11,73 +11,21 @@
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1650,27 +1650,6 @@
- fi
- 
- dnl>
--dnl> Lua - http://www.lua.org
--dnl>
--LUA_VERSION=lua-5.1.4
--if test -f "$LUA_VERSION.tar.gz"; then
--   echo "Lua already present on this machine"
--else
--   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
--fi
--
--tar xvfz $LUA_VERSION.tar.gz
--cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
--cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
--#rm -f /tmp/lua.temp
--cd $LUA_VERSION; make posix; cd ..
--
--LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
--LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
--INCS="${INCS} -I${LUA_LIB_DIR}"
--AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
--
--dnl>
- dnl> SCTP - RFC 3286
- dnl>
- AC_MSG_CHECKING([sctp])
-@@ -1962,40 +1941,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
--fi
--tar xvfz GeoIP.tar.gz
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
--# OSX Fix
--GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--if test -f $GEO_DYLIB; then
--   ln -s $GEO_DYLIB .
--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="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
-+LDFLAGS="$LDFLAGS -lGeoIP"
+@@ -1815,8 +1815,6 @@
+ else
+    if test -f "3rd_party/GeoLiteCity.dat.gz"; then
+      cp 3rd_party/GeoLiteCity.dat.gz .
+-   else
+-     wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+    fi
  
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+    gunzip GeoLiteCity.dat.gz
+@@ -1829,8 +1827,6 @@
+ else
+    if test -f "3rd_party/GeoIPASNum.dat.gz"; then
+      cp 3rd_party/GeoIPASNum.dat.gz .
+-   else
+-     wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+    fi
  
+    gunzip GeoIPASNum.dat.gz