FAQ
In metaconfig.git, the branch master has been updated

<http://perl5.git.perl.org/metaconfig.git/commitdiff/95e252bc504aeed3f6900fe0a93b3a0bbc61b93c?hp=5d3ffa97290d2d3d65a42a0ed8b69d945b661ee7>

- Log -----------------------------------------------------------------
commit 95e252bc504aeed3f6900fe0a93b3a0bbc61b93c
Author: H.Merijn Brand - Tux <h.m.brand@xs4all.nl>
Date: Sun May 29 18:52:25 2016 +0200

     dist/meta merge after acceptance upstream

     Three down, 161 to go
-----------------------------------------------------------------------

Summary of changes:
  U/modified/Filexp.U | 69 --------------------------------------
  U/modified/pager.U | 62 ----------------------------------
  U/modified/src.U | 96 -----------------------------------------------------
  dist/U/Filexp.U | 8 +++--
  dist/U/pager.U | 11 +++---
  dist/U/src.U | 12 ++++---
  6 files changed, 21 insertions(+), 237 deletions(-)
  delete mode 100644 U/modified/Filexp.U
  delete mode 100644 U/modified/pager.U
  delete mode 100644 U/modified/src.U

diff --git a/U/modified/Filexp.U b/U/modified/Filexp.U
deleted file mode 100644
index 8e31753..0000000
--- a/U/modified/Filexp.U
+++ /dev/null
@@ -1,69 +0,0 @@
-?RCS: $Id: Filexp.U 1 2006-08-24 12:32:52Z rmanfredi $
-?RCS:
-?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-?RCS:
-?RCS: You may redistribute only under the terms of the Artistic License,
-?RCS: as specified in the README file that comes with the distribution.
-?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic License; a copy of which may be found at the root
-?RCS: of the source tree for dist 4.0.
-?RCS:
-?RCS: $Log: Filexp.U,v $
-?RCS: Revision 3.0.1.2 1994/10/29 15:52:53 ram
-?RCS: patch36: added ?F: line for metalint file checking
-?RCS: patch36: added HOME to the ?T: line since metalint now checks ${HOME}
-?RCS:
-?RCS: Revision 3.0.1.1 1994/05/06 14:03:00 ram
-?RCS: patch23: made sure error status from csh is propagated (WED)
-?RCS:
-?RCS: Revision 3.0 1993/08/18 12:04:53 ram
-?RCS: Baseline for dist 3.0 netwide release.
-?RCS:
-?X:
-?X: This unit produces a shell script which will expand filenames beginning
-?X: with tildes. The script is deleted at the end of Configure.
-?X:
-?MAKE:Filexp: startsh sed test expr eunicefix
-?MAKE: -pick add $@ %<
-?F:./filexp
-?T:HOME LOGDIR dir me name failed
-: set up shell script to do ~ expansion
-cat >filexp <<EOSS
-$startsh
-: expand filename
-case "\$1" in
- \~/*|\~)
- echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|"
- ;;
- \~*)
- if $test -f /bin/csh; then
- /bin/csh -f -c "glob \$1"
- failed=\$?
- echo ""
- exit \$failed
- else
- name=\`$expr x\$1 : '..\([^/]*\)'\`
- dir=\`$sed -n -e "/^\${name}:/{s/^[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\).*"'\$'"/\1/" -e p -e q -e '}' </etc/passwd\`
- if $test ! -d "\$dir"; then
- me=\`basename \$0\`
- echo "\$me: can't locate home directory for: \$name" >&2
- exit 1
- fi
- case "\$1" in
- */*)
- echo \$dir/\`$expr x\$1 : '..[^/]*/\(.*\)'\`
- ;;
- *)
- echo \$dir
- ;;
- esac
- fi
- ;;
-*)
- echo \$1
- ;;
-esac
-EOSS
-chmod +x filexp
-$eunicefix filexp
-
diff --git a/U/modified/pager.U b/U/modified/pager.U
deleted file mode 100644
index 2a77777..0000000
--- a/U/modified/pager.U
+++ /dev/null
@@ -1,62 +0,0 @@
-?RCS: $Id: pager.U 1 2006-08-24 12:32:52Z rmanfredi $
-?RCS:
-?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-?RCS:
-?RCS: You may redistribute only under the terms of the Artistic License,
-?RCS: as specified in the README file that comes with the distribution.
-?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic License; a copy of which may be found at the root
-?RCS: of the source tree for dist 4.0.
-?RCS:
-?RCS: $Log: pager.U,v $
-?RCS: Revision 3.0.1.2 1995/01/30 14:41:26 ram
-?RCS: patch49: ensure dflt gets initialized in case no pagers are found (WED)
-?RCS:
-?RCS: Revision 3.0.1.1 1994/10/29 16:27:45 ram
-?RCS: patch36: replaced Myread by Getfile in the dependency line
-?RCS:
-?RCS: Revision 3.0 1993/08/18 12:09:30 ram
-?RCS: Baseline for dist 3.0 netwide release.
-?RCS:
-?MAKE:pager: pg more less Getfile Oldconfig
-?MAKE: -pick add $@ %<
-?S:pager:
-?S: This variable contains the name of the preferred pager on the system.
-?S: Usual values are (the full pathnames of) more, less, pg, or cat.
-?S:.
-: locate the preferred pager for this system
-fn=f/
-case "$pager" in
-'')
- dflt=''
- case "$pg" in
- /*) dflt=$pg;;
- [a-zA-Z]:/*) dflt=$pg;;
- esac
- case "$more" in
- /*) dflt=$more;;
- [a-zA-Z]:/*) dflt=$more;;
- esac
- case "$less" in
- /*) dflt=$less;;
- [a-zA-Z]:/*) dflt=$less;;
- esac
- case "$dflt" in
- '') dflt=/usr/ucb/more;;
- esac
- ;;
-*) dflt="$pager"
- ;;
-esac
-?X: Instruct ./getfile to trust the default pager value,
-?X: even if it does not begin with a slash. For example, on os2,
-?X: pager might be cmd /c more. Also, it might include some options,
-?X: such as '/usr/bin/less -R'. ./getfile would report that
-?X: "/usr/bin/less -R" doesn't exist.
-?X: See comments in Getfile.U.
-fn="f/($dflt)"
-echo " "
-rp='What pager is used on your system?'
-. ./getfile
-pager="$ans"
-
diff --git a/U/modified/src.U b/U/modified/src.U
deleted file mode 100644
index 1191f1e..0000000
--- a/U/modified/src.U
+++ /dev/null
@@ -1,96 +0,0 @@
-?RCS: $Id: src.U 1 2006-08-24 12:32:52Z rmanfredi $
-?RCS:
-?RCS: Copyright (c) 1996, Cygnus Support
-?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-?RCS:
-?RCS: You may redistribute only under the terms of the Artistic License,
-?RCS: as specified in the README file that comes with the distribution.
-?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic License; a copy of which may be found at the root
-?RCS: of the source tree for dist 4.0.
-?RCS:
-?RCS: Original Author: Tom Tromey <tromey@cygnus.com>
-?RCS:
-?RCS: $Log: src.U,v $
-?RCS: Revision 3.0.1.1 1997/02/28 16:23:54 ram
-?RCS: patch61: created
-?RCS:
-?MAKE:src +rsrc: Options package contains
-?MAKE: -pick add $@ %<
-?Y:TOP
-?S:src (srcdir):
-?S: This variable holds the (possibly relative) path of the package source.
-?S: It is up to the Makefile to use this variable and set VPATH accordingly
-?S: to find the sources remotely. Use $pkgsrc to have an absolute path.
-?S:.
-?S:rsrc (relsrcdir):
-?S: This variable holds a potentially relative path to the package
-?S: source. The contents are correct for the configuration environment,
-?S: i.e. there might be an extra .. prepended to get out of the UU dir.
-?S: Configure units should use this, not the src variable.
-?S:.
-: Find the path to the source tree
-case "$src" in
-'') case "$0" in
- */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`
- case "$src" in
- /*) ;;
- .) ;;
- *) src=`cd ../$src && pwd` ;;
- esac
- ;;
- *) src='.';;
- esac;;
-esac
-case "$src" in
-'') src=/
- rsrc=/
- ;;
-/*) rsrc="$src";;
-*) rsrc="../$src";;
-esac
-?X:
-?X: Now check whether we have found the right source tree (i.e. the one for the
-?X: package we're about to configure). The original unit from Tom Tromey forced
-?X: the user to pick a unique file from his distribution, and we were merely
-?X: checking the existence of that file. I prefer to rely on Configure (which
-?X: we know *is* present since this unit is part of it!) and look for the
-?X: definition of the package variable, making sure it's the same as ours.
-?X: If it matches, we know we found the right source tree. -- RAM, 15/03/96
-?X:
-if test -f $rsrc/Configure && \
- $contains "^package='$package'\$" $rsrc/Configure >/dev/null 2>&1
-then
- : found it, so we are ok.
-else
-?X: Otherwise try "." and up to 4 parent directories...
-?X: Note that we prepend a ".." to get out of the configuration environment.
- rsrc=''
- for src in . .. ../.. ../../.. ../../../..; do
- if test -f ../$src/Configure && \
- $contains "^package=$package$" ../$src/Configure >/dev/null 2>&1
- then
- rsrc=../$src
- break
- fi
- done
-fi
-case "$rsrc" in
-'')
- cat <<EOM >&4
-
-Sorry, I can't seem to locate the source dir for $package. Please start
-Configure with an explicit path -- i.e. /some/path/Configure.
-
-EOM
- exit 1
- ;;
-?X: Don't echo anything if the sources are in . -- they should know already ;-)
-?X: In that case, rsrc is ../. since we lookup from within UU
-../.) rsrc='..';;
-*)
- echo " "
- echo "Sources for $package found in \"$src\"." >&4
- ;;
-esac
-
diff --git a/dist/U/Filexp.U b/dist/U/Filexp.U
index bf768b1..31e57a5 100644
--- a/dist/U/Filexp.U
+++ b/dist/U/Filexp.U
@@ -31,11 +31,15 @@
  cat >filexp <<EOSS
  $startsh
  : expand filename
+?X:
+?X: The case entries below escape the ~ as some shells have shown expansion
+?X: of the ~ during here-doc processing.
+?X:
  case "\$1" in
- ~/*|~)
+ \~/*|\~)
   echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|"
   ;;
- ~*)
+ \~*)
   if $test -f /bin/csh; then
    /bin/csh -f -c "glob \$1"
    failed=\$?
diff --git a/dist/U/pager.U b/dist/U/pager.U
index d429438..e68cf8c 100644
--- a/dist/U/pager.U
+++ b/dist/U/pager.U
@@ -46,12 +46,15 @@ case "$pager" in
   esac
   ;;
  *) dflt="$pager"
-?X: Instruct ./getfile to trust the hinted or previous pager value,
-?X: even if it does not begin with a slash. For example, on os2,
-?X: pager might be cmd /c more. See comments in Getfile.U.
- fn="f/($pager)"
   ;;
  esac
+?X: Instruct ./getfile to trust the default pager value,
+?X: even if it does not begin with a slash. For example, on os2,
+?X: pager might be cmd /c more. Also, it might include some options,
+?X: such as '/usr/bin/less -R'. ./getfile would report that
+?X: "/usr/bin/less -R" doesn't exist.
+?X: See comments in Getfile.U.
+fn="f/($dflt)"
  echo " "
  rp='What pager is used on your system?'
  . ./getfile
diff --git a/dist/U/src.U b/dist/U/src.U
index cba884f..87471e0 100644
--- a/dist/U/src.U
+++ b/dist/U/src.U
@@ -32,10 +32,14 @@
  : Find the path to the source tree
  case "$src" in
  '') case "$0" in
- */*)
- src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`
- ;;
- *) src='.';;
+ */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`
+ case "$src" in
+ /*) ;;
+ .) ;;
+ *) src=`cd ../$src && pwd` ;;
+ esac
+ ;;
+ *) src='.';;
      esac;;
  esac
  case "$src" in

--
perl5 metaconfig repository

Search Discussions

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupperl5-changes @
categoriesperl
postedMay 29, '16 at 4:53p
activeMay 29, '16 at 4:53p
posts1
users1
websiteperl.org

1 user in discussion

H.Merijn Brand: 1 post

People

Translate

site design / logo © 2018 Grokbase