[43738] trunk/dports/sysutils/MacPorts/Portfile

blb at macports.org blb at macports.org
Sat Dec 13 20:50:14 PST 2008


Revision: 43738
          http://trac.macports.org/changeset/43738
Author:   blb at macports.org
Date:     2008-12-13 20:50:14 -0800 (Sat, 13 Dec 2008)
Log Message:
-----------
sysutils/MacPorts - version update to 1.7.0, clean up how resources are handled, and MacPorts violates the mtree

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

Modified: trunk/dports/sysutils/MacPorts/Portfile
===================================================================
--- trunk/dports/sysutils/MacPorts/Portfile	2008-12-14 04:22:04 UTC (rev 43737)
+++ trunk/dports/sysutils/MacPorts/Portfile	2008-12-14 04:50:14 UTC (rev 43738)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                MacPorts
-version             1.6.0
+version             1.7.0
 
 categories          sysutils
 platforms           darwin freebsd
@@ -16,11 +16,20 @@
 
 homepage            http://www.macports.org
 master_sites        macports:${distname}
+use_bzip2           yes
 
-checksums           md5 67e61ebf25389ccee8ab09b859397c83 \
-                    sha1 e47667954c265ff6dc73a3330085cbe14246b011 \
-                    rmd160 3cdc362a8f7c9ec9ba2e14c57d4ad45e16d35c04
+checksums           md5     c6e7827d495e34d9e61cc927ca5cad66 \
+                    sha1    5ab0f590836dd204693fe8e1474da1e4a5c69fba \
+                    rmd160  02599e15bca00e58e38f34e0ee93e3471b2356b4
 
+pre-fetch {
+   if {${prefix} != {/opt/local}} {
+      return -code error "You need to use a MacPorts from /opt/local to safely build the MacPorts port (ticket #17633)"
+   }
+}
+
+use_parallel_build  yes
+
 # Readline is disabled by default to avoid support issues with people who
 # have a readline in /usr/local. Since this portfile is presumably used in a
 # clean environment, enable it here.
@@ -35,41 +44,37 @@
 # so better do not use ccache to avoid problems
 configure.ccache no
 
+set resources_scripts ${workpath}/${name}-${version}.pkg/Contents/Resources
+set resources_lang ${workpath}/${name}-${version}.pkg/Contents/Resources
+
 post-pkg {
-    if {[file exists ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj]} {
-        set resources ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
-    } else {
-        set resources ${workpath}/${name}-${version}.pkg/Contents/Resources
+    global resources_scripts resources_lang
+    if {[file exists ${resources_scripts}/English.lproj]} {
+        set resources_lang ${resources_scripts}/English.lproj
     }
-    file copy -force -- ${worksrcpath}/portmgr/dmg/ReadMe.rtf ${resources}
-    file copy -force -- ${worksrcpath}/portmgr/dmg/License.html ${resources}
-    file copy -force -- ${worksrcpath}/portmgr/dmg/preflight ${resources}
-    file copy -force -- ${worksrcpath}/portmgr/dmg/postflight ${resources}
+    file copy -force -- ${worksrcpath}/portmgr/dmg/ReadMe.rtf ${resources_lang}
+    file copy -force -- ${worksrcpath}/portmgr/dmg/License.html ${resources_lang}
+    file copy -force -- ${worksrcpath}/portmgr/dmg/preflight ${resources_scripts}
+    file copy -force -- ${worksrcpath}/portmgr/dmg/postflight ${resources_scripts}
+    file copy -force -- ${worksrcpath}/src/dep_map_clean.tcl ${resources_scripts}
+    file copy -force -- ${worksrcpath}/src/upgrade_sources_conf_default.tcl ${resources_scripts}
 }
 
 platform darwin 7 {
     post-pkg {
-        if {[file exists ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj]} {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
-        } else {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources
-        }
-        reinplace "s|__XVERS__|10.3|" ${resources}/ReadMe.rtf
-        reinplace "s|or newer ||" ${resources}/Welcome.html
+        global resources_lang
+        reinplace "s|__XVERS__|10.3|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
     }
 }
 
 platform darwin 8 {
     post-pkg {
-        if {[file exists ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj]} {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
-        } else {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources
-        }
-        reinplace "s|is built|contains a Universal installer|" ${resources}/ReadMe.rtf
-        reinplace "s|__XVERS__|10.4|" ${resources}/ReadMe.rtf
-        reinplace "s|3|4|" ${resources}/Welcome.html
-        reinplace "s|or newer ||" ${resources}/Welcome.html
+        global resources_lang
+        reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|__XVERS__|10.4|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|3|4|" ${resources_lang}/Welcome.html
+        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
     }
 }
 
@@ -98,15 +103,11 @@
 
 platform darwin 9 {
     post-pkg {
-        if {[file exists ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj]} {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources/English.lproj
-        } else {
-            set resources ${workpath}/${name}-${version}.pkg/Contents/Resources
-        }
-        reinplace "s|is built|contains a Universal installer|" ${resources}/ReadMe.rtf
-        reinplace "s|__XVERS__|10.5|" ${resources}/ReadMe.rtf
-        reinplace "s|3|5|" ${resources}/Welcome.html
-        reinplace "s|or newer ||" ${resources}/Welcome.html
+        global resources_lang
+        reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|__XVERS__|10.5|" ${resources_lang}/ReadMe.rtf
+        reinplace "s|3|5|" ${resources_lang}/Welcome.html
+        reinplace "s|or newer ||" ${resources_lang}/Welcome.html
     }
 }
 
@@ -133,6 +134,7 @@
     configure.args-append SHLIB_LDFLAGS='-arch ppc -arch i386'
 }
 
+destroot.violate_mtree yes
 destroot.keepdirs    ${destroot}${prefix}/include \
                      ${destroot}${prefix}/lib \
                      ${destroot}${prefix}/libexec \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081213/5ebf9edf/attachment-0001.html>


More information about the macports-changes mailing list