[31682] branches/release_1_6/base

3 Dec 2007

Revision: 31682
          http://trac.macosforge.org/projects/macports/changeset/31682
Author:   jmpp@macports.org
Date:     2007-12-02 18:19:51 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
Rolled back revisions 31491-31492,31495-31496,31520,31600
(pertaining to the work done by James Berry on PATH and MANPATH additions to the Leopard only /etc/paths.d/ and /etc/manpaths.d/ directories)
via svnmerge from  http://svn.macports.org/repository/macports/trunk/base

Modified Paths:
--------------
    branches/release_1_6/base/configure
    branches/release_1_6/base/configure.ac
    branches/release_1_6/base/portmgr/dmg/postflight
    branches/release_1_6/base/src/Makefile.in

Removed Paths:
-------------
    branches/release_1_6/base/src/pathconf/

Property Changed:
----------------
    branches/release_1_6/base/


Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-31413,31415-31499,31501-31600
   + /trunk/base:1-31413,31415-31490,31493-31494,31497-31499,31501-31519,31521-31599

Modified: branches/release_1_6/base/configure
===================================================================

--- branches/release_1_6/base/configure	2007-12-03 01:57:53 UTC (rev 31681)
+++ branches/release_1_6/base/configure	2007-12-03 02:19:51 UTC (rev 31682)
@@ -754,18 +754,17 @@
 subdirs
 SQLITE3_LIBS
 SQLITE3_DIR
+OUR_INCLUDED_PACKAGES
 INCLUDES
 CFLAGS_DEBUG
 CFLAGS_OPTIMIZE
-PATHCONF
+TCL_DEFS
 STLIB_LD
 SHLIB_LD
 SHLIB_CFLAGS
 SHLIB_LDFLAGS
 SHLIB_SUFFIX
-TCL_DEFS
 TCL_CC
-OUR_INCLUDED_PACKAGES
 prefix_expanded
 MPCONFIGDIR_EXPANDED
 localstatedir_expanded
@@ -12035,6 +12034,8 @@
 
 
 
+
+
 # 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
@@ -12044,22 +12045,6 @@
 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
@@ -12117,8 +12102,6 @@
 
 
 
-
-
 # misc variables that need to be expanded for substitution into tcl
 
 oldprefix=$prefix
@@ -12140,7 +12123,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/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"
+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"
 
 
 cat >confcache <<\_ACEOF
@@ -12708,9 +12691,6 @@
     "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" ;;
@@ -12955,18 +12935,17 @@
 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
-PATHCONF!$PATHCONF$ac_delim
+TCL_DEFS!$TCL_DEFS$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
@@ -12974,7 +12953,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; 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-12-03 01:57:53 UTC (rev 31681)
+++ branches/release_1_6/base/configure.ac	2007-12-03 02:19:51 UTC (rev 31682)
@@ -287,26 +287,15 @@
 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
 
@@ -323,16 +312,14 @@
 AC_SUBST(INCLUDES)
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)
-AC_SUBST(PATHCONF)
+AC_SUBST(TCL_DEFS)
 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
 
@@ -369,9 +356,6 @@
 	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/dmg/postflight
===================================================================
--- branches/release_1_6/base/portmgr/dmg/postflight	2007-12-03 01:57:53 UTC (rev 31681)
+++ branches/release_1_6/base/portmgr/dmg/postflight	2007-12-03 02:19:51 UTC (rev 31682)
@@ -30,21 +30,15 @@
 # postflight
 # $Id$
 
+echo ""
+echo "Checking the PATH variable for $USER..."
+echo ""
 
 BINPATH=/opt/local/bin
 SBINPATH=/opt/local/sbin
 
-
-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!"
+    echo "You already have the right PATH - l337!"
 else
     USHELL=`basename $SHELL`
     echo "Setting the PATH of $USHELL for $USER in ${HOME:=/Users/$USER}..."
@@ -79,15 +73,20 @@
 
 # run selfupdate
 
-echo -e "\nSelfupdating The MacPorts system ...\n"
+echo""
+echo "Selfupdating The MacPorts system ..."
+echo ""
 
 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 1
+    exit
 fi
 
-# Postflight script is done with its job!
-echo -e "\nYou have succesfully installed the MacPorts system.\n"
+# done !!
+echo ""
+echo "You have succesfully installed the MacPorts system."
+echo ""
 echo "Launch a terminal and try it out !!"
-echo -e "Read the port manual page for help.\n"
+echo "Read the port manual page for help."
+echo ""

Modified: branches/release_1_6/base/src/Makefile.in
===================================================================
--- branches/release_1_6/base/src/Makefile.in	2007-12-03 01:57:53 UTC (rev 31681)
+++ branches/release_1_6/base/src/Makefile.in	2007-12-03 02:19:51 UTC (rev 31682)
@@ -8,7 +8,7 @@
 			registry2.0 \
 			darwintracelib1.0 \
 			tclobjc1.0
-SUBDIR=		${TCLPKG} @PATHCONF@ port programs
+SUBDIR=		${TCLPKG} port programs
 
 all::

    

jmpp＠macports.org

tags

participants (1)