alacarte: update patchfiles, reconfigure with our intltool.m4 to fix …

…intltool configuration.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@117721 d073be05-634f-4543-b044-5fe20cf6d1d6

gnome/alacarte/Portfile

@@ -36,10 +36,16 @@ depends_lib     port:desktop-file-utils \
 depends_run     port:gnome-settings-daemon \
                 port:yelp
 
-patchfiles      patch-Makefile.in.diff \
-                patch-configure.diff \
+patchfiles      patch-Makefile.am.diff \
+                patch-configure.ac.diff \
+                patch-acinclude.m4.diff \
                 patch-Alacarte-MenuEditor.py.diff
 
+# reconfigure with our intltool.m4
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
 post-destroot {
     move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
 }

gnome/alacarte/files/patch-Makefile.am.diff

@@ -0,0 +1,23 @@
+--- Makefile.am.orig	2014-03-09 09:04:17.000000000 -0700
++++ Makefile.am	2014-03-09 09:06:24.000000000 -0700
+@@ -4,16 +4,16 @@
+
+ CLEANFILES=
+
+-bin_SCRIPTS = alacarte
+-CLEANFILES += alacarte
++bin_SCRIPTS = alacarte.py
++CLEANFILES += alacarte.py
+
+ DISTCLEANFILES = ChangeLog
+
+-alacarte: alacarte.in
++alacarte.py: alacarte.in
+ 	$(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@!	\
+ 	    -e s!\@PYOPTIONS\@!-OOt!			\
+ 	    < $< > $@
+-alacarte: Makefile
++alacarte.py: Makefile
+
+ EXTRA_DIST = \
+ 	alacarte.in \

gnome/alacarte/files/patch-acinclude.m4.diff

@@ -0,0 +1,13 @@
+--- acinclude.m4.orig	2014-03-09 09:22:23.000000000 -0700
++++ acinclude.m4	2014-03-09 09:23:17.000000000 -0700
+@@ -79,8 +79,8 @@
+   dnl distinct variables so they can be overridden if need be.  However,
+   dnl general consensus is that you shouldn't need this ability.
+
+-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++  AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++  AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix);'`])
+
+   dnl At times (like when building shared libraries) you may want
+   dnl to know which OS platform Python thinks this is.

gnome/alacarte/files/patch-configure.ac.diff

@@ -0,0 +1,11 @@
+--- configure.ac.orig	2014-03-09 08:56:46.000000000 -0700
++++ configure.ac	2014-03-09 09:02:22.000000000 -0700
+@@ -1,7 +1,7 @@
+ dnl -*- Mode: autoconf -*-
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.53)
+-AC_INIT(alacarte, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
++AC_INIT(alacarte.py, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ AC_CONFIG_SRCDIR(alacarte.in)
+ AC_CONFIG_HEADERS([config.h])