[117721] trunk/dports/gnome/alacarte
devans at macports.org
devans at macports.org
Sun Mar 9 09:39:26 PDT 2014
Revision: 117721
https://trac.macports.org/changeset/117721
Author: devans at macports.org
Date: 2014-03-09 09:39:26 -0700 (Sun, 09 Mar 2014)
Log Message:
-----------
alacarte: update patchfiles, reconfigure with our intltool.m4 to fix intltool configuration.
Modified Paths:
--------------
trunk/dports/gnome/alacarte/Portfile
Added Paths:
-----------
trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff
trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff
trunk/dports/gnome/alacarte/files/patch-configure.ac.diff
Removed Paths:
-------------
trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff
trunk/dports/gnome/alacarte/files/patch-configure.diff
Modified: trunk/dports/gnome/alacarte/Portfile
===================================================================
--- trunk/dports/gnome/alacarte/Portfile 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/Portfile 2014-03-09 16:39:26 UTC (rev 117721)
@@ -36,10 +36,16 @@
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
}
Added: trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff 2014-03-09 16:39:26 UTC (rev 117721)
@@ -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 \
Deleted: trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-09 16:39:26 UTC (rev 117721)
@@ -1,27 +0,0 @@
---- Makefile.in.orig 2013-09-24 10:08:35.000000000 -0700
-+++ Makefile.in 2013-11-06 16:10:24.000000000 -0800
-@@ -356,8 +356,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = data po Alacarte
--CLEANFILES = alacarte
--bin_SCRIPTS = alacarte
-+CLEANFILES = alacarte.py
-+bin_SCRIPTS = alacarte.py
- DISTCLEANFILES = ChangeLog
- EXTRA_DIST = \
- alacarte.in \
-@@ -867,11 +867,11 @@
- tags-am uninstall uninstall-am uninstall-binSCRIPTS
-
-
--alacarte: alacarte.in
-+alacarte.py: alacarte.in
- $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
- -e s!\@PYOPTIONS\@!-OOt! \
- < $< > $@
--alacarte: Makefile
-+alacarte.py: Makefile
-
- ChangeLog:
- @echo Creating $@
Added: trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff 2014-03-09 16:39:26 UTC (rev 117721)
@@ -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.
Added: trunk/dports/gnome/alacarte/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/alacarte/files/patch-configure.ac.diff 2014-03-09 16:39:26 UTC (rev 117721)
@@ -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])
Deleted: trunk/dports/gnome/alacarte/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/alacarte/files/patch-configure.diff 2014-03-09 15:53:53 UTC (rev 117720)
+++ trunk/dports/gnome/alacarte/files/patch-configure.diff 2014-03-09 16:39:26 UTC (rev 117721)
@@ -1,50 +0,0 @@
---- configure.orig 2013-09-24 10:08:36.000000000 -0700
-+++ configure 2013-11-06 16:10:24.000000000 -0800
-@@ -5861,9 +5861,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -5936,9 +5936,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -6011,9 +6011,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -6086,9 +6086,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140309/c5973e06/attachment.html>
More information about the macports-changes
mailing list