CVS commit: pkgsrc/net/ntop

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun 19 05:55:57 UTC 2016

Modified Files:
        pkgsrc/net/ntop: Makefile distinfo
        pkgsrc/net/ntop/patches: patch-ab

Log Message:
Build with latest rrdtool.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/net/ntop/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/ntop/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ntop/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ntop/Makefile
diff -u pkgsrc/net/ntop/Makefile:1.95 pkgsrc/net/ntop/Makefile:1.96
--- pkgsrc/net/ntop/Makefile:1.95       Sat Mar  5 11:29:09 2016
+++ pkgsrc/net/ntop/Makefile    Sun Jun 19 05:55:56 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2016/03/05 11:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.96 2016/06/19 05:55:56 markd Exp $
 
 DISTNAME=      ntop-4.1.0
-PKGREVISION=   24
+PKGREVISION=   25
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ntop/}
 

Index: pkgsrc/net/ntop/distinfo
diff -u pkgsrc/net/ntop/distinfo:1.22 pkgsrc/net/ntop/distinfo:1.23
--- pkgsrc/net/ntop/distinfo:1.22       Wed Nov  4 00:35:17 2015
+++ pkgsrc/net/ntop/distinfo    Sun Jun 19 05:55:56 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 00:35:17 agc Exp $
+$NetBSD: distinfo,v 1.23 2016/06/19 05:55:56 markd Exp $
 
 SHA1 (ntop-4.1.0.tar.gz) = 11cd397e5524fa72652d840ce1b92631f8bf39a2
 RMD160 (ntop-4.1.0.tar.gz) = 6f10e30e1b2870fc1ec327512e17cfbe0783faa4
 SHA512 (ntop-4.1.0.tar.gz) = 6759ef6396768b33db96db20ceb907f9d8a5e3421c920d277e043bec85eb1fb38e41b7c88e189e7dd316a02c627aa4c4ea9295beee8cd890ac09b5d8b161a579
 Size (ntop-4.1.0.tar.gz) = 39118983 bytes
 SHA1 (patch-aa) = 92fc5a3c22db1315397e84650361af25c932ca8b
-SHA1 (patch-ab) = ffee6466664949a5d1759822ec4bcf0bb7176a6d
+SHA1 (patch-ab) = 0df07d788aef1a472334e017a747fc6f71b1bf45
 SHA1 (patch-ac) = 122d498c4d8a5809cf4ca41bd32c8eb86001f01f

Index: pkgsrc/net/ntop/patches/patch-ab
diff -u pkgsrc/net/ntop/patches/patch-ab:1.23 pkgsrc/net/ntop/patches/patch-ab:1.24
--- pkgsrc/net/ntop/patches/patch-ab:1.23       Mon Feb 18 08:41:34 2013
+++ pkgsrc/net/ntop/patches/patch-ab    Sun Jun 19 05:55:57 2016
@@ -1,7 +1,9 @@
-$NetBSD: patch-ab,v 1.23 2013/02/18 08:41:34 markd Exp $
+$NetBSD: patch-ab,v 1.24 2016/06/19 05:55:57 markd Exp $
 
 * First two chunks: automake-1.13 compatability.
 
+Latest rrdtool doesnt have separate librrd_th
+
 --- configure.in.orig  2011-08-15 08:34:28.000000000 +0000
 +++ configure.in
 @@ -56,7 +56,7 @@ dnl>
@@ -53,6 +55,32 @@ $NetBSD: patch-ab,v 1.23 2013/02/18 08:4
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
+@@ -876,19 +889,19 @@ else
+    fi
+ fi
+ 
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
++RRD_LIB="-L${RRD_HOME}/lib -lrrd"
+ 
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
++if test -f "$RRD_HOME/lib/librrd.so"; then
+    AC_MSG_RESULT(checking for rrdtool... yes)
+ else
+-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
++  if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX
+      AC_MSG_RESULT(checking for rrdtool... yes)
+   else
+-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
++     if test -f "$RRD_HOME/lib/librrd.a"; then
+        AC_MSG_RESULT(checking for rrdtool... yes)
+      else
+-       AC_CHECK_LIB([rrd_th], [main])
+-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
++       AC_CHECK_LIB([rrd], [main])
++       if test ".${ac_cv_lib_rrd_main}" != ".yes"; then
+          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+        AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+        else
 @@ -1721,8 +1734,6 @@ if test -f "GeoLiteCity.dat"; then
  else
     if test -f "3rd_party/GeoLiteCity.dat.gz"; then