[26822] trunk/dports/sysutils/MacPorts

source_changes at macosforge.org source_changes at macosforge.org
Mon Jul 9 02:05:11 PDT 2007


Revision: 26822
          http://trac.macosforge.org/projects/macports/changeset/26822
Author:   jmpp at macports.org
Date:     2007-07-09 02:05:10 -0700 (Mon, 09 Jul 2007)

Log Message:
-----------

Bring the MacPorts Portfile up to date with the 1.5.0 release:

 * New release and checksums;
 * Retabbing in destroot.keepdirs arguments;
 * New file hierarchy in destroot.keepdirs (dp2mp-move);
 * include preflight script for the dmg installer;
 * get rid of system call for cp, use xinstall -p;
 * new environment declarations to build universal.

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

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

Modified: trunk/dports/sysutils/MacPorts/Portfile
===================================================================
--- trunk/dports/sysutils/MacPorts/Portfile	2007-07-09 08:24:11 UTC (rev 26821)
+++ trunk/dports/sysutils/MacPorts/Portfile	2007-07-09 09:05:10 UTC (rev 26822)
@@ -3,7 +3,7 @@
 PortSystem 		1.0
 
 name			MacPorts
-version			1.4.0
+version			1.5.0
 
 categories		sysutils
 platforms		darwin freebsd
@@ -16,110 +16,112 @@
 homepage		http://www.macports.org
 master_sites		macports:${distname}
 
-checksums		md5 d845d2e4a2b62071e40207f62a342196 \
-			sha1 f5f17f77e4cde75546309b409bc98182db9d300d \
-			rmd160 c1a34317c0553705970b0cdcf3002ce1a5bce784
+checksums		md5 836012815ed0f93f226804878013a65a \
+			sha1 8e1f83308eef5971112ccdd734a8d48fd77673b3 \
+			rmd160 1f35a7a7f2827794741bd57641ec5c32d8272467
 
