[91501] trunk/dports/devel

3 Apr 2012

Revision: 91501
          https://trac.macports.org/changeset/91501
Author:   jeremyhu@macports.org
Date:     2012-04-03 12:08:04 -0700 (Tue, 03 Apr 2012)
Log Message:
-----------
ld64,cctools: Reformat the Portfile for consistency across the ports and for easier future updates

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/cctools-headers/Portfile
    trunk/dports/devel/ld64/Portfile

Modified: trunk/dports/devel/cctools/Portfile
===================================================================

--- trunk/dports/devel/cctools/Portfile	2012-04-03 19:04:47 UTC (rev 91500)
+++ trunk/dports/devel/cctools/Portfile	2012-04-03 19:08:04 UTC (rev 91501)
@@ -26,16 +26,33 @@
 
 patchfiles              PR-11136237.patch
 
-use_configure           no
-destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
-
 if {${os.major} < 9} {
     pre-fetch {
         ui_error "${name} requires Mac OS X 10.5 or later."
         return -code error "incompatible Mac OS X version"
     }
+} elseif {${os.major} < 10} {
+    # We should bump to at-least version 795, which was included in
+    # XCode 3.2.6 and supports Tiger and Leopard targets.
+    version             698.1
+    revision            1
+    distname            cctools-${version}
+    checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
+                        sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
+    patchfiles          patch-misc_libtool.c.diff PR-11136237-698.1.patch
+
+    supported_archs     i386 ppc
+} elseif {${os.major} == 10} {
+    version             809
+    revision            1
+    distname            cctools-${version}
+    checksums           rmd160  f433124035ac0ef403bdc6edec087bdedd0b4375 \
+                        sha256  03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
 }
 
+use_configure           no
+destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
+
 post-patch {
     # We don't want to build cctools ld.  We want to use ld64
     reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
@@ -88,25 +105,6 @@
 platform macosx {
     build.args-append RC_OS="macos"
     destroot.args-append RC_OS="macos"
-
-    if {${os.major} < 10} {
-        # We should bump to at-least version 795, which was included in
-        # XCode 3.2.6 and supports Tiger and Leopard targets.
-        version             698.1
-        revision            1
-        distname            cctools-${version}
-        checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
-                            sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-        patchfiles          patch-misc_libtool.c.diff PR-11136237-698.1.patch
-
-        supported_archs     i386 ppc
-    } elseif {${os.major} == 10} {
-        version             809
-        revision            1
-        distname            cctools-${version}
-        checksums           rmd160  f433124035ac0ef403bdc6edec087bdedd0b4375 \
-                            sha256  03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
-    }
 }
 
 destroot.target install_tools

Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile	2012-04-03 19:04:47 UTC (rev 91500)
+++ trunk/dports/devel/cctools-headers/Portfile	2012-04-03 19:08:04 UTC (rev 91501)
@@ -19,39 +19,35 @@
 checksums               rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
                         sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
 
-supported_archs         noarch
-universal_variant       no
-use_configure           no
-build {}
-
-destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
-destroot.target         installhdrs
-
-post-destroot {
-    file rename -force ${destroot}${prefix}/usr/include ${destroot}${prefix}/
-    file delete -force ${destroot}${prefix}/usr
-}
-
 if {${os.major} < 9} {
     pre-fetch {
         ui_error "${name} requires Mac OS X 10.5 or later."
         return -code error "incompatible Mac OS X version"
     }
-}
-
-platform darwin 9 {
+} elseif {${os.major} < 10} {
     version             698.1
     distname            cctools-${version}
     checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
                         sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-}
-
-platform darwin 10 {
+} elseif {${os.major} = 10} {
     version             809
     distname            cctools-${version}
     checksums           rmd160  f433124035ac0ef403bdc6edec087bdedd0b4375 \
                         sha256  03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad
 }
 
+supported_archs         noarch
+universal_variant       no
+use_configure           no
+build {}
+
+destroot.args           DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
+destroot.target         installhdrs
+
+post-destroot {
+    file rename -force ${destroot}${prefix}/usr/include ${destroot}${prefix}/
+    file delete -force ${destroot}${prefix}/usr
+}
+
 livecheck.type          regex
 livecheck.regex         "cctools-(\[\\d.\]+)"

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-04-03 19:04:47 UTC (rev 91500)
+++ trunk/dports/devel/ld64/Portfile	2012-04-03 19:08:04 UTC (rev 91501)
@@ -28,6 +28,35 @@
                         rmd160  0da68b89669233d7b6cc6ebdb92482e191bc9051 \
                         sha256  96a912464e2d4d3d7cdaab0744003b0fa93d139f203c82867f659ee94b4ae9f7
 
+if {${os.major} < 8} {
+    pre-fetch {
+        ui_error "${name} requires Mac OS X 10.4 or later."
+        return -code error "incompatible Mac OS X version"
+    }
+} elseif {${os.major} < 9} {
+    version             62.1
+    revision            3
+    checksums           rmd160 5b53ecb7b7a7e40e7420192fdf609e43151a736a \
+                        sha256 82ccb66eb5a452b8bb47771ebbdb73bed7e8824e3cbd58fa2d6d6fc91ca26b87     
+    supported_archs     i386 ppc
+    depends_build
+
+    patchfiles          ld64-62.1-dylib_version_args.patch
+} elseif {${os.major} == 9} {
+    version             85.2.1
+    revision            4
+    checksums           rmd160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 \
+                        sha256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
+    supported_archs     i386 ppc
+    depends_build       port:llvm-${llvm_version}
+    patchfiles          patch-MATH85-ld.cpp.diff
+} elseif {${os.major} == 10} {
+    version             127.2
+    revision            4
+    checksums           rmd160  8ee709341549a1944732daef6ebab7ef1acfcc6e \
+                        sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
+}
+
 xcode.target            all ObjectDump machocheck
 xcode.destroot.path     ${prefix}/bin
 
@@ -81,42 +110,5 @@
     }
 }
 
-
-if {${os.major} < 8} {
-    pre-fetch {
-        ui_error "${name} requires Mac OS X 10.4 or later."
-        return -code error "incompatible Mac OS X version"
-    }
-}
-
-
-platform darwin 8 {
-    version             62.1
-    revision            3
-    checksums           rmd160 5b53ecb7b7a7e40e7420192fdf609e43151a736a \
-                        sha256 82ccb66eb5a452b8bb47771ebbdb73bed7e8824e3cbd58fa2d6d6fc91ca26b87
-    supported_archs     i386 ppc
-    depends_build
-
-    patchfiles          ld64-62.1-dylib_version_args.patch
-}
-
-platform darwin 9 {
-    version             85.2.1
-    revision            4
-    checksums           rmd160 42c80bd4ad6e9f96a757245e6a2b95084c009ff1 \
-                        sha256 4bcbcbdfd62efdc46c51700b8f5dae2cbd1638e9e50f649d5c7f242d32fca804
-    supported_archs     i386 ppc
-    depends_build       port:llvm-${llvm_version}
-    patchfiles          patch-MATH85-ld.cpp.diff
-}
-
-platform darwin 10 {
-    version             127.2
-    revision            4
-    checksums           rmd160  8ee709341549a1944732daef6ebab7ef1acfcc6e \
-                        sha256  97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142
-}
-
 livecheck.type          regex
 livecheck.regex         "${name}-(\[\\d.\]+)"

    

jeremyhu＠macports.org

tags

participants (1)