Fix build with automake-1.13.

10 files changed, 93 insertions, 27 deletions

diff --git a/graphics/cal3d/distinfo b/graphics/cal3d/distinfo
index 5ccb6326123..56f994acfe0 100644
--- a/graphics/cal3d/distinfo
+++ b/graphics/cal3d/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2011/11/25 21:56:18 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/01/23 17:26:27 wiz Exp $
 
 SHA1 (cal3d-0.9.1.tar.bz2) = 2e0765caddc972f05f70d3a255862ced1276e039
 RMD160 (cal3d-0.9.1.tar.bz2) = f77dcf34a46a9286020592df16f5b16264839d80
 Size (cal3d-0.9.1.tar.bz2) = 2871094 bytes
 SHA1 (patch-aa) = dc308a6e7d0322a354b502d3ca6e9a01e497fa78
 SHA1 (patch-ab) = f3fbda1c69c22f5165fe57a7e1bf05190e88a9c0
-SHA1 (patch-af) = 0f70889b9c9c3cb0138b9f1a8e26ea6682d04f07
+SHA1 (patch-af) = 302a17aebb80a09b35395fc37d3254f0c5a00cb9
 SHA1 (patch-src_cal3d_platform.cpp) = 1d664fcc9b62124f089f202e98c74bc8ae99b8ee
 SHA1 (patch-src_cal3d_renderer.cpp) = 6c8ce2adbb1e58ed6ca22abbd0d3ed2672b11901
 SHA1 (patch-src_cal3d_submesh.cpp) = f336288724b501eeba67cb582424acfc0a583c74
diff --git a/graphics/cal3d/patches/patch-af b/graphics/cal3d/patches/patch-af
index cabfbaeae27..96f9f1db98d 100644
--- a/graphics/cal3d/patches/patch-af
+++ b/graphics/cal3d/patches/patch-af
@@ -1,7 +1,18 @@
-$NetBSD: patch-af,v 1.1 2006/02/28 17:55:47 wiz Exp $
+$NetBSD: patch-af,v 1.2 2013/01/23 17:26:27 wiz Exp $
+
+First chunk: automake-1.13 compat.
 
 --- configure.in.orig	2003-11-29 18:41:06.000000000 +0000
 +++ configure.in
+@@ -12,7 +12,7 @@ dnl ************************************
+ 
+ AC_INIT(src/cal3d/cal3d.h)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ AC_CANONICAL_SYSTEM
+ 
 @@ -29,6 +29,9 @@ AC_ARG_WITH(cc,[  --with-cc=CC          
  ],)
  
diff --git a/graphics/cheese/distinfo b/graphics/cheese/distinfo
index 698c0b8d3d9..9c253a99068 100644
--- a/graphics/cheese/distinfo
+++ b/graphics/cheese/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2009/08/08 16:06:20 wiz Exp $
+$NetBSD: distinfo,v 1.14 2013/01/23 17:27:13 wiz Exp $
 
 SHA1 (cheese-2.26.3.tar.gz) = 357e0e94c19a1c00472c4275c7ec77ac54b3e850
 RMD160 (cheese-2.26.3.tar.gz) = 590a04548c11da2ac95f0f37360582c4c8e2c5aa
 Size (cheese-2.26.3.tar.gz) = 3364424 bytes
-SHA1 (patch-aa) = de007ae5ce001f04f7f2314a523faf4d860e8cb2
+SHA1 (patch-aa) = c725d82329e181e7c138e7fdb40eab331faac5aa
 SHA1 (patch-ab) = ed77fa4abf5cd6439b5d406f322dfa932969a062
 SHA1 (patch-ac) = 4db9fc3c6288ba6eb20ad98aca8875326952dfd8
 SHA1 (patch-ad) = d42217a180956e5cd1aba9cf8c781d7f533063b3
diff --git a/graphics/cheese/patches/patch-aa b/graphics/cheese/patches/patch-aa
index bfa5a0dc06c..69910701720 100644
--- a/graphics/cheese/patches/patch-aa
+++ b/graphics/cheese/patches/patch-aa
@@ -1,10 +1,26 @@
-$NetBSD: patch-aa,v 1.5 2009/05/21 16:11:25 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2013/01/23 17:27:13 wiz Exp $
 
+First and second chunk: automake-1.13 compat.
 http://bugzilla.gnome.org/show_bug.cgi?id=583469
 
