[42123] trunk/dports/sysutils/disktype

[blb at macports.org]

Revision: 42123
          http://trac.macports.org/changeset/42123
Author:   blb at macports.org
Date:     2008-11-15 14:49:39 -0800 (Sat, 15 Nov 2008)
Log Message:
-----------
sysutils/disktype - fix build which assumed to always build universal against
10.4 SDK breaking build on 10.5, ticket #17259

Modified Paths:
--------------
    trunk/dports/sysutils/disktype/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/disktype/files/
    trunk/dports/sysutils/disktype/files/patch-Makefile.diff

Modified: trunk/dports/sysutils/disktype/Portfile
===================================================================
--- trunk/dports/sysutils/disktype/Portfile	2008-11-15 22:37:02 UTC (rev 42122)
+++ trunk/dports/sysutils/disktype/Portfile	2008-11-15 22:49:39 UTC (rev 42123)
@@ -4,6 +4,7 @@
 
 name                disktype
 version             9
+revision            1
 categories          sysutils
 platforms           darwin
 maintainers         nomaintainer
@@ -16,6 +17,22 @@
 master_sites        sourceforge
 checksums           sha1 5ccc55d1c47f9a37becce7336c4aa3a7a43cc89c
 
+patchfiles          patch-Makefile.diff
+post-patch {
+   if {[variant_isset universal]} {
+      reinplace "s|@@UNIVERSAL_CPPFLAGS@@|${configure.universal_cppflags}|" \
+         ${worksrcpath}/Makefile
+      reinplace "s|@@UNIVERSAL_CFLAGS@@|${configure.universal_cflags}|" \
+         ${worksrcpath}/Makefile
+      reinplace "s|@@UNIVERSAL_LDFLAGS@@|${configure.universal_ldflags}|" \
+         ${worksrcpath}/Makefile
+   } else {
+      reinplace "s|@@UNIVERSAL_CPPFLAGS@@||" ${worksrcpath}/Makefile
+      reinplace "s|@@UNIVERSAL_CFLAGS@@||" ${worksrcpath}/Makefile
+      reinplace "s|@@UNIVERSAL_LDFLAGS@@||" ${worksrcpath}/Makefile
+   }
+}
+
 use_configure       no
 
 destroot {
@@ -24,3 +41,6 @@
       ${destroot}${prefix}/share/man/man1
 }
 
+variant universal description {Build for multiple architectures} {
+}
+

Added: trunk/dports/sysutils/disktype/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/disktype/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/sysutils/disktype/files/patch-Makefile.diff	2008-11-15 22:49:39 UTC (rev 42123)
@@ -0,0 +1,19 @@
+--- Makefile.orig	2006-01-12 10:55:15.000000000 -0700
++++ Makefile	2008-11-15 15:43:03.000000000 -0700
+@@ -28,13 +28,10 @@
+     #CPPFLAGS += -DUSE_IOCTL_FREEBSD
+   endif
+   ifeq ($(system),Darwin)
+-    CPPFLAGS += -DUSE_MACOS_TYPE -DUSE_IOCTL_DARWIN
++    CPPFLAGS += -DUSE_MACOS_TYPE -DUSE_IOCTL_DARWIN @@UNIVERSAL_CPPFLAGS@@
++    CFLAGS   += @@UNIVERSAL_CFLAGS@@
++    LDFLAGS  += @@UNIVERSAL_LDFLAGS@@
+     LIBS     += -framework CoreServices
+-    ifeq (/Developer/SDKs/MacOSX10.4u.sdk,$(wildcard /Developer/SDKs/MacOSX10.4u.sdk))
+-      CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk
+-      CFLAGS   += -arch i386 -arch ppc
+-      LDFLAGS  += -arch i386 -arch ppc -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+-    endif
+   endif
+   ifeq ($(system),AmigaOS)
+     CC       += -noixemul
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081115/8fbf3278/attachment.html>