-destroot.keepdirs ${destroot}${prefix}/include\
-	${destroot}${prefix}/lib ${destroot}${prefix}/libexec\
-	${destroot}${prefix}/sbin\
-	${destroot}${prefix}/share/info\
-	${destroot}${prefix}/share/man/cat1 ${destroot}${prefix}/share/man/cat2 ${destroot}${prefix}/share/man/cat3\
-	${destroot}${prefix}/share/man/cat4 ${destroot}${prefix}/share/man/cat5 ${destroot}${prefix}/share/man/cat6\
-	${destroot}${prefix}/share/man/cat7 ${destroot}${prefix}/share/man/cat8 ${destroot}${prefix}/share/man/cat9\
-	${destroot}${prefix}/share/man/catl ${destroot}${prefix}/share/man/catn \
-	${destroot}${prefix}/share/man/man1 ${destroot}${prefix}/share/man/man2 ${destroot}${prefix}/share/man/man3\
-	${destroot}${prefix}/share/man/man4 ${destroot}${prefix}/share/man/man5 ${destroot}${prefix}/share/man/man6\
-	${destroot}${prefix}/share/man/man7 ${destroot}${prefix}/share/man/man8 ${destroot}${prefix}/share/man/man9\
-	${destroot}${prefix}/share/man/manl ${destroot}${prefix}/share/man/mann \
-	${destroot}${prefix}/share/nls/C ${destroot}${prefix}/share/nls/skel\
-	${destroot}${prefix}/share/nls/af_ZA.ISO8859-1\
-	${destroot}${prefix}/share/nls/af_ZA.ISO8859-15\
-	${destroot}${prefix}/share/nls/bg_BG.CP1251\
-	${destroot}${prefix}/share/nls/cs_CZ.ISO8859-2\
-	${destroot}${prefix}/share/nls/da_DK.ISO8859-1\
-	${destroot}${prefix}/share/nls/da_DK.ISO8859-15\
-	${destroot}${prefix}/share/nls/de_AT.ISO8859-1\
-	${destroot}${prefix}/share/nls/de_AT.ISO8859-15\
-	${destroot}${prefix}/share/nls/de_CH.ISO8859-1\
-	${destroot}${prefix}/share/nls/de_CH.ISO8859-15\
-	${destroot}${prefix}/share/nls/de_DE.ISO8859-1\
-	${destroot}${prefix}/share/nls/de_DE.ISO8859-15\
-	${destroot}${prefix}/share/nls/el_GR.ISO8859-7\
-	${destroot}${prefix}/share/nls/en_AU.ISO8859-1\
-	${destroot}${prefix}/share/nls/en_AU.ISO8859-15\
-	${destroot}${prefix}/share/nls/en_AU.US-ASCII\
-	${destroot}${prefix}/share/nls/en_CA.ISO8859-1\
-	${destroot}${prefix}/share/nls/en_CA.ISO8859-15\
-	${destroot}${prefix}/share/nls/en_CA.US-ASCII\
-	${destroot}${prefix}/share/nls/en_GB.ISO8859-1\
-	${destroot}${prefix}/share/nls/en_GB.ISO8859-15\
-	${destroot}${prefix}/share/nls/en_GB.US-ASCII\
-	${destroot}${prefix}/share/nls/en_NZ.ISO8859-1\
-	${destroot}${prefix}/share/nls/en_NZ.ISO8859-15\
-	${destroot}${prefix}/share/nls/en_NZ.US-ASCII\
-	${destroot}${prefix}/share/nls/en_US.ISO8859-1\
-	${destroot}${prefix}/share/nls/en_US.ISO8859-15\
-	${destroot}${prefix}/share/nls/es_ES.ISO8859-1\
-	${destroot}${prefix}/share/nls/es_ES.ISO8859-15\
-	${destroot}${prefix}/share/nls/et_EE.ISO8859-15\
-	${destroot}${prefix}/share/nls/fi_FI.ISO8859-1\
-	${destroot}${prefix}/share/nls/fi_FI.ISO8859-15\
-	${destroot}${prefix}/share/nls/fr_BE.ISO8859-1\
-	${destroot}${prefix}/share/nls/fr_BE.ISO8859-15\
-	${destroot}${prefix}/share/nls/fr_CA.ISO8859-1\
-	${destroot}${prefix}/share/nls/fr_CA.ISO8859-15\
-	${destroot}${prefix}/share/nls/fr_CH.ISO8859-1\
-	${destroot}${prefix}/share/nls/fr_CH.ISO8859-15\
-	${destroot}${prefix}/share/nls/fr_FR.ISO8859-1\
-	${destroot}${prefix}/share/nls/fr_FR.ISO8859-15\
-	${destroot}${prefix}/share/nls/hi_IN.ISCII-DEV\
-	${destroot}${prefix}/share/nls/hr_HR.ISO8859-2\
-	${destroot}${prefix}/share/nls/hu_HU.ISO8859-2\
-	${destroot}${prefix}/share/nls/is_IS.ISO8859-1\
-	${destroot}${prefix}/share/nls/is_IS.ISO8859-15\
-	${destroot}${prefix}/share/nls/it_CH.ISO8859-1\
-	${destroot}${prefix}/share/nls/it_CH.ISO8859-15\
-	${destroot}${prefix}/share/nls/it_IT.ISO8859-1\
-	${destroot}${prefix}/share/nls/it_IT.ISO8859-15\
-	${destroot}${prefix}/share/nls/ja_JP.SJIS\
-	${destroot}${prefix}/share/nls/ja_JP.eucJP\
-	${destroot}${prefix}/share/nls/ko_KR.eucKR\
-	${destroot}${prefix}/share/nls/la_LN.ISO8859-1\
-	${destroot}${prefix}/share/nls/la_LN.ISO8859-15\
-	${destroot}${prefix}/share/nls/la_LN.ISO8859-2\
-	${destroot}${prefix}/share/nls/la_LN.ISO8859-4\
-	${destroot}${prefix}/share/nls/la_LN.US-ASCII\
-	${destroot}${prefix}/share/nls/lt_LT.ISO8859-4\
-	${destroot}${prefix}/share/nls/nl_BE.ISO8859-1\
-	${destroot}${prefix}/share/nls/nl_BE.ISO8859-15\
-	${destroot}${prefix}/share/nls/nl_NL.ISO8859-1\
-	${destroot}${prefix}/share/nls/nl_NL.ISO8859-15\
-	${destroot}${prefix}/share/nls/no_NO.ISO8859-1\
-	${destroot}${prefix}/share/nls/no_NO.ISO8859-15\
-	${destroot}${prefix}/share/nls/pl_PL.ISO8859-2\
-	${destroot}${prefix}/share/nls/pt_BR.ISO8859-1\
-	${destroot}${prefix}/share/nls/pt_PT.ISO8859-1\
-	${destroot}${prefix}/share/nls/pt_PT.ISO8859-15\
-	${destroot}${prefix}/share/nls/ro_RO.ISO8859-2\
-	${destroot}${prefix}/share/nls/ru_RU.CP866\
-	${destroot}${prefix}/share/nls/ru_RU.ISO8859-5\
-	${destroot}${prefix}/share/nls/ru_RU.KOI8-R\
-	${destroot}${prefix}/share/nls/sk_SK.ISO8859-2\
-	${destroot}${prefix}/share/nls/sl_SI.ISO8859-2\
-	${destroot}${prefix}/share/nls/sv_SE.ISO8859-1\
-	${destroot}${prefix}/share/nls/sv_SE.ISO8859-15\
-	${destroot}${prefix}/share/nls/tr_TR.ISO8859-9\
-	${destroot}${prefix}/share/nls/uk_UA.ISO8859-5\
-	${destroot}${prefix}/share/nls/uk_UA.KOI8-U\
-	${destroot}${prefix}/share/nls/zh_CN.eucCN\
-	${destroot}${prefix}/share/nls/zh_TW.Big5\
-	${destroot}${prefix}/var/db/dports/distfiles ${destroot}${prefix}/var/db/dports/receipts
+destroot.keepdirs       ${destroot}${prefix}/include \
+                        ${destroot}${prefix}/lib ${destroot}${prefix}/libexec \
+                        ${destroot}${prefix}/sbin \
+                        ${destroot}${prefix}/share/info \
+                        ${destroot}${prefix}/share/man/cat1 ${destroot}${prefix}/share/man/cat2 ${destroot}${prefix}/share/man/cat3 \
+                        ${destroot}${prefix}/share/man/cat4 ${destroot}${prefix}/share/man/cat5 ${destroot}${prefix}/share/man/cat6 \
+                        ${destroot}${prefix}/share/man/cat7 ${destroot}${prefix}/share/man/cat8 ${destroot}${prefix}/share/man/cat9 \
+                        ${destroot}${prefix}/share/man/catl ${destroot}${prefix}/share/man/catn \
+                        ${destroot}${prefix}/share/man/man1 ${destroot}${prefix}/share/man/man2 ${destroot}${prefix}/share/man/man3 \
+                        ${destroot}${prefix}/share/man/man4 ${destroot}${prefix}/share/man/man5 ${destroot}${prefix}/share/man/man6 \
+                        ${destroot}${prefix}/share/man/man7 ${destroot}${prefix}/share/man/man8 ${destroot}${prefix}/share/man/man9 \
+                        ${destroot}${prefix}/share/man/manl ${destroot}${prefix}/share/man/mann \
+                        ${destroot}${prefix}/share/nls/C ${destroot}${prefix}/share/nls/skel \
+                        ${destroot}${prefix}/share/nls/af_ZA.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/af_ZA.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/bg_BG.CP1251 \
+                        ${destroot}${prefix}/share/nls/cs_CZ.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/da_DK.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/da_DK.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/de_AT.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/de_AT.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/de_CH.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/de_CH.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/de_DE.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/de_DE.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/el_GR.ISO8859-7 \
+                        ${destroot}${prefix}/share/nls/en_AU.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/en_AU.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/en_AU.US-ASCII \
+                        ${destroot}${prefix}/share/nls/en_CA.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/en_CA.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/en_CA.US-ASCII \
+                        ${destroot}${prefix}/share/nls/en_GB.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/en_GB.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/en_GB.US-ASCII \
+                        ${destroot}${prefix}/share/nls/en_NZ.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/en_NZ.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/en_NZ.US-ASCII \
+                        ${destroot}${prefix}/share/nls/en_US.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/en_US.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/es_ES.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/es_ES.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/et_EE.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/fi_FI.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/fi_FI.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/fr_BE.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/fr_BE.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/fr_CA.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/fr_CA.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/fr_CH.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/fr_CH.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/fr_FR.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/fr_FR.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/hi_IN.ISCII-DEV \
+                        ${destroot}${prefix}/share/nls/hr_HR.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/hu_HU.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/is_IS.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/is_IS.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/it_CH.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/it_CH.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/it_IT.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/it_IT.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/ja_JP.SJIS \
+                        ${destroot}${prefix}/share/nls/ja_JP.eucJP \
+                        ${destroot}${prefix}/share/nls/ko_KR.eucKR \
+                        ${destroot}${prefix}/share/nls/la_LN.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/la_LN.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/la_LN.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/la_LN.ISO8859-4 \
+                        ${destroot}${prefix}/share/nls/la_LN.US-ASCII \
+                        ${destroot}${prefix}/share/nls/lt_LT.ISO8859-4 \
+                        ${destroot}${prefix}/share/nls/nl_BE.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/nl_BE.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/nl_NL.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/nl_NL.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/no_NO.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/no_NO.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/pl_PL.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/pt_BR.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/pt_PT.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/pt_PT.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/ro_RO.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/ru_RU.CP866 \
+                        ${destroot}${prefix}/share/nls/ru_RU.ISO8859-5 \
+                        ${destroot}${prefix}/share/nls/ru_RU.KOI8-R \
+                        ${destroot}${prefix}/share/nls/sk_SK.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/sl_SI.ISO8859-2 \
+                        ${destroot}${prefix}/share/nls/sv_SE.ISO8859-1 \
+                        ${destroot}${prefix}/share/nls/sv_SE.ISO8859-15 \
+                        ${destroot}${prefix}/share/nls/tr_TR.ISO8859-9 \
+                        ${destroot}${prefix}/share/nls/uk_UA.ISO8859-5 \
+                        ${destroot}${prefix}/share/nls/uk_UA.KOI8-U \
+                        ${destroot}${prefix}/share/nls/zh_CN.eucCN \
+                        ${destroot}${prefix}/share/nls/zh_TW.Big5 \
+                        ${destroot}${prefix}/var/macports/distfiles \
+                        ${destroot}${prefix}/var/macports/receipts
 
 post-pkg {
 	set resources ${workpath}/${name}-${version}.pkg/Contents/Resources/
 	file copy -force -- ${filespath}/ReadMe.rtf ${resources}
 	file copy -force -- ${filespath}/License.html ${resources}
+        file copy -force -- ${filespath}/preflight ${resources}
 	file copy -force -- ${filespath}/postflight ${resources}
 }
 
