From 7bfb7bd76d16e4d29a2d400e0ccf65838fe75195 Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand - Tux" Date: Sat, 23 Apr 2016 19:08:19 +0200 Subject: [PATCH] Bring more dist in line with dist-git All of these still have been overruled units, so it'll change nothing in functionality but should ease finding diffs that do matter --- dist/U/Config_sh.U | 4 ++-- dist/U/Cross.U | 3 ++- dist/U/Finish.U | 2 +- dist/U/Unix.U | 2 +- dist/U/abortsig.U | 3 ++- dist/U/bin.U | 2 +- dist/U/d_csh.U | 2 +- dist/U/d_dosuid.U | 2 +- dist/U/d_fd_set.U | 5 ++++- dist/U/d_gconvert.U | 2 +- dist/U/d_gethname.U | 8 ++++---- dist/U/d_scannl.U | 4 ++-- dist/U/d_times.U | 2 +- dist/U/libc.U | 4 ++-- dist/U/lns.U | 2 +- dist/U/perlpath.U | 4 ++-- dist/U/sbrksmart.U | 2 +- dist/U/sitearch.U | 2 +- dist/U/sitelib.U | 2 +- dist/U/startperl.U | 2 +- dist/U/usenm.U | 2 +- 21 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dist/U/Config_sh.U b/dist/U/Config_sh.U index cc8741d..415fc0c 100644 --- a/dist/U/Config_sh.U +++ b/dist/U/Config_sh.U @@ -21,12 +21,12 @@ ?RCS: Revision 3.0 1993/08/18 12:04:48 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?X: +?X: ?X: This unit ends up producing the config.sh script, which contains all the ?X: definitions figured out by Configure. The add.Config_sh command knows ?X: which variables need to be remembered. It also adds the EOT (ends the ?X: here document redirection with variable substitution). -?X: +?X: ?MAKE:Config_sh: cf_time cf_by test spitshell startsh myuname Myread \ End Obsol_sh Loc +d_portable package src cat sed ?MAKE: -pick add.Config_sh $@ %< diff --git a/dist/U/Cross.U b/dist/U/Cross.U index f4c11b2..a54b091 100644 --- a/dist/U/Cross.U +++ b/dist/U/Cross.U @@ -83,6 +83,7 @@ ?LINT:extern loclibpth ?LINT:change locincpth ?LINT:change loclibpth +?LINT:extern TMPDIR : setup for possible cross-compilation run='' to=: @@ -196,7 +197,7 @@ $define|true|[yY]*) from=$from-$targetfrom case "$targetdir" in '') - targetdir=/tmp + targetdir="${TMPDIR:-/tmp}" echo "Guessing targetdir $targetdir." >&4 ;; esac diff --git a/dist/U/Finish.U b/dist/U/Finish.U index dd21d03..80399de 100644 --- a/dist/U/Finish.U +++ b/dist/U/Finish.U @@ -74,7 +74,7 @@ esac ?X: ?X: Turn silent mode off from now on (we want a verbose file extraction). -?X: This means we have to explicitly test for '$silent' from now on to +?X: This means we have to explicitely test for '$silent' from now on to ?X: strip off any verbose messages. ?X: echo " " diff --git a/dist/U/Unix.U b/dist/U/Unix.U index 952f51f..8d0b9ef 100644 --- a/dist/U/Unix.U +++ b/dist/U/Unix.U @@ -14,7 +14,7 @@ ?RCS: patch61: created ?RCS: ?X: -?X: The purpose of this unit is to define things that are common accross all +?X: The purpose of this unit is to define things that are common across all ?X: known UNIX platforms. If Configure is ported/used on a non-UNIX ?X: environment, then some of the following variables can be redefined in hint ?X: files. diff --git a/dist/U/abortsig.U b/dist/U/abortsig.U index cb723ec..dbefbb1 100644 --- a/dist/U/abortsig.U +++ b/dist/U/abortsig.U @@ -38,8 +38,9 @@ case "$abortsig" in for signal in SIGIOT SIGILL SIGABRT; do case "$abortsig" in '') $cat >abort.c <*/ #include -caught() { exit(0); } +caught() { exit(0); } /* FIXME: Use _exit() or _Exit() in signal handler */ int main() { #ifdef $signal diff --git a/dist/U/bin.U b/dist/U/bin.U index c319528..0ce4930 100644 --- a/dist/U/bin.U +++ b/dist/U/bin.U @@ -39,7 +39,7 @@ ?S:. ?S:installbin: ?S: This variable is the same as binexp unless AFS is running in which case -?S: the user is explicitly prompted for it. This variable should always +?S: the user is explicitely prompted for it. This variable should always ?S: be used in your makefiles for maximum portability. ?S:. ?C:BIN: diff --git a/dist/U/d_csh.U b/dist/U/d_csh.U index 540081e..6f1829e 100644 --- a/dist/U/d_csh.U +++ b/dist/U/d_csh.U @@ -35,7 +35,7 @@ ?C: This symbol, if defined, contains the full pathname of csh. ?C:. ?X: Previously, I just did $d_csh CSH "$full_csh", but that caused -?X: problems on VMS where the config.sh extraction program changes +?X: problems on VMS where the config.sh extraction program changes ?X: $undef to a real cpp undef, and they then had #undef CSH "" ?X: which the compiler didn't like. It's easy to work around this, ?X: so I did. --AD 3/1998. diff --git a/dist/U/d_dosuid.U b/dist/U/d_dosuid.U index 24e7af8..a3eb5a4 100644 --- a/dist/U/d_dosuid.U +++ b/dist/U/d_dosuid.U @@ -140,7 +140,7 @@ val="$undef" case "$d_suidsafe" in "$define") val="$undef" - echo "No need to emulate SUID scripts since they are secure here." >&4 + echo "No need to emulate SUID scripts since they are secure here." >& 4 ;; *) $cat <fd_set.c < #ifdef HAS_SOCKET +#ifdef I_SYS_SOCKET #include /* Might include */ #endif +#endif #ifdef I_SYS_TIME #include #endif diff --git a/dist/U/d_gconvert.U b/dist/U/d_gconvert.U index d760091..6fc6b63 100644 --- a/dist/U/d_gconvert.U +++ b/dist/U/d_gconvert.U @@ -21,7 +21,7 @@ ?RCS: Revision 3.0.1.1 1994/10/29 16:12:51 ram ?RCS: patch36: created by ADO ?RCS: -?MAKE:d_Gconvert: cat cc ccflags ldflags libs Inlibc rm _o +?MAKE:d_Gconvert: cat cc ccflags ldflags libs rm _o ?MAKE: -pick add $@ %< ?S:d_Gconvert: ?S: This variable holds what Gconvert is defined as to convert diff --git a/dist/U/d_gethname.U b/dist/U/d_gethname.U index 88c4ba4..cd206c1 100644 --- a/dist/U/d_gethname.U +++ b/dist/U/d_gethname.U @@ -108,7 +108,7 @@ case "$d_uname$d_gethname" in *define*) dflt=n cat <&4 $cat >try.c <<'EOCP' diff --git a/dist/U/d_times.U b/dist/U/d_times.U index 84f9761..3e9217c 100644 --- a/dist/U/d_times.U +++ b/dist/U/d_times.U @@ -27,7 +27,7 @@ ?MAKE: -pick add $@ %< ?S:d_times: ?S: This variable conditionally defines the HAS_TIMES symbol, which indicates -?S: that the times() routine exists. The times() routine is normaly +?S: that the times() routine exists. The times() routine is normally ?S: provided on UNIX systems. You may have to include . ?S:. ?S:clocktype: diff --git a/dist/U/libc.U b/dist/U/libc.U index 3acc918..1856628 100644 --- a/dist/U/libc.U +++ b/dist/U/libc.U @@ -264,14 +264,14 @@ $echo $n ".$c" ?X: $grep fprintf libc.tmp > libc.ptf ?X: -?X: In order to ehance readability and save some space, we define +?X: In order to enhance readability and save some space, we define ?X: some variables that will be "eval"ed. ?X: xscan='eval "libc.list"; $echo $n ".$c" >&4' xrun='eval "libc.list"; echo "done." >&4' ?X: BSD-like output, I and W types added for Linux ?X: Some versions of Linux include a leading __IO in the symbol name. -?X: HPUX10 reportedly has trailing spaces, though I'm suprised it has +?X: HPUX10 reportedly has trailing spaces, though I'm surprised it has ?X: BSD-like output. (AD). xxx='[ADTSIW]' if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx *_[_.]*//p' -e 's/^.* $xxx *//p'";\ diff --git a/dist/U/lns.U b/dist/U/lns.U index 25ef80e..d3fcd4f 100644 --- a/dist/U/lns.U +++ b/dist/U/lns.U @@ -28,8 +28,8 @@ ?S:. : determine whether symbolic links are supported echo " " +$rm -f blurfl sym $touch blurfl -$rm -f sym if $ln -s blurfl sym > /dev/null 2>&1 && $test -f sym; then echo "Symbolic links are supported." >&4 lns="$ln -s" diff --git a/dist/U/perlpath.U b/dist/U/perlpath.U index 9cb3fe4..0bfaad7 100644 --- a/dist/U/perlpath.U +++ b/dist/U/perlpath.U @@ -26,10 +26,10 @@ ?Y:TOP ?S:perlpath: ?S: This variable contains the eventual value of the PERLPATH symbol, -?S: which contains the absolute location of the perl interpeter. +?S: which contains the absolute location of the perl interpreter. ?S:. ?C:PERLPATH: -?C: This symbol contains the absolute location of the perl interpeter. +?C: This symbol contains the absolute location of the perl interpreter. ?C:. ?H:#define PERLPATH "$perlpath" /**/ ?H:. diff --git a/dist/U/sbrksmart.U b/dist/U/sbrksmart.U index 7b93c7d..14e6cc0 100644 --- a/dist/U/sbrksmart.U +++ b/dist/U/sbrksmart.U @@ -37,7 +37,7 @@ echo " " case "$d_sbrk" in "$define") echo "Let's see if your sbrk() is smart enough to release core..." >&4 - $cat > sbrk.c <<'EOC' + $cat > sbrk.c <