Revision: 117390 https://trac.macports.org/changeset/117390 Author: devans@macports.org Date: 2014-02-24 17:24:59 -0800 (Mon, 24 Feb 2014) Log Message: ----------- libgtop: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration, patch libgtop-sysdeps.m4 rather than configure. Modified Paths: -------------- trunk/dports/gnome/libgtop/Portfile Added Paths: ----------- trunk/dports/gnome/libgtop/files/patch-libgtop-sysdeps.m4.diff Removed Paths: ------------- trunk/dports/gnome/libgtop/files/patch-configure.diff Modified: trunk/dports/gnome/libgtop/Portfile =================================================================== --- trunk/dports/gnome/libgtop/Portfile 2014-02-25 00:52:30 UTC (rev 117389) +++ trunk/dports/gnome/libgtop/Portfile 2014-02-25 01:24:59 UTC (rev 117390) @@ -32,8 +32,17 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \ port:gobject-introspection -patchfiles patch-configure.diff +patchfiles patch-libgtop-sysdeps.m4.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 --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --enable-introspection Deleted: trunk/dports/gnome/libgtop/files/patch-configure.diff =================================================================== --- trunk/dports/gnome/libgtop/files/patch-configure.diff 2014-02-25 00:52:30 UTC (rev 117389) +++ trunk/dports/gnome/libgtop/files/patch-configure.diff 2014-02-25 01:24:59 UTC (rev 117390) @@ -1,11 +0,0 @@ ---- configure.orig 2013-08-19 13:31:42.000000000 -0700 -+++ configure 2013-08-20 06:40:39.000000000 -0700 -@@ -13258,7 +13258,7 @@ - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysinfo=yes -- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2' -+ libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server2 && chmod g+s $(DESTDIR)$(bindir)/libgtop_server2' - ;; - cygwin*) - libgtop_sysdeps_dir=cygwin Added: trunk/dports/gnome/libgtop/files/patch-libgtop-sysdeps.m4.diff =================================================================== --- trunk/dports/gnome/libgtop/files/patch-libgtop-sysdeps.m4.diff (rev 0) +++ trunk/dports/gnome/libgtop/files/patch-libgtop-sysdeps.m4.diff 2014-02-25 01:24:59 UTC (rev 117390) @@ -0,0 +1,11 @@ +--- libgtop-sysdeps.m4.orig 2014-02-24 17:12:35.000000000 -0800 ++++ libgtop-sysdeps.m4 2014-02-24 17:15:15.000000000 -0800 +@@ -107,7 +107,7 @@ + libgtop_use_machine_h=yes + libgtop_need_server=yes + libgtop_have_sysinfo=yes +- libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2' ++ libgtop_postinstall='chgrp kmem $(DESTDIR)$(bindir)/libgtop_server2 && chmod g+s $(DESTDIR)$(bindir)/libgtop_server2' + ;; + cygwin*) + libgtop_sysdeps_dir=cygwin