Revision: 75483 http://trac.macports.org/changeset/75483 Author: ryandesign@macports.org Date: 2011-01-26 02:51:15 -0800 (Wed, 26 Jan 2011) Log Message: ----------- glib2, glib2-devel: move libiconv out of Libs.private in glib-2.0.pc and back into Libs; see #28162 Modified Paths: -------------- trunk/dports/devel/glib2/Portfile trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff trunk/dports/devel/glib2-devel/Portfile trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff Modified: trunk/dports/devel/glib2/Portfile =================================================================== --- trunk/dports/devel/glib2/Portfile 2011-01-26 09:14:15 UTC (rev 75482) +++ trunk/dports/devel/glib2/Portfile 2011-01-26 10:51:15 UTC (rev 75483) @@ -8,6 +8,7 @@ conflicts glib2-devel set my_name glib version 2.26.1 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers ryandesign openmaintainer Modified: trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff =================================================================== --- trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2011-01-26 09:14:15 UTC (rev 75482) +++ trunk/dports/devel/glib2/files/patch-glib-2.0.pc.in.diff 2011-01-26 10:51:15 UTC (rev 75483) @@ -1,8 +1,11 @@ ---- glib-2.0.pc.in.orig 2008-07-02 16:13:24.000000000 -0500 -+++ glib-2.0.pc.in 2008-07-05 15:57:19.000000000 -0500 -@@ -12,4 +12,4 @@ +--- glib-2.0.pc.in.orig 2009-03-31 18:04:20.000000000 -0500 ++++ glib-2.0.pc.in 2011-01-26 04:04:36.000000000 -0600 +@@ -10,6 +10,5 @@ + Name: GLib + Description: C Utility Library Version: @VERSION@ - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @ICONV_LIBS@ +-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ +-Libs.private: @ICONV_LIBS@ -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ ++Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ +Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@ Modified: trunk/dports/devel/glib2-devel/Portfile =================================================================== --- trunk/dports/devel/glib2-devel/Portfile 2011-01-26 09:14:15 UTC (rev 75482) +++ trunk/dports/devel/glib2-devel/Portfile 2011-01-26 10:51:15 UTC (rev 75483) @@ -8,6 +8,7 @@ conflicts glib2 set my_name glib version 2.27.92 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] categories devel maintainers ryandesign openmaintainer Modified: trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff =================================================================== --- trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2011-01-26 09:14:15 UTC (rev 75482) +++ trunk/dports/devel/glib2-devel/files/patch-glib-2.0.pc.in.diff 2011-01-26 10:51:15 UTC (rev 75483) @@ -1,8 +1,11 @@ ---- glib-2.0.pc.in.orig 2008-07-02 16:13:24.000000000 -0500 -+++ glib-2.0.pc.in 2008-07-05 15:57:19.000000000 -0500 -@@ -12,4 +12,4 @@ +--- glib-2.0.pc.in.orig 2009-03-31 18:04:20.000000000 -0500 ++++ glib-2.0.pc.in 2011-01-26 04:09:18.000000000 -0600 +@@ -10,6 +10,5 @@ + Name: GLib + Description: C Utility Library Version: @VERSION@ - Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ - Libs.private: @ICONV_LIBS@ +-Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ +-Libs.private: @ICONV_LIBS@ -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ ++Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ +Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include -I${includedir} @GLIB_EXTRA_CFLAGS@