[100917] trunk/dports/gnome/libgnomekbd

[devans at macports.org]

Revision: 100917
          https://trac.macports.org/changeset/100917
Author:   devans at macports.org
Date:     2012-12-31 19:13:15 -0800 (Mon, 31 Dec 2012)
Log Message:
-----------
libgnomekbd: combine new patch to fix automake-1.13 build with previous glib 2.32 patch.

Modified Paths:
--------------
    trunk/dports/gnome/libgnomekbd/Portfile

Added Paths:
-----------
    trunk/dports/gnome/libgnomekbd/files/patch-configure.in.diff

Removed Paths:
-------------
    trunk/dports/gnome/libgnomekbd/files/glib-2.32.patch

Modified: trunk/dports/gnome/libgnomekbd/Portfile
===================================================================
--- trunk/dports/gnome/libgnomekbd/Portfile	2013-01-01 02:59:20 UTC (rev 100916)
+++ trunk/dports/gnome/libgnomekbd/Portfile	2013-01-01 03:13:15 UTC (rev 100917)
@@ -28,7 +28,7 @@
 
 use_bzip2           yes
 
-patchfiles glib-2.32.patch
+patchfiles          patch-configure.in.diff
 
 post-patch {
     reinplace "s|test capplet|capplet|" ${worksrcpath}/Makefile.in

Deleted: trunk/dports/gnome/libgnomekbd/files/glib-2.32.patch
===================================================================
--- trunk/dports/gnome/libgnomekbd/files/glib-2.32.patch	2013-01-01 02:59:20 UTC (rev 100916)
+++ trunk/dports/gnome/libgnomekbd/files/glib-2.32.patch	2013-01-01 03:13:15 UTC (rev 100917)
@@ -1,11 +0,0 @@
---- configure.in.orig	2012-04-22 02:19:41.000000000 -0700
-+++ configure.in	2012-04-22 02:20:30.000000000 -0700
-@@ -52,7 +52,7 @@ IT_PROG_INTLTOOL([0.35.0])
- 
- AC_CHECK_FUNCS(setlocale)
- 
--PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gmodule-2.0)
- 
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)

Added: trunk/dports/gnome/libgnomekbd/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/libgnomekbd/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/gnome/libgnomekbd/files/patch-configure.in.diff	2013-01-01 03:13:15 UTC (rev 100917)
@@ -0,0 +1,20 @@
+--- configure.in.orig	2012-12-31 19:02:40.000000000 -0800
++++ configure.in	2012-12-31 19:03:34.000000000 -0800
+@@ -7,7 +7,7 @@
+ VERSION_INFO=5:0:1
+ AC_SUBST(VERSION_INFO)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.9])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ AC_CONFIG_MACRO_DIR(m4)
+@@ -52,7 +52,7 @@
+ 
+ AC_CHECK_FUNCS(setlocale)
+ 
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gmodule-2.0)
+ 
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121231/7de787d1/attachment.html>