From 7d2ed5186e936eddf8bb1d614b91a98d2dfdfa84 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 12 Aug 1997 18:30:34 +0000
Subject: Remove the original tweaks to make tcl75 work with the ports system
 before we make the same mistake with tcl8.0.  This _should_ no longer
 conflict with a not-yet-imported tcl8.0 port and should allow the system and
 ports versions to be updated independently of each other (and tk) without the
 sky falling.

---
 tools/tools/tcl_bmake/mkMakefile.sh | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index 22b44c8..6700eab 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkMakefile.sh,v 1.21 1997/07/25 19:50:23 phk Exp $
+# $Id: mkMakefile.sh,v 1.22 1997/08/01 13:16:34 phk Exp $
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -18,12 +18,7 @@ LIBTCL=../../../lib/libtcl/
 
 mkdir -p ${LIBTCL}
 
-(
-cd ${SRCDIR}/unix ; 
-sed 's;TCL_PACKAGE_PATH="${prefix}/lib";TCL_PACKAGE_PATH="/usr/local/libdata/tcl";' configure > __configure
-sh __configure --enable-shared --prefix=/usr
-rm -f __configure
-) || true
+(cd ${SRCDIR}/unix ; sh configure --enable-shared --prefix=/usr) || true
 
 echo "include ${SRCDIR}/unix/Makefile" > m.x
 echo '
@@ -50,7 +45,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $Id: mkMakefile.sh,v 1.21 1997/07/25 19:50:23 phk Exp $
+# $Id: mkMakefile.sh,v 1.22 1997/08/01 13:16:34 phk Exp $
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
@@ -79,12 +74,6 @@ echo "SHLIB_MINOR=	${SHLIB_MINOR}"     >> ${LIBTCL}Makefile
 # Set the name of the library
 echo '
 LIB=    tcl
-
-.if !defined(NOPIC)
-LINKS+=	${SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-	${SHLIBDIR}/lib${LIB}${SHLIB_MAJOR}.so.1.${SHLIB_MINOR}
-.endif
-LINKS+=	${LIBDIR}/lib${LIB}.a ${LIBDIR}/lib${LIB}${SHLIB_MAJOR}.a
 ' >> ${LIBTCL}Makefile
 
 # some needed CFLAGS
@@ -92,7 +81,7 @@ echo "CFLAGS+=" `make -f m.x bar` >> ${LIBTCL}Makefile
 
 # some more needed CFLAGS
 echo "CFLAGS+=	-DTCL_LIBRARY=\\\"\${TCL_LIBRARY}\\\"" >> ${LIBTCL}Makefile
-echo "CFLAGS+=	-DTCL_PACKAGE_PATH=\\\"/usr/libdata/tcl\\ /usr/local/libdata/tcl\\\"" >> ${LIBTCL}Makefile
+echo "CFLAGS+=	-DTCL_PACKAGE_PATH=\\\"/usr/libdata/tcl\\\"" >> ${LIBTCL}Makefile
 
 echo '
 LDADD+= -lm
@@ -126,8 +115,6 @@ beforeinstall:
 		${TCLDIST}/unix/tclAppInit.c ${DESTDIR}${TCL_LIBRARY}
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${TCLDIST}/doc/man.macros ${DESTDIR}/usr/share/tmac/tcl.macros
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.CURDIR}/tclConfig.sh ${DESTDIR}${TCL_LIBRARY}
 .for m in ${HEADERS}
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${TCLDIST}/$m \
 		${DESTDIR}/usr/include/tcl/$m
@@ -214,10 +201,6 @@ CLEANFILES+= ${_tcltmp}
 .include <bsd.lib.mk>
 EOF
 
-sed < ${SRCDIR}/unix/tclConfig.sh > ${LIBTCL}/tclConfig.sh \
-	-e '/^TCL.*_LIB_SPEC=/s/-L.* //' \
-	-e "/libtcl/s/\.so\.1\.0/.so.1.${SHLIB_MINOR}/" \
-	-e "/^TCL_SRC_DIR/s/.*/TCL_SRC_DIR='\/usr\/src\/contrib\/tcl'/" \
-	-e "/RANLIB/s/:/ranlib/"
-
-rm -f m.x ${SRCDIR}/unix/config.log ${SRCDIR}/unix/Makefile ${SRCDIR}/unix/config.cache ${SRCDIR}/unix/config.status ${SRCDIR}/unix/tclConfig.sh
+rm -f m.x ${SRCDIR}/unix/config.log ${SRCDIR}/unix/Makefile \
+	${SRCDIR}/unix/config.cache ${SRCDIR}/unix/config.status \
+	${SRCDIR}/unix/tclConfig.sh
-- 
cgit v1.1