---- configure.ac.orig	2008-11-24 18:03:24.000000000 -0500
-+++ configure.ac	2008-12-23 22:47:58.000000000 -0500
-@@ -17,8 +17,9 @@
+--- configure.ac.orig	2009-06-29 20:32:01.000000000 +0000
++++ configure.ac
+@@ -3,7 +3,7 @@
+ AC_INIT(cheese, 2.26.3)
+ 
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+-AM_CONFIG_HEADER(cheese-config.h)
++AC_CONFIG_HEADERS(cheese-config.h)
+ AM_MAINTAINER_MODE
+ 
+ dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
+@@ -11,14 +11,14 @@ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FL
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
  
  CFLAGS="${CFLAGS} -Wall"
  
@@ -16,7 +32,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583469
  
  #*******************************************************************************
  # Expanded dirs
-@@ -88,7 +89,6 @@
+@@ -86,7 +86,6 @@ PKG_CHECK_MODULES(CHEESE, \ 
    cairo >= $CAIRO_REQUIRED \
    dbus-1 >= $DBUS_REQUIRED \
    dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
@@ -24,7 +40,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=583469
    pangocairo >= $PANGOCAIRO_REQUIRED \
    librsvg-2.0 >= $LIBRSVG_REQUIRED)
  AC_SUBST(CHEESE_CFLAGS)
-@@ -107,6 +107,25 @@
+@@ -105,6 +104,25 @@ fi
  
  AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes")
  
diff --git a/graphics/lib3ds/distinfo b/graphics/lib3ds/distinfo
index 1fa6e3505bb..fa7156e36b8 100644
--- a/graphics/lib3ds/distinfo
+++ b/graphics/lib3ds/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2009/01/28 00:37:27 dsainty Exp $
+$NetBSD: distinfo,v 1.8 2013/01/23 17:27:32 wiz Exp $
 
 SHA1 (lib3ds-1.2.0.tar.gz) = 49614218c4c11572887beefaa34d23f72ef70a2c
 RMD160 (lib3ds-1.2.0.tar.gz) = 3e0401e36b545c2a54213ecb2ea3216360450562
 Size (lib3ds-1.2.0.tar.gz) = 136806 bytes
-SHA1 (patch-aa) = 0933c6cb86b05306feb97a10f282ea935bfe2c24
+SHA1 (patch-aa) = 602a369374d286f7de6ae55b6caeb62cdc9b2eb4
 SHA1 (patch-ab) = b2d6804b71fb37428ebf7fb59168ae8ef2eec362
 SHA1 (patch-ac) = d73dd1b2cdabe61f78d4a7307a04917ff5fc379b
 SHA1 (patch-ad) = bbf95ca49e1bf6fa67314f9818af5b1b974eb54a
diff --git a/graphics/lib3ds/patches/patch-aa b/graphics/lib3ds/patches/patch-aa
index f589a83fd1a..cacb14c52ea 100644
--- a/graphics/lib3ds/patches/patch-aa
+++ b/graphics/lib3ds/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2006/04/11 14:47:06 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2013/01/23 17:27:32 wiz Exp $
 
---- configure.in.orig	2002-01-14 13:09:15.000000000 +0100
+First part of diff: automake-1.13 compat.
+
+--- configure.in.orig	2002-01-14 12:09:15.000000000 +0000
 +++ configure.in
-@@ -38,7 +38,7 @@ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION
+@@ -33,12 +33,12 @@ AC_SUBST(LT_CURRENT)
+ AC_SUBST(LT_REVISION)
+ AC_SUBST(LT_AGE)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE(lib3ds, $LIB3DS_VERSION)
  
  dnl Checks for programs.
  AC_PROG_CC
diff --git a/security/libfprint/distinfo b/security/libfprint/distinfo
index 1d0eb126d1b..527b656e6ff 100644
--- a/security/libfprint/distinfo
+++ b/security/libfprint/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/05/10 18:25:34 hasso Exp $
+$NetBSD: distinfo,v 1.3 2013/01/23 17:27:48 wiz Exp $
 
 SHA1 (libfprint-0.0.6.tar.bz2) = 430af91efbefeb2b98fe30215fb33051e4f8efc5
 RMD160 (libfprint-0.0.6.tar.bz2) = 3677a0997da641ba3e8586222ca88640e1f6373f
 Size (libfprint-0.0.6.tar.bz2) = 431957 bytes
-SHA1 (patch-aa) = 839a4c7f402b3e4e55b7ac3b6b829c50cb6d2d77
+SHA1 (patch-aa) = 19797404ed4937941c008fd129e5efb643b9f5e2
 SHA1 (patch-ab) = 0bde246ce6e1d223637ba0decce6fa5db9e88eb1
