[38145] branches/gsoc08-privileges/base

pmagrath at macports.org pmagrath at macports.org
Tue Jul 8 13:39:57 PDT 2008 

Revision: 38145
          http://trac.macosforge.org/projects/macports/changeset/38145
Author:   pmagrath at macports.org
Date:     2008-07-08 13:39:57 -0700 (Tue, 08 Jul 2008)
Log Message:
-----------
Merged revisions 38101-38102,38107,38109,38114-38115 via svnmerge from 
https://svn.macosforge.org/repository/macports/trunk/base

........
  r38101 | raimue at macports.org | 2008-07-06 17:41:47 +0100 (Sun, 06 Jul 2008) | 3 lines
  
  doc/Makefile:
  gzip man pages on make all
........
  r38102 | raimue at macports.org | 2008-07-06 17:43:33 +0100 (Sun, 06 Jul 2008) | 3 lines
  
  doc:
  Ignore generated gzipped man pages
........
  r38107 | raimue at macports.org | 2008-07-06 19:49:40 +0100 (Sun, 06 Jul 2008) | 3 lines
  
  Makefile.in:
  Remove Doxyfile on distclean
........
  r38109 | raimue at macports.org | 2008-07-06 21:27:48 +0100 (Sun, 06 Jul 2008) | 5 lines
  
  base:
  Add a new setupenv.sh script which can be used to setup the environment for
  MacPorts. It will be installed to ${prefix}/share/macports/setupenv.sh and can
  be sourced from your profile.
........
  r38114 | raimue at macports.org | 2008-07-07 01:38:32 +0100 (Mon, 07 Jul 2008) | 3 lines
  
  base:
  Rename setupenv.sh to setupenv.bash to reflect that it is for bash only
........
  r38115 | raimue at macports.org | 2008-07-07 02:00:40 +0100 (Mon, 07 Jul 2008) | 3 lines
  
  setupenv.bash.in:
  Set svn:keywords=Id and svn:eol-style=native
........

Modified Paths:
--------------
    branches/gsoc08-privileges/base/Makefile.in
    branches/gsoc08-privileges/base/configure
    branches/gsoc08-privileges/base/configure.ac
    branches/gsoc08-privileges/base/doc/Makefile

Added Paths:
-----------
    branches/gsoc08-privileges/base/setupenv.bash.in

Property Changed:
----------------
    branches/gsoc08-privileges/base/
    branches/gsoc08-privileges/base/doc/


Property changes on: branches/gsoc08-privileges/base
___________________________________________________________________
Name: svn:ignore
   - autom4te.cache
config.log
config.status
Makefile
Doxyfile
tcldox

   + autom4te.cache
config.log
config.status
Makefile
Doxyfile
tcldox
setupenv.bash

Name: svnmerge-integrated
   - /trunk/base:1-38095
   + /trunk/base:1-38144

Modified: branches/gsoc08-privileges/base/Makefile.in
===================================================================
--- branches/gsoc08-privileges/base/Makefile.in	2008-07-08 20:35:34 UTC (rev 38144)
+++ branches/gsoc08-privileges/base/Makefile.in	2008-07-08 20:39:57 UTC (rev 38145)
@@ -32,6 +32,7 @@
 include Mk/macports.upgrade.mk
 
 install:: upgrade
+	$(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
@@ -55,6 +56,7 @@
 	rm -f config.log config.status configure.lineno
 	rm -rf autom4te.cache ${DISTDIR}
 	rm -f Makefile Mk/macports.autoconf.mk portmgr/fedora/macports.spec portmgr/freebsd/Makefile
+	rm -f Doxyfile
 
 _gettag:
 	cd ${DISTDIR}; svn co ${SVNURL}/tags/${SVNTAG} ${PKGNAME}-svn

Modified: branches/gsoc08-privileges/base/configure
===================================================================
--- branches/gsoc08-privileges/base/configure	2008-07-08 20:35:34 UTC (rev 38144)
+++ branches/gsoc08-privileges/base/configure	2008-07-08 20:39:57 UTC (rev 38145)
@@ -12474,7 +12474,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"
+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
@@ -13050,6 +13050,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.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: branches/gsoc08-privileges/base/configure.ac
===================================================================
--- branches/gsoc08-privileges/base/configure.ac	2008-07-08 20:35:34 UTC (rev 38144)
+++ branches/gsoc08-privileges/base/configure.ac	2008-07-08 20:39:57 UTC (rev 38145)
@@ -417,6 +417,7 @@
 	src/registry1.0/registry_autoconf.tcl
 	src/programs/Makefile
 	src/macports1.0/macports_fastload.tcl
+	setupenv.bash
 ])
 
 AC_OUTPUT


Property changes on: branches/gsoc08-privileges/base/doc
___________________________________________________________________
Name: svn:ignore
   - macports.conf
prefix.mtree
macosx.mtree

   + macports.conf
prefix.mtree
macosx.mtree
*[0-9].gz


Modified: branches/gsoc08-privileges/base/doc/Makefile
===================================================================
--- branches/gsoc08-privileges/base/doc/Makefile	2008-07-08 20:35:34 UTC (rev 38144)
+++ branches/gsoc08-privileges/base/doc/Makefile	2008-07-08 20:39:57 UTC (rev 38145)
@@ -8,7 +8,7 @@
 include ../Mk/macports.autoconf.mk
 endif
 
-all:
+all: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
 
 clean:
 	rm -f *.{1,5,7}.gz
@@ -27,7 +27,7 @@
 %.7.gz: %.7
 	gzip -c $^ > $@
 
-install: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
+install: all
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
 	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${mpconfigdir}
 

Copied: branches/gsoc08-privileges/base/setupenv.bash.in (from rev 38115, trunk/base/setupenv.bash.in)
===================================================================
--- branches/gsoc08-privileges/base/setupenv.bash.in	                        (rev 0)
+++ branches/gsoc08-privileges/base/setupenv.bash.in	2008-07-08 20:39:57 UTC (rev 38145)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080708/8dc724ae/attachment.html

More information about the macports-changes mailing list