Revision: 100211 https://trac.macports.org/changeset/100211 Author: pixilla@macports.org Date: 2012-12-03 12:37:04 -0800 (Mon, 03 Dec 2012) Log Message: ----------- users/pixilla/scripts: - Update user helper scripts. Modified Paths: -------------- users/pixilla/scripts/mp-distributable users/pixilla/scripts/mp-sqlite-registry users/pixilla/scripts/mp-svn-propedit users/pixilla/scripts/mp-svn-st-port users/pixilla/scripts/mp-svn-tree-setup users/pixilla/scripts/mp-trac-table-port Added Paths: ----------- users/pixilla/scripts/mp-base-upgrade users/pixilla/scripts/mp-find-in-Portfiles users/pixilla/scripts/mp-port-clean-find-work users/pixilla/scripts/mp-port-livecheck users/pixilla/scripts/mp-sources.conf-add-pwd users/pixilla/scripts/mp-svn-ci-port users/pixilla/scripts/mp-svn-diff-port users/pixilla/scripts/mp-svn-log-port users/pixilla/scripts/mp-svn-revert-port users/pixilla/scripts/mp-trac-tickets-port users/pixilla/scripts/mp-trunk-upgrade users/pixilla/scripts/mp-trunk-upgrade-all Removed Paths: ------------- users/pixilla/scripts/mp-upgrade-base users/pixilla/scripts/mp-upgrade-trunk users/pixilla/scripts/mp-upgrade-trunk-all Copied: users/pixilla/scripts/mp-base-upgrade (from rev 98238, users/pixilla/scripts/mp-upgrade-base) =================================================================== --- users/pixilla/scripts/mp-base-upgrade (rev 0) +++ users/pixilla/scripts/mp-base-upgrade 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,22 @@ +#!/bin/bash +# mp-base-upgrade +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNCMD:="/opt/local/bin/svn"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNBASE:="${MP_SVNTRUNK}/base"} +echo "MP_SVNBASE=${MP_SVNBASE}" +if [ "${MP_PREFIX}" = "/opt/local" ];then + CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline" +else + CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline --with-tclpackage=${MP_PREFIX}/Library/Tcl --with-applications-dir=${MP_PREFIX}/Applications" +fi +echo "CONFIGURE_ARGS=${CONFIGURE_ARGS}" +cd "${MP_SVNBASE}" +${MP_SVNCMD} upgrade +${MP_SVNCMD} up +make distclean +./configure ${CONFIGURE_ARGS} +make +sudo make install +make distclean +port version \ No newline at end of file Modified: users/pixilla/scripts/mp-distributable =================================================================== --- users/pixilla/scripts/mp-distributable 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-distributable 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,9 +1,15 @@ #!/bin/bash # mp-distributable + +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNBASE:="${MP_SVNTRUNK}/base"} + + if [[ $# -eq 0 || $1 == "help" ]] then echo "Usage example:" echo "mp-distributable zlib" exit 1 fi -/opt/local/var/macports/sources/svn.macports.org/trunk/base/portmgr/jobs/port_binary_distributable.tcl -v "$@" +${MP_SVNBASE}/portmgr/jobs/port_binary_distributable.tcl -v "$@" Added: users/pixilla/scripts/mp-find-in-Portfiles =================================================================== --- users/pixilla/scripts/mp-find-in-Portfiles (rev 0) +++ users/pixilla/scripts/mp-find-in-Portfiles 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,9 @@ +#!/bin/sh +# mp-find-in-Portfiles + +# Set vars if not set. +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNDPORTS:="${MP_SVNTRUNK}/dports"} + +find $MP_SVNDPORTS -maxdepth 3 -name Portfile -exec echo {} \; -exec grep -E -- "$@" {} \; | grep -B1 -v -E "/Portfile" Property changes on: users/pixilla/scripts/mp-find-in-Portfiles ___________________________________________________________________ Added: svn:executable + * Added: users/pixilla/scripts/mp-port-clean-find-work =================================================================== --- users/pixilla/scripts/mp-port-clean-find-work (rev 0) +++ users/pixilla/scripts/mp-port-clean-find-work 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,12 @@ +#!/bin/sh +# mp-port-clean-find-work + +# Set vars if not set. +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNDPORTS:="${MP_SVNTRUNK}/dports"} + +DIRS=$(find $MP_SVNDPORTS -depth 3 -type l -name work -exec echo {} \; | awk -F/ '{print $(NF-2)"/"$(NF-1)}') +for DIR in ${DIRS};do + sudo port clean $DIR +done \ No newline at end of file Property changes on: users/pixilla/scripts/mp-port-clean-find-work ___________________________________________________________________ Added: svn:executable + * Added: users/pixilla/scripts/mp-port-livecheck =================================================================== --- users/pixilla/scripts/mp-port-livecheck (rev 0) +++ users/pixilla/scripts/mp-port-livecheck 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,17 @@ +#!/bin/bash +# mp-port-livecheck +if [[ $# -eq 0 || $1 == "help" ]] +then + echo "mp-port-livecheck <stdin> # port -d livecheck $@" + echo "Usage example:" + echo "mp-port-livecheck zlib" + echo "mp-port-livecheck dependentof:zlib" + exit 1 +fi +for port in $(port echo $@) +do + echo $port; + port -d livecheck $port 2>&1 | grep -E "cannot check|^$port" | awk '{if ($2 == "The") print " "$(NF-1)" "$(NF);else if ($2 == "Port") print " "$0;else print $0;}' | sed -e 's,DEBUG: ,,g' -e 's,Error: ,,g' | uniq; +done + +exit 0 Property changes on: users/pixilla/scripts/mp-port-livecheck ___________________________________________________________________ Added: svn:executable + * Added: users/pixilla/scripts/mp-sources.conf-add-pwd =================================================================== --- users/pixilla/scripts/mp-sources.conf-add-pwd (rev 0) +++ users/pixilla/scripts/mp-sources.conf-add-pwd 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,13 @@ +#!/bin/bash + +# Set vars if not set. +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNDPORTS:="${MP_SVNTRUNK}/dports"} + +DATE=`date +%Y%m%d%H%M%S` +sudo cp ${MP_PREFIX}/etc/macports/sources.conf $(PWD)/sources-${DATE}.conf +sed 's,^\([^#].*\[default\]\),file://'"$PWD"' [nosync]'$'\\\n''\1,' sources-${DATE}.conf > sources.conf +sudo mv sources.conf ${MP_PREFIX}/etc/macports/sources.conf +sudo mv sources-${DATE}.conf ${MP_PREFIX}/etc/macports/sources-${DATE}.conf +sudo chown root:admin ${MP_PREFIX}/etc/macports/sources* \ No newline at end of file Property changes on: users/pixilla/scripts/mp-sources.conf-add-pwd ___________________________________________________________________ Added: svn:executable + * Modified: users/pixilla/scripts/mp-sqlite-registry =================================================================== --- users/pixilla/scripts/mp-sqlite-registry 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-sqlite-registry 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,4 +1,8 @@ #!/bin/sh # mp-sqlite-registry + +# Set vars if not set. +: ${MP_PREFIX:="/opt/local"} + EXECPATH=$(dirname $0) -sqlite3 --init ${EXECPATH}/mp-sqlite-registry.init /opt/local/var/macports/registry/registry.db "$@" 2>&1 | tail +3 +sqlite3 --init ${EXECPATH}/mp-sqlite-registry.init ${MP_PREFIX}/var/macports/registry/registry.db "$@" 2>&1 | tail +3 Added: users/pixilla/scripts/mp-svn-ci-port =================================================================== --- users/pixilla/scripts/mp-svn-ci-port (rev 0) +++ users/pixilla/scripts/mp-svn-ci-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,12 @@ +#!/bin/sh +# mp-svn-cu-port +# svn commit for "port dir <stdin>" +: ${MP_SVNCMD:="/opt/local/bin/svn"} +CMD="port dir $@ | sort -u" +#echo "${CMD}" +#exit +DIRS=$(eval $CMD) +#echo "${DIRS}" +#exit +echo "${DIRS}" | awk -F/ '{print $(NF-1)"/"$NF":"}' | pbcopy +${MP_SVNCMD} commit ${DIRS} Property changes on: users/pixilla/scripts/mp-svn-ci-port ___________________________________________________________________ Added: svn:executable + * Added: users/pixilla/scripts/mp-svn-diff-port =================================================================== --- users/pixilla/scripts/mp-svn-diff-port (rev 0) +++ users/pixilla/scripts/mp-svn-diff-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,11 @@ +#!/bin/sh +# mp-svn-diff-port +# Get svn diff for "port dir <stdin>" +: ${MP_SVNCMD:="/opt/local/bin/svn"} +CMD="port dir $@ | sort -u" +#echo "${CMD}" +#exit +DIRS=$(eval $CMD) +#echo "${DIRS}" +#exit +${MP_SVNCMD} diff ${DIRS} Property changes on: users/pixilla/scripts/mp-svn-diff-port ___________________________________________________________________ Added: svn:executable + * Added: users/pixilla/scripts/mp-svn-log-port =================================================================== --- users/pixilla/scripts/mp-svn-log-port (rev 0) +++ users/pixilla/scripts/mp-svn-log-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,11 @@ +#!/bin/sh +# mp-svn-log-port +# Get svn log for "port dir <stdin>" +: ${MP_SVNCMD:="/opt/local/bin/svn"} +CMD="port dir $@ | sort -u" +#echo "${CMD}" +#exit +DIRS=$(eval $CMD) +#echo "${DIRS}" +#exit +${MP_SVNCMD} log ${DIRS} Property changes on: users/pixilla/scripts/mp-svn-log-port ___________________________________________________________________ Added: svn:executable + * Modified: users/pixilla/scripts/mp-svn-propedit =================================================================== --- users/pixilla/scripts/mp-svn-propedit 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-svn-propedit 2012-12-03 20:37:04 UTC (rev 100211) @@ -4,6 +4,8 @@ # Argument = [-q] <path name> +: ${MP_SVNCMD:="/opt/local/bin/svn"} + usage() { cat << EOF @@ -11,7 +13,7 @@ usage: $(basename $0) options This script runs this command to edit svn commit messages: -\$ svn propedit -r N --revprop svn:log URL +\$ ${MP_SVNCMD} propedit -r N --revprop svn:log URL where N is the revision number whose log message you wish to change, and URL is the location of the repository. If you run this command from within a working copy, you can leave off the URL. @@ -69,8 +71,8 @@ done [[ ! -z $PORT && -z $DIR ]] && DIR=$(port file $PORT 2>/dev/null) [[ -z $DIR ]] && DIR=. -[[ -z $URL ]] && URL=$(svn info "${DIR}" | grep ^URL: | awk '{print $2}') -[[ -z $REVISION ]] && REVISION=$(svn info "${DIR}" | grep ^Revision: | awk '{print $2}') +[[ -z $URL ]] && URL=$(${MP_SVNCMD} info "${DIR}" | grep ^URL: | awk '{print $2}') +[[ -z $REVISION ]] && REVISION=$(${MP_SVNCMD} info "${DIR}" | grep ^Revision: | awk '{print $2}') #echo $REVISION $PORT $DIR $URL ;exit 1 if [[ -z $REVISION ]] then @@ -86,4 +88,4 @@ exit 1 fi -svn propedit -r "${REVISION}" --revprop svn:log "${URL}" +${MP_SVNCMD} propedit -r "${REVISION}" --revprop svn:log "${URL}" Added: users/pixilla/scripts/mp-svn-revert-port =================================================================== --- users/pixilla/scripts/mp-svn-revert-port (rev 0) +++ users/pixilla/scripts/mp-svn-revert-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,11 @@ +#!/bin/sh +# mp-svn-revert-port +# Recrusive svn revert for "port dir <stdin>" +: ${MP_SVNCMD:="/opt/local/bin/svn"} +CMD="port dir $@ | sort -u" +#echo "${CMD}" +#exit +DIRS=$(eval $CMD) +#echo "${DIRS}" +#exit +${MP_SVNCMD} -R revert ${DIRS} Property changes on: users/pixilla/scripts/mp-svn-revert-port ___________________________________________________________________ Added: svn:executable + * Modified: users/pixilla/scripts/mp-svn-st-port =================================================================== --- users/pixilla/scripts/mp-svn-st-port 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-svn-st-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,11 +1,11 @@ #!/bin/sh # mp-svn-st-port # Get svn st for "port dir <stdin>" -CMD="port dir $@" -#echo $CMD +: ${MP_SVNCMD:="/opt/local/bin/svn"} +CMD="port dir $@ | sort -u" +#echo "${CMD}" #exit -#$CMD +DIRS=$(eval $CMD) +#echo "${DIRS}" #exit -for dir in $($CMD); do \ - svn st ${dir} -done +${MP_SVNCMD} st ${DIRS} Modified: users/pixilla/scripts/mp-svn-tree-setup =================================================================== --- users/pixilla/scripts/mp-svn-tree-setup 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-svn-tree-setup 2012-12-03 20:37:04 UTC (rev 100211) @@ -4,18 +4,21 @@ # set date for file names DATE=$(date +%Y%m%d%H%M$S) +# set svn command +: ${MP_SVNCMD:="/opt/local/bin/svn"} + # set MacPorts prefix if not in env -[[ -z $MP_PREFIX ]] && MP_PREFIX=/opt/local +: ${MP_PREFIX:="/opt/local"} # set local svn directory if not in env -[[ -z $MP_SVNDIR ]] && MP_SVNDIR=$MP_PREFIX/var/macports/sources/svn.macports.org +: ${MP_SVNDIR:="${MP_PREFIX}/var/macports/sources/svn.macports.org"} # set svn repo to get if not in env # If you want to build base set MP_SVNREPO to trunk (base, doc, doc-new, dports and www). -[[ -z $MP_SVNREPO ]] && MP_SVNREPO=trunk/dports +: ${MP_SVNREPO:="trunk/dports"} # temp sources.conf file if not in env -[[ -z $MP_SRCCONFTEMP ]] && MP_SRCCONFTEMP=/tmp/sources.conf.$DATE +: ${MP_SRCCONFTEMP:="/tmp/sources.conf.${DATE}"} if [ "x$1" = "xgo" ]; then @@ -24,7 +27,7 @@ sudo chown -R $(whoami) $MP_SVNDIR cd $MP_SVNDIR # checkout macports trunk - svn co https://svn.macports.org/repository/macports/$MP_SVNREPO $MP_SVNREPO + ${MP_SVNCMD} co https://svn.macports.org/repository/macports/$MP_SVNREPO $MP_SVNREPO # create port index files cd trunk/dports portindex @@ -44,7 +47,7 @@ sudo chown -R $(whoami) $MP_SVNDIR cd $MP_SVNDIR # checkout macports trunk -svn co https://svn.macports.org/repository/macports/$MP_SVNREPO $MP_SVNREPO +${MP_SVNCMD} co https://svn.macports.org/repository/macports/$MP_SVNREPO $MP_SVNREPO # create port index files cd trunk/dports portindex @@ -62,6 +65,7 @@ echo "" echo "# You can set these env vars to control this script" + echo "MP_SVNCMD=$MP_SVNCMD" echo "MP_PREFIX=$MP_PREFIX" echo "MP_SVNDIR=$MP_SVNDIR" echo "MP_SVNREPO=$MP_SVNREPO" Modified: users/pixilla/scripts/mp-trac-table-port =================================================================== --- users/pixilla/scripts/mp-trac-table-port 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-trac-table-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,12 +1,13 @@ #!/bin/sh # mp-trac-table-port # Make trac wiki formatted table of MacPorts ports matching "port echo <stdin>" +: ${MP_SVNCMD:="/opt/local/bin/svn"} CMD="port echo $@" #echo $CMD #exit echo "||'''Port'''||'''Category'''||'''Repository'''||'''Tickets'''||"; \ for name in $($CMD); do \ - svn info $(port file $name) 2>&1 \ + ${MP_SVNCMD} info $(port file $name) 2>&1 \ | grep -B 20 -E "^Revision" \ | grep -E '^URL: https?://svn.macports.org/repository/macports/' \ | sed -E \ Added: users/pixilla/scripts/mp-trac-tickets-port =================================================================== --- users/pixilla/scripts/mp-trac-tickets-port (rev 0) +++ users/pixilla/scripts/mp-trac-tickets-port 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ $# -lt 1 ]; then + echo "Usage:" + echo "mp-trac-tickets-port name:zlib" + exit +fi + +PORTS=$(port echo "$@") +QUERY="status=!closed&" +OR="" +for PORT in $PORTS;do + QUERY="${QUERY}${OR}port=${PORT}" + OR="&or&status=!closed&" +done + +# If we are remote use curl else open +if [ "${SSH_TTY+1}" ];then + curl -s "http://trac.macports.org/query?status=!closed&${QUERY}" | grep ' assigned\| closed\| new\| reopened\|href.*/ticket/' | sed -e 's|<[^>]*>||g' +else + open "http://trac.macports.org/query?status=!closed&${QUERY}" +fi Property changes on: users/pixilla/scripts/mp-trac-tickets-port ___________________________________________________________________ Added: svn:executable + * Copied: users/pixilla/scripts/mp-trunk-upgrade (from rev 98238, users/pixilla/scripts/mp-upgrade-trunk) =================================================================== --- users/pixilla/scripts/mp-trunk-upgrade (rev 0) +++ users/pixilla/scripts/mp-trunk-upgrade 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,37 @@ +#!/bin/bash +# mp-trunk-upgrade +# Set vars if not set. +: ${MP_PREFIX:="/opt/local"} +: ${MP_SVNCMD:="/opt/local/bin/svn"} +: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} +: ${MP_SVNDPORTS:="${MP_SVNTRUNK}/dports"} +: ${MP_SVNBASE:="${MP_SVNTRUNK}/base"} +echo "MP_PREFIX=${MP_PREFIX}" +echo "MP_SVNCMD=${MP_SVNCMD}" +echo "MP_SVNTRUNK=${MP_SVNTRUNK}" +echo "MP_SVNDPORTS=${MP_SVNDPORTS}" +echo "MP_SVNBASE=${MP_SVNBASE}" + +# svn upgrade and update trunk +cd "${MP_SVNTRUNK}" +${MP_SVNCMD} upgrade +${MP_SVNCMD} up + +# build base +cd "${MP_SVNBASE}" +if [ "${MP_PREFIX}" = "/opt/local" ];then + CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline" +else + CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline --with-tclpackage=${MP_PREFIX}/Library/Tcl --with-applications-dir=${MP_PREFIX}/Applications" +fi +echo "CONFIGURE_ARGS=${CONFIGURE_ARGS}" +make distclean +./configure ${CONFIGURE_ARGS} +make +sudo make install +make distclean +port version + +# update portindex +cd "${MP_SVNDPORTS}" +portindex Copied: users/pixilla/scripts/mp-trunk-upgrade-all (from rev 98238, users/pixilla/scripts/mp-upgrade-trunk-all) =================================================================== --- users/pixilla/scripts/mp-trunk-upgrade-all (rev 0) +++ users/pixilla/scripts/mp-trunk-upgrade-all 2012-12-03 20:37:04 UTC (rev 100211) @@ -0,0 +1,13 @@ +#!/bin/bash +# mp-trunk-upgrade-all +. ~/.bash_profile +# Store our active MP* function name. +MP_PREOLD=$(MP-GET) +echo $MP_PREOLD +# Call each MP* function followed by pm-upgrad-trunk +for MPPRE in $(MP-LIST);do + $MPPRE + mp-trunk-upgrade +done +# Call our original MP* function to end up where we started +$MP_PREOLD Deleted: users/pixilla/scripts/mp-upgrade-base =================================================================== --- users/pixilla/scripts/mp-upgrade-base 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-upgrade-base 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,22 +0,0 @@ -#!/bin/bash -# mp-upgrade-base -: ${MP_PREFIX:="/opt/local"} -: ${MP_SVNCMD:="/opt/local/bin/svn"} -: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} -: ${MP_SVNBASE:="${MP_SVNTRUNK}/base"} -echo "MP_SVNBASE=${MP_SVNBASE}" -if [ "${MP_PREFIX}" = "/opt/local" ];then - CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline" -else - CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline --with-tclpackage=${MP_PREFIX}/Library/Tcl --with-applications-dir=${MP_PREFIX}/Applications" -fi -echo "CONFIGURE_ARGS=${CONFIGURE_ARGS}" -cd "${MP_SVNBASE}" -${MP_SVNCMD} upgrade -${MP_SVNCMD} up -make distclean -./configure ${CONFIGURE_ARGS} -make -sudo make install -make distclean -port version \ No newline at end of file Deleted: users/pixilla/scripts/mp-upgrade-trunk =================================================================== --- users/pixilla/scripts/mp-upgrade-trunk 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-upgrade-trunk 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,37 +0,0 @@ -#!/bin/bash -# mp-upgrade-trunk -# Set vars if not set. -: ${MP_PREFIX:="/opt/local"} -: ${MP_SVNCMD:="/opt/local/bin/svn"} -: ${MP_SVNTRUNK:="${MP_PREFIX}/var/macports/sources/svn.macports.org/trunk"} -: ${MP_SVNDPORTS:="${MP_SVNTRUNK}/dports"} -: ${MP_SVNBASE:="${MP_SVNTRUNK}/base"} -echo "MP_PREFIX=${MP_PREFIX}" -echo "MP_SVNCMD=${MP_SVNCMD}" -echo "MP_SVNTRUNK=${MP_SVNTRUNK}" -echo "MP_SVNDPORTS=${MP_SVNDPORTS}" -echo "MP_SVNBASE=${MP_SVNBASE}" - -# svn upgrade and update trunk -cd "${MP_SVNTRUNK}" -${MP_SVNCMD} upgrade -${MP_SVNCMD} up - -# build base -cd "${MP_SVNBASE}" -if [ "${MP_PREFIX}" = "/opt/local" ];then - CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline" -else - CONFIGURE_ARGS="--prefix=${MP_PREFIX} --enable-readline --with-tclpackage=${MP_PREFIX}/Library/Tcl --with-applications-dir=${MP_PREFIX}/Applications" -fi -echo "CONFIGURE_ARGS=${CONFIGURE_ARGS}" -make distclean -./configure ${CONFIGURE_ARGS} -make -sudo make install -make distclean -port version - -# update portindex -cd "${MP_SVNDPORTS}" -portindex Deleted: users/pixilla/scripts/mp-upgrade-trunk-all =================================================================== --- users/pixilla/scripts/mp-upgrade-trunk-all 2012-12-03 20:36:39 UTC (rev 100210) +++ users/pixilla/scripts/mp-upgrade-trunk-all 2012-12-03 20:37:04 UTC (rev 100211) @@ -1,13 +0,0 @@ -#!/bin/bash -# mp-upgrade-trunk-all -. ~/.bash_profile -# Store our active MP* function name. -MP_PREOLD=$(MP-GET) -echo $MP_PREOLD -# Call each MP* function followed by pm-upgrad-trunk -for MPPRE in $(MP-LIST);do - $MPPRE - mp-upgrade-trunk -done -# Call our original MP* function to end up where we started -$MP_PREOLD