[31601] branches/release_1_6/base
jmpp at macports.org
jmpp at macports.org
Wed Nov 28 22:27:45 PST 2007
Revision: 31601
http://trac.macosforge.org/projects/macports/changeset/31601
Author: jmpp at macports.org
Date: 2007-11-28 22:27:42 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Merged revisions 31415-31499,31501-31600 via svnmerge from
http://svn.macports.org/repository/macports/trunk/base
........
r31415 | jmpp at macports.org | 2007-11-22 14:55:12 -0400 (Thu, 22 Nov 2007) | 1 line
The primary key should not be incremented monolithically, I misunderstood its intent at first.
........
r31427 | jmpp at macports.org | 2007-11-22 20:29:20 -0400 (Thu, 22 Nov 2007) | 8 lines
* Rework the script to execute less expensive stuff first and thus bail out early with minimal fuss if needed;
* Resort to puts(n) rather than ui_error for error reporting before we initialize macports1.0 through mportinit;
* Catch around the sourcing and loading of the macports1.0 files & Tcl package, report error if needed;
* Provide an absolute example path for the password file;
* Do not use 'IF NOT EXISTS' when creating the log table if we are dropping it right before: if the table creation instruction fails, we might want to know about it;
........
r31429 | jmpp at macports.org | 2007-11-22 20:49:15 -0400 (Thu, 22 Nov 2007) | 1 line
Cleanup sql file here too, after the reordering.
........
r31442 | ryandesign at macports.org | 2007-11-24 05:58:27 -0400 (Sat, 24 Nov 2007) | 1 line
set svn:keywords to Id and svn:eol-style to native to match other files
........
r31455 | jmpp at macports.org | 2007-11-24 14:39:52 -0400 (Sat, 24 Nov 2007) | 1 line
Standardize db variables naming with those found on the trunk/www/includes/common.inc file.
........
r31483 | ryandesign at macports.org | 2007-11-25 08:36:24 -0400 (Sun, 25 Nov 2007) | 1 line
ReleaseProcess: typos, minor wording
........
r31486 | jmpp at macports.org | 2007-11-25 12:17:19 -0400 (Sun, 25 Nov 2007) | 5 lines
Don't output anything to a temporary file to then try to read from it, as there is a non-zero chance that mktemp call may fail (even if very small).
Instead, grep out path from the output of "/usr/bin/printenv PATH" directly. Thanks to asigel at apple.com for the suggestion, closes #8401.
........
r31487 | jmpp at macports.org | 2007-11-25 12:20:26 -0400 (Sun, 25 Nov 2007) | 1 line
Whitespace cleanups.
........
r31491 | jberry at macports.org | 2007-11-25 17:07:29 -0400 (Sun, 25 Nov 2007) | 1 line
Add support for Leopard's /etc/paths.d and /etc/manpaths.d scheme for configuration of path and manpath, however wrong-headed is the setting of MANPATH by path_helper.
........
r31492 | jberry at macports.org | 2007-11-25 17:08:40 -0400 (Sun, 25 Nov 2007) | 1 line
autoreconf following addition of support for /etc/paths.d and /etc/manpaths.d
........
r31495 | eridius at macports.org | 2007-11-25 20:39:40 -0400 (Sun, 25 Nov 2007) | 1 line
Add dummy clean target
........
r31496 | eridius at macports.org | 2007-11-25 23:29:01 -0400 (Sun, 25 Nov 2007) | 1 line
Add @prefix@/sbin to default paths
........
r31519 | jmpp at macports.org | 2007-11-27 00:10:57 -0400 (Tue, 27 Nov 2007) | 4 lines
Add Ryan's suggested chmod call to make the script executable upon regen (how silly of me to not have thought of this... thinking about an install(1) call, sheeeshh!!).
........
r31520 | jberry at macports.org | 2007-11-27 01:20:02 -0400 (Tue, 27 Nov 2007) | 1 line
Install paths files only if our prefix will be /opt/local. For all other cases, let the user be warned.
........
r31521 | jberry at macports.org | 2007-11-27 01:36:20 -0400 (Tue, 27 Nov 2007) | 1 line
Eliminate a warning about ignoring --datarootdir, and some gratuitous whitespace changes.
........
r31522 | jmpp at macports.org | 2007-11-27 02:18:20 -0400 (Tue, 27 Nov 2007) | 6 lines
Quote variables passed to the shell in the dp2mp-move upgrade code when looking for the user homefolder, as there are cases in which that path may contain spaces.
Not doing this for the rest of the variables used in this code as we don't really support installing MacPorts into a path with embedded spaces.
Fixes #13145.
........
r31562 | jmpp at macports.org | 2007-11-28 01:57:29 -0400 (Wed, 28 Nov 2007) | 8 lines
You're right Ryan, is not this script's job to keep a MacPorts installation up to date.
Switch to an mportsync call, because it is this script's job to always keep a ports tree current ;-)
Looking into this made me wonder... why isn't the 'mportsync' proc in the macports:: namespace? That's so inconsistent!
(/me promises to look into that after 1.6.0)
........
r31565 | jmpp at macports.org | 2007-11-28 03:53:04 -0400 (Wed, 28 Nov 2007) | 1 line
Accept new naming suggestion for our dmgs, starting with the upcoming 1.6.0
........
r31600 | jmpp at macports.org | 2007-11-29 01:35:54 -0400 (Thu, 29 Nov 2007) | 5 lines
Check if we're on Leopard before running, we already install stuff into /etc/{man,}path.d so we don't need to adjust anything on that platform.
Also cleanup the script somewhat: use echo -e since our shebang assures us we're using bash.
........
Modified Paths:
--------------
branches/release_1_6/base/Mk/macports.autoconf.mk.in
branches/release_1_6/base/Mk/macports.upgrade.mk
branches/release_1_6/base/configure
branches/release_1_6/base/configure.ac
branches/release_1_6/base/portmgr/ReleaseProcess
branches/release_1_6/base/portmgr/dmg/postflight
branches/release_1_6/base/portmgr/jobs/Makefile
branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl
branches/release_1_6/base/src/Makefile.in
branches/release_1_6/base/src/package1.0/portsrpm.tcl
branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl
branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl
Added Paths:
-----------
branches/release_1_6/base/src/pathconf/
branches/release_1_6/base/src/pathconf/Makefile.in
branches/release_1_6/base/src/pathconf/manpaths.in
branches/release_1_6/base/src/pathconf/paths.in
Removed Paths:
-------------
branches/release_1_6/base/src/pathconf/Makefile.in
branches/release_1_6/base/src/pathconf/manpaths.in
branches/release_1_6/base/src/pathconf/paths.in
Property Changed:
----------------
branches/release_1_6/base/
branches/release_1_6/base/src/package1.0/portsrpm.tcl
branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl
branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl
Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/base:1-31413
+ /trunk/base:1-31413,31415-31499,31501-31600
Modified: branches/release_1_6/base/Mk/macports.autoconf.mk.in
===================================================================
--- branches/release_1_6/base/Mk/macports.autoconf.mk.in 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/Mk/macports.autoconf.mk.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -18,31 +18,31 @@
CFLAGS_WERROR = @CFLAGS_WERROR@
READLINE_CFLAGS =
-MD5_CFLAGS =
+MD5_CFLAGS =
SQLITE3_CFLAGS =
-CURL_CFLAGS = @CFLAGS_LIBCURL@
+CURL_CFLAGS = @CFLAGS_LIBCURL@
OBJC_RUNTIME = @OBJC_RUNTIME@
OBJC_RUNTIME_FLAGS = @OBJC_RUNTIME_FLAGS@
-OBJC_LIBS = @OBJC_LIBS@
+OBJC_LIBS = @OBJC_LIBS@
OBJC_FOUNDATION = @OBJC_FOUNDATION@
OBJC_FOUNDATION_CPPFLAGS = @OBJC_FOUNDATION_CPPFLAGS@
-OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
+OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
OBJC_FOUNDATION_LIBS = @OBJC_FOUNDATION_LIBS@
TCL_CC = @TCL_CC@
SHLIB_LD = @SHLIB_LD@
STLIB_LD = @STLIB_LD@
LDFLAGS = -L/usr/local/lib @LDFLAGS@
-SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ ${LDFLAGS}
+SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ ${LDFLAGS}
SHLIB_SUFFIX = @SHLIB_SUFFIX@
TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
LIBS = @LIBS@
-READLINE_LIBS = @READLINE_LIBS@
+READLINE_LIBS = @READLINE_LIBS@
MD5_LIBS = @MD5_LIBS@
-SQLITE3_LIBS = @SQLITE3_LIBS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
CURL_LIBS = @LDFLAGS_LIBCURL@
INSTALL = @INSTALL@
MTREE = @MTREE@
@@ -51,7 +51,7 @@
BZIP2 = @BZIP2@
TCLSH = @TCLSH@
-TCL_PACKAGE_DIR = @TCL_PACKAGE_DIR@
+TCL_PACKAGE_DIR = @TCL_PACKAGE_DIR@
DSTUSR = @DSTUSR@
DSTGRP = @DSTGRP@
@@ -62,9 +62,10 @@
sysconfdir = @sysconfdir@
exec_prefix = @exec_prefix@
bindir = @bindir@
+datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
-localstatedir = @localstatedir@
+localstatedir = @localstatedir@
infodir = @infodir@
mpconfigdir = @MPCONFIGDIR@
Modified: branches/release_1_6/base/Mk/macports.upgrade.mk
===================================================================
--- branches/release_1_6/base/Mk/macports.upgrade.mk 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/Mk/macports.upgrade.mk 2007-11-29 06:27:42 UTC (rev 31601)
@@ -86,24 +86,24 @@
## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
- [ ! \( -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; \
+ [ ! \( -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"; \
}
# Upgrade success announcement (meaning we're done ;):
Modified: branches/release_1_6/base/configure
===================================================================
--- branches/release_1_6/base/configure 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/configure 2007-11-29 06:27:42 UTC (rev 31601)
@@ -754,17 +754,18 @@
subdirs
SQLITE3_LIBS
SQLITE3_DIR
-OUR_INCLUDED_PACKAGES
INCLUDES
CFLAGS_DEBUG
CFLAGS_OPTIMIZE
-TCL_DEFS
+PATHCONF
STLIB_LD
SHLIB_LD
SHLIB_CFLAGS
SHLIB_LDFLAGS
SHLIB_SUFFIX
+TCL_DEFS
TCL_CC
+OUR_INCLUDED_PACKAGES
prefix_expanded
MPCONFIGDIR_EXPANDED
localstatedir_expanded
@@ -12034,8 +12035,6 @@
-
-
# Check whether --with-trace-sdk was given.
if test "${with_trace_sdk+set}" = set; then
withval=$with_trace_sdk; test -d /Developer/SDKs/$withval && cat >>confdefs.h <<_ACEOF
@@ -12045,6 +12044,22 @@
fi
+
+# If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
+{ echo "$as_me:$LINENO: checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d" >&5
+echo $ECHO_N "checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d... $ECHO_C" >&6; }
+mpprefix=$prefix
+test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
+if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
+ PATHCONF=pathconf
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
# Allows building of shared libraries
{ echo "$as_me:$LINENO: checking how to build libraries" >&5
@@ -12102,6 +12117,8 @@
+
+
# misc variables that need to be expanded for substitution into tcl
oldprefix=$prefix
@@ -12123,7 +12140,7 @@
# Output
-ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
+ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
cat >confcache <<\_ACEOF
@@ -12691,6 +12708,9 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
"src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
+ "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
+ "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
+ "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
"src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
"src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
"src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
@@ -12935,17 +12955,18 @@
subdirs!$subdirs$ac_delim
SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
SQLITE3_DIR!$SQLITE3_DIR$ac_delim
-OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
INCLUDES!$INCLUDES$ac_delim
CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
CFLAGS_OPTIMIZE!$CFLAGS_OPTIMIZE$ac_delim
-TCL_DEFS!$TCL_DEFS$ac_delim
+PATHCONF!$PATHCONF$ac_delim
STLIB_LD!$STLIB_LD$ac_delim
SHLIB_LD!$SHLIB_LD$ac_delim
SHLIB_CFLAGS!$SHLIB_CFLAGS$ac_delim
SHLIB_LDFLAGS!$SHLIB_LDFLAGS$ac_delim
SHLIB_SUFFIX!$SHLIB_SUFFIX$ac_delim
+TCL_DEFS!$TCL_DEFS$ac_delim
TCL_CC!$TCL_CC$ac_delim
+OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
prefix_expanded!$prefix_expanded$ac_delim
MPCONFIGDIR_EXPANDED!$MPCONFIGDIR_EXPANDED$ac_delim
localstatedir_expanded!$localstatedir_expanded$ac_delim
@@ -12953,7 +12974,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: branches/release_1_6/base/configure.ac
===================================================================
--- branches/release_1_6/base/configure.ac 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/configure.ac 2007-11-29 06:27:42 UTC (rev 31601)
@@ -287,15 +287,26 @@
AC_SUBST(SQLITE3_LIBS)
AC_SUBST(SQLITE3_DIR)
-AC_SUBST(OUR_INCLUDED_PACKAGES)
-
AH_TEMPLATE([TRACE_SDK], [SDK for SDK redirect in tracelib])
AC_ARG_WITH(
trace-sdk,
AS_HELP_STRING([--with-trace-sdk=SDK],
[SDK for redirection in trace lib (for example MacOSX10.4u.sdk)]),
[test -d /Developer/SDKs/$withval && AC_DEFINE_UNQUOTED([TRACE_SDK], "${withval}")], [])
+
+
+# If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
+AC_MSG_CHECKING(whether to install macports paths into /etc/paths.d and /etc/manpaths.d)
+mpprefix=$prefix
+test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
+if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
+ PATHCONF=pathconf
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+
# Allows building of shared libraries
SC_ENABLE_SHARED
@@ -312,14 +323,16 @@
AC_SUBST(INCLUDES)
AC_SUBST(CFLAGS_DEBUG)
AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(TCL_DEFS)
+AC_SUBST(PATHCONF)
AC_SUBST(STLIB_LD)
AC_SUBST(SHLIB_LD)
AC_SUBST(SHLIB_CFLAGS)
AC_SUBST(SHLIB_LDFLAGS)
AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(TCL_DEFS)
AC_SUBST(TCL_STUB_LIB_SPEC)
AC_SUBST(TCL_CC)
+AC_SUBST(OUR_INCLUDED_PACKAGES)
# misc variables that need to be expanded for substitution into tcl
@@ -356,6 +369,9 @@
src/Makefile
src/macports1.0/macports_autoconf.tcl
src/tclobjc1.0/Makefile
+ src/pathconf/Makefile
+ src/pathconf/paths
+ src/pathconf/manpaths
src/port1.0/port_autoconf.tcl
src/registry1.0/registry_autoconf.tcl
src/programs/Makefile
Modified: branches/release_1_6/base/portmgr/ReleaseProcess
===================================================================
--- branches/release_1_6/base/portmgr/ReleaseProcess 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/portmgr/ReleaseProcess 2007-11-29 06:27:42 UTC (rev 31601)
@@ -50,7 +50,7 @@
Only the base subdirectory, not the ports subdirectory, is branched for a given release.
It is strongly recommended to use the svnmerge.py tool (provided by the subversion port) to
-maintain merge tracking information between release branches and trunk/base if you pretend to
+maintain merge tracking information between release branches and trunk/base if you intend to
merge revisions back and forth between them, which is a very likely scenario. To do this, you
must initialize the tracking information from within the "base" directory of your checkout of
the branch you intend to manage:
@@ -65,7 +65,7 @@
In preparation for a release, several things should be completed within the code:
- * Update the file base/ChangeLog in both trunk and the relase branch to reflect the appropriate changes.
+ * Update the file base/ChangeLog in both trunk and the release branch to reflect the appropriate changes.
* Update the file base/config/mp_version with the target release number. Note that this is a floating
point number that corresponds to the release number; it should correspond roughly to the release number
where possible. Release 1.6.1, for instance, would be represented by the floating point number 1.610.
@@ -75,15 +75,15 @@
it from the latter.
* Update the autoconf 'configure' script through the provided base/regen.sh script once the version number
in mp_version has been changed, since the former reads the latter.
- * Make sure that these, and any other changes or bug fixes are made on and/or merged between the release branch
- and trunk as needded. For instance, if you've made changes to ChangeLog only on the release branch,
+ * Make sure that these and any other changes or bug fixes are made on and/or merged between the release branch
+ and trunk as needed. For instance, if you've made changes to ChangeLog only on the release branch,
those changes should be merged back into trunk as well.
=== Tag the Release ===
Once the release is ready, it must be tagged so that the release components may be fetched in the future,
-to ensure replicatability. Generally, a release candidate is first tagged and built. When and if it is
+to ensure replicability. Generally, a release candidate is first tagged and built. When and if it is
approved as the actual release, an additional tag is created that names the same sources.
Tagging conventions:
@@ -93,20 +93,20 @@
* release_1_6_0-archive (tagged release 1.6.0 -- complete archive)
* release_1_6_1 (1.6.1 release)
-We first tag the branched base directory to make up for the final release:
+We first tag the branched base directory to make up the final release:
svn cp -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_6 \
http://svn.macports.org/repository/macports/tags/release_1_6_0
-Although only the base subdirectory is branched and tagged for a given major release, we also create a
+Although only the base subdirectory is branched and tagged for a given major release, we also create a
separate tag for the entire tree (base sources and full ports tree) at the time the final release tag is
created (only for major releases, 1.x.0), in order to provide a stake in the ground that specifies a set
of ports intended to work with that release. Note that this tag incorporates the entire svn trunk directory
at the revision number at which the final release was tagged.
The necessary working copy to create such a tag is created by checking out all of trunk at the specific
-revision of the final tagging of base and then switching the base directory inturn to the appropriate
-release tag URL. For instance:
+revision of the final tagging of base and then switching the base directory to the appropriate release
+tag URL. For instance:
svn co [-r<rev>] http://svn.macports.org/repository/macports/trunk release_1.6.0-archive
cd release_1.6.0-archive/base
@@ -120,7 +120,7 @@
=== Create & Post Release Tarballs ===
-The release tarballs are tar.bz2 and tar.gz archives of the base directory only and of the entire svn tree
+The release tarballs are tar.bz2 and tar.gz archives of the base directory only and of the entire svn tree
for a particular release. They are named with the following naming convention:
MacPorts-1.6.0.tar.{bz2,gz} (base directory only, corresponding to tag release_1_6_0)
@@ -146,14 +146,14 @@
=== Create Release Disk Image(s) ===
-The dmg is a Mac OS X disk image that contains a standalone and default configured installer for major
+The dmg is a Mac OS X disk image that contains a standalone installer, configured in the usual way, for major
MacPorts releases (1.x.0), named in a consistent fashion and incorporating the OS version for which it
was built.
- MacPorts-1.6.0-10.4.dmg
- MacPorts-1.6.0-10.5.dmg
+ MacPorts-1.6.0-10.4-Tiger.dmg
+ MacPorts-1.6.0-10.5-Leopard.dmg
-To create the disk image use the MacPorts port. The Portfile will need to be updated to incorporate the
+To create a disk image, use the MacPorts port. The Portfile will need to be updated to incorporate the
proper release version and checksums, and the release tarballs will need to be already uploaded to the
downloads section of the site (wherefrom the sources are fetched by the MacPorts port to build the dmg
for the release). Resource files in the files/ directory of the MacPorts port will also have to be fully
@@ -162,11 +162,11 @@
sudo port -d dmg MacPorts
Name the dmg appropriately, and generate checksums, which will need to be added to the existing checksums
-file up at the downloads directory:
+file in the downloads directory:
cd work
- mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5.dmg
- for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.6.0-10.5.dmg; done
+ mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5-Leopard.dmg
+ for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.6.0-10.5-Leopard.dmg; done
These new products, along with the new checksums, also have to be posted to the appropriate downloads
directory of the MacPorts svn repository. Developers are required to validate the generated installer as
@@ -177,7 +177,7 @@
* Linking: libraries and binaries should not be linked against anything that's not present by default
on a vanilla Mac OS X installation + developer tools, excluding even the MacPorts installation prefix;
this can be accomplished through the use of otool's -L flag. Currently the libraries and binaries in need
- of linking validation are: ${destroot}/Library/Tcl/macports1.0/MacPorts.dylib, ${dstroot}/opt/local/bin/daemondo
+ of linking validation are: ${destroot}/Library/Tcl/macports1.0/MacPorts.dylib, ${destroot}/opt/local/bin/daemondo
${destroot}/opt/local/share/macports/Tcl/darwintrace1.0/darwintrace.dylib, ${destroot}/opt/local/share/macports/\
Tcl/pextlib1.0/Pextlib.dylib and ${destroot}/opt/local/share/macports/Tcl/tclobjc1.0/tclobjc.dylib.
* tclsh shell invoked by our scripts: all scripts installed in ${destroot}/opt/local/bin (that is port,
@@ -186,14 +186,14 @@
#\
exec /usr/bin/tclsh "$0" "$@"
thus ensuring that the default Mac OS X bundled Tcl is used in our scripts.
- * macports1.0 Tcl package: The macports1.0 Tcl package should be source off its default location in /Library/Tcl/macports1.0
+ * macports1.0 Tcl package: The macports1.0 Tcl package should be sourced off its default location in /Library/Tcl/macports1.0
in every single one of our scripts in ${destroot}/opt/local/bin.
- * Miscellaneous: anything else that might seem out of the ordinary for a fully default configured MacPorts
+ * Miscellaneous: anything else that might seem out of the ordinary for a fully default-configured MacPorts
installation.
-Once the above requirements have been possitively asserted, the one remaining test is to make sure that, both,
-the dmg mounts on the Finder when double clicking it and the pkg cointained therein properly starts up Installer.app
-when double clicked in turn.
+Once the above requirements have been positively asserted, the one remaining test is to make sure that the
+dmg mounts in the Finder when double-clicked, and that the pkg contained therein properly starts up Installer.app
+when it's double-clicked.
=== Make the Release Available through Self-Update ===
@@ -213,4 +213,5 @@
* Apple's [http://www.apple.com/downloads/macosx/unix_open_source/macports.html Mac OS X software downloads page] (submitter: jmpp@)
* [http://freshmeat.net/projects/macports/ Freshmeat] (submitter: mww@)
* [http://www.versiontracker.com/dyn/moreinfo/macosx/26679 VersionTracker] (submitter: mij@)
- * (Where else? -- MacUpdate?)
+ * [http://www.macupdate.com/info.php/id/21309/macports MacUpdate] (submitter: ???)
+ * (Where else?)
Modified: branches/release_1_6/base/portmgr/dmg/postflight
===================================================================
--- branches/release_1_6/base/portmgr/dmg/postflight 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/portmgr/dmg/postflight 2007-11-29 06:27:42 UTC (rev 31601)
@@ -30,45 +30,48 @@
# postflight
# $Id$
-echo ""
-echo "Checking the PATH variable for $USER..."
-echo ""
BINPATH=/opt/local/bin
SBINPATH=/opt/local/sbin
-TMP=`/usr/bin/mktemp /tmp/mp.$$`
-$SHELL -l <<EOF > $TMP
- /usr/bin/printenv PATH
- exit
-EOF
-if grep $BINPATH $TMP >/dev/null 2>&1; then
- echo "You already have the right PATH - l337!"
+
+echo -e "\nChecking the PATH variable for $USER...\n"
+
+# No need to do any path adjustments if we're on Leopard, as we already install our path configs into /etc/paths.d/ and /etc/manpaths.d/
+if [ $(sw_vers -productVersion | awk -F . '{print $2}') -eq 5 ]; then
+ echo "No need to adjust the PATH and MANPATH environment variables on Leopard!"
+ exit 0
+fi
+
+if $SHELL -c "/usr/bin/printenv PATH" | grep -c $BINPATH > /dev/null; then
+ echo "You already have the right PATH!"
else
USHELL=`basename $SHELL`
- echo "Setting the PATH of $USHELL for $USER in ${HOME:=/Users/$USER}..."
+ echo "Setting the PATH of $USHELL for $USER in ${HOME:=/Users/$USER}..."
case $USHELL in
- *csh)
- /bin/cp -fp $HOME/.cshrc $HOME/.cshrc.mpsaved # we backup the original
- echo "#" >> $HOME/.cshrc
- echo "# Your previous .cshrc (if any) is saved as .cshrc.mpsaved" >> $HOME/.cshrc
- echo "# Setting the path for MacPorts." >> $HOME/.cshrc
- echo "set path=($BINPATH $SBINPATH" '$path'")" >> $HOME/.cshrc
- chown $USER $HOME/.cshrc
- echo "Finished modifying $HOME/.cshrc"
- ;;
- *sh)
- /bin/cp -fp $HOME/.profile $HOME/.profile.mpsaved # we backup the original
- echo "#" >> $HOME/.profile
- echo "# Your previous .profile (if any) is saved as .profile.mpsaved" >> $HOME/.profile
- echo "# Setting the path for MacPorts." >> $HOME/.profile
- echo "export PATH=$BINPATH:$SBINPATH:\$PATH" >> $HOME/.profile
- chown $USER $HOME/.profile
- echo "Finished modifying $HOME/.profile"
+ *csh)
+ # we backup the original
+ /bin/cp -fp $HOME/.cshrc $HOME/.cshrc.mpsaved
+ echo "#" >> $HOME/.cshrc
+ echo "# Your previous .cshrc (if any) is saved as .cshrc.mpsaved" >> $HOME/.cshrc
+ echo "# Setting the path for MacPorts." >> $HOME/.cshrc
+ echo "set path=($BINPATH $SBINPATH" '$path'")" >> $HOME/.cshrc
+ chown $USER $HOME/.cshrc
+ echo "Finished modifying $HOME/.cshrc"
;;
- *)
- echo "Unknown shell! Please set your own PATH manually."
+ *sh)
+ # we backup the original
+ /bin/cp -fp $HOME/.profile $HOME/.profile.mpsaved
+ echo "#" >> $HOME/.profile
+ echo "# Your previous .profile (if any) is saved as .profile.mpsaved" >> $HOME/.profile
+ echo "# Setting the path for MacPorts." >> $HOME/.profile
+ echo "export PATH=$BINPATH:$SBINPATH:\$PATH" >> $HOME/.profile
+ chown $USER $HOME/.profile
+ echo "Finished modifying $HOME/.profile"
;;
+ *)
+ echo "Unknown shell! Please set your own PATH manually."
+ ;;
esac
fi
@@ -76,20 +79,15 @@
# run selfupdate
-echo""
-echo "Selfupdating The MacPorts system ..."
-echo ""
+echo -e "\nSelfupdating The MacPorts system ...\n"
port -d selfupdate
if [ $? != 0 ]; then
echo "An attempt to synchronize your recent MacPorts installation with the rsync server failed, please run 'port -d selfupdate' manually to find out the cause of the error."
- exit
+ exit 1
fi
-# done !!
-echo ""
-echo "You have succesfully installed the MacPorts system."
-echo ""
+# Postflight script is done with its job!
+echo -e "\nYou have succesfully installed the MacPorts system.\n"
echo "Launch a terminal and try it out !!"
-echo "Read the port manual page for help."
-echo ""
+echo -e "Read the port manual page for help.\n"
Modified: branches/release_1_6/base/portmgr/jobs/Makefile
===================================================================
--- branches/release_1_6/base/portmgr/jobs/Makefile 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/portmgr/jobs/Makefile 2007-11-29 06:27:42 UTC (rev 31601)
@@ -13,6 +13,7 @@
PortIndex2MySQL: PortIndex2MySQL.tcl
${edit} $< > $@
+ chmod 755 $@
clean:
rm -f ${SCRIPTS}
Modified: branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl
===================================================================
--- branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl 2007-11-29 06:27:42 UTC (rev 31601)
@@ -5,7 +5,7 @@
# Kevin Van Vechten | kevin at opendarwin.org
# 3-Oct-2002
# Juan Manuel Palacios | jmpp at macports.org
-# 30-Jul-2007
+# 22-Nov-2007
# $Id$
#
# Copyright (c) 2007 Juan Manuel Palacios, The MacPorts Project.
@@ -37,6 +37,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+
#####
# The PortIndex2MySQL script populates a database with key information extracted
# from the Portfiles in the ports tree pointed to by the sources.conf file in a
@@ -57,12 +58,6 @@
#####
-# Load macports1.0 so that we can use some of its procs and the portinfo array.
-catch {source \
- [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
-package require macports
-
-
# Runtime information log file and reciepient.
set runlog "/tmp/portsdb.log"
set runlog_fd [open $runlog w+]
@@ -72,6 +67,7 @@
set subject "PortIndex2MySQL run failure on $DATE"
set SPAM_LOVERS macports-dev at lists.macosforge.org
+
# House keeping on exit.
proc cleanup {args} {
foreach file_to_clean $args {
@@ -95,6 +91,32 @@
}
+# We first initialize the runlog with a proper mail subject.
+puts $runlog_fd "Subject: $subject"
+
+# Check if there are any stray sibling jobs before moving on, bail in such case.
+if {[file exists $lockfile]} {
+ puts $runlog_fd "PortIndex2MySQL lock file found, is another job running?"
+ terminate 1
+} else {
+ set lockfile_fd [open $lockfile a]
+}
+
+
+# Load macports1.0 so that we can use some of its procs and the portinfo array.
+if {[catch { source [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl] } errstr]} {
+ puts $runlog_fd "${::errorInfo}"
+ puts $runlog_fd "Failed to locate the macports1.0 Tcl package file: $errstr"
+ cleanup lockfile
+ terminate 1
+}
+if {[catch { package require macports } errstr]} {
+ puts $runlog_fd "${::errorInfo}"
+ puts $runlog_fd "Failed to load the macports1.0 Tcl package: $errstr"
+ cleanup lockfile
+ terminate 1
+}
+
# UI instantiation to route information/error messages wherever we want.
proc ui_channels {priority} {
global runlog_fd
@@ -129,40 +151,18 @@
}
}
-
-# We first initialize the runlog with a proper mail subject:
-puts $runlog_fd "Subject: $subject"
-
-# Check if there are any stray sibling jobs before moving on, bail in such case.
-if {[file exists $lockfile]} {
- ui_error "PortIndex2MySQL lock file found, is another job running?"
- terminate 1
-} else {
- set lockfile_fd [open $lockfile a]
-}
-
-
# Initialize macports1.0 and its UI, in order to find the sources.conf file
# (which is what will point us to the PortIndex we're gonna use) and use
# the runtime information.
array set ui_options {ports_verbose yes}
if {[catch {mportinit ui_options} errstr]} {
- ui_error "${::errorInfo}"
- ui_error "Failed to initialize MacPorts, $errstr"
+ puts $runlog_fd "${::errorInfo}"
+ puts $runlog_fd "Failed to initialize MacPorts: $errstr"
cleanup lockfile
terminate 1
}
-# Call the selfupdate procedure to make sure the MacPorts installation
-# is up-to-date and with a fresh ports tree.
-if {[catch {macports::selfupdate} errstr]} {
- ui_error "${::errorInfo}"
- ui_error "Failed to update the ports tree, $errstr"
- cleanup lockfile
- terminate 1
-}
-
# Procedure to catch the database password from a protected file.
proc getpasswd {passwdfile} {
if {[catch {open $passwdfile r} passwdfile_fd]} {
@@ -184,12 +184,12 @@
# Database abstraction variables:
set sqlfile "/tmp/portsdb.sql"
-set dbcmd [macports::findBinary mysql5]
-set dbhost 127.0.0.1
-set dbuser macports
-set passwdfile "./password_file"
-set dbpasswd [getpasswd $passwdfile]
-set dbname macports
+set portsdb_host localhost
+set portsdb_name macports
+set portsdb_user macports
+set passwdfile "/opt/local/share/macports/resources/portmgr/password_file"
+set portsdb_passwd [getpasswd $passwdfile]
+set portsdb_cmd [macports::findBinary mysql5]
# Flat text file to which sql statements are written.
@@ -199,6 +199,24 @@
terminate 1
}
+
+# Call the sync procedure to make sure we always have a fresh ports tree.
+if {[catch {mportsync} errstr]} {
+ ui_error "${::errorInfo}"
+ ui_error "Failed to update the ports tree, $errstr"
+ cleanup sqlfile lockfile
+ terminate 1
+}
+
+# Load every port in the index through a search that matches everything.
+if {[catch {set ports [mportsearch ".+"]} errstr]} {
+ ui_error "${::errorInfo}"
+ ui_error "port search failed: $errstr"
+ cleanup sqlfile lockfile
+ terminate 1
+}
+
+
# SQL string escaping.
proc sql_escape {str} {
regsub -all -- {'} $str {\\'} str
@@ -210,7 +228,7 @@
# Initial creation of database tables: log, portfiles, categories, maintainers, dependencies, variants and platforms.
# Do we need any other?
puts $sqlfile_fd "DROP TABLE IF EXISTS log;"
-puts $sqlfile_fd "CREATE TABLE IF NOT EXISTS log (activity VARCHAR(255), activity_time TIMESTAMP(14));"
+puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14));"
puts $sqlfile_fd "INSERT INTO log VALUES ('update', NOW());"
puts $sqlfile_fd "DROP TABLE IF EXISTS portfiles;"
@@ -232,14 +250,6 @@
puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255));"
-# Load every port in the index through a search that matches everything.
-if {[catch {set ports [mportsearch ".+"]} errstr]} {
- ui_error "${::errorInfo}"
- ui_error "port search failed: $errstr"
- cleanup sqlfile lockfile
- terminate 1
-}
-
# Iterate over each matching port, extracting its information from the
# portinfo array.
foreach {name array} $ports {
@@ -301,14 +311,14 @@
foreach category $categories {
set category [sql_escape $category]
puts $sqlfile_fd "INSERT INTO categories VALUES ('$portname', '$category', $primary);"
- incr primary
+ set primary 0
}
set primary 1
foreach maintainer $maintainers {
set maintainer [sql_escape $maintainer]
puts $sqlfile_fd "INSERT INTO maintainers VALUES ('$portname', '$maintainer', $primary);"
- incr primary
+ set primary 0
}
foreach build_dep $depends_build {
@@ -346,7 +356,7 @@
cleanup sqlfile lockfile
terminate 1
}
-if {[catch {exec -- $dbcmd --host=$dbhost --user=$dbuser --password=$dbpasswd --database=$dbname <@ $sqlfile_fd} errstr]} {
+if {[catch {exec -- $portsdb_cmd --host=$portsdb_host --user=$portsdb_user --password=$portsdb_passwd --database=$portsdb_name <@ $sqlfile_fd} errstr]} {
ui_error "${::errorCode}: $errstr"
cleanup sqlfile lockfile
terminate 1
Modified: branches/release_1_6/base/src/Makefile.in
===================================================================
--- branches/release_1_6/base/src/Makefile.in 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/src/Makefile.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -8,7 +8,7 @@
registry2.0 \
darwintracelib1.0 \
tclobjc1.0
-SUBDIR= ${TCLPKG} port programs
+SUBDIR= ${TCLPKG} @PATHCONF@ port programs
all::
Modified: branches/release_1_6/base/src/package1.0/portsrpm.tcl
===================================================================
--- branches/release_1_6/base/src/package1.0/portsrpm.tcl 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/src/package1.0/portsrpm.tcl 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1,6 +1,6 @@
# et:ts=4
# portsrpm.tcl
-# $Id: portsrpm.tcl $
+# $Id$
#
# Copyright (c) 2002 - 2003 Apple Computer, Inc.
# All rights reserved.
Property changes on: branches/release_1_6/base/src/package1.0/portsrpm.tcl
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Copied: branches/release_1_6/base/src/pathconf (from rev 31496, trunk/base/src/pathconf)
Property changes on: branches/release_1_6/base/src/pathconf
___________________________________________________________________
Name: svn:ignore
+ Makefile
paths
manpaths
Deleted: branches/release_1_6/base/src/pathconf/Makefile.in
===================================================================
--- trunk/base/src/pathconf/Makefile.in 2007-11-26 03:29:01 UTC (rev 31496)
+++ branches/release_1_6/base/src/pathconf/Makefile.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1,16 +0,0 @@
-# $Id: Makefile.in 26177 2007-06-15 10:11:22Z jmpp at macports.org $
-
-top_srcdir = @top_srcdir@
-
-include ${top_srcdir}/Mk/macports.autoconf.mk
-
-all:
-
-distclean::
- rm -f Makefile manpaths paths
-
-install:
- ${INSTALL} -o root -g wheel -m 644 paths /etc/paths.d/macports
- ${INSTALL} -o root -g wheel -m 644 manpaths /etc/manpaths.d/macports
-
-clean:
Copied: branches/release_1_6/base/src/pathconf/Makefile.in (from rev 31496, trunk/base/src/pathconf/Makefile.in)
===================================================================
--- branches/release_1_6/base/src/pathconf/Makefile.in (rev 0)
+++ branches/release_1_6/base/src/pathconf/Makefile.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -0,0 +1,16 @@
+# $Id: Makefile.in 26177 2007-06-15 10:11:22Z jmpp at macports.org $
+
+top_srcdir = @top_srcdir@
+
+include ${top_srcdir}/Mk/macports.autoconf.mk
+
+all:
+
+distclean::
+ rm -f Makefile manpaths paths
+
+install:
+ ${INSTALL} -o root -g wheel -m 644 paths /etc/paths.d/macports
+ ${INSTALL} -o root -g wheel -m 644 manpaths /etc/manpaths.d/macports
+
+clean:
Deleted: branches/release_1_6/base/src/pathconf/manpaths.in
===================================================================
--- trunk/base/src/pathconf/manpaths.in 2007-11-26 03:29:01 UTC (rev 31496)
+++ branches/release_1_6/base/src/pathconf/manpaths.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1 +0,0 @@
- at prefix@/share/man
Copied: branches/release_1_6/base/src/pathconf/manpaths.in (from rev 31496, trunk/base/src/pathconf/manpaths.in)
===================================================================
--- branches/release_1_6/base/src/pathconf/manpaths.in (rev 0)
+++ branches/release_1_6/base/src/pathconf/manpaths.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -0,0 +1 @@
+ at prefix@/share/man
Deleted: branches/release_1_6/base/src/pathconf/paths.in
===================================================================
--- trunk/base/src/pathconf/paths.in 2007-11-26 03:29:01 UTC (rev 31496)
+++ branches/release_1_6/base/src/pathconf/paths.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1,2 +0,0 @@
- at prefix@/bin
- at prefix@/sbin
Copied: branches/release_1_6/base/src/pathconf/paths.in (from rev 31496, trunk/base/src/pathconf/paths.in)
===================================================================
--- branches/release_1_6/base/src/pathconf/paths.in (rev 0)
+++ branches/release_1_6/base/src/pathconf/paths.in 2007-11-29 06:27:42 UTC (rev 31601)
@@ -0,0 +1,2 @@
+ at prefix@/bin
+ at prefix@/sbin
Modified: branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1,7 +1,7 @@
# et:ts=4
# python25-1.0.tcl
#
-# $Id: $
+# $Id$
#
# Copyright (c) 2007 Markus W. Weissman <mww at macports.org>,
# All rights reserved.
Property changes on: branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
Modified: branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl 2007-11-29 05:35:54 UTC (rev 31600)
+++ branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl 2007-11-29 06:27:42 UTC (rev 31601)
@@ -1,7 +1,7 @@
# et:ts=4
# python30-1.0.tcl
#
-# $Id: $
+# $Id$
#
# Copyright (c) 2007 Markus W. Weissman <mww at macports.org>,
# All rights reserved.
Property changes on: branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071128/6343e278/attachment-0001.html
More information about the macports-changes
mailing list