diff --git a/security/libfprint/patches/patch-aa b/security/libfprint/patches/patch-aa
index 7a96cacfec8..20862a45aca 100644
--- a/security/libfprint/patches/patch-aa
+++ b/security/libfprint/patches/patch-aa
@@ -1,7 +1,18 @@
-$NetBSD: patch-aa,v 1.1 2009/05/10 18:25:34 hasso Exp $
+$NetBSD: patch-aa,v 1.2 2013/01/23 17:27:48 wiz Exp $
 
---- configure.ac.orig	2009-05-10 19:25:36 +0300
-+++ configure.ac	2009-05-10 19:36:05 +0300
+First chunk: automake-1.13 compat.
+
+--- configure.ac.orig	2008-03-20 13:55:45.000000000 +0000
++++ configure.ac
+@@ -1,7 +1,7 @@
+ AC_INIT([libfprint], [0.0.6])
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR([libfprint/core.c])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PREREQ([2.50])
+ AC_PROG_CC
 @@ -89,9 +89,15 @@ if test "x$debug_log_enabled" != "xno"; 
  	AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging])
  fi
diff --git a/sysutils/libdevkit-gobject/distinfo b/sysutils/libdevkit-gobject/distinfo
index f0e7b474f32..51fd99c9b44 100644
--- a/sysutils/libdevkit-gobject/distinfo
+++ b/sysutils/libdevkit-gobject/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/16 19:03:10 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/01/23 17:28:13 wiz Exp $
 
 SHA1 (DeviceKit-003.tar.gz) = 31874d013b8816a71d6a7a9200b7a74701b204e4
 RMD160 (DeviceKit-003.tar.gz) = c4966300273cb983a166b13f68c1c707575ce516
 Size (DeviceKit-003.tar.gz) = 384408 bytes
 SHA1 (patch-aa) = dd2f1973ad7df7b6950a63a69f9a49538970c312
-SHA1 (patch-ab) = 04f38467eba2fa93e1a2626dc2ba36f1766045d2
+SHA1 (patch-ab) = 1aceede623fb5df758b0c404586905fb257a4511
diff --git a/sysutils/libdevkit-gobject/patches/patch-ab b/sysutils/libdevkit-gobject/patches/patch-ab
index aa053b36fdd..44bee750090 100644
--- a/sysutils/libdevkit-gobject/patches/patch-ab
+++ b/sysutils/libdevkit-gobject/patches/patch-ab
@@ -1,8 +1,28 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/09/16 19:03:10 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2013/01/23 17:28:13 wiz Exp $
+
+First and second chunk: automake-1.13 compat.
+Rest: ?
 
 --- configure.ac.orig	2008-12-19 01:12:03.000000000 +0000
 +++ configure.ac
-@@ -30,6 +30,7 @@ AM_PROG_CC_C_O
+@@ -3,7 +3,7 @@ dnl Process this file with autoconf to p
+ AC_PREREQ(2.59c)
+ AC_INIT(DeviceKit, 003, http://lists.freedesktop.org/mailman/listinfo/devkit-devel)
+ AM_INIT_AUTOMAKE(DeviceKit, 003)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+ # libtool versioning - this applies to all libraries in this package
+@@ -19,7 +19,6 @@ AC_SUBST(LT_AGE)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+@@ -30,6 +29,7 @@ AM_PROG_CC_C_O
  # Taken from dbus
  AC_ARG_ENABLE(ansi,             [  --enable-ansi           enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
  AC_ARG_ENABLE(man-pages,        [  --enable-man-pages      build manual pages],enable_man_pages=$enableval,enable_man_pages=yes)
@@ -10,7 +30,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/09/16 19:03:10 wiz Exp $
  
  if test "${enable_man_page}" != no; then
  dnl
-@@ -116,9 +117,15 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-
+@@ -116,9 +116,15 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-
  AC_SUBST(DBUS_GLIB_CFLAGS)
  AC_SUBST(DBUS_GLIB_LIBS)
  
@@ -27,7 +47,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/09/16 19:03:10 wiz Exp $
  
  if test "x$GCC" = "xyes"; then
    LDFLAGS="-Wl,--as-needed $LDFLAGS"
-@@ -161,4 +168,5 @@ echo "
+@@ -161,4 +167,5 @@ echo "
          Maintainer mode:            ${USE_MAINTAINER_MODE}
          Building api docs:          ${enable_gtk_doc}
          Building man pages:         ${enable_man_pages}