[24535] branches/dp2mp-move/base/src/package1.0
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 27 11:35:01 PDT 2007
Revision: 24535
http://trac.macosforge.org/projects/macports/changeset/24535
Author: jmpp at macports.org
Date: 2007-04-27 11:35:00 -0700 (Fri, 27 Apr 2007)
Log Message:
-----------
Moving all of package1.0 to the MacPorts name space. Branch tested to configure, compile, install and make distclean.
One question I have: should we move the com.apple.<target> naming to our own org.macports.<target> namespace?
Modified Paths:
--------------
branches/dp2mp-move/base/src/package1.0/package.tcl
branches/dp2mp-move/base/src/package1.0/portarchive.tcl
branches/dp2mp-move/base/src/package1.0/portdpkg.tcl
branches/dp2mp-move/base/src/package1.0/portmpkg.tcl
branches/dp2mp-move/base/src/package1.0/portpkg.tcl
branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl
branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
Modified: branches/dp2mp-move/base/src/package1.0/package.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/package.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/package.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -30,7 +30,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
# standard package load
-package provide dp_package 1.0
+package provide mp_package 1.0
package require portrpmpackage 1.0
package require portpkg 1.0
Modified: branches/dp2mp-move/base/src/package1.0/portarchive.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portarchive.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portarchive.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -241,18 +241,18 @@
}
# Copy state file into destroot for archiving
- # +STATE contains a copy of the DP state information
- set statefile [file join $workpath .darwinports.${portname}.state]
+ # +STATE contains a copy of the MacPorts state information
+ set statefile [file join $workpath .macports.${portname}.state]
file copy -force $statefile [file join $destpath "+STATE"]
# Copy Portfile into destroot for archiving
- # +PORTFILE contains a copy of the DP Portfile
+ # +PORTFILE contains a copy of the MacPorts Portfile
set portfile [file join $portpath Portfile]
file copy -force $portfile [file join $destpath "+PORTFILE"]
# Create some informational files that we don't really use just yet,
# but we may in the future in order to allow port installation from
- # archives without a full "dports" tree of Portfiles.
+ # archives without a full "ports" tree of Portfiles.
#
# Note: These have been modeled after FreeBSD type package files to
# start. We can change them however we want for actual future use if
Modified: branches/dp2mp-move/base/src/package1.0/portdpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portdpkg.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portdpkg.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -162,7 +162,7 @@
proc com.apple.dpkg::make_dependency_list {portname} {
set result {}
- if {[catch {set res [dport_search "^$portname\$"]} error]} {
+ if {[catch {set res [port_search "^$portname\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port search failed: $error"
Modified: branches/dp2mp-move/base/src/package1.0/portmpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portmpkg.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portmpkg.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -54,7 +54,7 @@
proc make_dependency_list {portname} {
set result {}
- if {[catch {set res [dport_search "^$portname\$"]} error]} {
+ if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port search failed: $error"
@@ -88,7 +88,7 @@
proc make_one_package {portname portversion mpkgpath} {
global prefix package.destpath
- if {[catch {set res [dport_search "^$portname\$"]} result]} {
+ if {[catch {set res [mport_search "^$portname\$"]} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port search failed: $result"
@@ -100,9 +100,9 @@
if {[info exists portinfo(porturl)] && [info exists portinfo(version)] && $portinfo(version) == $portversion} {
# only the prefix gets passed to the worker.
ui_debug "building dependency package: $portname"
- set worker [dport_open $portinfo(porturl) [list prefix $prefix package.destpath ${mpkgpath}/Contents/Resources] {} yes]
- dport_exec $worker pkg
- dport_close $worker
+ set worker [mport_open $portinfo(porturl) [list prefix $prefix package.destpath ${mpkgpath}/Contents/Resources] {} yes]
+ mport_exec $worker pkg
+ mport_close $worker
}
unset portinfo
}
@@ -188,7 +188,7 @@
<key>CFBundleGetInfoString</key>
<string>${portname} ${portversion}</string>
<key>CFBundleIdentifier</key>
- <string>org.opendarwin.darwinports.mpkg.${portname}</string>
+ <string>org.macports.mpkg.${portname}</string>
<key>CFBundleName</key>
<string>${portname}</string>
<key>CFBundleShortVersionString</key>
Modified: branches/dp2mp-move/base/src/package1.0/portpkg.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portpkg.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portpkg.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -141,7 +141,7 @@
<key>CFBundleGetInfoString</key>
<string>${portname} ${portversion}</string>
<key>CFBundleIdentifier</key>
- <string>org.opendarwin.darwinports.${portname}</string>
+ <string>org.macports.${portname}</string>
<key>CFBundleName</key>
<string>${portname}</string>
<key>CFBundleShortVersionString</key>
Modified: branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portrpmpackage.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -65,7 +65,7 @@
set rpmdestpath "--define '_topdir ${pkgpath}'"
}
- foreach dir { "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/darwinports/rpms/RPMS"} {
+ foreach dir { "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/macports/rpms/RPMS"} {
foreach arch {"ppc" "i386" "fat"} {
set rpmpath "$dir/${arch}/${portname}-${portversion}-${portrevision}.${arch}.rpm"
if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
@@ -102,22 +102,22 @@
# depend on system (virtual packages for apple stuff)
regexp {[0-9]+} ${os.version} major
- lappend dependencies "org.darwinports.${os.arch}"
- lappend dependencies "org.darwinports.${os.platform}${major}"
+ lappend dependencies "org.macports.${os.arch}"
+ lappend dependencies "org.macports.${os.platform}${major}"
system "rm -f '${workpath}/${portname}.filelist' && touch '${workpath}/${portname}.filelist'"
#system "cd '${destpath}' && find . -type d | grep -v -E '^.$' | sed -e 's/\"/\\\"/g' -e 's/^./%dir \"/' -e 's/$/\"/' > '${workpath}/${portname}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep -v /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./\"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
system "cd '${destpath}' && find . ! -type d | grep /etc/ | sed -e 's/\"/\\\"/g' -e 's/^./%config \"/' -e 's/$/\"/' >> '${workpath}/${portname}.filelist'"
write_spec ${specpath} $portname $portversion $portrevision $pkg_description $pkg_long_description $category $maintainer $destpath $dependencies $epoch
- system "DP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath} ${specpath}"
+ system "MP_USERECEIPTS='${portdbpath}/receipts' rpmbuild -bb -v ${rpmdestpath} ${specpath}"
return 0
}
proc make_dependency_list {portname} {
set result {}
- if {[catch {set res [dport_search "^$portname\$"]} error]} {
+ if {[catch {set res [mport_search "^$portname\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port search failed: $error"
@@ -154,9 +154,9 @@
set origportname ${portname}
regsub -all -- "\-" $portversion "_" portversion
regsub -all -- "\-" $portname "_" portname
- puts $specfd "\#Spec file generated by DarwinPorts
-%define distribution DarwinPorts
-%define vendor OpenDarwin
+ puts $specfd "\#Spec file generated by MacPorts
+%define distribution MacPorts
+%define vendor MacPorts
%define packager ${maintainer}
Summary: ${description}
@@ -178,7 +178,7 @@
${long_description}
%prep
%build
-echo \"Go DarwinPorts\"
+echo \"Go MacPorts\"
%install
%clean
%files -f ${destroot}/../${origportname}.filelist
Modified: branches/dp2mp-move/base/src/package1.0/portunarchive.tcl
===================================================================
--- branches/dp2mp-move/base/src/package1.0/portunarchive.tcl 2007-04-27 17:58:51 UTC (rev 24534)
+++ branches/dp2mp-move/base/src/package1.0/portunarchive.tcl 2007-04-27 18:35:00 UTC (rev 24535)
@@ -283,7 +283,7 @@
global UI_PREFIX target_state_fd unarchive.file portname workpath destpath
# Reset state file with archive version
- set statefile [file join $workpath .darwinports.${portname}.state]
+ set statefile [file join $workpath .macports.${portname}.state]
file copy -force [file join $destpath "+STATE"] $statefile
exec touch $statefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070427/e4ef5855/attachment.html
More information about the macports-changes
mailing list