Revision: 138256 https://trac.macports.org/changeset/138256 Author: devans@macports.org Date: 2015-07-03 07:44:31 -0700 (Fri, 03 Jul 2015) Log Message: ----------- GNOME-3/stable: glib2, sync with trunk. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile Property Changed: ---------------- users/devans/GNOME-3/stable/dports/devel/glib2/ Property changes on: users/devans/GNOME-3/stable/dports/devel/glib2 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,125620-136264 /trunk/dports/devel/glib2-devel:51739-120463 /users/cal/ports/devel/glib2:96570-97031 /users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619 + /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /trunk/dports/devel/glib2:52045-52046,62644,64476,72697,91791,125620-138255 /trunk/dports/devel/glib2-devel:51739-120463 /users/cal/ports/devel/glib2:96570-97031 /users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619 Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile 2015-07-03 13:49:23 UTC (rev 138255) +++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile 2015-07-03 14:44:31 UTC (rev 138256) @@ -11,6 +11,7 @@ conflicts glib2-devel set my_name glib version 2.44.1 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers ryandesign openmaintainer @@ -53,8 +54,7 @@ depends_lib port:gettext \ port:libiconv \ port:zlib \ - port:libffi \ - path:bin/perl:perl5 + port:libffi # GLib-CRITICAL **: attempting to free a locked GVariant instance. This should never happen. compiler.blacklist-append {clang < 318} @@ -71,7 +71,7 @@ configure.args --enable-static --disable-libelf \ --disable-compile-warnings -configure.perl ${prefix}/bin/perl +configure.perl /usr/bin/perl configure.python /usr/bin/python configure.env-append PERL_PATH=${configure.perl} \ PKG_CONFIG=false \ @@ -105,7 +105,7 @@ post-destroot { file delete ${destroot}${prefix}/lib/charset.alias - set docdir ${prefix}/share/doc/${name} + set docdir ${prefix}/share/doc/${my_name} xinstall -d ${destroot}${docdir} xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog HACKING NEWS \ README ${destroot}${docdir}