[121455] trunk/dports/sysutils/MacPorts/Portfile

[jmr at macports.org]

Revision: 121455
          https://trac.macports.org/changeset/121455
Author:   jmr at macports.org
Date:     2014-06-25 16:31:29 -0700 (Wed, 25 Jun 2014)
Log Message:
-----------
MacPorts port: update to 2.3.1

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

Modified: trunk/dports/sysutils/MacPorts/Portfile
===================================================================
--- trunk/dports/sysutils/MacPorts/Portfile	2014-06-25 22:41:36 UTC (rev 121454)
+++ trunk/dports/sysutils/MacPorts/Portfile	2014-06-25 23:31:29 UTC (rev 121455)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                MacPorts
-version             2.3.0
+version             2.3.1
 
 categories          sysutils macports
 platforms           darwin freebsd
@@ -24,8 +24,8 @@
 #dist_subdir         ${name}/testing
 use_bzip2           yes
 
-checksums           rmd160 5a9a0af9aea9386ad6256c81763faf7e412baa71 \
-                    sha256 d3d164bd12cc2f3125ab3a9d6762a4988dd426ab2c25890a23a70bdf3f3aa27a
+checksums           rmd160 6c3893428ae6a316e477fd1abad52980fe14c15c \
+                    sha256 1fd802693a9194ef46ff82285173a44f608b1954ed66f325009f64bf3b3f2a6d
 
 variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
 if {![variant_isset keep_prefix]} {
@@ -63,10 +63,7 @@
     delete ${destroot}${prefix}/etc/macports/variants.conf
 }
 
-if {![info exists package.resources]} {
-    set package.resources ${workpath}/pkg_resources
-    set package.scripts   ${workpath}/pkg_resources
-} elseif {!${package.flat}} {
+if {!${package.flat}} {
     package.scripts   ${package.resources}
 }
 set resources_lang ${package.resources}/English.lproj
@@ -87,7 +84,6 @@
     file attributes ${resources_lang}/License.html -permissions 0644
 
     reinplace "s|__PREFIX__|${prefix}|g" \
-              ${package.scripts}/postflight \
               ${resources_lang}/ReadMe.rtf
     reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
     reinplace "s|__XVERS__|${macosx_deployment_target}|" ${resources_lang}/ReadMe.rtf
@@ -118,24 +114,16 @@
         reinplace "s|__XVERS__|${macosx_deployment_target}|" \
             ${resources_lang}/InstallationCheck.strings
     }
-    # won't be there before the pkg is built with older base versions
-    if {[file isfile ${resources_lang}/Welcome.html]} {
-        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
-        if {${os.major} > 8} {
-            reinplace "s|10\\.4|${macosx_deployment_target}|" ${resources_lang}/Welcome.html
-        }
+
+    reinplace "s|or newer ||" ${resources_lang}/Welcome.html
+    if {${os.major} > 8} {
+        reinplace "s|10\\.4|${macosx_deployment_target}|" ${resources_lang}/Welcome.html
     }
 }
 
-post-pkg {
-    # for older base versions
-    set lproj ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
-    if {[file isfile ${lproj}/Welcome.html]} {
-        reinplace "s|or newer ||" ${lproj}/Welcome.html
-        if {${os.major} > 8} {
-            reinplace "s|10\\.4|${macosx_deployment_target}|" ${lproj}/Welcome.html
-        }
-    }
+platform darwin 8 {
+    # has ${prefix}/include ahead of /usr/include in default search path
+    compiler.blacklist apple-gcc-4.2
 }
 
 platform darwin 8 powerpc {
@@ -168,7 +156,11 @@
 }
 
 platform darwin {
-    if {${os.major} >= 10} {
+    if {${os.major} >= 11} {
+        # Lion and above only run on x86_64.
+        configure.cflags-append -arch x86_64
+        configure.args-append SHLIB_LDFLAGS='-arch x86_64'
+    } elseif {${os.major} == 10} {
         # 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'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140625/bad46c30/attachment.html>