[24155] branches/release_1_4/base
source_changes at macosforge.org
source_changes at macosforge.org
Tue Apr 17 17:36:19 PDT 2007
Revision: 24155
http://trac.macosforge.org/projects/macports/changeset/24155
Author: jberry at macports.org
Date: 2007-04-17 17:36:18 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
Merge from trunk to release_1_4 for release 1.4.3
Modified Paths:
--------------
branches/release_1_4/base/ChangeLog
branches/release_1_4/base/config/RELEASE_URL
branches/release_1_4/base/config/dp_version
branches/release_1_4/base/src/port1.0/port_autoconf.tcl.in
branches/release_1_4/base/src/port1.0/portstartupitem.tcl
branches/release_1_4/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/release_1_4/base/
branches/release_1_4/base/src/programs/mtree/
branches/release_1_4/base/src/programs/xar/
branches/release_1_4/base/src/programs/xar/include/
branches/release_1_4/base/src/programs/xar/src/
Property changes on: branches/release_1_4/base
___________________________________________________________________
Name: svn:ignore
- config.log
config.status
Makefile
+ autom4te.cache
config.log
config.status
Makefile
Modified: branches/release_1_4/base/ChangeLog
===================================================================
--- branches/release_1_4/base/ChangeLog 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/ChangeLog 2007-04-18 00:36:18 UTC (rev 24155)
@@ -7,6 +7,18 @@
(unreleased):
+Release 1.4.3 (17-Apr-2007):
+
+ - Fix bug in launchd support, introduced in 1.4.2. Remove remnants of
+ launchd enable flag which caused reversion to systemstarter in 1.4.2.
+ (jberry r24151).
+
+ - add functions 'backup' and 'lipo' along with some description
+ to be used for lipo-based universal variants, tested with openssl.
+ These functions should be considered test only for the time being,
+ and should not yet be adopted widely by port authors.
+ (pipping r24148).
+
Release 1.4.2 (16-Apr-2007):
- New logic for variants overload that basically yields to listing only
Modified: branches/release_1_4/base/config/RELEASE_URL
===================================================================
--- branches/release_1_4/base/config/RELEASE_URL 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/config/RELEASE_URL 2007-04-18 00:36:18 UTC (rev 24155)
@@ -1 +1 @@
-http://svn.macports.org/repository/macports/tags/release_1_4_1/
+http://svn.macports.org/repository/macports/tags/release_1_4_2/
Modified: branches/release_1_4/base/config/dp_version
===================================================================
--- branches/release_1_4/base/config/dp_version 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/config/dp_version 2007-04-18 00:36:18 UTC (rev 24155)
@@ -1 +1 @@
-1.420
+1.430
Modified: branches/release_1_4/base/src/port1.0/port_autoconf.tcl.in
===================================================================
--- branches/release_1_4/base/src/port1.0/port_autoconf.tcl.in 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/src/port1.0/port_autoconf.tcl.in 2007-04-18 00:36:18 UTC (rev 24155)
@@ -34,7 +34,6 @@
variable cvs_path "@CVS@"
variable rsync_path "@RSYNC@"
variable tar_command "@TAR_CMD@"
- variable enable_launchd_support "@ENABLE_LAUNCHD_SUPPORT@"
variable have_launchd "@HAVE_LAUNCHD@"
variable launchctl_path "@LAUNCHCTL@"
variable install_user "@DSTUSR@"
Modified: branches/release_1_4/base/src/port1.0/portstartupitem.tcl
===================================================================
--- branches/release_1_4/base/src/port1.0/portstartupitem.tcl 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/src/port1.0/portstartupitem.tcl 2007-04-18 00:36:18 UTC (rev 24155)
@@ -613,10 +613,8 @@
if {${startupitem.type} == "default" || ${startupitem.type} == ""} {
switch -exact ${os.platform} {
darwin {
- set enableLaunchd ${portutil::autoconf::enable_launchd_support}
set haveLaunchd ${portutil::autoconf::have_launchd}
-
- if { [tbool enableLaunchd] && [tbool haveLaunchd] } {
+ if { [tbool haveLaunchd] } {
set startupitem.type "launchd"
} else {
set startupitem.type "systemstarter"
Modified: branches/release_1_4/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_1_4/base/src/port1.0/portutil.tcl 2007-04-18 00:29:15 UTC (rev 24154)
+++ branches/release_1_4/base/src/port1.0/portutil.tcl 2007-04-18 00:36:18 UTC (rev 24155)
@@ -922,6 +922,38 @@
eval "proc $name {} $body"
}
+# backup
+# Operates on universal_filelist, creates universal_archlist
+# Save single-architecture files, a temporary location, preserving the original
+# directory structure.
+
+proc backup {arch} {
+ global universal_archlist universal_filelist workpath
+ lappend universal_archlist ${arch}
+ foreach file ${universal_filelist} {
+ set filedir [file dirname $file]
+ xinstall -d ${workpath}/${arch}/${filedir}
+ xinstall ${file} ${workpath}/${arch}/${filedir}
+ }
+}
+
+# lipo
+# Operates on universal_filelist, universal_archlist.
+# Run lipo(1) on a list of single-arch files.
+
+proc lipo {} {
+ global universal_archlist universal_filelist workpath
+ foreach file ${universal_filelist} {
+ xinstall -d [file dirname $file]
+ file delete ${file}
+ set lipoSources ""
+ foreach arch $universal_archlist {
+ append lipoSources "-arch ${arch} ${workpath}/${arch}/${file} "
+ }
+ system "lipo ${lipoSources}-create -output ${file}"
+ }
+}
+
########### Internal Dependency Manipulation Procedures ###########
proc target_run {ditem} {
Property changes on: branches/release_1_4/base/src/programs/mtree
___________________________________________________________________
Name: svn:ignore
+ autom4te.cache
Property changes on: branches/release_1_4/base/src/programs/xar
___________________________________________________________________
Name: svn:ignore
- config.log
cfgoutputs.stamp
config.status
cfghdrs.stamp
Makefile
+ config.log
Property changes on: branches/release_1_4/base/src/programs/xar/include
___________________________________________________________________
Name: svn:ignore
- xar.h
config.h
Property changes on: branches/release_1_4/base/src/programs/xar/src
___________________________________________________________________
Name: svn:ignore
- ixar
Makefile.inc
xar
xar.d
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070417/1c77f227/attachment.html
More information about the macports-changes
mailing list