@@ -150,16 +152,17 @@
 			if {![file exists ${sdkrootpath}${tclstubpath}]} {
 				ui_msg "Fixing your MacOSX10.4u installation by copying libtclstub8.4.a to\
 				 ${sdkrootpath}${tclstubpath}"
-				system "cp -p ${tclstubpath} ${sdkrootpath}${tclstubpath}"
+				 xinstall -p ${tclstubpath} ${sdkrootpath}${tclstubpath}
 			}
 			# Supply architecture flags to build MacPorts as fat
-			configure.args-append "CFLAGS='-isysroot ${sdkrootpath} -arch ppc -arch i386'\
-			SHLIB_LDFLAGS='-Wl,-syslibroot,${sdkrootpath} -arch ppc -arch i386'"
+                        configure.cflags-append -isysroot ${sdkrootpath} -arch ppc -arch i386
+                        configure.env-append SHLIB_LDFLAGS='-Wl,-syslibroot,${sdkrootpath} -arch ppc -arch i386'
 		}
 	}
 }
 
 platform darwin 8 i386 {
 	# Supply architecture flags to build MacPorts as fat on an Intel Mac
-	configure.args-append "CFLAGS='-arch ppc -arch i386' SHLIB_LDFLAGS='-arch ppc -arch i386'"
+	configure.cflags-append -arch ppc -arch i386
+        configure.env-append SHLIB_LDFLAGS='-arch ppc -arch i386'
 }

