[61145] trunk/dports/devel/glib2-devel
ryandesign at macports.org
ryandesign at macports.org
Wed Dec 2 15:29:50 PST 2009
Revision: 61145
http://trac.macports.org/changeset/61145
Author: ryandesign at macports.org
Date: 2009-12-02 15:29:49 -0800 (Wed, 02 Dec 2009)
Log Message:
-----------
glib2-devel: update to 2.23.0, bring over the new universal build scheme from glib2
Modified Paths:
--------------
trunk/dports/devel/glib2-devel/Portfile
Added Paths:
-----------
trunk/dports/devel/glib2-devel/files/config.h.ed
Removed Paths:
-------------
trunk/dports/devel/glib2-devel/files/patch-which.diff
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2009-12-02 23:15:05 UTC (rev 61144)
+++ trunk/dports/devel/glib2-devel/Portfile 2009-12-02 23:29:49 UTC (rev 61145)
@@ -1,12 +1,11 @@
# $Id$
PortSystem 1.0
-PortGroup muniversal 1.0
name glib2-devel
conflicts glib2
set my_name glib
-version 2.21.6
+version 2.23.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
maintainers ryandesign
@@ -31,9 +30,9 @@
ftp://ftp.gtk.org/pub/${my_name}/${branch}/
checksums \
- md5 3b0452fbd877db53dafabdc074600cb8 \
- sha1 a05f74a1cc9ae7a77efa988be72575c192da1afc \
- rmd160 683102b179137cce26f0e071ae7a0822ade679bd
+ md5 75909517629c54e5c5b36d8e233915a9 \
+ sha1 8dc4905b4dc280320b2fd4bce4f41b87a5b64040 \
+ rmd160 d147ffcae737ae8b526184d371f1ed2d4b005af7
# ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
# See http://trac.macports.org/changeset/27148
@@ -41,8 +40,7 @@
patch-configure.in.diff \
patch-glib-2.0.pc.in.diff \
patch-gi18n.h.diff \
- patch-gio_xdgmime_xdgmime.c.diff \
- patch-which.diff
+ patch-gio_xdgmime_xdgmime.c.diff
depends_build \
port:pkgconfig
@@ -55,7 +53,9 @@
use_autoconf yes
+# -lresolv is needed at least on Tiger PPC.
configure.ldflags-append \
+ -lresolv \
-bind_at_load
configure.cflags-append \
@@ -73,6 +73,10 @@
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/gio/xdgmime/xdgmime.c
}
+post-configure {
+ system "ed - ${worksrcpath}/config.h < ${filespath}/config.h.ed"
+}
+
platform darwin {
patchfiles-append \
patch-child-test.c.diff
@@ -85,56 +89,6 @@
file delete ${destroot}${prefix}/lib/charset.alias
}
-if {[variant_isset universal]} {
- pre-configure {
- global merger_configure_args merger_configure_env merger_configure_cppflags merger_configure_ldflags
-
- # See http://trac.macports.org/ticket/19196.
- if { ${os.major}=="8" } {
- set merger_configure_cppflags(ppc64) "-D __LP64__"
- set merger_configure_ldflags(ppc64) "-framework Carbon"
- set merger_configure_cppflags(x86_64) "-D __LP64__"
- set merger_configure_ldflags(x86_64) "-framework Carbon"
- }
-
- # Find architectures which will not run on build platform.
- if { ${os.arch}=="i386" || ${os.arch}=="x86_64"} {
- set cross_archs "ppc ppc64"
- set host_archs "ppc ppc64"
- set big_endian "yes"
- } else {
- set cross_archs "i386 x86_64"
- set host_archs "i386 x86_64"
- set big_endian "no"
- }
-
- set run_arch [lindex ${universal_archs} 0]
- if { [lsearch ${cross_archs} ${run_arch}] >= 0 } {
- ui_msg "When building a universal binary of ${name}, make sure none of {${cross_archs}} is first in universal_archs in ${prefix}/etc/macports/macports.conf"
- error "incompatible universal_archs value"
- }
-
- foreach arch ${cross_archs} {
- lappend merger_configure_env(${arch}) \
- GLIB_GENMARSHAL=${worksrcpath}-${run_arch}/gobject/glib-genmarshal \
- glib_cv_stack_grows=no \
- glib_cv_uscore=no \
- ac_cv_func_posix_getpwuid_r=yes \
- ac_cv_func_posix_getgrgid_r=yes
- }
-
- # Correct NM values is not found.
- # With -arch, ac_cv_c_bigendian is set to universal, which defaults to little endian.
- foreach arch ${host_archs} {
- lappend merger_configure_env(${arch}) \
- NM='/usr/bin/nm -p' \
- ac_cv_c_bigendian=${big_endian}
- }
- }
-
- set merger_dont_diff ${prefix}/lib/glib-2.0/include/glibconfig.h
-}
-
livecheck.type regex
livecheck.url http://ftp.gnome.org/pub/GNOME/sources/${my_name}/${branch}/?C=M&O=D
livecheck.regex ${my_name}-(\[0-9.\]+)\\.tar
Copied: trunk/dports/devel/glib2-devel/files/config.h.ed (from rev 61043, trunk/dports/devel/glib2/files/config.h.ed)
===================================================================
--- trunk/dports/devel/glib2-devel/files/config.h.ed (rev 0)
+++ trunk/dports/devel/glib2-devel/files/config.h.ed 2009-12-02 23:29:49 UTC (rev 61145)
@@ -0,0 +1,75 @@
+/ AC_APPLE_UNIVERSAL_BUILD /c
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+.
+/ ASM_NUMERIC_LABELS /c
+#ifdef __BIG_ENDIAN__
+#define ASM_NUMERIC_LABELS 1
+#else
+/* #undef ASM_NUMERIC_LABELS */
+#endif
+.
+/ GLIB_BYTE_CONTENTS_GMUTEX /c
+#ifdef __LP64__
+#ifdef __BIG_ENDIAN__
+#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+#else
+#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+#endif
+#else
+#ifdef __BIG_ENDIAN__
+#define GLIB_BYTE_CONTENTS_GMUTEX 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+#else
+#define GLIB_BYTE_CONTENTS_GMUTEX -89,-85,-86,50,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+#endif
+#endif
+.
+/ GLIB_SIZEOF_GMUTEX /c
+#ifdef __LP64__
+#define GLIB_SIZEOF_GMUTEX 64
+#else
+#define GLIB_SIZEOF_GMUTEX 44
+#endif
+.
+/ GLIB_SIZEOF_SYSTEM_THREAD /c
+#ifdef __LP64__
+#define GLIB_SIZEOF_SYSTEM_THREAD 8
+#else
+#define GLIB_SIZEOF_SYSTEM_THREAD 4
+#endif
+.
+/ G_ATOMIC_POWERPC /c
+#ifdef __BIG_ENDIAN__
+#define G_ATOMIC_POWERPC 1
+#else
+/* #undef G_ATOMIC_POWERPC */
+#endif
+.
+/ G_VA_COPY_AS_ARRAY /c
+#ifdef __LP64__
+#define G_VA_COPY_AS_ARRAY 1
+#else
+/* #undef G_VA_COPY_AS_ARRAY */
+#endif
+.
+/ SIZEOF_LONG /c
+#ifdef __LP64__
+#define SIZEOF_LONG 8
+#else
+#define SIZEOF_LONG 4
+#endif
+.
+/ SIZEOF_SIZE_T /c
+#ifdef __LP64__
+#define SIZEOF_SIZE_T 8
+#else
+#define SIZEOF_SIZE_T 4
+#endif
+.
+/ SIZEOF_VOID_P /c
+#ifdef __LP64__
+#define SIZEOF_VOID_P 8
+#else
+#define SIZEOF_VOID_P 4
+#endif
+.
+w
Deleted: trunk/dports/devel/glib2-devel/files/patch-which.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-which.diff 2009-12-02 23:15:05 UTC (rev 61144)
+++ trunk/dports/devel/glib2-devel/files/patch-which.diff 2009-12-02 23:29:49 UTC (rev 61145)
@@ -1,114 +0,0 @@
-Use "which" in a way that works on Mac OS X 10.4.x and earlier. See #17418.
---- docs/reference/gio/Makefile.in 2009-05-16 21:53:56.000000000 -0500
-+++ docs/reference/gio/Makefile.in 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-05-16 21:53:56.000000000 -0500
-+++ docs/reference/glib/Makefile.in 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-05-16 21:53:56.000000000 -0500
-+++ docs/reference/gobject/Makefile.in 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-05-16 19:56:51.000000000 -0500
-+++ gio/pltcheck.sh 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-03-31 18:04:20.000000000 -0500
-+++ glib/pltcheck.sh 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-03-31 18:04:20.000000000 -0500
-+++ gobject/pltcheck.sh 2009-05-23 07:12:03.000000000 -0500
-@@ -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 2009-05-16 22:25:13.000000000 -0500
-+++ gtk-doc.make 2009-05-23 07:12:03.000000000 -0500
-@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091202/f3127661/attachment.html>
More information about the macports-changes
mailing list