Changes 4.0.3:

This is a bug fix release.

3 files changed, 21 insertions, 17 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 72b71008cb5..0ed8df3df29 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.63 2011/01/13 13:39:07 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2011/02/09 08:37:10 adam Exp $
 
-DISTNAME=	ntop-4.0
-PKGREVISION=	2
+DISTNAME=	ntop-4.0.3
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.ntop.org/ntop.html
@@ -44,8 +44,10 @@ USE_BUILTIN.libevent=	no
 
 pre-configure:
 	set -e; cd ${WRKSRC}; \
-	cp ${PREFIX}/share/libtool/config/ltmain.sh .; \
+	libtoolize -c -f; cp m4/libtool.m4 libtool.m4.in; \
+	cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
+#	cp ${PREFIX}/share/libtool/config/ltmain.sh .; \
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../databases/rrdtool/buildlink3.mk"
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 408ddc3e334..629f02081fd 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2010/07/22 21:10:52 adam Exp $
+$NetBSD: distinfo,v 1.17 2011/02/09 08:37:10 adam Exp $
 
-SHA1 (ntop-4.0.tar.gz) = 1f47ce024a7e72a35d86abdae6d1d4aa2c68e2c5
-RMD160 (ntop-4.0.tar.gz) = 7c17f330a4d9a46df49369182f015042527585f4
-Size (ntop-4.0.tar.gz) = 39252530 bytes
+SHA1 (ntop-4.0.3.tgz) = e7c31eabf31f61758e97d69398176520c1cb5613
+RMD160 (ntop-4.0.3.tgz) = a7b0f15409fee6b53b7c10d8b397fe0ade13120f
+Size (ntop-4.0.3.tgz) = 39191671 bytes
 SHA1 (patch-aa) = e04050a3ca4364898f3d0bf892290f90cc23b092
-SHA1 (patch-ab) = 1c178b8d80e39a24880706e76d114624899cf348
+SHA1 (patch-ab) = f989f36ef5ea96d6e1256496ad44879956d0c723
 SHA1 (patch-ac) = f947853ed8f4f77f55f75adedacf16b179513202
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index c41aac62913..928ddbae9a5 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2010/07/22 21:10:52 adam Exp $
+$NetBSD: patch-ab,v 1.19 2011/02/09 08:37:10 adam Exp $
 
---- configure.in.orig	2010-07-19 16:50:08.000000000 +0000
+--- configure.in.orig	2010-10-24 10:01:01.000000000 +0000
 +++ configure.in
-@@ -423,6 +423,19 @@ case "${target}:${CC}" in
+@@ -437,6 +437,19 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
  
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.18 2010/07/22 21:10:52 adam Exp $
      * )
          echo "* ${target} is an unknown/unsupported OS"
          echo "*"
-@@ -582,8 +595,8 @@ if test ".${PCAPRING_DIR}" != .; then
+@@ -596,8 +609,8 @@ if test ".${PCAPRING_DIR}" != .; then
  else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
@@ -33,10 +33,11 @@ $NetBSD: patch-ab,v 1.18 2010/07/22 21:10:52 adam Exp $
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1816,10 +1829,7 @@ else
+@@ -1829,11 +1842,7 @@ if test -f "GeoLiteCity.dat"; then
+ else
     if test -f "3rd_party/GeoLiteCity.dat.gz"; then
       cp 3rd_party/GeoLiteCity.dat.gz .
-    else
+-   else
 -     wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
     fi
 -
@@ -44,10 +45,11 @@ $NetBSD: patch-ab,v 1.18 2010/07/22 21:10:52 adam Exp $
  fi
  
  dnl> --------
-@@ -1830,10 +1840,8 @@ else
+@@ -1843,11 +1852,8 @@ if test -f "GeoIPASNum.dat"; then
+ else
     if test -f "3rd_party/GeoIPASNum.dat.gz"; then
       cp 3rd_party/GeoIPASNum.dat.gz .
-    else
+-   else
 -     wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
     fi