Revision: 117439 https://trac.macports.org/changeset/117439 Author: devans@macports.org Date: 2014-02-26 01:03:30 -0800 (Wed, 26 Feb 2014) Log Message: ----------- rygel: move configure patch to configure.ac, replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration. Modified Paths: -------------- trunk/dports/net/rygel/Portfile Added Paths: ----------- trunk/dports/net/rygel/files/patch-configure.ac.diff Removed Paths: ------------- trunk/dports/net/rygel/files/patch-configure.diff Modified: trunk/dports/net/rygel/Portfile =================================================================== --- trunk/dports/net/rygel/Portfile 2014-02-26 08:32:42 UTC (rev 117438) +++ trunk/dports/net/rygel/Portfile 2014-02-26 09:03:30 UTC (rev 117439) @@ -38,9 +38,18 @@ depends_run port:gnome-settings-daemon -patchfiles patch-configure.diff \ +patchfiles patch-configure.ac.diff \ patch-return.diff +# update m4/intltool.m4 and autoreconf + +pre-configure { + copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4 +} + +use_autoreconf yes +autoreconf.args -fvi + configure.args --disable-silent-rules \ --enable-tracker-plugin=no Added: trunk/dports/net/rygel/files/patch-configure.ac.diff =================================================================== --- trunk/dports/net/rygel/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/net/rygel/files/patch-configure.ac.diff 2014-02-26 09:03:30 UTC (rev 117439) @@ -0,0 +1,20 @@ +--- configure.ac.orig 2013-12-22 03:32:37.000000000 -0800 ++++ configure.ac 2014-02-26 00:43:42.000000000 -0800 +@@ -43,7 +43,7 @@ + GSTPBU_REQUIRED=1.0 + GIO_REQUIRED=2.26 + GEE_REQUIRED=0.8.0 +-UUID_REQUIRED=1.41.3 ++UUID_REQUIRED=1.6.2 + LIBSOUP_REQUIRED=2.34.0 + GTK_REQUIRED=3.0 + +@@ -387,7 +387,7 @@ + AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes) + + AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS], +- ["-module -avoid-version -Wl,-z,defs"]) ++ ["-module -avoid-version"]) + AC_SUBST([RYGEL_PLUGIN_DIR], + [${libdir}/rygel-2.0/plugins]) + AC_SUBST([RYGEL_MEDIA_ENGINE_DIR], Deleted: trunk/dports/net/rygel/files/patch-configure.diff =================================================================== --- trunk/dports/net/rygel/files/patch-configure.diff 2014-02-26 08:32:42 UTC (rev 117438) +++ trunk/dports/net/rygel/files/patch-configure.diff 2014-02-26 09:03:30 UTC (rev 117439) @@ -1,20 +0,0 @@ ---- configure.orig 2013-11-11 11:26:23.000000000 -0800 -+++ configure 2013-11-16 12:02:53.000000000 -0800 -@@ -12902,7 +12902,7 @@ - GSTPBU_REQUIRED=1.0 - GIO_REQUIRED=2.26 - GEE_REQUIRED=0.8.0 --UUID_REQUIRED=1.41.3 -+UUID_REQUIRED=1.6.2 - LIBSOUP_REQUIRED=2.34.0 - GTK_REQUIRED=3.0 - -@@ -17584,7 +17584,7 @@ - fi - - --RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version -Wl,-z,defs" -+RYGEL_PLUGIN_LINKER_FLAGS="-module -avoid-version" - - RYGEL_PLUGIN_DIR=${libdir}/rygel-2.0/plugins -