[48109] trunk/dports/devel/dbus

[mcalhoun at macports.org]

Revision: 48109
          http://trac.macports.org/changeset/48109
Author:   mcalhoun at macports.org
Date:     2009-03-14 10:18:21 -0700 (Sat, 14 Mar 2009)
Log Message:
-----------
dbus: Assume maintainership with openmaintainer.
Use muniversal PortGroup instead of manually patching in #ifndef __LP64__.

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

Added Paths:
-----------
    trunk/dports/devel/dbus/files/config.cache

Removed Paths:
-------------
    trunk/dports/devel/dbus/files/patch-config.h.diff
    trunk/dports/devel/dbus/files/patch-configure-int64.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-03-14 16:55:05 UTC (rev 48108)
+++ trunk/dports/devel/dbus/Portfile	2009-03-14 17:18:21 UTC (rev 48109)
@@ -2,11 +2,12 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       muniversal 1.0
 
 name            dbus
 version         1.2.12
 revision        4
-maintainers     nomaintainer
+maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
 description     A message bus system, a simple way for applications to talk to one another.
@@ -23,8 +24,7 @@
 
                 
 patchfiles      patch-dbus-sysdeps-unix.c.diff \
-                patch-launchd-integration-dist.diff \
-                patch-configure-int64.diff
+                patch-launchd-integration-dist.diff
 
 post-patch {
    reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
@@ -39,12 +39,6 @@
                 --without-x \
                 --enable-launchd
 
-post-configure {
-    if {[variant_isset universal] && [lsearch -glob ${universal_archs} *64] != -1} {
-        system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config.h.diff && touch stamp-h1"
-    }
-}
-
 platform darwin 7 {
     patchfiles              patch-dbus-launch-x11.c.diff \
                             patch-dbus-sysdeps-util-unix.c.diff
@@ -111,5 +105,28 @@
     configure.args-append   --enable-tests
 }
 
+if {[variant_isset universal]} {
+    if { ${os.arch}=="i386" } {
+        if { ${os.arch}=="i386" } {
+            array set merger_configure_args {
+                ppc64   --config-cache
+            }
+            if { ${os.major} > 9 } {
+                set merger_configure_args(ppc)  --config-cache
+            }
+        } else {
+            array set merger_configure_args {
+                i386    --config-cache
+                x86_64  --config-cache
+            }
+        }
+
+        post-extract {
+            # Answers to questions configure can't determine without running a program.
+            copy ${filespath}/config.cache ${worksrcpath}
+        }
+    }
+}
+
 livecheck.check regex
 livecheck.regex {D-Bus (\d+(?:\.\d+)*)}

Added: trunk/dports/devel/dbus/files/config.cache
===================================================================
--- trunk/dports/devel/dbus/files/config.cache	                        (rev 0)
+++ trunk/dports/devel/dbus/files/config.cache	2009-03-14 17:18:21 UTC (rev 48109)
@@ -0,0 +1,2 @@
+broken_poll=yes
+ac_cv_have_abstract_sockets=no

Deleted: trunk/dports/devel/dbus/files/patch-config.h.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-config.h.diff	2009-03-14 16:55:05 UTC (rev 48108)
+++ trunk/dports/devel/dbus/files/patch-config.h.diff	2009-03-14 17:18:21 UTC (rev 48109)
@@ -1,26 +0,0 @@
---- config.h.orig	2009-01-12 23:33:36.000000000 +1100
-+++ config.h	2009-01-12 23:36:33.000000000 +1100
-@@ -287,7 +287,11 @@
- #define SIZEOF_INT 4
- 
- /* The size of `long', as computed by sizeof. */
-+#ifdef __LP64__
- #define SIZEOF_LONG 8
-+#else
-+#define SIZEOF_LONG 4
-+#endif
- 
- /* The size of `long long', as computed by sizeof. */
- #define SIZEOF_LONG_LONG 8
-@@ -296,7 +300,11 @@
- #define SIZEOF_SHORT 2
- 
- /* The size of `void *', as computed by sizeof. */
-+#ifdef __LP64__
- #define SIZEOF_VOID_P 8
-+#else
-+#define SIZEOF_VOID_P 4
-+#endif
- 
- /* The size of `__int64', as computed by sizeof. */
- #define SIZEOF___INT64 0

Deleted: trunk/dports/devel/dbus/files/patch-configure-int64.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-configure-int64.diff	2009-03-14 16:55:05 UTC (rev 48108)
+++ trunk/dports/devel/dbus/files/patch-configure-int64.diff	2009-03-14 17:18:21 UTC (rev 48109)
@@ -1,26 +0,0 @@
---- configure.orig	2009-01-12 23:27:10.000000000 +1100
-+++ configure	2009-01-12 23:31:09.000000000 +1100
-@@ -23652,6 +23652,11 @@
- $as_echo_n "checking 64-bit integer type... " >&6; }
- 
- case 8 in
-+$ac_cv_sizeof_long_long)
-+  dbusint64='long long'
-+  dbusint64_constant='(val##LL)'
-+  dbusuint64_constant='(val##ULL)'
-+  ;;
- $ac_cv_sizeof_int)
-   dbusint64=int
-   dbusint64_constant='(val)'
-@@ -23662,11 +23667,6 @@
-   dbusint64_constant='(val##L)'
-   dbusuint64_constant='(val##UL)'
-   ;;
--$ac_cv_sizeof_long_long)
--  dbusint64='long long'
--  dbusint64_constant='(val##LL)'
--  dbusuint64_constant='(val##ULL)'
--  ;;
- $ac_cv_sizeof___int64)
-   dbusint64=__int64
-   dbusint64_constant='(val##i64)'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090314/d72c3abd/attachment.html>