Changeset 79811

Timestamp:

06/26/11 14:05:06 (4 years ago)

Author:

jmr@…

Message:

update mpab to match base

Location:

contrib/mpab

Files:

• chroot-scripts/buildports (modified) (3 diffs)
• mpab-functions (modified) (1 diff)
• mpexport.sh (modified) (1 diff)
• mpsync.sh (modified) (1 diff)

contrib/mpab/chroot-scripts/buildports

@@ -76 +76 @@
 tclOS=`echo 'puts [string tolower $tcl_platform(os)]' | tclsh`
 tclOSMajor=`echo 'puts [lindex [split $tcl_platform(osVersion) .] 0]' | tclsh`
-packageDir="${PREFIX}/var/macports/packages/${tclOS}_${tclOSMajor}"
+packageDir="${PREFIX}/var/macports/software"
+shopt -s extglob
 if [[ $tclOSMajor -ge 10 ]]; then
-    ACCEPT_ARCHS="?(noarch|x86_64|i386)"
+    ACCEPT_ARCHS="+(noarch|x86_64|i386|-)"
 else
-    ACCEPT_ARCHS="?(noarch|i386|ppc)"
+    ACCEPT_ARCHS="+(noarch|i386|ppc|-)"
 fi
 
@@ -92 +93 @@
    portRevision=`${PREFIX}/bin/port info --revision ${portName} | awk '{print $2}'`
    portPackageBaseName="${portName}-${portVersion}_${portRevision}"
-   ls ${packageDir}/*/${portName}/${portPackageBaseName}*.*${ACCEPT_ARCHS}*${ARCHIVE_TYPE} > /dev/null 2>&1
+   ls ${packageDir}/${portName}/${portPackageBaseName}[+.]*${tclOS}_${tclOSMajor}.${ACCEPT_ARCHS}${ARCHIVE_TYPE} > /dev/null 2>&1
    if [[ $? == 0 ]]; then
       echo "package found, not building again"
@@ -113 +114 @@
             echo "failure"
             ${PREFIX}/bin/port clean --work $portName
-            # If a port fails in the activation stage, MP has already built
-            # a package, so remove it here
-            rm -f ${packageDir}/*/${portName}/${portPackageBaseName}*.*${ACCEPT_ARCHS}*${ARCHIVE_TYPE}
          fi
          uninstallPorts

contrib/mpab/mpab-functions

@@ -243 +243 @@
 
    if [[ ! -f ${chrootPath}/opt/local/bin/port ]]; then
-
       chrootExec installmacports
-
-      sed -E -e 's/#?portarchivemode.*no/portarchivemode yes/' \
-          -e 's/#?portarchivetype.*tgz/portarchivetype tbz2/' \
-          ${chrootPath}/opt/local/etc/macports/macports.conf \
-          > ${chrootPath}/opt/local/etc/macports/macports.conf.new
-      mv ${chrootPath}/opt/local/etc/macports/macports.conf.new ${chrootPath}/opt/local/etc/macports/macports.conf
    fi
 

contrib/mpab/mpexport.sh

@@ -1 +1 @@
 #/bin/sh
-svn checkout -r HEAD http://svn.macports.org/repository/macports/trunk mpexport
+svn checkout -r HEAD https://svn.macports.org/repository/macports/trunk mpexport
 cd mpexport
 tar c --exclude '.svn' -f - . | bzip2 -c > ../macports_dist.tar.bz2

contrib/mpab/mpsync.sh

@@ -31 +31 @@
     echo "Checking out macports from svn..."
     svn checkout --non-interactive -r HEAD \
-        http://svn.macports.org/repository/macports/trunk \
+        https://svn.macports.org/repository/macports/trunk \
         ${dataDir}/${exportDir} > /dev/null || exit 1
 fi