[79811] contrib/mpab

26 Jun 2011

Revision: 79811
          http://trac.macports.org/changeset/79811
Author:   jmr@macports.org
Date:     2011-06-26 14:05:06 -0700 (Sun, 26 Jun 2011)
Log Message:
-----------
update mpab to match base

Modified Paths:
--------------
    contrib/mpab/chroot-scripts/buildports
    contrib/mpab/mpab-functions
    contrib/mpab/mpexport.sh
    contrib/mpab/mpsync.sh

Modified: contrib/mpab/chroot-scripts/buildports
===================================================================

--- contrib/mpab/chroot-scripts/buildports	2011-06-26 17:51:37 UTC (rev 79810)
+++ contrib/mpab/chroot-scripts/buildports	2011-06-26 21:05:06 UTC (rev 79811)
@@ -75,11 +75,12 @@
 
 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
 
 currentCount=1
@@ -91,7 +92,7 @@
    portVersion=`${PREFIX}/bin/port info --version ${portName} | awk '{print $2}'`
    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"
    else
@@ -112,9 +113,6 @@
             /bin/mv ${PORTRESULTSDIR}/${portName}.log ${PORTRESULTSDIR}/fail
             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
          if [[ $? != 0 ]]; then

Modified: contrib/mpab/mpab-functions
===================================================================
--- contrib/mpab/mpab-functions	2011-06-26 17:51:37 UTC (rev 79810)
+++ contrib/mpab/mpab-functions	2011-06-26 21:05:06 UTC (rev 79811)
@@ -242,14 +242,7 @@
    fi
 
    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
 
    chrootExec recreateportindex

Modified: contrib/mpab/mpexport.sh
===================================================================
--- contrib/mpab/mpexport.sh	2011-06-26 17:51:37 UTC (rev 79810)
+++ contrib/mpab/mpexport.sh	2011-06-26 21:05:06 UTC (rev 79811)
@@ -1,5 +1,5 @@
 #/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
 cd ..

Modified: contrib/mpab/mpsync.sh
===================================================================
--- contrib/mpab/mpsync.sh	2011-06-26 17:51:37 UTC (rev 79810)
+++ contrib/mpab/mpsync.sh	2011-06-26 21:05:06 UTC (rev 79811)
@@ -30,7 +30,7 @@
 else
     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

    

jmr＠macports.org

tags

participants (1)