Changeset 80938

Timestamp:

07/21/11 13:50:09 (4 years ago)

Author:

jmr@…

Message:

MacPorts port: update to 2.0.0

File:

• trunk/dports/sysutils/MacPorts/Portfile (modified) (7 diffs)

trunk/dports/sysutils/MacPorts/Portfile

@@ -4 +4 @@
 
 name                MacPorts
-version             1.9.2
+version             2.0.0
 
 categories          sysutils
@@ -15 +15 @@
    management of freely available software on Mac OS X 10.4 or newer systems.
 
+notes "This port cannot directly be used to upgrade MacPorts; use 'port\
+selfupdate' for that."
+
 homepage            http://www.macports.org/
-master_sites        macports_distfiles
+master_sites
 # testing subdir is for non-final releases only
 #dist_subdir         ${name}/testing
 use_bzip2           yes
 
-checksums           md5     a8da5dfaffe03d6f9369572f14ff085a \
-                    sha1    553b2a55e970d3ed92caa634c1345054ff87cd1f \
-                    rmd160  511599576cff3a0c3aa200e9af96aa69fa54c17a
+checksums           md5     7506e08151d5c919da39c03ac2be0b18 \
+                    sha1    5899f39fd277613720a99ea32c9c6aea0031c882 \
+                    rmd160  0abf2ee0b04744f5d89572a143bd1e596fd248b6
 
 variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
@@ -42 +45 @@
 configure.cppflags
 configure.ldflags
-
-if {[info exists configure.cc_archflags]} {
-    configure.cc_archflags
-    configure.objc_archflags
-}
-if {[info exists configure.ld_archflags]} {
-    configure.ld_archflags
-}
-if {[info exists compiler.cpath]} {
-    compiler.cpath
-    compiler.library_path
-}
+configure.cc_archflags
+configure.objc_archflags
+configure.ld_archflags
+compiler.cpath
+compiler.library_path
 
 # MacPorts' configure removes ${prefix}/bin from $PATH,
@@ -62 +58 @@
     # Only install .default versions of config files.
     delete ${destroot}${prefix}/etc/macports/macports.conf
+    delete ${destroot}${prefix}/etc/macports/pubkeys.conf
     delete ${destroot}${prefix}/etc/macports/sources.conf
     delete ${destroot}${prefix}/etc/macports/variants.conf
@@ -79 +76 @@
     file copy -force -- ${worksrcpath}/portmgr/dmg/InstallationCheck ${resources_scripts}
     file copy -force -- ${worksrcpath}/portmgr/dmg/InstallationCheck.strings ${resources_lang}
-    file copy -force -- ${worksrcpath}/src/dep_map_clean.tcl ${resources_scripts}
     file copy -force -- ${worksrcpath}/src/upgrade_sources_conf_default.tcl ${resources_scripts}
-    
+    file copy -force -- ${worksrcpath}/src/images_to_archives.tcl ${resources_scripts}
+
     reinplace "s|__PREFIX__|${prefix}|g" \
               ${resources_scripts}/InstallationCheck \
@@ -169 +166 @@
         reinplace "s|or newer ||" ${resources_lang}/Welcome.html
         reinplace "s|__DARWINVERS__|10|" ${resources_scripts}/InstallationCheck
+    }
+}
+
+platform darwin 11 {
+    # Supply architecture flags to build MacPorts universal.
+    configure.cflags-append -arch x86_64 -arch i386
+    configure.args-append SHLIB_LDFLAGS='-arch x86_64 -arch i386'
+    post-pkg {
+        global resources_scripts resources_lang
+        reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|__XVERS__|10.7|" ${resources_lang}/ReadMe.rtf \
+            ${resources_lang}/InstallationCheck.strings
+        reinplace "s|10.4|10.7|" ${resources_lang}/Welcome.html
+        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
+        reinplace "s|__DARWINVERS__|11|" ${resources_scripts}/InstallationCheck
     }
 }
@@ -285 +297 @@
                      ${destroot}${prefix}/var/macports/build \
                      ${destroot}${prefix}/var/macports/distfiles \
-                     ${destroot}${prefix}/var/macports/receipts \
-                     ${destroot}${prefix}/var/macports/registry \
-                     ${destroot}${prefix}/var/macports/packages
+                     ${destroot}${prefix}/var/macports/registry