Fix AC_DEFUN argument quoting for automake 1.8 and newer. Addresses

part of PR 30053.  No PKGREVISION bump because most people won't
care.

12 files changed, 99 insertions, 6 deletions

diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
index 92513f46755..078a63cd472 100644
--- a/audio/libaudiofile/distinfo
+++ b/audio/libaudiofile/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/02/23 20:39:47 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/04/27 08:59:41 wiz Exp $
 
 SHA1 (audiofile-0.2.6.tar.gz) = 94a6ab8e5122bc1971cf186e5a52d032811c9bc5
 RMD160 (audiofile-0.2.6.tar.gz) = b61fbc856768a5838ca5c0fad602f35205e8d037
 Size (audiofile-0.2.6.tar.gz) = 374688 bytes
+SHA1 (patch-aa) = 7c498a63fe055f1f7e16f45f655341a9b6708f71
 SHA1 (patch-ab) = cd292a827aa18b9839305b2c62c3dbd526384430
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
new file mode 100644
index 00000000000..aeb9599c840
--- /dev/null
+++ b/audio/libaudiofile/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.10 2005/04/27 08:59:41 wiz Exp $
+
+--- audiofile.m4.orig	2004-03-06 07:39:23.000000000 +0100
++++ audiofile.m4
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS.
+ dnl
+-AC_DEFUN(AM_PATH_AUDIOFILE,
++AC_DEFUN([AM_PATH_AUDIOFILE],
+ [dnl 
+ dnl Get compiler flags and libraries from the audiofile-config script.
+ dnl
diff --git a/devel/glib/distinfo b/devel/glib/distinfo
index 0b3e407b7b3..ba50b7ddf6b 100644
--- a/devel/glib/distinfo
+++ b/devel/glib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/02/23 22:24:15 agc Exp $
+$NetBSD: distinfo,v 1.15 2005/04/27 09:02:57 wiz Exp $
 
 SHA1 (glib-1.2.10.tar.gz) = e5a9361c594608d152d5d9650154c2e3260b87fa
 RMD160 (glib-1.2.10.tar.gz) = f19efe8c87ebeea979a4d36902d8a8209640cd95
@@ -10,5 +10,6 @@ SHA1 (patch-ad) = a7c10916ccaef52a62415d129060a6dddbc5fbd8
 SHA1 (patch-ae) = 222a1f4c470fd1123deb3b4dd918b036b3607e59
 SHA1 (patch-af) = 8fa1db64eb7a44e83e9e2ad483b12cf9fe50341e
 SHA1 (patch-ag) = efdff0d20a1c3280c9916405a8d89190c68b9604
+SHA1 (patch-ah) = 1e6dec25db0c72601868bb0f7c465202ecead81b
 SHA1 (patch-ai) = 6f6e5727bcb52655865b689c923601843d8d453d
 SHA1 (patch-aj) = ee05519f3b36e5b2a711ca01599ba1f0662faa20
diff --git a/devel/glib/patches/patch-ah b/devel/glib/patches/patch-ah
new file mode 100644
index 00000000000..1a34a48cc99
--- /dev/null
+++ b/devel/glib/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4 2005/04/27 09:02:57 wiz Exp $
+
+--- glib.m4.orig	1998-12-31 21:58:03.000000000 +0100
++++ glib.m4
+@@ -5,7 +5,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTI
+ dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+ dnl gthread is specified in MODULES, pass to glib-config
+ dnl
+-AC_DEFUN(AM_PATH_GLIB,
++AC_DEFUN([AM_PATH_GLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the glib-config script
+ dnl
diff --git a/graphics/aalib/distinfo b/graphics/aalib/distinfo
index 0c55fc42b1b..3f1b0d6f4a2 100644
--- a/graphics/aalib/distinfo
+++ b/graphics/aalib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/03/29 14:28:05 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/04/27 08:58:17 wiz Exp $
 
 SHA1 (aalib-1.4rc5.tar.gz) = a23269e950a249d2ef93625837cace45ddbce03b
 RMD160 (aalib-1.4rc5.tar.gz) = a10bcab16d3aa0e60facca3e989f6a51846885f6
 Size (aalib-1.4rc5.tar.gz) = 391028 bytes
 SHA1 (patch-aa) = 927d69a8f499b99f0bd5f13cf220ce8cbb7ea591
+SHA1 (patch-ab) = 272f6f10dbe7a525c582a9b4c865f0ab9b2f9fba
diff --git a/graphics/aalib/patches/patch-ab b/graphics/aalib/patches/patch-ab
new file mode 100644
index 00000000000..679039e92c1
--- /dev/null
+++ b/graphics/aalib/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/04/27 08:58:17 wiz Exp $
+
+--- aalib.m4.orig	2001-04-26 16:37:31.000000000 +0200
++++ aalib.m4
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_AALIB,
++AC_DEFUN([AM_PATH_AALIB],
+ [dnl 
+ dnl Get the cflags and libraries from the aalib-config script
+ dnl
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index da7aac47cc1..f0ad86fecdc 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.17 2005/02/24 08:45:07 agc Exp $
+$NetBSD: distinfo,v 1.18 2005/04/27 09:05:12 wiz Exp $
 
 SHA1 (imlib-1.9.15.tar.bz2) = c9a732a354fbb3c7e1a426e5d19fc92d73f8f720
 RMD160 (imlib-1.9.15.tar.bz2) = 195b80833167134ba2d9a9574d420279f9cf55f4
 Size (imlib-1.9.15.tar.bz2) = 683242 bytes
 SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = d1daff101bec77680f3e17cb776285976a7b5c7a
+SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d
 SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
 SHA1 (patch-ag) = 961a92dfedc79570aacdd75102e63a32171ece55
 SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
diff --git a/graphics/imlib/patches/patch-ac b/graphics/imlib/patches/patch-ac
new file mode 100644
index 00000000000..a9e9590a4eb
--- /dev/null
+++ b/graphics/imlib/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.13 2005/04/27 09:05:12 wiz Exp $
+
+--- imlib.m4.orig	2004-08-27 18:03:11.000000000 +0200
++++ imlib.m4
+@@ -6,7 +6,7 @@
+ dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_IMLIB,
++AC_DEFUN([AM_PATH_IMLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the imlib-config script
+ dnl
+@@ -164,7 +164,7 @@ int main ()
+ ])
+ 
+ # Check for gdk-imlib
+-AC_DEFUN(AM_PATH_GDK_IMLIB,
++AC_DEFUN([AM_PATH_GDK_IMLIB],
+ [dnl 
+ dnl Get the cflags and libraries from the imlib-config script
+ dnl
diff --git a/net/ORBit/distinfo b/net/ORBit/distinfo
index e5cd4737e7d..a91a17a3b9b 100644
--- a/net/ORBit/distinfo
+++ b/net/ORBit/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.24 2005/03/09 15:57:07 jmmv Exp $
+$NetBSD: distinfo,v 1.25 2005/04/27 08:57:00 wiz Exp $
 
 SHA1 (ORBit-0.5.17.tar.bz2) = c8b2daef43b028d65d0ab82f0a88558942be6217
 RMD160 (ORBit-0.5.17.tar.bz2) = 9087d6659adbd0066d76a3eed5cc2799de640df4
 Size (ORBit-0.5.17.tar.bz2) = 1065003 bytes
+SHA1 (patch-aa) = 9b8854a5e5e988222de4cb5b27da3e82f87df4e3
 SHA1 (patch-ab) = c2b7cc5f83230035c214600bff59d4dfefd92422
 SHA1 (patch-ac) = b46d9dc6fcb3ca598aa986c25a25053fa3e1410a
 SHA1 (patch-ad) = d4f61e2fef4b862606473ced8f0b27ea3b7f22b3
diff --git a/net/ORBit/patches/patch-aa b/net/ORBit/patches/patch-aa
new file mode 100644
index 00000000000..6ba683c0e68
--- /dev/null
+++ b/net/ORBit/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.13 2005/04/27 08:57:00 wiz Exp $
+
+--- ORBit.m4.orig	2002-06-06 13:07:26.000000000 +0200
++++ ORBit.m4
+@@ -1,7 +1,7 @@
+ dnl AM_PATH_ORBIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for ORBit, and define ORBIT_CFLAGS and ORBIT_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_ORBIT,
++AC_DEFUN([AM_PATH_ORBIT],
+ [dnl 
+ dnl Get the cflags and libraries from the orbit-config script
+ dnl
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
index a62ccd915d4..cae38165dc5 100644
--- a/x11/gtk/distinfo
+++ b/x11/gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/04/27 09:03:59 wiz Exp $
 
 SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
 RMD160 (gtk+-1.2.10.tar.gz) = 9b38310d2768e947c4f6173db009243dd11db288
@@ -10,3 +10,4 @@ SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60
 SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c
 SHA1 (patch-af) = 22846f1bd14d6ba7f071d98afb2910ea4cb528c0
 SHA1 (patch-ag) = fb08ae3210a6994c633b45f15bbe5adcb26c4284
+SHA1 (patch-ah) = a7277734c5cf0f858f78a454a02b0069036c3155
diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah
new file mode 100644
index 00000000000..33df39ad580
--- /dev/null
+++ b/x11/gtk/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4 2005/04/27 09:03:59 wiz Exp $
+
+--- gtk.m4.orig	1999-02-18 17:43:35.000000000 +0100
++++ gtk.m4
+@@ -4,7 +4,7 @@
+ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl 
+ dnl Get the cflags and libraries from the gtk-config script
+ dnl