[csw-devel] SF.net SVN: gar:[7751] csw/mgar/pkg/ntop/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Sat Dec 26 11:01:27 CET 2009
Revision: 7751
http://gar.svn.sourceforge.net/gar/?rev=7751&view=rev
Author: hson
Date: 2009-12-26 10:01:26 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
ntop: Update to 3.3.10 plus some patches to get closer to a build
Modified Paths:
--------------
csw/mgar/pkg/ntop/trunk/Makefile
csw/mgar/pkg/ntop/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ntop/trunk/files/configure.in.diff
csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff
Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 02:01:07 UTC (rev 7750)
+++ csw/mgar/pkg/ntop/trunk/Makefile 2009-12-26 10:01:26 UTC (rev 7751)
@@ -1,5 +1,5 @@
GARNAME = ntop
-GARVERSION = 3.3.9
+GARVERSION = 3.3.10
CATEGORIES = net
DESCRIPTION = A network traffic usage monitor.
@@ -15,7 +15,8 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-# PATCHFILES = intdef.diff
+PATCHFILES = configure.in.diff
+PATCHFILES += configureextra_opencsw.diff
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233
@@ -23,6 +24,18 @@
UFILES_REGEX = (\d+(?:\.\d+)*)
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-pcap-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-pcap-include=/opt/csw/include
+CONFIGURE_ARGS += --with-gdbm-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-gdbm-include=/opt/csw/include
+CONFIGURE_ARGS += --with-zlib-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-zlib-include=/opt/csw/include
+CONFIGURE_ARGS += --with-ossl-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-ossl-include=/opt/csw/include
include gar/category.mk
+pre-configure-modulated:
+ ( cd $(WORKSRC) ; ./autogen.sh --noconfig)
+ @$(MAKECOOKIE)
+
Modified: csw/mgar/pkg/ntop/trunk/checksums
===================================================================
--- csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 02:01:07 UTC (rev 7750)
+++ csw/mgar/pkg/ntop/trunk/checksums 2009-12-26 10:01:26 UTC (rev 7751)
@@ -1 +1,3 @@
-0c22038e0f2aa003110437b5a5d5a6a5 download/ntop-3.3.9.tar.gz
+1615818e06d4a503b6a52426e88aaed4 configure.in.diff
+257b92864fc22a475e23191c60dd100c configureextra_opencsw.diff
+6e2ffa90d5f935c8f03d88a5dd19a866 ntop-3.3.10.tar.gz
Added: csw/mgar/pkg/ntop/trunk/files/configure.in.diff
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/configure.in.diff (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/configure.in.diff 2009-12-26 10:01:26 UTC (rev 7751)
@@ -0,0 +1,44 @@
+--- ntop-3.3.10.old/configure.in 2009-05-06 16:55:22.000000000 +0200
++++ ntop-3.3.10/configure.in 2009-12-24 02:57:08.602866458 +0100
+@@ -274,6 +274,15 @@
+ [ --with-pcap-root=DIR LBNL pcap located in DIR],
+ PCAP_ROOT="$withval",
+ PCAP_ROOT=)
++AC_ARG_WITH( pcap-lib,
++ [ --with-pcap-lib=DIR or libpcap located in DIR],
++ PCAP_LIB="$withval",
++ PCAP_LIB=)
++AC_ARG_WITH( pcap-include,
++ [ --with-pcap-include=DIR or pcap.h located in DIR],
++ PCAP_INCLUDE="$withval",
++ PCAP_INCLUDE=)
++
+ AC_ARG_WITH( gdbm-root,
+ [ --with-gdbm-root=DIR gdbm located in DIR],
+ GDBM_DIRECTORY="$withval",
+@@ -670,6 +679,7 @@
+ INCS="${INCS} -I/usr/include/pcap"
+ AC_MSG_RESULT([found in $PCAP_ROOT])
+ else
++ NTOP_APPENDS([${PCAP_INCLUDE}], [${PCAP_LIB}], [pcap])
+ AC_CHECK_LIB(pcap, pcap_lookupdev, , [
+ AC_MSG_RESULT([ *** FATAL ERROR *** ])
+ AC_MSG_RESULT([ It looks that you don't have the libpcap distribution installed.])
+@@ -1659,7 +1669,7 @@
+ wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
+ fi
+
+-tar xvfz $LUA_VERSION.tar.gz
++gtar 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
+@@ -1968,7 +1978,7 @@
+ else
+ wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
+ fi
+-tar xvfz GeoIP.tar.gz
++gtar xvfz GeoIP.tar.gz
+ GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
+ cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
+ # OSX Fix
Added: csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/configureextra_opencsw.diff 2009-12-26 10:01:26 UTC (rev 7751)
@@ -0,0 +1,51 @@
+diff -ru ntop-3.3.10.old/configureextra/SOLARIS10 ntop-3.3.10/configureextra/SOLARIS10
+--- ntop-3.3.10.old/configureextra/SOLARIS10 2007-05-03 23:31:40.000000000 +0200
++++ ntop-3.3.10/configureextra/SOLARIS10 2009-12-24 02:31:19.464874160 +0100
+@@ -5,9 +5,9 @@
+ #
+
+ echo " Setting Solaris 10 specific flag values"
+-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}"
+ LIBS="-lnsl -lsocket ${LIBS}"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include"
+
+ . configureextra/functions
+
+@@ -28,4 +28,4 @@
+ echo "- ln -s libpcap.so.0.X.Y libpcap.so"
+ echo "- rm libpcap.a"
+ echo ""
+-echo "*************************************************"
+\ No newline at end of file
++echo "*************************************************"
+diff -ru ntop-3.3.10.old/configureextra/SOLARIS8 ntop-3.3.10/configureextra/SOLARIS8
+--- ntop-3.3.10.old/configureextra/SOLARIS8 2005-09-29 10:42:23.000000000 +0200
++++ ntop-3.3.10/configureextra/SOLARIS8 2009-12-24 02:33:36.592681360 +0100
+@@ -1,8 +1,9 @@
+ #!/bin/sh
+
+ echo " Setting Solaris 8 specific flag values"
+-LDFLAGS="-L/usr/local/lib"
++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}"
+ LIBS="-lnsl -lsocket ${LIBS}"
++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include"
+
+ . configureextra/functions
+
+diff -ru ntop-3.3.10.old/configureextra/SOLARIS9 ntop-3.3.10/configureextra/SOLARIS9
+--- ntop-3.3.10.old/configureextra/SOLARIS9 2003-12-02 13:03:47.000000000 +0100
++++ ntop-3.3.10/configureextra/SOLARIS9 2009-12-24 02:33:21.611018077 +0100
+@@ -1,9 +1,9 @@
+ #!/bin/sh
+
+ echo " Setting Solaris 9 specific flag values"
+-LDFLAGS="-L/opt/sfw/lib -L/usr/local/lib -R/opt/sfw/lib -R/usr/local/lib ${LDFLAGS}"
++LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib ${LDFLAGS}"
+ LIBS="-lnsl -lsocket ${LIBS}"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/sfw/include"
++CPPFLAGS="${CPPFLAGS} -I/opt/csw/include"
+
+ . configureextra/functions
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list