home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
rcs-5.7-diffs.gz
/
rcs-5.7-diffs
Wrap
Text File
|
1996-10-13
|
29KB
|
868 lines
This file contains patches that transform the baseline version into
the amiga version. Assuming that you have unarchived the baseline
version in the current directory, just run the command:
patch -p1 -E -b .pbak <diff-file
where 'diff-file' is this patch file. After running patch you should
remove all the generated *.pbak files, and look for any *.rej files
that indicate a problem patching the baseline source.
diff -rup --new-file baseline/fsf/rcs/Product-Info amiga/fsf/rcs/Product-Info
--- baseline/fsf/rcs/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/rcs/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,22 @@
+.name
+rcs
+.fullname
+Revision Control System
+.type
+Programmer Tool
+.short
+Revision Control System
+.description
+RCS, the Revision Control System, manages multiple revisions of files.
+RCS can store, retrieve, log, identify, and merge revisions. It is
+useful for files that are revised frequently, e.g. programs,
+documentation, graphics, and papers.
+.version
+5.7
+.author
+Walter F. Tichy
+et. al.
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/rcs/configure amiga/fsf/rcs/configure
--- baseline/fsf/rcs/configure Thu Jun 15 23:57:50 1995
+++ amiga/fsf/rcs/configure Mon Sep 30 22:49:09 1996
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.4
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -35,9 +35,25 @@ target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
+mandir='${prefix}/man'
# Initialize some other variables.
subdirs=
+MFLAGS= MAKEFLAGS=
ac_prev=
for ac_option
@@ -59,9 +75,14 @@ do
case "$ac_option" in
- -build | --build | --buil | --bui | --bu | --b)
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
@@ -71,6 +92,12 @@ do
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
cache_file="$ac_optarg" ;;
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
-disable-* | --disable-*)
ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
@@ -121,12 +148,32 @@ Configuration:
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
- --exec-prefix=PREFIX install architecture-dependent files in PREFIX
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix]
+ --bindir=DIR user executables in DIR [EPREFIX/bin]
+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data in DIR
+ [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data in DIR
+ [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
+ --libdir=DIR object code libraries in DIR [EPREFIX/lib]
+ --includedir=DIR C header files in DIR [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
+ --infodir=DIR info documentation in DIR [PREFIX/info]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
+ --mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+ --program-transform-name=PROGRAM
+ run sed PROGRAM on installed program names
+EOF
+ cat << EOF
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
@@ -138,8 +185,10 @@ Features and packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
---enable and --with options recognized:$ac_help
EOF
+ if test -n "$ac_help"; then
+ echo "--enable and --with options recognized:$ac_help"
+ fi
exit 0 ;;
-host | --host | --hos | --ho)
@@ -147,6 +196,56 @@ EOF
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir="$ac_optarg" ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir="$ac_optarg" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
@@ -159,6 +258,15 @@ EOF
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
no_recursion=yes ;;
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
+
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
@@ -199,6 +307,23 @@ EOF
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
+
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
@@ -209,6 +334,13 @@ EOF
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
srcdir="$ac_optarg" ;;
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir="$ac_optarg" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
@@ -218,7 +350,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.4"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@@ -264,7 +396,7 @@ EOF
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
- *)
+ *)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
@@ -384,8 +516,8 @@ fi
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -412,8 +544,8 @@ a1 1
EOF
# Check whether --with-diffutils or --without-diffutils was given.
-withval="$with_diffutils"
-if test -n "$withval"; then
+if test "${with_diffutils+set}" = set; then
+ withval="$with_diffutils"
with_diffutils=$withval
else
with_diffutils=no
@@ -421,6 +553,11 @@ else
fi
+# Amiga hack - for now force --with-diffutils, since that is
+# currently true. The tests for diff3 seem to fail for some
+# currently unknown reason. -fnf
+with_diffutils=yes
+
case $with_diffutils in
yes)
: ${DIFF='$(bindir)/diff'}
@@ -445,7 +582,7 @@ else
rcs_cv_prog_diff=$DIFF
case $rcs_cv_prog_diff in
'')
- for i in diff /usr/lib/rdiff rdiff
+ for i in diff /ade/lib/rdiff rdiff
do
sh -c "exec $i -n conftest0 conftest1" >conftestout 2>/dev/null
case $? in
@@ -626,8 +763,8 @@ case $DIFF_L in
esac
# Set DIFF3 to the name of the diff3 program.
-# In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
-diff3PATH=$PATH:/usr/libexec
+# In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /ade/libexec.
+diff3PATH=$PATH:/ade/libexec
echo $ac_n "checking diff3 -m""... $ac_c" 1>&6
if eval "test \"`echo '$''{'rcs_cv_prog_diff3_bin'+set}'`\" = set"; then
@@ -702,7 +839,7 @@ else
$DIFF conftest0 conftest1 >conftest01
$DIFF /dev/null conftest1 >conftestn1
- for i in /usr/*lib*/*diff3*; do
+ for i in /ade/*lib*/*diff3*; do
sh -c "exec $i -E conftest01 conftestn1 conftest0 /dev/null conftest1" >conftestout 2>/dev/null
# The exit status is arbitrary! Test the output a bit.
if
@@ -771,7 +908,7 @@ fi
ac_save_path=$PATH
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+PATH=/ade/lib:/ade/bin:/bin:$PATH
for ac_prog in sendmail mail mailx
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -867,7 +1004,6 @@ else
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
@@ -877,6 +1013,55 @@ else
echo "$ac_t""no" 1>&6
fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
@@ -887,12 +1072,13 @@ else
yes;
#endif
EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
fi
fi
+
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
@@ -910,11 +1096,12 @@ fi
rm -f conftest*
fi
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+
+echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
+ CFLAGS="-g -O2"
else
- CFLAGS="-O"
+ CFLAGS="-O2"
fi
fi
else
@@ -948,6 +1135,7 @@ ac_configure=$ac_aux_dir/configure # Thi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /c/install
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
@@ -960,7 +1148,7 @@ else
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ /|./|.//|/etc/*|/c/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall installbsd scoinst install; do
@@ -980,10 +1168,17 @@ else
esac
done
IFS="$ac_save_ifs"
- # As a last resort, use the slow shell script.
- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
+
fi
- INSTALL="$ac_cv_path_install"
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL="$ac_cv_path_install"
+ else
+ # As a last resort, use the slow shell script. We don't cache a
+ # path for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the path is relative.
+ INSTALL="$ac_install_sh"
+ fi
fi
echo "$ac_t""$INSTALL" 1>&6
@@ -1073,7 +1268,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
s%\[%\\&%g
s%\]%\\&%g
@@ -1087,7 +1282,9 @@ rm -f conftest.defs
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
@@ -1108,7 +1305,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.4"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -1120,10 +1317,12 @@ ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile man/Makefile src/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
s%@CFLAGS@%$CFLAGS%g
@@ -1135,6 +1334,21 @@ s%@LIBS@%$LIBS%g
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
+s%@mandir@%$mandir%g
s%@DIFF@%$DIFF%g
s%@DIFF_SUCCESS@%$DIFF_SUCCESS%g
s%@DIFF_FAILURE@%$DIFF_FAILURE%g
@@ -1216,6 +1430,7 @@ rm -f conftest.subs
exit 0
EOF
chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/rcs/configure.in amiga/fsf/rcs/configure.in
--- baseline/fsf/rcs/configure.in Thu Jun 15 23:19:24 1995
+++ amiga/fsf/rcs/configure.in Sat Sep 28 00:00:00 1996
@@ -21,6 +21,11 @@ AC_ARG_WITH(diffutils,
[with_diffutils=no]
)
+# Amiga hack - for now force --with-diffutils, since that is
+# currently true. The tests for diff3 seem to fail for some
+# currently unknown reason. -fnf
+with_diffutils=yes
+
case $with_diffutils in
yes)
: ${DIFF='$(bindir)/diff'}
@@ -42,7 +47,7 @@ AC_CACHE_VAL(rcs_cv_prog_diff, [
rcs_cv_prog_diff=$DIFF
case $rcs_cv_prog_diff in
'')
- for i in diff /usr/lib/rdiff rdiff
+ for i in diff /ade/lib/rdiff rdiff
do
sh -c "exec $i -n conftest0 conftest1" >conftestout 2>/dev/null
case $? in
@@ -166,8 +171,8 @@ case $DIFF_L in
esac
# Set DIFF3 to the name of the diff3 program.
-# In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /usr/libexec.
-diff3PATH=$PATH:/usr/libexec
+# In some systems (e.g. BSD/OS 2.0), diffutils diff3 lives in /ade/libexec.
+diff3PATH=$PATH:/ade/libexec
AC_SUBST(DIFF3)
AC_MSG_CHECKING([diff3 -m])
AC_CACHE_VAL(rcs_cv_prog_diff3_bin, [
@@ -206,7 +211,7 @@ case $rcs_cv_prog_diff3_bin in
AC_CACHE_VAL(rcs_cv_path_diff3_lib, [
$DIFF conftest0 conftest1 >conftest01
$DIFF /dev/null conftest1 >conftestn1
- for i in /usr/*lib*/*diff3*; do
+ for i in /ade/*lib*/*diff3*; do
sh -c "exec $i -E conftest01 conftestn1 conftest0 /dev/null conftest1" >conftestout 2>/dev/null
# The exit status is arbitrary! Test the output a bit.
if
@@ -243,7 +248,7 @@ rm -f conftest*
AC_PATH_PROG(ED, ed, ed)
ac_save_path=$PATH
-PATH=/usr/lib:/usr/bin:/bin:/usr/sbin:/sbin:$PATH
+PATH=/ade/lib:/ade/bin:/bin:$PATH
AC_PATH_PROGS(SENDMAIL, sendmail mail mailx)
PATH=$ac_save_path
case $SENDMAIL in
diff -rup --new-file baseline/fsf/rcs/manifests/bin amiga/fsf/rcs/manifests/bin
--- baseline/fsf/rcs/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/rcs/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,22 @@
+COPYING
+COPYING.info
+bin/ci
+bin/co
+bin/ident
+bin/merge
+bin/rcs
+bin/rcsclean
+bin/rcsdiff
+bin/rcsmerge
+bin/rlog
+man/man1/ci.1
+man/man1/co.1
+man/man1/ident.1
+man/man1/merge.1
+man/man1/rcs.1
+man/man1/rcsclean.1
+man/man1/rcsdiff.1
+man/man1/rcsintro.1
+man/man1/rcsmerge.1
+man/man1/rlog.1
+man/man5/rcsfile.5
diff -rup --new-file baseline/fsf/rcs/manifests/src amiga/fsf/rcs/manifests/src
--- baseline/fsf/rcs/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/rcs/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,70 @@
+fsf/rcs/COPYING
+fsf/rcs/CREDITS
+fsf/rcs/ChangeLog
+fsf/rcs/INSTALL
+fsf/rcs/INSTALL.RCS
+fsf/rcs/Makefile.in
+fsf/rcs/NEWS
+fsf/rcs/Product-Info
+fsf/rcs/README
+fsf/rcs/REFS
+fsf/rcs/configure
+fsf/rcs/configure.in
+fsf/rcs/install-sh
+fsf/rcs/man/COPYING
+fsf/rcs/man/ChangeLog
+fsf/rcs/man/Makefile.in
+fsf/rcs/man/ci.1
+fsf/rcs/man/co.1
+fsf/rcs/man/ident.1
+fsf/rcs/man/merge.1
+fsf/rcs/man/rcs.1
+fsf/rcs/man/rcsclean.1
+fsf/rcs/man/rcsdiff.1
+fsf/rcs/man/rcsfile.5
+fsf/rcs/man/rcsfile.5in
+fsf/rcs/man/rcsfreeze.1
+fsf/rcs/man/rcsintro.1
+fsf/rcs/man/rcsmerge.1
+fsf/rcs/man/rlog.1
+fsf/rcs/manifests/bin
+fsf/rcs/manifests/src
+fsf/rcs/mkinstalldirs
+fsf/rcs/rcs.ms
+fsf/rcs/rcs_func.ms
+fsf/rcs/src/COPYING
+fsf/rcs/src/ChangeLog
+fsf/rcs/src/Makefile.in
+fsf/rcs/src/TAGS
+fsf/rcs/src/ci.c
+fsf/rcs/src/co.c
+fsf/rcs/src/conf.heg
+fsf/rcs/src/conf.sh
+fsf/rcs/src/ident.c
+fsf/rcs/src/maketime.c
+fsf/rcs/src/maketime.h
+fsf/rcs/src/merge.c
+fsf/rcs/src/merger.c
+fsf/rcs/src/partime.c
+fsf/rcs/src/partime.h
+fsf/rcs/src/rcs.c
+fsf/rcs/src/rcsbase.h
+fsf/rcs/src/rcsclean.c
+fsf/rcs/src/rcsdiff.c
+fsf/rcs/src/rcsedit.c
+fsf/rcs/src/rcsfcmp.c
+fsf/rcs/src/rcsfnms.c
+fsf/rcs/src/rcsfreeze.sh
+fsf/rcs/src/rcsgen.c
+fsf/rcs/src/rcskeep.c
+fsf/rcs/src/rcskeys.c
+fsf/rcs/src/rcslex.c
+fsf/rcs/src/rcsmap.c
+fsf/rcs/src/rcsmerge.c
+fsf/rcs/src/rcsrev.c
+fsf/rcs/src/rcssyn.c
+fsf/rcs/src/rcstest
+fsf/rcs/src/rcstime.c
+fsf/rcs/src/rcsutil.c
+fsf/rcs/src/rlog.c
+fsf/rcs/src/version.c
diff -rup --new-file baseline/fsf/rcs/src/conf.sh amiga/fsf/rcs/src/conf.sh
--- baseline/fsf/rcs/src/conf.sh Thu Jun 15 23:19:24 1995
+++ amiga/fsf/rcs/src/conf.sh Sat Sep 28 00:00:00 1996
@@ -32,9 +32,9 @@ Id='$Id: conf.sh,v 5.25 1995/06/16 06:19
# and can be inspected for clues otherwise.
# The Makefile overrides the following defaults.
-: ${RCSPREFIX=/usr/local/bin/}
-: ${ALL_CFLAGS=-Dhas_conf_h}
-: ${CC=cc}
+: ${RCSPREFIX=/ade/bin/}
+: ${ALL_CFLAGS=-Dhas_conf_h -I. -I/gnu-src/src/rcs-5.7/src -O2}
+: ${CC=gcc}
: ${COMPAT2=0}
: ${DIFF=${RCSPREFIX}diff}
: ${DIFF3=${DIFF}3}
@@ -43,7 +43,7 @@ Id='$Id: conf.sh,v 5.25 1995/06/16 06:19
: ${DIFF_L=1}
: ${DIFF_SUCCESS=0} ${DIFF_FAILURE=1} ${DIFF_TROUBLE=2}
: ${ED=/bin/ed}
-: ${SENDMAIL='"/usr/lib/sendmail"'}
+: ${SENDMAIL=''}
# : ${LDFLAGS=} ${LIBS=} tickles old shell bug
C="$CC $ALL_CFLAGS"
@@ -78,8 +78,9 @@ rm -f a.d &&
date >a.d &&
chmod 0 a.d &&
{ test -w a.d || cp /dev/null a.d 2>/dev/null; } && {
- echo >&3 "$n$0: This command should not be run with superuser permissions."
- exit 1
+ # AmigaOS effectively always runs as superuser.
+ #echo >&3 "$n$0: This command should not be run with superuser permissions."
+ #exit 1
}
echo >&3 OK
rm -f a.d || exit
@@ -293,7 +294,7 @@ echo >&3 $ok
echo "#define has_sys_param_h $h /* Does #include <sys/param.h> work? */"
# We must do errno next, because has_readlink needs it.
-/* <errno.h> */
+#-huh? /* <errno.h> */
$ech >&3 "$0: configuring errno $dots"
cat >a.c <<EOF
#include "$A_H"
@@ -331,7 +332,8 @@ main() {
EOF
$PREPARE_CC a.sym* || exit
readlink_isreg_errno='?'
-if (ln -s a.sym1 a.sym2 && $CL a.c $L) >&2 && readlink_isreg_errno=`$aout`
+# fnf: run $aout first to make sure readlink_isreg_errno won't end up empty.
+if (ln -s a.sym1 a.sym2 && $CL a.c $L) >&2 && $aout >/dev/null && readlink_isreg_errno=`$aout`
then h=1
else h=0
fi
@@ -1335,7 +1337,10 @@ main() {
EOF
for declare_fread in 1 0
do
- for fread_type in ssize_t size_t int unsigned
+ # Amiga local - reorder below tests to work around pdksh bug
+ # where success will only happen if the first combination
+ # tested is the right one. -fnf
+ for fread_type in size_t ssize_t int unsigned
do
for freadarg_type in size_t ssize_t unsigned int
do
@@ -1690,7 +1695,8 @@ case $h in
($CL a.c $L && $aout) >&2 && h=1 ok=OK
echo >&3 $ok
esac
-echo "#define has_fork $h /* Does fork() work? */"
+# Amiga Hack - has vfork, but not fork.
+echo "#define has_fork 0 /* Does fork() work? */"
$PREPARE_CC || exit
$ech >&3 "$0: configuring has_waitpid $dots"
if ($CL -DTRY_VFORK=$has_vfork -DTRY_WAITPID=1 a.c $L && $aout) >&2
diff -rup --new-file baseline/fsf/rcs/src/rcsutil.c amiga/fsf/rcs/src/rcsutil.c
--- baseline/fsf/rcs/src/rcsutil.c Thu Jun 15 23:19:24 1995
+++ amiga/fsf/rcs/src/rcsutil.c Sat Sep 28 00:00:00 1996
@@ -947,6 +947,12 @@ redirect(old, new)
#else /* !has_fork && !has_spawn */
+#ifdef AMIGA
+#define QUOTECHAR '\"'
+#else
+#define QUOTECHAR '\''
+#endif
+
static void bufargcat P((struct buf*,int,char const*));
static void
bufargcat(b, c, s)
@@ -960,24 +966,26 @@ bufargcat(b, c, s)
size_t bl, sl;
for (t=s, sl=0; *t; )
- sl += 3*(*t++=='\'') + 1;
+ sl += 3*(*t++==QUOTECHAR) + 1;
bl = strlen(b->string);
bufrealloc(b, bl + sl + 4);
p = b->string + bl;
*p++ = c;
- *p++ = '\'';
+ *p++ = QUOTECHAR;
while (*s) {
- if (*s == '\'') {
- *p++ = '\'';
+ if (*s == QUOTECHAR) {
+ *p++ = QUOTECHAR;
*p++ = '\\';
- *p++ = '\'';
+ *p++ = QUOTECHAR;
}
*p++ = *s++;
}
- *p++ = '\'';
+ *p++ = QUOTECHAR;
*p = 0;
}
+#undef QUOTECHAR
+
#endif
#if !has_spawn && has_fork
@@ -1134,7 +1142,7 @@ runv(infd, outname, args)
# endif
#else
static struct buf b;
- char const *p;
+ char const **p;
/* Use system(). On many hosts system() discards signals. Yuck! */
p = args + 1;
@@ -1143,11 +1151,14 @@ runv(infd, outname, args)
bufargcat(&b, ' ', *p);
if (infd != -1 && infd != STDIN_FILENO) {
char redirection[32];
- VOID sprintf(redirection, "<&%d", infd);
+ VOID sprintf(redirection, " <&%d", infd);
bufscat(&b, redirection);
}
if (outname)
+ {
+ bufscat(&b, " ");
bufargcat(&b, '>', outname);
+ }
wstatus = system(b.string);
#endif
#endif