Fix build with kqueue option and automake-1.13.

3 files changed, 19 insertions, 8 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index fdc3ba24ea7..af28487f4ff 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.181 2012/12/14 19:20:19 drochner Exp $
+$NetBSD: distinfo,v 1.182 2013/01/21 15:54:24 wiz Exp $
 
 SHA1 (glib-2.34.3.tar.xz) = f2b94ca757191dddba686e54b32b3dfc5ad5d8fb
 RMD160 (glib-2.34.3.tar.xz) = 94508de21d25634f794066de246e9eecf6cbd0f8
@@ -15,7 +15,7 @@ SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
 SHA1 (patch-ai) = 037e2bb85fbc473c431bbf736dae89825236ff31
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 2d6826e2a07852a7c093353996361547cce1d17f
+SHA1 (patch-ak) = 8811ff800b4fa5b258b96e06777f985294175666
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
 SHA1 (patch-an) = c93823539ba95a0e182a25714ef5024c91da3a47
diff --git a/devel/glib2/options.mk b/devel/glib2/options.mk
index 7376cc6a24d..6a400c3ef61 100644
--- a/devel/glib2/options.mk
+++ b/devel/glib2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2012/10/06 20:44:04 prlw1 Exp $
+# $NetBSD: options.mk,v 1.19 2013/01/21 15:54:24 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.glib2
 PKG_SUPPORTED_OPTIONS=	kqueue
@@ -26,7 +26,7 @@ USE_TOOLS+=	aclocal autoconf autoheader automake
 pre-configure: regen-autotools
 regen-autotools:
 	cd ${WRKSRC} && aclocal
-	cd ${WRKSRC} && automake
+	cd ${WRKSRC} && automake -acf
 	cd ${WRKSRC} && autoheader
 	cd ${WRKSRC} && autoconf
 .endif
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 4d8d84e9153..924435ef7a1 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,7 +1,18 @@
-$NetBSD: patch-ak,v 1.13 2012/10/06 20:44:05 prlw1 Exp $
+$NetBSD: patch-ak,v 1.14 2013/01/21 15:54:24 wiz Exp $
 
---- configure.ac.orig	2012-09-25 07:35:55.000000000 +0000
+First chunk: automake-1.13 compat.
+
+--- configure.ac.orig	2013-01-21 15:53:29.000000000 +0000
 +++ configure.ac
+@@ -291,7 +291,7 @@ AC_TRY_COMPILE(,[class a { int b; } c;],
+ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
+ AC_LANG_RESTORE
+ 
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ 
 @@ -864,7 +864,7 @@ int main (int argc, char **argv)
  AC_MSG_RESULT($g_have_gnuc_visibility)
  AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
@@ -125,7 +136,7 @@ $NetBSD: patch-ak,v 1.13 2012/10/06 20:44:05 prlw1 Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -2010,22 +2056,8 @@ AS_IF([ test x"$have_threads" = xposix],
+@@ -2021,22 +2067,8 @@ AS_IF([ test x"$have_threads" = xposix],
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
@@ -150,7 +161,7 @@ $NetBSD: patch-ak,v 1.13 2012/10/06 20:44:05 prlw1 Exp $
         ;;
    esac
  ])
-@@ -2311,6 +2343,7 @@ case $host in
+@@ -2322,6 +2354,7 @@ case $host in
      ;;
    *-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"