[91862] trunk/dports/sysutils/MacPorts

[jmr at macports.org]

Revision: 91862
          https://trac.macports.org/changeset/91862
Author:   jmr at macports.org
Date:     2012-04-11 20:00:59 -0700 (Wed, 11 Apr 2012)
Log Message:
-----------
MacPorts port: update to 2.1.0-beta1

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

Added Paths:
-----------
    trunk/dports/sysutils/MacPorts/files/
    trunk/dports/sysutils/MacPorts/files/Distribution

Modified: trunk/dports/sysutils/MacPorts/Portfile
===================================================================
--- trunk/dports/sysutils/MacPorts/Portfile	2012-04-12 02:34:17 UTC (rev 91861)
+++ trunk/dports/sysutils/MacPorts/Portfile	2012-04-12 03:00:59 UTC (rev 91862)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                MacPorts
-version             2.0.4
+version             2.1.0-beta1
 
 categories          sysutils
 platforms           darwin freebsd
@@ -20,11 +20,11 @@
 homepage            http://www.macports.org/
 master_sites
 # testing subdir is for non-final releases only
-#dist_subdir         ${name}/testing
+dist_subdir         ${name}/testing
 use_bzip2           yes
 
-checksums           rmd160 02d8cce3ee1d4bc8f74d20dc3486ac3ae8d9b1d1 \
-                    sha256 0229cd60addea3fb2ccd4123dbb7751998b138466f57946f01c822439dcc46ad
+checksums           rmd160 589e69331c26bf89b8ce615495fcc5437db3bbe0 \
+                    sha256 37bb0102922b5b68c8b5502377f0d0154db5cba982e7a7bfec1c94b4af53b425
 
 variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
 if {![variant_isset keep_prefix]} {
@@ -55,14 +55,13 @@
 
 post-destroot {
     # Only install .default versions of config files.
+    delete ${destroot}${prefix}/etc/macports/archive_sites.conf
     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
 }
 
-# don't enable until releases have a Distribution file
-package.flat    no
 if {![info exists package.resources]} {
     set package.resources ${workpath}/pkg_resources
     set package.scripts   ${workpath}/pkg_resources
@@ -90,11 +89,12 @@
     reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
     reinplace "s|__XVERS__|${macosx_deployment_target}|" ${resources_lang}/ReadMe.rtf
     if {${package.flat}} {
-        if {[file exists ${worksrcpath}/portmgr/dmg/Distribution]} {
-            file copy -force -- ${worksrcpath}/portmgr/dmg/Distribution ${workpath}
-        } else {
+        # XXX restore this for beta2
+        #if {[file exists ${worksrcpath}/portmgr/dmg/Distribution]} {
+        #    file copy -force -- ${worksrcpath}/portmgr/dmg/Distribution ${workpath}
+        #} else {
             file copy -force -- ${filespath}/Distribution ${workpath}
-        }
+        #}
         file attributes ${workpath}/Distribution -permissions 0644
         reinplace "s|__PREFIX__|${prefix}|g" ${workpath}/Distribution
         switch $macosx_deployment_target {
@@ -132,9 +132,9 @@
     # for older base versions
     set lproj ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
     if {[file isfile ${lproj}/Welcome.html]} {
-        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
+        reinplace "s|or newer ||" ${lproj}/Welcome.html
         if {${os.major} > 8} {
-            reinplace "s|10\\.4|${macosx_deployment_target}|" ${resources_lang}/Welcome.html
+            reinplace "s|10\\.4|${macosx_deployment_target}|" ${lproj}/Welcome.html
         }
     }
 }

Added: trunk/dports/sysutils/MacPorts/files/Distribution
===================================================================
--- trunk/dports/sysutils/MacPorts/files/Distribution	                        (rev 0)
+++ trunk/dports/sysutils/MacPorts/files/Distribution	2012-04-12 03:00:59 UTC (rev 91862)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <title>MacPorts</title>
+    <options customize="never"/>
+    <allowed-os-versions><os-version min="__XVERS__" before="__NEXT_XVERS__"/></allowed-os-versions>
+    <installation-check script="InstallationCheck();"/>
+    <script><![CDATA[
+function InstallationCheck () {
+    if (system.compareVersions(system.version.ProductVersion, "__XVERS__") < 0
+        || system.compareVersions(system.version.ProductVersion, "__NEXT_XVERS__") >= 0) {
+        my.result.message = "This package is meant to be installed on Mac OS X __XVERS__.";
+        my.result.type = 'Fatal';
+        return false;
+    }
+    if (system.files.fileExistsAtPath('__PREFIX__/etc/ports/dp_version')) {
+        my.result.message = "Your existing MacPorts or DarwinPorts installation is too old to be upgraded by this installer. Please install MacPorts 1.7.1 first.";
+        my.result.type = 'Fatal';
+        return false;
+    }
+    if (!system.files.fileExistsAtPath('/usr/bin/xcodebuild')) {
+        my.result.message = "Xcode is not installed, or was installed without __XCODECLITOOLS__.";
+        my.result.type = 'Warn';
+        return false;
+    }
+    return true;
+}
+    ]]>
+    </script>
+    <background file="background.tiff" mime-type="image/tiff" alignment="bottomleft" scaling="none"/>
+    <license mime-type="text/html" file="License.html"/>
+    <readme mime-type="text/rtf" file="ReadMe.rtf"/>
+    <welcome mime-type="text/html" file="Welcome.html"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="org.macports.MacPorts"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="org.macports.MacPorts" visible="false">
+        <pkg-ref id="org.macports.MacPorts"/>
+    </choice>
+    <pkg-ref id="org.macports.MacPorts">MacPorts-__VERSION__-component.pkg</pkg-ref>
+</installer-gui-script>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120411/ee246121/attachment.html>