Added: trunk/dports/sysutils/MacPorts/files/preflight
===================================================================
--- trunk/dports/sysutils/MacPorts/files/preflight	                        (rev 0)
+++ trunk/dports/sysutils/MacPorts/files/preflight	2007-07-09 09:05:10 UTC (rev 26822)
@@ -0,0 +1,126 @@
+#!/bin/bash
+#
+# Copyright (c) 2007 Juan Manuel Palacios <jmpp at macports.org>, MacPorts Team.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of MacPorts Team nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+
+###
+# dp2mp-move upgrading facility for users installing MacPorts through the pkg installer in the dmg.
+# This script is meant to run as the preflight of the installer, to upgrade an existing MacPorts
+# installation to the MacPorts namespace in the same way the "upgrade" target in base/Makefile
+# does for users installing from source or selfupdate.
+# preflight
+# $Id: preflight 26533 2007-06-27 22:39:54Z jmpp at macports.org $
+###
+
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+UPGRADECHECK=/opt/local/var/macports/.mprename
+
+
+[ ! -d /Library/Tcl/darwinports1.0 ] || rm -rf /Library/Tcl/darwinports1.0
+
+[ ! -d /opt/local/share/darwinports ] || rm -rf /opt/local/darwinports
+
+[ ! -f /opt/local/etc/ports/dp_version ] || rm -vf /opt/local/etc/ports/dp_version
+
+[ ! -f /opt/local/share/man/man5/ports.conf.5 ] || rm -vf /opt/local/share/man/man5/ports.conf.5
+
+[ ! -d /opt/local/etc/ports ] || mv -v /opt/local/etc/ports /opt/local/etc/macports
+
+[ -d /opt/local/var/macports ] || mkdir -vp /opt/local/var/macports
+for dir in distfiles packages receipts software; do
+    [ ! -d /opt/local/var/db/dports/${dir} ] || mv -v /opt/local/var/db/dports/${dir} /opt/local/var/macports
+done
+
+[ ! -d /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || {
+    mkdir -vp /opt/local/var/macports/sources/rsync.macports.org/release && mv -v \
+        /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports /opt/local/var/macports/sources/rsync.macports.org/release/ports ;
+}
+
+for receipt in /opt/local/var/macports/receipts/*/*/receipt.bz2 ; do
+    [ ! \( -f ${receipt} -a ! -f ${receipt}.mpsaved \) ] || { cp -v ${receipt} ${receipt}.mpsaved && {
+      bzip2 -q -dc ${receipt} | sed 's/db\/dports/macports/g' | bzip2 -q -zf > ${receipt}.new ;
+    } && mv -v ${receipt}.new ${receipt} ;
+}; done
+
+[ ! \( -f /opt/local/etc/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || {
+  mv -v /opt/local/etc/macports/ports.conf /opt/local/etc/macports/macports.conf.mpsaved
+  sed 's/etc\/ports/etc\/macports/g' /opt/local/etc/macports/macports.conf.mpsaved > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/db\/dports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc//macports/macports.conf.tmp && \
+    mv -v /opt/local/etc//macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/darwinports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/dpupdate1\/base/release\/base/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed '/^rsync_options/s/"\(.*\)"/\1/' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/ --delete / /' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+  sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
+    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
+}
+
+[ ! \( -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} \) ] || {
+  cp -v /opt/local/etc/macports/sources.conf /opt/local/etc/macports/sources.conf.mpsaved
+  sed 's/darwinports/macports/g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \
+    mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf
+  sed 's/dpupdate\/dports/release\/ports\//g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \
+    mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf
+}
+
+[ ! \( -f ${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || {
+  mv -v ${HOME}/.macports/ports.conf ${HOME}/.macports/macports.conf.mpsaved
+  sed 's/etc\/ports/etc\/macports/g' ${HOME}/.macports/macports.conf.mpsaved > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/db\/dports/macports/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/darwinports/macports/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/dpupdate1\/base/release\/base/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed '/^rsync_options/s/"\(.*\)"/\1/' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/ --delete / /' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+  sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+   sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
+    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
+}
+
+[ -f ${UPGRADECHECK} ] || {
+    echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo ""
+	echo "MacPorts rename update done!" > ${UPGRADECHECK} ;
+}


Property changes on: trunk/dports/sysutils/MacPorts/files/preflight
___________________________________________________________________
Name: svn:executable
   + *

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070709/6d8e2aa3/attachment.html


More information about the macports-changes mailing list