diff options
author | phk <phk@FreeBSD.org> | 1997-08-01 13:16:40 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1997-08-01 13:16:40 +0000 |
commit | 2a200c9684e54dae084d85b919f1d04efa2b4bbd (patch) | |
tree | efad4376454dc590951e051d2ffb172e3ea7d134 | |
parent | 0825d024f6c302e5867b7dc3fc13669d8c6bce86 (diff) | |
download | FreeBSD-src-2a200c9684e54dae084d85b919f1d04efa2b4bbd.zip FreeBSD-src-2a200c9684e54dae084d85b919f1d04efa2b4bbd.tar.gz |
Move tcl packages to libdata/pkg
-rw-r--r-- | etc/mtree/BSD.local.dist | 6 | ||||
-rw-r--r-- | etc/mtree/BSD.usr.dist | 4 | ||||
-rw-r--r-- | lib/libtcl/Makefile | 4 | ||||
-rw-r--r-- | lib/libtcl/tclConfig.sh | 2 | ||||
-rw-r--r-- | tools/tools/tcl_bmake/mkMakefile.sh | 9 |
5 files changed, 13 insertions, 12 deletions
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist index 7e53640..254e601 100644 --- a/etc/mtree/BSD.local.dist +++ b/etc/mtree/BSD.local.dist @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.28 1997/06/10 07:55:10 asami Exp $ +# $Id: BSD.local.dist,v 1.29 1997/07/25 20:36:54 phk Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -14,7 +14,9 @@ info .. lib - tclpkg + .. + libdata + tcl .. .. libexec diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 13a1799..14a7f95 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.92 1997/07/19 15:21:45 jfieber Exp $ +# $Id: BSD.usr.dist,v 1.93 1997/07/25 20:36:54 phk Exp $ # /set type=dir uname=bin gname=bin mode=0755 @@ -16,8 +16,6 @@ lib compat .. - tclpkg - .. .. libdata gcc diff --git a/lib/libtcl/Makefile b/lib/libtcl/Makefile index 4e13513..ee69e2d 100644 --- a/lib/libtcl/Makefile +++ b/lib/libtcl/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 1997/02/22 15:08:06 peter Exp $ +# $Id: Makefile,v 1.19 1997/07/25 19:51:44 phk Exp $ # # This file is generated automatically, do not edit it here! # @@ -31,7 +31,7 @@ LINKS+= ${LIBDIR}/lib${LIB}.a ${LIBDIR}/lib${LIB}${SHLIB_MAJOR}.a CFLAGS+= -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_SHLIB_EXT=\".so\" CFLAGS+= -DTCL_LIBRARY=\"${TCL_LIBRARY}\" -CFLAGS+= -DTCL_PACKAGE_PATH=\"/usr/lib/tclpkg\ /usr/local/lib/tclpkg\" +CFLAGS+= -DTCL_PACKAGE_PATH=\"/usr/libdata/tcl\ /usr/local/libdata/tcl\" LDADD+= -lm DPADD+= ${LIBM} diff --git a/lib/libtcl/tclConfig.sh b/lib/libtcl/tclConfig.sh index 8a0689b..0b51380 100644 --- a/lib/libtcl/tclConfig.sh +++ b/lib/libtcl/tclConfig.sh @@ -110,4 +110,4 @@ TCL_SRC_DIR='/usr/src/contrib/tcl' # 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='/usr/local/lib/tclpkg' +TCL_PACKAGE_PATH='/usr/local/libdata/tcl' diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh index ed841f8..22b44c8 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.20 1997/02/22 14:08:38 peter Exp $ +# $Id: mkMakefile.sh,v 1.21 1997/07/25 19:50:23 phk Exp $ # # This script generates a bmake Makefile for src/lib/libtcl # @@ -20,7 +20,7 @@ mkdir -p ${LIBTCL} ( cd ${SRCDIR}/unix ; -sed 's;TCL_PACKAGE_PATH="${prefix}/lib";TCL_PACKAGE_PATH="/usr/local/lib/tclpkg";' configure > __configure +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 @@ -50,7 +50,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.20 1997/02/22 14:08:38 peter Exp $ +# $Id: mkMakefile.sh,v 1.21 1997/07/25 19:50:23 phk Exp $ # ' | tr -d '$' >> ${LIBTCL}Makefile @@ -92,7 +92,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/lib/tclpkg\\ /usr/local/lib/tclpkg\\\"" >> ${LIBTCL}Makefile +echo "CFLAGS+= -DTCL_PACKAGE_PATH=\\\"/usr/libdata/tcl\\ /usr/local/libdata/tcl\\\"" >> ${LIBTCL}Makefile echo ' LDADD+= -lm @@ -217,6 +217,7 @@ 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 |