[69652] trunk/dports/devel/glib2-devel

[ryandesign at macports.org]

Revision: 69652
          http://trac.macports.org/changeset/69652
Author:   ryandesign at macports.org
Date:     2010-07-12 00:45:43 -0700 (Mon, 12 Jul 2010)
Log Message:
-----------
glib2-devel: update to 2.25.11, adding upstream patch to disable dtrace usage that is not compatible with Mac OS X

Modified Paths:
--------------
    trunk/dports/devel/glib2-devel/Portfile

Added Paths:
-----------
    trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2010-07-12 07:25:22 UTC (rev 69651)
+++ trunk/dports/devel/glib2-devel/Portfile	2010-07-12 07:45:43 UTC (rev 69652)
@@ -6,7 +6,7 @@
 name                        glib2-devel
 conflicts                   glib2
 set my_name                 glib
-version                     2.25.7
+version                     2.25.11
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign
@@ -27,13 +27,14 @@
 master_sites                gnome:sources/${my_name}/${branch}/ \
                             ftp://ftp.gtk.org/pub/${my_name}/${branch}/
 
-checksums                   md5     ac4867b9450f8bf5f1075336a32a1a88 \
-                            sha1    8423e1f5346ecc629e85adfe5498c2545de421ef \
-                            rmd160  7c16e4c4e133aee02625c6e5dfb430736b4de33e
+checksums                   md5     19f76d17ca65f70f9b36daf8b1e57673 \
+                            sha1    3794dac04e4a4c5dabf2452d1d7e98b3d0c83edb \
+                            rmd160  a949384227eaa7491c2fa903d84771ea3be00215
 
 # ${prefix}/include/glib-2.0/glib/gi18n.h requires -I${prefix}/include to find libintl.h
 # See http://trac.macports.org/changeset/27148
 patchfiles                  patch-configure.in.diff \
+                            patch-configure.in-dtrace.diff \
                             patch-glib-2.0.pc.in.diff \
                             patch-glib_gunicollate.c.diff \
                             patch-gi18n.h.diff \

Added: trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff	                        (rev 0)
+++ trunk/dports/devel/glib2-devel/files/patch-configure.in-dtrace.diff	2010-07-12 07:45:43 UTC (rev 69652)
@@ -0,0 +1,43 @@
+From: Colin Walters <walters at verbum.org>
+Date: Fri, 25 Jun 2010 09:37:06 -0400
+Subject: [PATCH] Don't attempt to build dtrace support on OS X
+
+Apparently the OS X "dtrace" command is different from the Sun one,
+which is what Linux supports.  Since I don't have access to an OS X
+machine to test build patches on, simply disable dtrace on OS X
+for now.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=622697
+--- configure.in.orig
++++ configure.in
+@@ -2789,17 +2789,21 @@ AC_ARG_ENABLE([dtrace],
+ have_dtrace=no
+ AC_MSG_CHECKING([whether to include dtrace tracing support])
+ if test "x$enable_dtrace" != xno; then
+-  AC_MSG_RESULT([yes])
+-  AC_CHECK_PROGS(DTRACE, dtrace)
+-  if test -z "$DTRACE"; then
+-    if test "x$enable_dtrace" = xyes; then
+-      AC_MSG_ERROR([dtrace not found])
++  if test x$glib_have_carbon = xyes; then
++    AC_MSG_RESULT([no (not yet compatible with MacOS dtrace)])
++  else 
++    AC_MSG_RESULT([yes])
++    AC_CHECK_PROGS(DTRACE, dtrace)
++    if test -z "$DTRACE"; then
++      if test "x$enable_dtrace" = xyes; then
++        AC_MSG_ERROR([dtrace not found])
++      fi
+     fi
++    AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
++                    [if test "x$enable_dtrace" = xyes; then
++                      AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
++                     fi])
+   fi
+-  AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
+-                  [if test "x$enable_dtrace" = xyes; then
+-                     AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
+-                   fi])
+ else
+   AC_MSG_RESULT([no])
+ fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100712/1cd348f7/attachment.html>