diff options
| -rw-r--r-- | net/ntop2/Makefile | 23 | ||||
| -rw-r--r-- | net/ntop2/PLIST | 43 | ||||
| -rw-r--r-- | net/ntop2/distinfo | 6 | ||||
| -rw-r--r-- | net/ntop2/patches/patch-aa | 29 |
4 files changed, 43 insertions, 58 deletions
diff --git a/net/ntop2/Makefile b/net/ntop2/Makefile index bbae8d4bada..0d8a57a441d 100644 --- a/net/ntop2/Makefile +++ b/net/ntop2/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.10 2002/11/21 10:23:06 grant Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/09 18:22:11 mycroft Exp $ -DISTNAME= ntop-2.1 -PKGNAME= ntop2-2.1 -PKGREVISION= 1 +DISTNAME= ntop-2.1.54 +PKGNAME= ntop2-2.1.54 +#PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/} +EXTRACT_SUFX= .tgz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.ntop.org/ @@ -12,19 +13,28 @@ COMMENT= shows network usage (similar to "top" for processes) CONFLICTS= ntop-[0-9]* -WRKSRC= ${WRKDIR}/ntop +WRKSRC= ${WRKDIR}/${DISTNAME}/ntop USE_BUILDLINK2= yes USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNU_READLINE= yes # --enable-micro-ntop causes compile to fail -CONFIGURE_ARGS+= --disable-mysql +CONFIGURE_ARGS+= --enable-automake171 +CONFIGURE_ARGS+= --with-pcap-root=${BUILDLINK_PREFIX.libpcap} +CONFIGURE_ARGS+= --with-gdbm-root=${BUILDLINK_PREFIX.gdbm} +CONFIGURE_ARGS+= --with-gdchart-root=${BUILDLINK_PREFIX.gdchart} USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PTHREAD_OPTS+= require +pre-configure: + cd ${WRKSRC} && ${ACLOCAL} + cd ${WRKSRC} && ${LOCALBASE}/bin/libtoolize --automake + cd ${WRKSRC} && ${AUTOMAKE} --add-missing + cd ${WRKSRC} && ${AUTOCONF} + .include "../../net/libpcap/buildlink2.mk" .include "../../devel/ncurses/buildlink2.mk" .include "../../databases/gdbm/buildlink2.mk" @@ -32,4 +42,5 @@ PTHREAD_OPTS+= require .include "../../graphics/gdchart/buildlink2.mk" .include "../../security/openssl/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" +.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ntop2/PLIST b/net/ntop2/PLIST index 72345c35830..adde6a0a531 100644 --- a/net/ntop2/PLIST +++ b/net/ntop2/PLIST @@ -1,50 +1,41 @@ -@comment $NetBSD: PLIST,v 1.4 2002/10/07 20:04:42 wiz Exp $ -bin/intop +@comment $NetBSD: PLIST,v 1.5 2003/01/09 18:22:12 mycroft Exp $ bin/ntop -bin/ntop-config +lib/libicmpPlugin-${PKGVERSION}.so lib/libicmpPlugin.a lib/libicmpPlugin.so -lib/libicmpPlugin.so.0 -lib/libicmpPlugin.so.0.0 +lib/liblastSeenPlugin-${PKGVERSION}.so lib/liblastSeenPlugin.a lib/liblastSeenPlugin.so -lib/liblastSeenPlugin.so.0 -lib/liblastSeenPlugin.so.0.0 +lib/libnetflowPlugin-${PKGVERSION}.so lib/libnetflowPlugin.a lib/libnetflowPlugin.so -lib/libnetflowPlugin.so.0 -lib/libnetflowPlugin.so.0.0 +lib/libnfsPlugin-${PKGVERSION}.so lib/libnfsPlugin.a lib/libnfsPlugin.so -lib/libnfsPlugin.so.0 -lib/libnfsPlugin.so.0.0 lib/libntop-${PKGVERSION}.so -lib/libntop-${PKGVERSION}.so.0 -lib/libntop-${PKGVERSION}.so.0.0 lib/libntop.a lib/libntop.la lib/libntop.so lib/libntopreport-${PKGVERSION}.so -lib/libntopreport-${PKGVERSION}.so.0 -lib/libntopreport-${PKGVERSION}.so.0.0 lib/libntopreport.a lib/libntopreport.la lib/libntopreport.so +lib/libpdaPlugin-${PKGVERSION}.so lib/libpdaPlugin.a lib/libpdaPlugin.so -lib/libpdaPlugin.so.0 -lib/libpdaPlugin.so.0.0 +lib/librrdPlugin-${PKGVERSION}.so +lib/librrdPlugin.a +lib/librrdPlugin.so +lib/libsflowPlugin-${PKGVERSION}.so lib/libsflowPlugin.a lib/libsflowPlugin.so -lib/libsflowPlugin.so.0 -lib/libsflowPlugin.so.0.0 lib/ntop/plugins/icmpPlugin.so lib/ntop/plugins/lastSeenPlugin.so lib/ntop/plugins/netflowPlugin.so lib/ntop/plugins/nfsPlugin.so lib/ntop/plugins/pdaPlugin.so +lib/ntop/plugins/rrdPlugin.so lib/ntop/plugins/sflowPlugin.so -man/man1/intop.1 man/man8/ntop.8 share/ntop/html/About.html share/ntop/html/Admin.html @@ -53,6 +44,7 @@ share/ntop/html/DataRcvd.html share/ntop/html/DataSent.html share/ntop/html/IPProtocols.html share/ntop/html/IPTraffic.html +share/ntop/html/TotalData.html share/ntop/html/Risk_high.gif share/ntop/html/Risk_low.gif share/ntop/html/Risk_medium.gif @@ -76,13 +68,17 @@ share/ntop/html/corner.gif share/ntop/html/deleteURL.gif share/ntop/html/deleteUser.gif share/ntop/html/dns.gif +share/ntop/html/download.gif +share/ntop/html/dump.html share/ntop/html/error.gif share/ntop/html/expanded.gif share/ntop/html/favicon.ico share/ntop/html/fback.gif share/ntop/html/fforward.gif share/ntop/html/forward.gif +share/ntop/html/functions.js share/ntop/html/gauge.jpg +share/ntop/html/graph.gif share/ntop/html/gray_bg.gif share/ntop/html/help.html share/ntop/html/index.html @@ -101,6 +97,7 @@ share/ntop/html/j_home.html share/ntop/html/j_index_top.html share/ntop/html/mail.gif share/ntop/html/major.gif +share/ntop/html/marchio_unipi_pant541_144.gif share/ntop/html/menubar.png share/ntop/html/menubar_j.png share/ntop/html/menuline.png @@ -109,6 +106,9 @@ share/ntop/html/modifyUser.gif share/ntop/html/multihomed.gif share/ntop/html/ntop.gif share/ntop/html/ntop.html +share/ntop/html/ntophelp.html +share/ntop/html/p2p.gif +share/ntop/html/pie-error.png share/ntop/html/printer.gif share/ntop/html/question.gif share/ntop/html/router.gif @@ -337,10 +337,13 @@ share/ntop/html/statsicons/os/sun.gif share/ntop/html/statsicons/os/windows.gif share/ntop/html/style.css share/ntop/html/top.html +share/ntop/html/upload.gif share/ntop/html/url.gif share/ntop/html/user.gif +share/ntop/html/users.gif share/ntop/html/vgauge.jpg share/ntop/html/warning.gif +share/ntop/html/web.gif share/ntop/html/wheel.gif share/ntop/html/white_bg.gif @dirrm share/ntop/html/statsicons/os diff --git a/net/ntop2/distinfo b/net/ntop2/distinfo index b98893fca9b..49c1ccfb034 100644 --- a/net/ntop2/distinfo +++ b/net/ntop2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/07/23 11:34:00 agc Exp $ +$NetBSD: distinfo,v 1.2 2003/01/09 18:22:12 mycroft Exp $ -SHA1 (ntop-2.1.tar.gz) = e99cd319064d9faa6079914e989703fcc38232c0 -Size (ntop-2.1.tar.gz) = 1948860 bytes +SHA1 (ntop-2.1.54.tgz) = 3543d37293ca136b12cd72d57c5f86dd403e1e85 +Size (ntop-2.1.54.tgz) = 2337890 bytes SHA1 (patch-aa) = 27e1922ba1e517dc31219a5d4302dcffe038a101 diff --git a/net/ntop2/patches/patch-aa b/net/ntop2/patches/patch-aa deleted file mode 100644 index 1cf7403f0dd..00000000000 --- a/net/ntop2/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/07/23 11:34:00 agc Exp $ - -The ac_mysql variable really means "ac_disable_mysql" - -Remove an extraneous ',' - ---- configure 2002/07/23 10:17:28 1.1 -+++ configure 2002/07/23 10:17:52 -@@ -2475,9 +2475,9 @@ - # Check whether --enable-mysql or --disable-mysql was given. - if test "${enable_mysql+set}" = set; then - enableval="$enable_mysql" -- ac_mysql="yes" --else - ac_mysql="no" -+else -+ ac_mysql="yes" - fi - - -@@ -2909,7 +2909,7 @@ - #include "confdefs.h" - - # include <sys/types.h> --# include <netinet/in.h>, -+# include <netinet/in.h> - #include <netinet/in_systm.h> - # include <sys/socket.h> - # include <netinet/ip.h> |