Fix shell escaping so that "tclConfig.sh" actually works.

2 files changed, 156 insertions, 1 deletions

diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 25d90dd96f5..d96d20afda2 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/04/01 13:36:56 agc Exp $
+# $NetBSD: Makefile,v 1.21 1999/04/03 14:26:01 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp
 #
 
@@ -16,6 +16,7 @@ GNU_CONFIGURE=		yes
 # Use disable-shared, so that libtool works with the generated Makefile
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--disable-shared
+SH=			${PREFIX}/bash
 
 test:
 	cd ${WRKSRC} && ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
diff --git a/lang/tcl80/patches/patch-ae b/lang/tcl80/patches/patch-ae
new file mode 100644
index 00000000000..a78ebcfcc97
--- /dev/null
+++ b/lang/tcl80/patches/patch-ae
@@ -0,0 +1,154 @@
+$NetBSD: patch-ae,v 1.1 1999/04/03 14:26:01 tron Exp $
+
+--- tclConfig.sh.in.orig	Tue Mar  9 07:51:26 1999
++++ tclConfig.sh.in	Sat Apr  3 16:13:26 1999
+@@ -12,109 +12,109 @@
+ # RCS: @(#) $Id: patch-ae,v 1.1 1999/04/03 14:26:01 tron Exp $
+ 
+ # Tcl's version number.
+-TCL_VERSION='@TCL_VERSION@'
+-TCL_MAJOR_VERSION='@TCL_MAJOR_VERSION@'
+-TCL_MINOR_VERSION='@TCL_MINOR_VERSION@'
+-TCL_PATCH_LEVEL='@TCL_PATCH_LEVEL@'
++TCL_VERSION="@TCL_VERSION@"
++TCL_MAJOR_VERSION="@TCL_MAJOR_VERSION@"
++TCL_MINOR_VERSION="@TCL_MINOR_VERSION@"
++TCL_PATCH_LEVEL="@TCL_PATCH_LEVEL@"
+ 
+ # C compiler to use for compilation.
+-TCL_CC='@CC@'
++TCL_CC="@CC@"
+ 
+ # -D flags for use with the C compiler.
+-TCL_DEFS='@DEFS@'
++TCL_DEFS="@DEFS@"
+ 
+ # If TCL was built with debugging symbols, generated libraries contain
+ # this string at the end of the library name (before the extension).
+ TCL_DBGX=@TCL_DBGX@
+ 
+ # Default flags used in an optimized and debuggable build, respectively.
+-TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
+-TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
++TCL_CFLAGS_DEBUG="@CFLAGS_DEBUG@"
++TCL_CFLAGS_OPTIMIZE="@CFLAGS_OPTIMIZE@"
+ 
+ # Flag, 1: we built a shared lib, 0 we didn't
+ TCL_SHARED_BUILD=@TCL_SHARED_BUILD@
+ 
+ # The name of the Tcl library (may be either a .a file or a shared library):
+-TCL_LIB_FILE='@TCL_LIB_FILE@'
++TCL_LIB_FILE="@TCL_LIB_FILE@"
+ 
+ # Additional libraries to use when linking Tcl.
+-TCL_LIBS='@DL_LIBS@ @LIBS@ @MATH_LIBS@'
++TCL_LIBS="@DL_LIBS@ @LIBS@ @MATH_LIBS@"
+ 
+ # Top-level directory in which Tcl's platform-independent files are
+ # installed.
+-TCL_PREFIX='@prefix@'
++TCL_PREFIX="@prefix@"
+ 
+ # Top-level directory in which Tcl's platform-specific files (e.g.
+ # executables) are installed.
+-TCL_EXEC_PREFIX='@exec_prefix@'
++TCL_EXEC_PREFIX="@exec_prefix@"
+ 
+ # Flags to pass to cc when compiling the components of a shared library:
+-TCL_SHLIB_CFLAGS='@SHLIB_CFLAGS@'
++TCL_SHLIB_CFLAGS="@SHLIB_CFLAGS@"
+ 
+ # Extra flags to pass to cc:
+-TCL_EXTRA_CFLAGS='@EXTRA_CFLAGS@'
++TCL_EXTRA_CFLAGS="@EXTRA_CFLAGS@"
+ 
+ # Base command to use for combining object files into a shared library:
+-TCL_SHLIB_LD='@SHLIB_LD@'
++TCL_SHLIB_LD="@SHLIB_LD@"
+ 
+ # Either '$LIBS' (if dependent libraries should be included when linking
+ # shared libraries) or an empty string.  See Tcl's configure.in for more
+ # explanation.
+-TCL_SHLIB_LD_LIBS='@SHLIB_LD_LIBS@'
++TCL_SHLIB_LD_LIBS="@SHLIB_LD_LIBS@"
+ 
+ # Suffix to use for the name of a shared library.
+-TCL_SHLIB_SUFFIX='@SHLIB_SUFFIX@'
++TCL_SHLIB_SUFFIX="@SHLIB_SUFFIX@"
+ 
+ # Library file(s) to include in tclsh and other base applications
+ # in order to provide facilities needed by DLOBJ above.
+-TCL_DL_LIBS='@DL_LIBS@'
++TCL_DL_LIBS="@DL_LIBS@"
+ 
+ # Flags to pass to the compiler when linking object files into
+ # an executable tclsh or tcltest binary.
+-TCL_LD_FLAGS='@LD_FLAGS@'
++TCL_LD_FLAGS="@LD_FLAGS@"
+ 
+ # Flags to pass to ld, such as "-R /usr/local/tcl/lib", that tell the
+ # run-time dynamic linker where to look for shared libraries such as
+ # libtcl.so.  Used when linking applications.  Only works if there
+ # is a variable "LIB_RUNTIME_DIR" defined in the Makefile.
+-TCL_LD_SEARCH_FLAGS='@TCL_LD_SEARCH_FLAGS@'
++TCL_LD_SEARCH_FLAGS="@TCL_LD_SEARCH_FLAGS@"
+ 
+ # Additional object files linked with Tcl to provide compatibility
+ # with standard facilities from ANSI C or POSIX.
+-TCL_COMPAT_OBJS='@LIBOBJS@'
++TCL_COMPAT_OBJS="@LIBOBJS@"
+ 
+ # Name of the ranlib program to use.
+-TCL_RANLIB='@RANLIB@'
++TCL_RANLIB="@RANLIB@"
+ 
+ # -l flag to pass to the linker to pick up the Tcl library
+-TCL_LIB_FLAG='@TCL_LIB_FLAG@'
++TCL_LIB_FLAG="@TCL_LIB_FLAG@"
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # build directory.
+-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
++TCL_BUILD_LIB_SPEC="@TCL_BUILD_LIB_SPEC@"
+ 
+ # String to pass to linker to pick up the Tcl library from its
+ # installed directory.
+-TCL_LIB_SPEC='@TCL_LIB_SPEC@'
++TCL_LIB_SPEC="@TCL_LIB_SPEC@"
+ 
+ # Indicates whether a version numbers should be used in -l switches
+ # ("ok" means it's safe to use switches like -ltcl7.5;  "nodots" means
+ # use switches like -ltcl75).  SunOS and FreeBSD require "nodots", for
+ # example.
+-TCL_LIB_VERSIONS_OK='@TCL_LIB_VERSIONS_OK@'
++TCL_LIB_VERSIONS_OK="@TCL_LIB_VERSIONS_OK@"
+ 
+ # String that can be evaluated to generate the part of a shared library
+ # name that comes after the "libxxx" (includes version number, if any,
+ # extension, and anything else needed).  May depend on the variables
+ # VERSION and SHLIB_SUFFIX.  On most UNIX systems this is
+ # ${VERSION}${SHLIB_SUFFIX}.
+-TCL_SHARED_LIB_SUFFIX='@CFG_TCL_SHARED_LIB_SUFFIX@'
++TCL_SHARED_LIB_SUFFIX="@CFG_TCL_SHARED_LIB_SUFFIX@"
+ 
+ # String that can be evaluated to generate the part of an unshared library
+ # name that comes after the "libxxx" (includes version number, if any,
+ # extension, and anything else needed).  May depend on the variable
+ # VERSION.  On most UNIX systems this is ${VERSION}.a.
+-TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@'
++TCL_UNSHARED_LIB_SUFFIX="@CFG_TCL_UNSHARED_LIB_SUFFIX@"
+ 
+ # Location of the top-level source directory from which Tcl was built.
+ # This is the directory that contains a README file as well as
+@@ -122,9 +122,9 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tcl was
+ # compiled.
+-TCL_SRC_DIR='@TCL_SRC_DIR@'
++TCL_SRC_DIR="@TCL_SRC_DIR@"
+ 
+ # List of standard directories in which to look for packages during
+ # "package require" commands.  Contains the "prefix" directory plus also
+ # the "exec_prefix" directory, if it is different.
+-TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@'
++TCL_PACKAGE_PATH="@TCL_PACKAGE_PATH@"