Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20843
Modified Files: ntop.info ntop.patch Log Message: New version works for me Index: ntop.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/ntop.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ntop.info 20 Apr 2008 18:53:10 -0000 1.2 +++ ntop.info 29 May 2009 04:53:12 -0000 1.3 @@ -1,30 +1,106 @@ Package: ntop -Version: 1.1 -Revision: 1023 +Version: 3.3 +Revision: 1 Maintainer: None <fink-de...@lists.sourceforge.net> -Depends: libpcap-shlibs, ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006) -BuildDepends: libpcap, libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12-1) -GCC: 4.0 -Source: mirror:custom:%n-%v-src.tar.gz -Source-MD5: 4630ed141d9d5f16f929a9b64b70a45c -CustomMirror: << - nam-US: http://www.alltheweb.com/go/1/H/ftp/ftp/ftp.cs.rpi.edu/.2/FreeBSD/ports/distfiles/ - nam-US: http://www.alltheweb.com/go/3/H/ftp/ftp/ftp.isc.org/FreeBSD/ports/distfiles/ +Depends: << + cairo-shlibs (>= 1.8-1), + expat1-shlibs, + fontconfig2-shlibs (>= 2.4.1-1), + freetype219-shlibs (>= 2.3.8-2), + gdbm3-shlibs, + glib2-shlibs (>= 0.18.0-1), + glitz-shlibs, + libgettext3-shlibs, + libiconv, + libpcap-shlibs (>= 0.9.8-1), + libpng3-shlibs, + librrd4-shlibs (>= 1.3.8-1), + libxml2-shlibs (>= 2.6.32-1), + net-snmp-unified15-shlibs (>= 5.4.2.1-4), + pango1-xft2-ft219-shlibs (>= 1.22.4-3), + pcre-shlibs, + pixman-shlibs (>= 0.12.0-1), + rrdtool (>= 1.3.8-1) << -#Source: ftp://ftp.de.ntop.org/pub/ntop/source/ntop-%v-src.tar.gz -SourceDirectory: ntop-%v +BuildDepends: << + autoconf, + automake1.10, + cairo (>= 1.8-1), + expat1, + fink (>= 0.28), + fontconfig2-dev (>= 2.4.1-1), + freetype219 (>= 2.3.8-2), + gdbm3, + glib2-dev (>= 0.18.0-1), + glitz-shlibs, + libgettext3-dev, + libiconv-dev, + libpcap (>= 0.9.8-1), + libpng3, + libtool2, + libxml2 (>= 2.6.32-1), + net-snmp-unified15-dev (>= 5.4.2.1-4), + net-snmp-unified (>= 5.4.2.1-4), + pango1-xft2-ft219-dev (>= 1.22.4-3), + pcre, + pixman (>= 0.12.0-1), + rrdtool-dev (>= 1.3.8-1), + system-openssl-dev +<< +Source: mirror:debian:pool/main/n/%n/%n_%v.orig.tar.gz +Source-MD5: a0e52a85587c8a5519d822d04862dab4 +SourceDirectory: %n-%v PatchFile: %n.patch -PatchFile-MD5: 979ff294c89e4afd88640fa027dc82d4 -UpdateConfigGuess: true -ConfigureParams: --mandir=%p/share/man +PatchFile-MD5: 6b2d6b14aa4ea2000e6115ed3cee6893 +PatchScript: << + sed "s,@PREFIX@,%p,g" < %{PatchFile} | patch -p1 + perl -pi -e 's/-shared/-module -avoid-version/' plugins/Makefile.am + perl -pi -e 's/-release \...@package_version\@//' plugins/Makefile.am +<< +SetCPPFLAGS: -I%p/lib/system-openssl/include +SetLDFLAGS: -L%p/lib/system-openssl/lib +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --disable-static --with-ssl --with-tcpwrap --enable-i18n --with-localedir=%p/share/locale +CompileScript: << + rm -f libtool.m4.in ltmain.sh aclocal.m4 acinclude.m4.in + cp acinclude.m4.ntop acinclude.m4 + autoreconf -fi + ./configure %c + make +<< InstallScript: << - mkdir -p %i/sbin - mkdir -p %i/share/man/man8 make install DESTDIR=%d - make install-man DESTDIR=%d << -SetCFLAGS: -I%p/include -DocFiles: CHANGES COPYING FAQ KNOWN_BUGS README THREADS-FAQ TO_DO VERSION +DocFiles: AUTHORS COPYING ChangeLog NEWS SUPPORT_NTOP.txt THANKS docs/1STRUN.txt docs/BUG_REPORT docs/FAQ* docs/HACKING docs/KNOWN_BUGS docs/README docs/TODO docs/database/README:README.database docs/database/README.mySQL:README.mySQL +Shlibs: << + ! %p/lib/libntop-3.3.dylib + ! %p/lib/libntopreport-3.3.dylib +<< +DescPackaging: << + Upstream website is confusing, just pull debian's source. + + net-snmp's .la are in %N instead of %N15-dev. + + net-snmp-config publishes flags related to perl but ntop + doesn't use or embed perl itself, so doesn't matter that they + are not portable among system-perl perlversions. But remove + /usr/local paths for safety (wish net-snmp already did that!). + + Install the ASN datafiles. +<< +DescPort: << + Fix upstream confusion about what a shared-library vs a + loadable module is for building plugins. + + Avoid lots of non-portable darwin-specific hacks that aren't + needed on modern unix-standard OS X. + + Leaving as -flat_namespace pending evidence that changing it + is good (libnetsnmp is flat). + + Plugins cannot be -no-undefined because they need symbols from + main shared-libraries but don't link them or specify + -bundle_loader. Leaving alone until someone cares. +<< Description: Tool that shows network usage, similar to top License: GPL Homepage: http://www.ntop.org/ Index: ntop.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/ntop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ntop.patch 7 Feb 2006 04:29:29 -0000 1.1 +++ ntop.patch 29 May 2009 04:53:12 -0000 1.2 @@ -1,16 +1,275 @@ -diff -ru -x *~ ntop-1.1/Makefile.in ntop-1.1-patched/Makefile.in ---- ntop-1.1/Makefile.in Mon May 3 10:03:10 1999 -+++ ntop-1.1-patched/Makefile.in Tue Nov 6 22:56:58 2001 -@@ -104,10 +104,10 @@ - http.c: ntop.h - report.c: ntop.h +diff -Nurd -x'*~' ntop-3.3.orig/Makefile.am ntop-3.3/Makefile.am +--- ntop-3.3.orig/Makefile.am 2007-06-09 17:15:11.000000000 -0400 ++++ ntop-3.3/Makefile.am 2009-05-28 23:05:29.000000000 -0400 +@@ -157,8 +157,8 @@ + .PHONY: snapshot --install: -+install: $(PROG) - $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG) --install-man: -+install-man: $(PROG).8 - $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8 +-acinclude.m4: acinclude.m4.ntop libtool.m4.in +- @cat acinclude.m4.ntop libtool.m4.in >acinclude.m4 ++acinclude.m4: acinclude.m4.ntop ++ @cat acinclude.m4.ntop >acinclude.m4 - clean: + CLEANLIST = `ls -l $(DESTDIR)$(libdir)/*ntop*.so $(DESTDIR)$(libdir)/*Plugin*.so | \ + grep -v $(VERSION) | \ +@@ -266,7 +266,7 @@ + fi; \ + done + +-install: install-recursive ++install: install-recursive install-data-as + + @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) + +@@ -360,7 +360,6 @@ + done + + install-data-local: ntop.txt ntop.html faq.html +- @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins; + @if ! test -d $(DESTDIR)/$(datadir)/ntop; then \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \ + touch $(DESTDIR)/$(datadir)/ntop/warnuser; \ +diff -Nurd -x'*~' ntop-3.3.orig/configure.in ntop-3.3/configure.in +--- ntop-3.3.orig/configure.in 2007-06-09 17:30:00.000000000 -0400 ++++ ntop-3.3/configure.in 2009-05-29 00:09:52.000000000 -0400 +@@ -159,6 +159,7 @@ + + AC_PROG_CPP + AC_PROG_CC ++AM_PROG_CC_C_O + dnl> AC_PROG_CXX no c++ code (yet?) + AC_PROG_INSTALL + AC_PROG_LN_S +@@ -360,7 +361,6 @@ + echo + echo "Checking C compiler program and features..." + echo +-AM_PROG_CC_STDC + if test ".${ac_cv_prog_cc_stdc}" = ".no"; then + echo + echo "*******************************************************************" +@@ -508,10 +508,6 @@ + LOCALEDIR="/usr/lib/locale" + fi + +-dnl> Add /usr/local/ +-CFLAGS="${CFLAGS} -I/usr/local/include" +-CPPFLAGS="${CPPFLAGS} -I/usr/local/include" +-LDFLAGS="${LDFLAGS} -L/usr/local/lib" + + + +@@ -546,14 +542,7 @@ + ) + + dnl> add pic flag in any case this makes sure all our code is relocatable +-case "${target}:${CC}" in +- *-*-darwin*:* ) +- CFLAGS="$CFLAGS "`grep pic_flag= /usr/bin/glibtool | head -n1 | sed -e 's/.*pic_flag=//' -e 's/"//g'` +- ;; +- * ) +- CFLAGS="$CFLAGS "`grep pic_flag= libtool | head -n1 | sed -e 's/.*pic_flag=//' -e 's/"//g'` +- ;; +-esac ++dnl nah, just let libtool Do The Right Thing + + dnl> Presets for the make flags go here... + CFLAGS="${CFLAGS}" +@@ -1581,13 +1570,13 @@ + AC_CHECK_TOOL(NETSNMP, net-snmp-config) + if test "x$ac_cv_prog_ac_ct_NETSNMP" = "xnet-snmp-config"; then + AC_DEFINE_UNQUOTED(HAVE_SNMP, 1, [SNMP is supported]) +- SNMPLIBS="`net-snmp-config --libs`" ++ SNMPLIBS="`net-snmp-config --libs | sed 's/-L\/usr\/local\/lib//g'`" + SNMPLIBS="`echo ${SNMPLIBS}|sed -e s,'-R../lib',,g`" + echo "net-snmp libs: ${SNMPLIBS}" + LIBS="${LIBS} ${SNMPLIBS}" + dnl remove unecessary path + LIBS=`echo ${LIBS}|sed -e s,'-R../lib',,g` +- INCS="${INCS} `net-snmp-config --cflags`" ++ INCS="${INCS} `net-snmp-config --cflags | sed 's/-I\/usr\/local\/include//g'`" + else + AC_MSG_RESULT(NET-SNMP is not present: SNMP support is disabled) + fi +@@ -2088,7 +2077,7 @@ + echo "#endif /* MEMORY_DEBUG */" >> version.c + + case "${host}" in +- *darwin* ) ++ *darwin_skip-this-hack* ) + echo + echo "Copying patched versions of some configure-related files for Mac OS X" + cp packages/MacOSX/lt* . +diff -Nurd -x'*~' ntop-3.3.orig/configureextra/DARWIN ntop-3.3/configureextra/DARWIN +--- ntop-3.3.orig/configureextra/DARWIN 2005-03-24 07:09:07.000000000 -0500 ++++ ntop-3.3/configureextra/DARWIN 2009-05-28 22:30:42.000000000 -0400 +@@ -1,13 +1,5 @@ + #!/bin/sh + + echo " Setting Darwin (Mac OS X) specific flag values" +-CFLAGS="-no-cpp-precomp $CFLAGS" + +-case "${target}" in +- *-*-darwin5.5* ) +- DYN_FLAGS="-bundle -flat_namespace -undefined suppress $DYN_FLAGS" +- ;; +- *-*-darwin8* ) + CPPFLAGS="${CPPFLAGS} -DTIGER" +- ;; +-esac +diff -Nurd -x'*~' ntop-3.3.orig/globals-defines.h ntop-3.3/globals-defines.h +--- ntop-3.3.orig/globals-defines.h 2007-05-17 11:30:08.000000000 -0400 ++++ ntop-3.3/globals-defines.h 2009-05-29 00:12:49.000000000 -0400 +@@ -2051,7 +2051,7 @@ + * default file and directories + */ + #define DEFAULT_NTOP_PIDFILE "ntop.pid" +-#define DEFAULT_NTOP_PID_DIRECTORY "/var/run" ++#define DEFAULT_NTOP_PID_DIRECTORY "@PREFIX@/var/run" + + /* + * default configuration parameters -- the comment gives the (short getopt) name +diff -Nurd -x'*~' ntop-3.3.orig/plugins/Makefile.am ntop-3.3/plugins/Makefile.am +--- ntop-3.3.orig/plugins/Makefile.am 2007-06-07 17:57:43.000000000 -0400 ++++ ntop-3.3/plugins/Makefile.am 2009-05-28 21:16:26.000000000 -0400 +@@ -42,16 +42,7 @@ + # + # The meat for ntop + # +-noinst_PROGRAMS = \ +- icmpPlugin.so \ +- lastSeenPlugin.so \ +- netflowPlugin.so \ +- pdaPlugin.so \ +- remotePlugin.so \ +- rrdPlugin.so \ +- sflowPlugin.so +- +-lib_LTLIBRARIES = \ ++plugin_LTLIBRARIES = \ + libicmpPlugin.la \ + liblastSeenPlugin.la \ + libnetflowPlugin.la \ +@@ -89,117 +80,12 @@ + libsflowPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@ + libsflowPlugin_la_CFLAGS = $(AM_CFLAGS) + +-# +-# Dependencies to allow ntop loading plugins on-place +-# by default ntop looks for plugins in the plugins/ subdirectory +-# +- +- +-.libs/libicmpplugin...@so_version_patch@: +- @if test -f libicmpPlugin_la-icmpPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpplugin...@so_version_patch@ libicmpPlugin_la-icmpPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libicmpplugin...@so_version_patch@ icmpPlugin.o; \ +- fi +- +-icmpPlugin.so$(EXEEXT): .libs/libicmpplugin...@so_version_patch@ +- @$(LN_S) .libs/libicmpPlugin.so icmpPlugin.so +- +-############### +- +-.libs/liblastseenplugin...@so_version_patch@: +- @if test -f liblastSeenPlugin_la-lastSeenPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastseenplugin...@so_version_patch@ liblastSeenPlugin_la-lastSeenPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/liblastseenplugin...@so_version_patch@ lastSeenPlugin.o; \ +- fi +- +-lastSeenPlugin.so$(EXEEXT): .libs/liblastseenplugin...@so_version_patch@ +- @$(LN_S) .libs/liblastSeenPlugin.so lastSeenPlugin.so +- +-############### +- +-.libs/libnetflowplugin...@so_version_patch@: +- @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowplugin...@so_version_patch@ libnetflowPlugin_la-netflowPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowplugin...@so_version_patch@ netflowPlugin.o; \ +- fi +- +-netflowPlugin.so$(EXEEXT): .libs/libnetflowplugin...@so_version_patch@ +- @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so +- +-############### +- +-.libs/libpdaplugin...@so_version_patch@: +- @if test -f libpdaPlugin_la-pdaPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaplugin...@so_version_patch@ libpdaPlugin_la-pdaPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libpdaplugin...@so_version_patch@ pdaPlugin.o; \ +- fi +- +-pdaPlugin.so$(EXEEXT): .libs/libpdaplugin...@so_version_patch@ +- @$(LN_S) .libs/libpdaPlugin.so pdaPlugin.so +- +-############### +- +-.libs/libremoteplugin...@so_version_patch@: +- @if test -f libremotePlugin_la-remotePlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremoteplugin...@so_version_patch@ libremotePlugin_la-remotePlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libremoteplugin...@so_version_patch@ remotePlugin.o; \ +- fi +- +-remotePlugin.so$(EXEEXT): .libs/libremoteplugin...@so_version_patch@ +- @$(LN_S) .libs/libremotePlugin.so remotePlugin.so +- +-############### +- +-.libs/librrdplugin...@so_version_patch@: +- @if test -f librrdPlugin_la-rrdPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdplugin...@so_version_patch@ librrdPlugin_la-rrdPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdplugin...@so_version_patch@ rrdPlugin.o; \ +- fi +- +-rrdPlugin.so$(EXEEXT): .libs/librrdplugin...@so_version_patch@ +- @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so +- +-############### +- +-.libs/libsflowplugin...@so_version_patch@: +- @if test -f libsflowPlugin_la-sflowPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowplugin...@so_version_patch@ libsflowPlugin_la-sflowPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowplugin...@so_version_patch@ sflowPlugin.o; \ +- fi + +-sflowPlugin.so$(EXEEXT): .libs/libsflowplugin...@so_version_patch@ +- @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so +- +-############### +- +-.libs/libxmldumpplugin...@so_version_patch@: +- @if test -f libxmldumpPlugin_la-xmldumpPlugin.o; then \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpplugin...@so_version_patch@ libxmldumpPlugin_la-xmldumpPlugin.o; \ +- else \ +- $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libxmldumpplugin...@so_version_patch@ xmldumpPlugin.o; \ +- fi +- +-xmldumpPlugin.so$(EXEEXT): .libs/libxmldumpplugin...@so_version_patch@ +- @$(LN_S) .libs/libxmldumpPlugin.so xmldumpPlugin.so +- +-############### +- +-install-data-local: +- @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir); +- @for file in $(noinst_PROGRAMS); do \ +- cp -p $$file $(DESTDIR)$(plugindir)/$$file; \ +- done +-# remove installed libraries +- @for file in $(lib_LTLIBRARIES); do \ +- rm -f $(DESTDIR)$(libdir)/$$file; \ +- done ++# use -hook (runs after real install) instead of -local (runs before) ++install-data-hook: ++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) ++# we dlopen(*), so nuke everything except the actual loadable .so files ++ rm -f $(DESTDIR)$(plugindir)/*.la + + # + # Special stuff for xml auto-generation of code from the "doc": ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp as they present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs