[134343] trunk/dports/x11/xkeyboard-config

[devans at macports.org]

Revision: 134343
          https://trac.macports.org/changeset/134343
Author:   devans at macports.org
Date:     2015-03-23 06:47:45 -0700 (Mon, 23 Mar 2015)
Log Message:
-----------
xkeyboard-config: reconfigure using autogen.sh for intltool 0.51 compatibility.

Modified Paths:
--------------
    trunk/dports/x11/xkeyboard-config/Portfile

Added Paths:
-----------
    trunk/dports/x11/xkeyboard-config/files/patch-autogen.sh.diff

Modified: trunk/dports/x11/xkeyboard-config/Portfile
===================================================================
--- trunk/dports/x11/xkeyboard-config/Portfile	2015-03-23 13:41:22 UTC (rev 134342)
+++ trunk/dports/x11/xkeyboard-config/Portfile	2015-03-23 13:47:45 UTC (rev 134343)
@@ -8,7 +8,7 @@
 license             X11
 platforms           darwin
 supported_archs     noarch
-maintainers          jeremyhu openmaintainer
+maintainers         jeremyhu openmaintainer
 description         X11 XKB keyboard descriptions
 long_description    ${description}
 
@@ -26,16 +26,21 @@
 	port:pkgconfig \
 	port:gettext \
 	port:xorg-util-macros \
-	port:intltool
+	port:intltool \
+	port:autoconf \
+	port:automake \
+	port:libtool
 
 depends_lib \
 	port:xkbcomp
 
-# Don't do intltool's INTLTOOL_PERL dance
-use_autoreconf  yes
-autoreconf.args -fvi
-patchfiles      configure.in.diff
+patchfiles      patch-autogen.sh.diff \
+                configure.in.diff
 
+# reconfigure using autogen.sh for intltool 0.51 compatibility
+
+configure.cmd   ./autogen.sh
+
 livecheck.type  regex
 livecheck.url   http://xorg.freedesktop.org/releases/individual/data/
 livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)

Added: trunk/dports/x11/xkeyboard-config/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/x11/xkeyboard-config/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/x11/xkeyboard-config/files/patch-autogen.sh.diff	2015-03-23 13:47:45 UTC (rev 134343)
@@ -0,0 +1,12 @@
+--- autogen.sh.orig	2015-03-21 16:57:59.000000000 -0700
++++ autogen.sh	2015-03-21 16:58:56.000000000 -0700
+@@ -6,7 +6,8 @@
+ ORIGDIR=`pwd`
+ cd $srcdir
+ 
+-intltoolize
++# use --force to overwrite existing files
++intltoolize --force
+ 
+ autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150323/d8a8b283/attachment.html>