[38114] trunk/base
raimue at macports.org
raimue at macports.org
Sun Jul 6 17:38:33 PDT 2008
Revision: 38114
http://trac.macosforge.org/projects/macports/changeset/38114
Author: raimue at macports.org
Date: 2008-07-06 17:38:32 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
base:
Rename setupenv.sh to setupenv.bash to reflect that it is for bash only
Modified Paths:
--------------
trunk/base/Makefile.in
trunk/base/configure
trunk/base/configure.ac
Added Paths:
-----------
trunk/base/setupenv.bash.in
Removed Paths:
-------------
trunk/base/setupenv.sh.in
Property Changed:
----------------
trunk/base/
Property changes on: trunk/base
___________________________________________________________________
Name: svn:ignore
- autom4te.cache
config.log
config.status
Makefile
Doxyfile
tcldox
setupenv.sh
+ autom4te.cache
config.log
config.status
Makefile
Doxyfile
tcldox
setupenv.bash
Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in 2008-07-07 00:11:37 UTC (rev 38113)
+++ trunk/base/Makefile.in 2008-07-07 00:38:32 UTC (rev 38114)
@@ -32,7 +32,7 @@
include Mk/macports.upgrade.mk
install:: upgrade
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.sh ${datadir}/macports/
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash ${datadir}/macports/
[ ! -f ${sysconfdir}/macports/mp_version ] || rm -vf ${sysconfdir}/macports/mp_version
include Mk/macports.subdir.mk
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2008-07-07 00:11:37 UTC (rev 38113)
+++ trunk/base/configure 2008-07-07 00:38:32 UTC (rev 38114)
@@ -12377,7 +12377,7 @@
# Output
-ac_config_files="$ac_config_files Doxyfile 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 setupenv.sh"
+ac_config_files="$ac_config_files Doxyfile 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 setupenv.bash"
cat >confcache <<\_ACEOF
@@ -12953,7 +12953,7 @@
"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" ;;
"src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
- "setupenv.sh") CONFIG_FILES="$CONFIG_FILES setupenv.sh" ;;
+ "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac 2008-07-07 00:11:37 UTC (rev 38113)
+++ trunk/base/configure.ac 2008-07-07 00:38:32 UTC (rev 38114)
@@ -412,7 +412,7 @@
src/registry1.0/registry_autoconf.tcl
src/programs/Makefile
src/macports1.0/macports_fastload.tcl
- setupenv.sh
+ setupenv.bash
])
AC_OUTPUT
Copied: trunk/base/setupenv.bash.in (from rev 38111, trunk/base/setupenv.sh.in)
===================================================================
--- trunk/base/setupenv.bash.in (rev 0)
+++ trunk/base/setupenv.bash.in 2008-07-07 00:38:32 UTC (rev 38114)
@@ -0,0 +1,87 @@
+# -*- coding: utf-8; mode: shell-script-mode; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=sh:et:sw=4:ts=4:sts=4
+#
+# Copyright (c) 2008 Rainer Mueller <raimue at macports.org>, The MacPorts Project.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. Neither the name of Apple, Inc., The MacPorts Project nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $Id$
+
+function export_path() {
+ local binpath="@prefix_expanded@/bin"
+ local sbinpath="@prefix_expanded@/sbin"
+
+ local IFS=":"
+ for p in $PATH; do
+ if [ "$p" == "$binpath" ]; then
+ binpath=""
+ elif [ "$p" == "$sbinpath" ]; then
+ sbinpath=""
+ fi
+ done
+
+ if [ -n "$binpath" ]; then
+ binpath+=":"
+ fi
+
+ if [ -n "$sbinpath" ]; then
+ sbinpath+=":"
+ fi
+
+ export PATH="${binpath}${sbinpath}${PATH}"
+}
+
+function export_manpath() {
+ mpath="@prefix_expanded@/share/man"
+
+ local IFS=":"
+ for p in $MANPATH; do
+ if [ "$p" == "$mpath" ]; then
+ mpath=""
+ fi
+ done
+
+ if [ -n "$mpath" ]; then
+ mpath+=":"
+ fi
+
+ export MANPATH="${mpath}${MANPATH}"
+}
+
+function export_display() {
+ if [ -z $DISPLAY ]; then
+ export DISPLAY=":0.0"
+ fi
+}
+
+export_path
+export_manpath
+export_display
+
+# Remove defined functions to prevent them from cluttering the shell,
+# but they are needed to restrict variables to the local scope
+unset export_path
+unset export_manpath
+unset export_display
Property changes on: trunk/base/setupenv.bash.in
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/base/setupenv.sh.in
===================================================================
--- trunk/base/setupenv.sh.in 2008-07-07 00:11:37 UTC (rev 38113)
+++ trunk/base/setupenv.sh.in 2008-07-07 00:38:32 UTC (rev 38114)
@@ -1,87 +0,0 @@
-# -*- coding: utf-8; mode: shell-script-mode; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=sh:et:sw=4:ts=4:sts=4
-#
-# Copyright (c) 2008 Rainer Mueller <raimue at macports.org>, The MacPorts Project.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple, Inc., The MacPorts Project nor the
-# names of its contributors may be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $Id$
-
-function export_path() {
- local binpath="@prefix_expanded@/bin"
- local sbinpath="@prefix_expanded@/sbin"
-
- local IFS=":"
- for p in $PATH; do
- if [ "$p" == "$binpath" ]; then
- binpath=""
- elif [ "$p" == "$sbinpath" ]; then
- sbinpath=""
- fi
- done
-
- if [ -n "$binpath" ]; then
- binpath+=":"
- fi
-
- if [ -n "$sbinpath" ]; then
- sbinpath+=":"
- fi
-
- export PATH="${binpath}${sbinpath}${PATH}"
-}
-
-function export_manpath() {
- mpath="@prefix_expanded@/share/man"
-
- local IFS=":"
- for p in $MANPATH; do
- if [ "$p" == "$mpath" ]; then
- mpath=""
- fi
- done
-
- if [ -n "$mpath" ]; then
- mpath+=":"
- fi
-
- export MANPATH="${mpath}${MANPATH}"
-}
-
-function export_display() {
- if [ -z $DISPLAY ]; then
- export DISPLAY=":0.0"
- fi
-}
-
-export_path
-export_manpath
-export_display
-
-# Remove defined functions to prevent them from cluttering the shell,
-# but they are needed to restrict variables to the local scope
-unset export_path
-unset export_manpath
-unset export_display
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080706/c9ea7677/attachment-0001.html
More information about the macports-changes
mailing list