[42891] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Mon Dec 1 19:31:50 PST 2008
Revision: 42891
http://trac.macports.org/changeset/42891
Author: ryandesign at macports.org
Date: 2008-12-01 19:31:49 -0800 (Mon, 01 Dec 2008)
Log Message:
-----------
glib2-devel: update to 2.19.2 and include changes from glib2 revisions r42728, r42796, r42805
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/devel/glib2-devel/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
trunk/dports/devel/glib2-devel/files/patch-which.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2008-12-02 03:06:27 UTC (rev 42890)
+++ trunk/dports/devel/glib2-devel/Portfile 2008-12-02 03:31:49 UTC (rev 42891)
@@ -4,7 +4,7 @@
name glib2-devel
set my_name glib
-version 2.19.0
+version 2.19.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign
@@ -28,14 +28,15 @@
# ftp://ftp.gtk.org/pub/${my_name}/${branch}/
checksums \
- md5 0ff01feebce78b61ce37877e20d71eba \
- sha1 057a093c0fc18f9e5648e0df3f0c61fa0a5c5912 \
- rmd160 6aa268ad627acde137308ea70df43ac981051096
+ md5 9999ed8a3dea6e33fae39cf7ffe056cf \
+ sha1 a39a4b15aac2c904c0f362ce0a517ec9335dfe59 \
+ rmd160 c0004ec597b35b940c17f25998bf39bdce52aa3f
patchfiles \
patch-glib-2.0.pc.in.diff \
patch-gutils.c.diff \
- patch-gi18n.h.diff
+ patch-gi18n.h.diff \
+ patch-which.diff
depends_build \
port:pkgconfig
@@ -65,7 +66,9 @@
}
platform darwin {
- patchfiles-append patch-configure.diff
+ patchfiles-append \
+ patch-child-test.c.diff \
+ patch-configure.diff
}
platform powerpc {
@@ -91,6 +94,21 @@
}
}
+# MACOSX_DEPLOYMENT_TARGET bits can be removed when MacPorts 1.7.0 is released
+platform darwin 7 {
+ configure.env-append \
+ MACOSX_DEPLOYMENT_TARGET=10.3
+ build.env-append \
+ MACOSX_DEPLOYMENT_TARGET=10.3
+}
+
+platform darwin 8 {
+ configure.env-append \
+ MACOSX_DEPLOYMENT_TARGET=10.4
+ build.env-append \
+ MACOSX_DEPLOYMENT_TARGET=10.4
+}
+
platform darwin 9 {
patchfiles-append patch-glib_gutils.h.diff
}
Copied: trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff (from rev 42884, trunk/dports/devel/glib2/files/patch-child-test.c.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff 2008-12-02 03:31:49 UTC (rev 42891)
@@ -0,0 +1,11 @@
+--- tests/child-test.c 2008-11-23 23:45:21.000000000 -0600
++++ tests/child-test.c 2008-11-28 16:30:29.000000000 -0600
+@@ -175,7 +175,7 @@
+ #ifdef G_OS_WIN32
+ system ("ipconfig /all");
+ #else
+- system ("/bin/true");
++ system ("/usr/bin/true");
+ #endif
+
+ alive = 2;
Property changes on: trunk/dports/devel/glib2-devel/files/patch-child-test.c.diff
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/dports/devel/glib2-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.diff 2008-12-02 03:06:27 UTC (rev 42890)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.diff 2008-12-02 03:31:49 UTC (rev 42891)
@@ -1,6 +1,6 @@
---- configure 2008-10-16 17:24:49.000000000 -0500
-+++ configure 2008-11-04 13:30:29.000000000 -0600
-@@ -31493,28 +31493,11 @@
+--- configure.orig 2008-12-01 13:10:35.000000000 -0600
++++ configure 2008-12-01 20:20:27.000000000 -0600
+@@ -28551,28 +28551,11 @@
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
$as_echo "$ac_cv_c_bigendian" >&6; }
@@ -31,7 +31,7 @@
if test x$ac_cv_c_bigendian = xuniversal ; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -42614,7 +42597,11 @@
+@@ -39672,7 +39655,11 @@
$as_echo "$glib_cv_byte_contents_gmutex" >&6; }
cat >>confdefs.h <<_ACEOF
@@ -44,7 +44,7 @@
_ACEOF
-@@ -48191,10 +48178,13 @@
+@@ -46419,10 +46406,13 @@
_______EOF
fi
@@ -62,7 +62,7 @@
echo >>$outfile
-@@ -48243,7 +48233,12 @@
+@@ -46471,7 +46461,12 @@
long dummy_long;
} static_mutex;
};
@@ -76,7 +76,7 @@
#define g_static_mutex_get_mutex(mutex) \\
(g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \\
g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
-@@ -48272,24 +48267,39 @@
+@@ -46500,24 +46495,39 @@
void *dummy_pointer;
long dummy_long;
};
@@ -132,7 +132,7 @@
#define GLONG_TO_LE(val) ((glong) GINT${glongbits}_TO_LE (val))
#define GULONG_TO_LE(val) ((gulong) GUINT${glongbits}_TO_LE (val))
#define GLONG_TO_BE(val) ((glong) GINT${glongbits}_TO_BE (val))
-@@ -48298,7 +48308,11 @@
+@@ -46526,7 +46536,11 @@
#define GUINT_TO_LE(val) ((guint) GUINT${gintbits}_TO_LE (val))
#define GINT_TO_BE(val) ((gint) GINT${gintbits}_TO_BE (val))
#define GUINT_TO_BE(val) ((guint) GUINT${gintbits}_TO_BE (val))
Copied: trunk/dports/devel/glib2-devel/files/patch-which.diff (from rev 42884, trunk/dports/devel/glib2/files/patch-which.diff)
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-which.diff (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-which.diff 2008-12-02 03:31:49 UTC (rev 42891)
@@ -0,0 +1,114 @@
+Use "which" in a way that works on Mac OS X. See #17418.
+--- docs/reference/gio/Makefile.in 2008-12-01 13:10:28.000000000 -0600
++++ docs/reference/gio/Makefile.in 2008-12-01 20:44:55.000000000 -0600
+@@ -740,7 +740,7 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ fi
+
+@@ -770,7 +770,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+--- docs/reference/glib/Makefile.in 2008-12-01 13:10:28.000000000 -0600
++++ docs/reference/glib/Makefile.in 2008-12-01 20:44:55.000000000 -0600
+@@ -772,7 +772,7 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ fi
+
+@@ -802,7 +802,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+--- docs/reference/gobject/Makefile.in 2008-12-01 13:10:28.000000000 -0600
++++ docs/reference/gobject/Makefile.in 2008-12-01 20:44:55.000000000 -0600
+@@ -755,7 +755,7 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ fi
+
+@@ -785,7 +785,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+--- gio/pltcheck.sh 2008-12-01 13:09:05.000000000 -0600
++++ gio/pltcheck.sh 2008-12-01 20:44:55.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- glib/pltcheck.sh 2008-12-01 13:09:06.000000000 -0600
++++ glib/pltcheck.sh 2008-12-01 20:44:55.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- gobject/pltcheck.sh 2008-12-01 13:09:07.000000000 -0600
++++ gobject/pltcheck.sh 2008-12-01 20:44:55.000000000 -0600
+@@ -4,7 +4,7 @@
+
+ status=0
+
+-if ! which readelf 2>/dev/null >/dev/null; then
++if ! test -x "`which readelf`"; then
+ echo "'readelf' not found; skipping test"
+ exit 0
+ fi
+--- gtk-doc.make 2008-12-01 13:35:57.000000000 -0600
++++ gtk-doc.make 2008-12-01 20:44:55.000000000 -0600
+@@ -157,7 +157,7 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
+ fi
+
+@@ -190,7 +190,7 @@
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
++ ! test -x "`which gtkdoc-rebase`" || \
+ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
Property changes on: trunk/dports/devel/glib2-devel/files/patch-which.diff
___________________________________________________________________
Added: svn:mergeinfo
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081201/c94f4cde/attachment.html>
More information about the macports-changes
mailing list