automake-1.13 compatability.

4 files changed, 42 insertions, 6 deletions

diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index ccd406be7b0..21a65dd92bb 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2011/10/18 10:33:06 adam Exp $
+$NetBSD: distinfo,v 1.20 2013/01/25 11:59:13 jperkin Exp $
 
 SHA1 (ntop-4.1.0.tar.gz) = 11cd397e5524fa72652d840ce1b92631f8bf39a2
 RMD160 (ntop-4.1.0.tar.gz) = 6f10e30e1b2870fc1ec327512e17cfbe0783faa4
 Size (ntop-4.1.0.tar.gz) = 39118983 bytes
 SHA1 (patch-aa) = 92fc5a3c22db1315397e84650361af25c932ca8b
-SHA1 (patch-ab) = 1c8d20ab57edac2f55d82cb5ac81e8fdfe9413b3
+SHA1 (patch-ab) = c233afeb3643fef9a5dcb02c200c8735ee0a7e7d
 SHA1 (patch-ac) = 122d498c4d8a5809cf4ca41bd32c8eb86001f01f
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index 8771e06cc3d..69066903572 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,7 +1,27 @@
-$NetBSD: patch-ab,v 1.21 2011/10/18 10:33:06 adam Exp $
+$NetBSD: patch-ab,v 1.22 2013/01/25 11:59:13 jperkin Exp $
 
---- configure.in.orig	2011-08-15 08:34:28.000000000 +0000
-+++ configure.in
+* First two chunks: automake-1.13 compatability.
+
+--- /home/pbulk/build/upstream-trunk32/net/ntop/work/ntop-4.1.0/configure.in.orig	2011-08-15 08:34:28.000000000 +0000
++++ /home/pbulk/build/upstream-trunk32/net/ntop/work/ntop-4.1.0/configure.in
+@@ -56,7 +56,7 @@ dnl>
+ dnl> generate the config header
+ dnl>
+ umask 002
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ HAS_ERROR=
+ HAS_WARNING=
+@@ -324,7 +324,7 @@ dnl>
+ echo
+ echo "Checking C compiler program and features..."
+ echo
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+     echo
+     echo "*******************************************************************"
 @@ -395,6 +395,19 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
diff --git a/textproc/wbxml2/distinfo b/textproc/wbxml2/distinfo
index 380aae631f5..4ecb765926d 100644
--- a/textproc/wbxml2/distinfo
+++ b/textproc/wbxml2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/01/12 14:05:17 dillo Exp $
+$NetBSD: distinfo,v 1.2 2013/01/25 12:06:16 jperkin Exp $
 
 SHA1 (wbxml2-0.9.2.tar.gz) = ee02ec4a1e6cd0312d0b2a02c85c603e4c98ba14
 RMD160 (wbxml2-0.9.2.tar.gz) = 00e4f88d74be96a1a42dddc80c6edab94a6a8870
 Size (wbxml2-0.9.2.tar.gz) = 304115 bytes
 SHA1 (patch-aa) = f508c228ecb0778121a07bad6069c0966188f8fc
+SHA1 (patch-configure.in) = a4e126689f113eadcd2ba40c2a8512d4b29e4bfd
diff --git a/textproc/wbxml2/patches/patch-configure.in b/textproc/wbxml2/patches/patch-configure.in
new file mode 100644
index 00000000000..44297e1befa
--- /dev/null
+++ b/textproc/wbxml2/patches/patch-configure.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.in,v 1.1 2013/01/25 12:06:16 jperkin Exp $
+
+* automake-1.13 compatability.
+
+--- configure.in.orig	2006-07-11 11:47:44.000000000 +0000
++++ configure.in
+@@ -1,7 +1,7 @@
+ dnl  Process this file with autoconf to produce a configure script.
+ AC_INIT(doxygen.h)
+ AM_INIT_AUTOMAKE(wbxml2, 0.9.0)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ 
+ dnl Define common variables