diff options
32 files changed, 1607 insertions, 1566 deletions
diff --git a/lang/Makefile b/lang/Makefile index bc8595324d80..54b9bd5f99cf 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -91,6 +91,7 @@ SUBDIR += tcl80 SUBDIR += tcl81 SUBDIR += tcl81-thread + SUBDIR += tcl82 SUBDIR += tclX75 SUBDIR += tclX80 SUBDIR += tclplugin diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile index 9c8bf656b4ab..ee4d27fbc1d5 100644 --- a/lang/tcl82/Makefile +++ b/lang/tcl82/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: tcl8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tcl8.2.0 +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tcl8.1.1 -PKGNAME= tcl-8.1.1 -CATEGORIES= lang tcl81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tcl8.2.0 +PKGNAME= tcl-8.2.0 +CATEGORIES= lang tcl82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org @@ -23,22 +23,25 @@ CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +PLIST_SUB= TCL_VER=8.2 SHORT_TCL_VER=82 + MAN1= tclsh.1 MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ - CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ - CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ - CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ - DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ - ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ - GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ - LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 OpenFileChnl.3 \ - OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \ - RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 SetRecLmt.3 SetResult.3 \ - SetVar.3 Sleep.3 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \ - StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 TclInitStubs.3 Thread.3 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 + ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \ + CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \ + CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \ + DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \ + Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \ + GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \ + Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \ + OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \ + PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \ + SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \ + StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \ + TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \ + Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ @@ -48,10 +51,10 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ - read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ - safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ - switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ - uplevel.n upvar.n variable.n vwait.n while.n + re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \ + return.n safe.n scan.n seek.n set.n socket.n source.n split.n \ + string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \ + unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks MLINKS= Access.3 Tcl_Access.3 \ @@ -362,11 +365,9 @@ MLINKS= Access.3 Tcl_Access.3 \ pkgMkIndex.n pkg_mkIndex.n \ safe.n Safe\Base.n -MANCOMPRESSED= yes - .include <bsd.port.pre.mk> -post-extract: +post-extract: ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: diff --git a/lang/tcl82/distinfo b/lang/tcl82/distinfo index 8dad15681844..6550a1b09da9 100644 --- a/lang/tcl82/distinfo +++ b/lang/tcl82/distinfo @@ -1 +1 @@ -MD5 (tcl8.1.1.tar.gz) = fd85414ffca58be880a40f1e699653b2 +MD5 (tcl8.2.0.tar.gz) = acaa5113663ed3fc10b8ae5baf9e904d diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa index b158373c4290..05f24146fb78 100644 --- a/lang/tcl82/files/patch-aa +++ b/lang/tcl82/files/patch-aa @@ -1,26 +1,35 @@ ---- Makefile.in.orig Fri Apr 30 08:23:33 1999 -+++ Makefile.in Tue May 11 01:48:45 1999 -@@ -55,7 +55,9 @@ - BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin +--- Makefile.in.orig Fri Aug 13 18:02:47 1999 ++++ Makefile.in Sun Sep 5 10:44:32 1999 +@@ -48,7 +48,9 @@ + SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/unix +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) ++GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic ++UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -86,7 +88,7 @@ + MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man +@@ -65,7 +67,7 @@ + MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann + + # Directory in which to install the include file tcl.h: +-INCLUDE_INSTALL_DIR = @includedir@ ++#INCLUDE_INSTALL_DIR = @includedir@ + + # Package search path. + TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ +@@ -85,7 +87,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ +CFLAGS? = @CFLAGS@ - # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -161,7 +163,7 @@ + # on the following lines: +@@ -159,7 +161,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,53 +38,45 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -391,15 +393,21 @@ +@@ -386,7 +388,7 @@ + + all: binaries libraries doc - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) +-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh ++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh --all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh -+all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh + libraries: - # The following target is configured by autoconf to generate either - # a shared library or non-shared library for Tcl. +@@ -397,8 +399,14 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ -+ ln -sf ${TCL_LIB_FILE} libtcl81.so ++ ln -sf ${TCL_LIB_FILE} libtcl82.so $(RANLIB) ${TCL_LIB_FILE} -+libtcl81.a: ${OBJS} -+ rm -f libtcl81.a -+ ar cr libtcl81.a ${OBJS} -+ $(RANLIB) libtcl81.a ++libtcl82.a: ${OBJS} ++ rm -f libtcl82.a ++ ar cr libtcl82.a ${OBJS} ++ $(RANLIB) libtcl82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -499,7 +507,7 @@ - # possible (e.g. if installing as root). - - install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -- tclsh -+ libtcl81.a tclsh - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -511,8 +519,13 @@ - done; +@@ -504,8 +512,13 @@ @echo "Installing $(TCL_LIB_FILE)" + chmod +x $(SRC_DIR)/install-sh @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl81.so ++ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @echo "Installing libtcl81.a" -+ @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a ++ @echo "Installing libtcl82.a" ++ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE)"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -521,7 +534,8 @@ +@@ -514,7 +527,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" @@ -85,7 +86,7 @@ @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ echo "Installing $(TCL_STUB_LIB_FILE)"; \ $(INSTALL_DATA) $(STUB_LIB_FILE) \ -@@ -529,8 +543,8 @@ +@@ -522,8 +536,8 @@ fi install-libraries: @@ -96,10 +97,10 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -548,11 +562,16 @@ - else true; \ +@@ -542,11 +556,20 @@ fi; \ done; + chmod +x $(SRC_DIR)/install-sh - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ @@ -108,48 +109,44 @@ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h -+ @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" -+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) ++ @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -584,30 +603,35 @@ +@@ -579,21 +602,19 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN1_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -602,7 +623,14 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) + @echo "**********" diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab index 551b0c24760a..d3d9bb55b69f 100644 --- a/lang/tcl82/files/patch-ab +++ b/lang/tcl82/files/patch-ab @@ -1,59 +1,98 @@ ---- configure.orig Fri Apr 30 08:23:33 1999 -+++ configure Tue May 11 01:25:32 1999 -@@ -4384,7 +4384,7 @@ - LD_FLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-12.*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | tr './\055' '___'` +--- configure.orig Fri Aug 13 18:02:47 1999 ++++ configure Sat Sep 4 13:15:50 1999 +@@ -4648,7 +4648,7 @@ + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ++ TCL_TRIM_DOTS=82 + ECHO_VERSION='`echo ${VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +@@ -4892,7 +4892,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -4413,14 +4413,19 @@ +@@ -4922,16 +4922,21 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LD_FLAGS="" - LD_SEARCH_FLAGS="" -- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - +- + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ echo "SHARED_LIB_SUFFIX JSEGER" ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else echo "$ac_t""no" 1>&6 -@@ -4443,17 +4448,6 @@ - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LD_FLAGS="" -- LD_SEARCH_FLAGS="" -- ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" - SHLIB_LD="cc -nostdlib -r" -@@ -5100,6 +5094,7 @@ - # stub support. - #-------------------------------------------------------------------- - # Replace ${VERSION} with contents of ${TCL_VERSION} -+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 - eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" - # Replace DBGX with TCL_DBGX - eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" +@@ -4954,17 +4959,6 @@ + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- FreeBSD-*) +- # FreeBSD 3.* and greater have ELF. +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" +- SHLIB_LD_LIBS="" +- SHLIB_SUFFIX=".so" +- DL_OBJS="tclLoadDl.o" +- DL_LIBS="" +- LDFLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5371,7 +5365,7 @@ + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + fi + if test "$UNSHARED_LIB_SUFFIX" = "" ; then +- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + fi + + +@@ -5628,11 +5622,7 @@ + # up the Tcl library. + + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then +- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" +- else +- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +- fi ++ TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}" + TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" + else +@@ -5678,11 +5668,7 @@ + + TCL_STUB_LIB_FILE=${STUB_LIB_FILE} + +-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" +-else +- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +-fi ++TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}" + + TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" + TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}" diff --git a/lang/tcl82/pkg-plist b/lang/tcl82/pkg-plist index 8eb81b29bd43..4280ebbf81a5 100644 --- a/lang/tcl82/pkg-plist +++ b/lang/tcl82/pkg-plist @@ -1,123 +1,127 @@ -bin/tclsh8.1 -include/tcl8.1/generic/regcustom.h -include/tcl8.1/generic/regerrs.h -include/tcl8.1/generic/regex.h -include/tcl8.1/generic/regguts.h -include/tcl8.1/generic/tcl.h -include/tcl8.1/generic/tclCompile.h -include/tcl8.1/generic/tclDecls.h -include/tcl8.1/generic/tclInitScript.h -include/tcl8.1/generic/tclInt.h -include/tcl8.1/generic/tclIntDecls.h -include/tcl8.1/generic/tclIntPlatDecls.h -include/tcl8.1/generic/tclMath.h -include/tcl8.1/generic/tclPlatDecls.h -include/tcl8.1/generic/tclPort.h -include/tcl8.1/generic/tclRegexp.h -include/tcl8.1/tcl.h -include/tcl8.1/tclDecls.h -include/tcl8.1/unix/tclUnixPort.h -lib/libtcl81.a -lib/libtcl81.so -lib/libtcl81.so.1 -lib/libtclstub81.a +bin/tclsh%%TCL_VER%% +include/tcl%%TCL_VER%%/generic/regcustom.h +include/tcl%%TCL_VER%%/generic/regerrs.h +include/tcl%%TCL_VER%%/generic/regex.h +include/tcl%%TCL_VER%%/generic/regguts.h +include/tcl%%TCL_VER%%/generic/tcl.h +include/tcl%%TCL_VER%%/generic/tclCompile.h +include/tcl%%TCL_VER%%/generic/tclDecls.h +include/tcl%%TCL_VER%%/generic/tclInitScript.h +include/tcl%%TCL_VER%%/generic/tclInt.h +include/tcl%%TCL_VER%%/generic/tclIntDecls.h +include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclMath.h +include/tcl%%TCL_VER%%/generic/tclPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclPort.h +include/tcl%%TCL_VER%%/generic/tclRegexp.h +include/tcl%%TCL_VER%%/tcl.h +include/tcl%%TCL_VER%%/tclDecls.h +include/tcl%%TCL_VER%%/unix/tclUnixPort.h +include/tcl%%TCL_VER%%/unix/tclUnixThrd.h +lib/libtcl%%SHORT_TCL_VER%%.a +lib/libtcl%%SHORT_TCL_VER%%.so +lib/libtcl%%SHORT_TCL_VER%%.so.1 +lib/libtclstub%%SHORT_TCL_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tcl8.1/auto.tcl -lib/tcl8.1/encoding/ascii.enc -lib/tcl8.1/encoding/big5.enc -lib/tcl8.1/encoding/cp1250.enc -lib/tcl8.1/encoding/cp1251.enc -lib/tcl8.1/encoding/cp1252.enc -lib/tcl8.1/encoding/cp1253.enc -lib/tcl8.1/encoding/cp1254.enc -lib/tcl8.1/encoding/cp1255.enc -lib/tcl8.1/encoding/cp1256.enc -lib/tcl8.1/encoding/cp1257.enc -lib/tcl8.1/encoding/cp1258.enc -lib/tcl8.1/encoding/cp437.enc -lib/tcl8.1/encoding/cp737.enc -lib/tcl8.1/encoding/cp775.enc -lib/tcl8.1/encoding/cp850.enc -lib/tcl8.1/encoding/cp852.enc -lib/tcl8.1/encoding/cp855.enc -lib/tcl8.1/encoding/cp857.enc -lib/tcl8.1/encoding/cp860.enc -lib/tcl8.1/encoding/cp861.enc -lib/tcl8.1/encoding/cp862.enc -lib/tcl8.1/encoding/cp863.enc -lib/tcl8.1/encoding/cp864.enc -lib/tcl8.1/encoding/cp865.enc -lib/tcl8.1/encoding/cp866.enc -lib/tcl8.1/encoding/cp869.enc -lib/tcl8.1/encoding/cp874.enc -lib/tcl8.1/encoding/cp932.enc -lib/tcl8.1/encoding/cp936.enc -lib/tcl8.1/encoding/cp949.enc -lib/tcl8.1/encoding/cp950.enc -lib/tcl8.1/encoding/dingbats.enc -lib/tcl8.1/encoding/euc-cn.enc -lib/tcl8.1/encoding/euc-jp.enc -lib/tcl8.1/encoding/euc-kr.enc -lib/tcl8.1/encoding/gb12345.enc -lib/tcl8.1/encoding/gb1988.enc -lib/tcl8.1/encoding/gb2312.enc -lib/tcl8.1/encoding/iso2022-jp.enc -lib/tcl8.1/encoding/iso2022-kr.enc -lib/tcl8.1/encoding/iso2022.enc -lib/tcl8.1/encoding/iso8859-1.enc -lib/tcl8.1/encoding/iso8859-2.enc -lib/tcl8.1/encoding/iso8859-3.enc -lib/tcl8.1/encoding/iso8859-4.enc -lib/tcl8.1/encoding/iso8859-5.enc -lib/tcl8.1/encoding/iso8859-6.enc -lib/tcl8.1/encoding/iso8859-7.enc -lib/tcl8.1/encoding/iso8859-8.enc -lib/tcl8.1/encoding/iso8859-9.enc -lib/tcl8.1/encoding/jis0201.enc -lib/tcl8.1/encoding/jis0208.enc -lib/tcl8.1/encoding/jis0212.enc -lib/tcl8.1/encoding/koi8-r.enc -lib/tcl8.1/encoding/ksc5601.enc -lib/tcl8.1/encoding/macCentEuro.enc -lib/tcl8.1/encoding/macCroatian.enc -lib/tcl8.1/encoding/macCyrillic.enc -lib/tcl8.1/encoding/macDingbats.enc -lib/tcl8.1/encoding/macGreek.enc -lib/tcl8.1/encoding/macIceland.enc -lib/tcl8.1/encoding/macJapan.enc -lib/tcl8.1/encoding/macRoman.enc -lib/tcl8.1/encoding/macRomania.enc -lib/tcl8.1/encoding/macThai.enc -lib/tcl8.1/encoding/macTurkish.enc -lib/tcl8.1/encoding/macUkraine.enc -lib/tcl8.1/encoding/shiftjis.enc -lib/tcl8.1/encoding/symbol.enc -lib/tcl8.1/history.tcl -lib/tcl8.1/http1.0/http.tcl -lib/tcl8.1/http1.0/pkgIndex.tcl -lib/tcl8.1/http2.0/http.tcl -lib/tcl8.1/http2.0/pkgIndex.tcl -lib/tcl8.1/init.tcl -lib/tcl8.1/ldAix -lib/tcl8.1/ldAout.tcl -lib/tcl8.1/msgcat1.0/msgcat.tcl -lib/tcl8.1/msgcat1.0/pkgIndex.tcl -lib/tcl8.1/opt0.4/optparse.tcl -lib/tcl8.1/opt0.4/pkgIndex.tcl -lib/tcl8.1/package.tcl -lib/tcl8.1/parray.tcl -lib/tcl8.1/safe.tcl -lib/tcl8.1/tclAppInit.c -lib/tcl8.1/tclConfig.sh -lib/tcl8.1/tclIndex -lib/tcl8.1/word.tcl -@dirrm lib/tcl8.1/opt0.4 -@dirrm lib/tcl8.1/msgcat1.0 -@dirrm lib/tcl8.1/http2.0 -@dirrm lib/tcl8.1/http1.0 -@dirrm lib/tcl8.1/encoding -@dirrm lib/tcl8.1 -@dirrm include/tcl8.1/unix -@dirrm include/tcl8.1/generic -@dirrm include/tcl8.1 +lib/tcl%%TCL_VER%%/auto.tcl +lib/tcl%%TCL_VER%%/encoding/ascii.enc +lib/tcl%%TCL_VER%%/encoding/big5.enc +lib/tcl%%TCL_VER%%/encoding/cp1250.enc +lib/tcl%%TCL_VER%%/encoding/cp1251.enc +lib/tcl%%TCL_VER%%/encoding/cp1252.enc +lib/tcl%%TCL_VER%%/encoding/cp1253.enc +lib/tcl%%TCL_VER%%/encoding/cp1254.enc +lib/tcl%%TCL_VER%%/encoding/cp1255.enc +lib/tcl%%TCL_VER%%/encoding/cp1256.enc +lib/tcl%%TCL_VER%%/encoding/cp1257.enc +lib/tcl%%TCL_VER%%/encoding/cp1258.enc +lib/tcl%%TCL_VER%%/encoding/cp437.enc +lib/tcl%%TCL_VER%%/encoding/cp737.enc +lib/tcl%%TCL_VER%%/encoding/cp775.enc +lib/tcl%%TCL_VER%%/encoding/cp850.enc +lib/tcl%%TCL_VER%%/encoding/cp852.enc +lib/tcl%%TCL_VER%%/encoding/cp855.enc +lib/tcl%%TCL_VER%%/encoding/cp857.enc +lib/tcl%%TCL_VER%%/encoding/cp860.enc +lib/tcl%%TCL_VER%%/encoding/cp861.enc +lib/tcl%%TCL_VER%%/encoding/cp862.enc +lib/tcl%%TCL_VER%%/encoding/cp863.enc +lib/tcl%%TCL_VER%%/encoding/cp864.enc +lib/tcl%%TCL_VER%%/encoding/cp865.enc +lib/tcl%%TCL_VER%%/encoding/cp866.enc +lib/tcl%%TCL_VER%%/encoding/cp869.enc +lib/tcl%%TCL_VER%%/encoding/cp874.enc +lib/tcl%%TCL_VER%%/encoding/cp932.enc +lib/tcl%%TCL_VER%%/encoding/cp936.enc +lib/tcl%%TCL_VER%%/encoding/cp949.enc +lib/tcl%%TCL_VER%%/encoding/cp950.enc +lib/tcl%%TCL_VER%%/encoding/dingbats.enc +lib/tcl%%TCL_VER%%/encoding/euc-cn.enc +lib/tcl%%TCL_VER%%/encoding/euc-jp.enc +lib/tcl%%TCL_VER%%/encoding/euc-kr.enc +lib/tcl%%TCL_VER%%/encoding/gb12345.enc +lib/tcl%%TCL_VER%%/encoding/gb1988.enc +lib/tcl%%TCL_VER%%/encoding/gb2312.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc +lib/tcl%%TCL_VER%%/encoding/iso2022.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-5.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc +lib/tcl%%TCL_VER%%/encoding/jis0201.enc +lib/tcl%%TCL_VER%%/encoding/jis0208.enc +lib/tcl%%TCL_VER%%/encoding/jis0212.enc +lib/tcl%%TCL_VER%%/encoding/koi8-r.enc +lib/tcl%%TCL_VER%%/encoding/ksc5601.enc +lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc +lib/tcl%%TCL_VER%%/encoding/macCroatian.enc +lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc +lib/tcl%%TCL_VER%%/encoding/macDingbats.enc +lib/tcl%%TCL_VER%%/encoding/macGreek.enc +lib/tcl%%TCL_VER%%/encoding/macIceland.enc +lib/tcl%%TCL_VER%%/encoding/macJapan.enc +lib/tcl%%TCL_VER%%/encoding/macRoman.enc +lib/tcl%%TCL_VER%%/encoding/macRomania.enc +lib/tcl%%TCL_VER%%/encoding/macThai.enc +lib/tcl%%TCL_VER%%/encoding/macTurkish.enc +lib/tcl%%TCL_VER%%/encoding/macUkraine.enc +lib/tcl%%TCL_VER%%/encoding/shiftjis.enc +lib/tcl%%TCL_VER%%/encoding/symbol.enc +lib/tcl%%TCL_VER%%/history.tcl +lib/tcl%%TCL_VER%%/http1.0/http.tcl +lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/http2.1/http.tcl +lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl +lib/tcl%%TCL_VER%%/init.tcl +lib/tcl%%TCL_VER%%/ldAix +lib/tcl%%TCL_VER%%/ldAout.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl +lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl +lib/tcl%%TCL_VER%%/package.tcl +lib/tcl%%TCL_VER%%/parray.tcl +lib/tcl%%TCL_VER%%/safe.tcl +lib/tcl%%TCL_VER%%/tclAppInit.c +lib/tcl%%TCL_VER%%/tclConfig.sh +lib/tcl%%TCL_VER%%/tclIndex +lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl +lib/tcl%%TCL_VER%%/word.tcl +@dirrm lib/tcl%%TCL_VER%%/tcltest1.0 +@dirrm lib/tcl%%TCL_VER%%/opt0.4 +@dirrm lib/tcl%%TCL_VER%%/msgcat1.0 +@dirrm lib/tcl%%TCL_VER%%/http2.1 +@dirrm lib/tcl%%TCL_VER%%/http1.0 +@dirrm lib/tcl%%TCL_VER%%/encoding +@dirrm lib/tcl%%TCL_VER%% +@dirrm include/tcl%%TCL_VER%%/unix +@dirrm include/tcl%%TCL_VER%%/generic +@dirrm include/tcl%%TCL_VER%% diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile index 9c8bf656b4ab..ee4d27fbc1d5 100644 --- a/lang/tcl83/Makefile +++ b/lang/tcl83/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: tcl8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tcl8.2.0 +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tcl8.1.1 -PKGNAME= tcl-8.1.1 -CATEGORIES= lang tcl81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tcl8.2.0 +PKGNAME= tcl-8.2.0 +CATEGORIES= lang tcl82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org @@ -23,22 +23,25 @@ CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +PLIST_SUB= TCL_VER=8.2 SHORT_TCL_VER=82 + MAN1= tclsh.1 MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ - CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ - CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ - CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ - DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ - ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ - GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ - LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 OpenFileChnl.3 \ - OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \ - RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 SetRecLmt.3 SetResult.3 \ - SetVar.3 Sleep.3 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \ - StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 TclInitStubs.3 Thread.3 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 + ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \ + CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \ + CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \ + DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \ + Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \ + GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \ + Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \ + OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \ + PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \ + SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \ + StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \ + TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \ + Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ @@ -48,10 +51,10 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ - read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ - safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ - switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ - uplevel.n upvar.n variable.n vwait.n while.n + re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \ + return.n safe.n scan.n seek.n set.n socket.n source.n split.n \ + string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \ + unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks MLINKS= Access.3 Tcl_Access.3 \ @@ -362,11 +365,9 @@ MLINKS= Access.3 Tcl_Access.3 \ pkgMkIndex.n pkg_mkIndex.n \ safe.n Safe\Base.n -MANCOMPRESSED= yes - .include <bsd.port.pre.mk> -post-extract: +post-extract: ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo index 8dad15681844..6550a1b09da9 100644 --- a/lang/tcl83/distinfo +++ b/lang/tcl83/distinfo @@ -1 +1 @@ -MD5 (tcl8.1.1.tar.gz) = fd85414ffca58be880a40f1e699653b2 +MD5 (tcl8.2.0.tar.gz) = acaa5113663ed3fc10b8ae5baf9e904d diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa index b158373c4290..05f24146fb78 100644 --- a/lang/tcl83/files/patch-aa +++ b/lang/tcl83/files/patch-aa @@ -1,26 +1,35 @@ ---- Makefile.in.orig Fri Apr 30 08:23:33 1999 -+++ Makefile.in Tue May 11 01:48:45 1999 -@@ -55,7 +55,9 @@ - BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin +--- Makefile.in.orig Fri Aug 13 18:02:47 1999 ++++ Makefile.in Sun Sep 5 10:44:32 1999 +@@ -48,7 +48,9 @@ + SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/unix +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) ++GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic ++UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -86,7 +88,7 @@ + MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man +@@ -65,7 +67,7 @@ + MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann + + # Directory in which to install the include file tcl.h: +-INCLUDE_INSTALL_DIR = @includedir@ ++#INCLUDE_INSTALL_DIR = @includedir@ + + # Package search path. + TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ +@@ -85,7 +87,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ +CFLAGS? = @CFLAGS@ - # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -161,7 +163,7 @@ + # on the following lines: +@@ -159,7 +161,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,53 +38,45 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -391,15 +393,21 @@ +@@ -386,7 +388,7 @@ + + all: binaries libraries doc - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) +-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh ++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh --all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh -+all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh + libraries: - # The following target is configured by autoconf to generate either - # a shared library or non-shared library for Tcl. +@@ -397,8 +399,14 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ -+ ln -sf ${TCL_LIB_FILE} libtcl81.so ++ ln -sf ${TCL_LIB_FILE} libtcl82.so $(RANLIB) ${TCL_LIB_FILE} -+libtcl81.a: ${OBJS} -+ rm -f libtcl81.a -+ ar cr libtcl81.a ${OBJS} -+ $(RANLIB) libtcl81.a ++libtcl82.a: ${OBJS} ++ rm -f libtcl82.a ++ ar cr libtcl82.a ${OBJS} ++ $(RANLIB) libtcl82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -499,7 +507,7 @@ - # possible (e.g. if installing as root). - - install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -- tclsh -+ libtcl81.a tclsh - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -511,8 +519,13 @@ - done; +@@ -504,8 +512,13 @@ @echo "Installing $(TCL_LIB_FILE)" + chmod +x $(SRC_DIR)/install-sh @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl81.so ++ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @echo "Installing libtcl81.a" -+ @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a ++ @echo "Installing libtcl82.a" ++ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE)"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -521,7 +534,8 @@ +@@ -514,7 +527,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" @@ -85,7 +86,7 @@ @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ echo "Installing $(TCL_STUB_LIB_FILE)"; \ $(INSTALL_DATA) $(STUB_LIB_FILE) \ -@@ -529,8 +543,8 @@ +@@ -522,8 +536,8 @@ fi install-libraries: @@ -96,10 +97,10 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -548,11 +562,16 @@ - else true; \ +@@ -542,11 +556,20 @@ fi; \ done; + chmod +x $(SRC_DIR)/install-sh - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ @@ -108,48 +109,44 @@ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h -+ @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" -+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) ++ @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -584,30 +603,35 @@ +@@ -579,21 +602,19 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN1_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -602,7 +623,14 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) + @echo "**********" diff --git a/lang/tcl83/files/patch-ab b/lang/tcl83/files/patch-ab index 551b0c24760a..d3d9bb55b69f 100644 --- a/lang/tcl83/files/patch-ab +++ b/lang/tcl83/files/patch-ab @@ -1,59 +1,98 @@ ---- configure.orig Fri Apr 30 08:23:33 1999 -+++ configure Tue May 11 01:25:32 1999 -@@ -4384,7 +4384,7 @@ - LD_FLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-12.*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | tr './\055' '___'` +--- configure.orig Fri Aug 13 18:02:47 1999 ++++ configure Sat Sep 4 13:15:50 1999 +@@ -4648,7 +4648,7 @@ + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ++ TCL_TRIM_DOTS=82 + ECHO_VERSION='`echo ${VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +@@ -4892,7 +4892,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -4413,14 +4413,19 @@ +@@ -4922,16 +4922,21 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LD_FLAGS="" - LD_SEARCH_FLAGS="" -- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - +- + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ echo "SHARED_LIB_SUFFIX JSEGER" ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else echo "$ac_t""no" 1>&6 -@@ -4443,17 +4448,6 @@ - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LD_FLAGS="" -- LD_SEARCH_FLAGS="" -- ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" - SHLIB_LD="cc -nostdlib -r" -@@ -5100,6 +5094,7 @@ - # stub support. - #-------------------------------------------------------------------- - # Replace ${VERSION} with contents of ${TCL_VERSION} -+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 - eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" - # Replace DBGX with TCL_DBGX - eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" +@@ -4954,17 +4959,6 @@ + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- FreeBSD-*) +- # FreeBSD 3.* and greater have ELF. +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" +- SHLIB_LD_LIBS="" +- SHLIB_SUFFIX=".so" +- DL_OBJS="tclLoadDl.o" +- DL_LIBS="" +- LDFLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5371,7 +5365,7 @@ + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + fi + if test "$UNSHARED_LIB_SUFFIX" = "" ; then +- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + fi + + +@@ -5628,11 +5622,7 @@ + # up the Tcl library. + + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then +- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" +- else +- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +- fi ++ TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}" + TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" + else +@@ -5678,11 +5668,7 @@ + + TCL_STUB_LIB_FILE=${STUB_LIB_FILE} + +-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" +-else +- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +-fi ++TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}" + + TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" + TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}" diff --git a/lang/tcl83/pkg-plist b/lang/tcl83/pkg-plist index 8eb81b29bd43..4280ebbf81a5 100644 --- a/lang/tcl83/pkg-plist +++ b/lang/tcl83/pkg-plist @@ -1,123 +1,127 @@ -bin/tclsh8.1 -include/tcl8.1/generic/regcustom.h -include/tcl8.1/generic/regerrs.h -include/tcl8.1/generic/regex.h -include/tcl8.1/generic/regguts.h -include/tcl8.1/generic/tcl.h -include/tcl8.1/generic/tclCompile.h -include/tcl8.1/generic/tclDecls.h -include/tcl8.1/generic/tclInitScript.h -include/tcl8.1/generic/tclInt.h -include/tcl8.1/generic/tclIntDecls.h -include/tcl8.1/generic/tclIntPlatDecls.h -include/tcl8.1/generic/tclMath.h -include/tcl8.1/generic/tclPlatDecls.h -include/tcl8.1/generic/tclPort.h -include/tcl8.1/generic/tclRegexp.h -include/tcl8.1/tcl.h -include/tcl8.1/tclDecls.h -include/tcl8.1/unix/tclUnixPort.h -lib/libtcl81.a -lib/libtcl81.so -lib/libtcl81.so.1 -lib/libtclstub81.a +bin/tclsh%%TCL_VER%% +include/tcl%%TCL_VER%%/generic/regcustom.h +include/tcl%%TCL_VER%%/generic/regerrs.h +include/tcl%%TCL_VER%%/generic/regex.h +include/tcl%%TCL_VER%%/generic/regguts.h +include/tcl%%TCL_VER%%/generic/tcl.h +include/tcl%%TCL_VER%%/generic/tclCompile.h +include/tcl%%TCL_VER%%/generic/tclDecls.h +include/tcl%%TCL_VER%%/generic/tclInitScript.h +include/tcl%%TCL_VER%%/generic/tclInt.h +include/tcl%%TCL_VER%%/generic/tclIntDecls.h +include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclMath.h +include/tcl%%TCL_VER%%/generic/tclPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclPort.h +include/tcl%%TCL_VER%%/generic/tclRegexp.h +include/tcl%%TCL_VER%%/tcl.h +include/tcl%%TCL_VER%%/tclDecls.h +include/tcl%%TCL_VER%%/unix/tclUnixPort.h +include/tcl%%TCL_VER%%/unix/tclUnixThrd.h +lib/libtcl%%SHORT_TCL_VER%%.a +lib/libtcl%%SHORT_TCL_VER%%.so +lib/libtcl%%SHORT_TCL_VER%%.so.1 +lib/libtclstub%%SHORT_TCL_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tcl8.1/auto.tcl -lib/tcl8.1/encoding/ascii.enc -lib/tcl8.1/encoding/big5.enc -lib/tcl8.1/encoding/cp1250.enc -lib/tcl8.1/encoding/cp1251.enc -lib/tcl8.1/encoding/cp1252.enc -lib/tcl8.1/encoding/cp1253.enc -lib/tcl8.1/encoding/cp1254.enc -lib/tcl8.1/encoding/cp1255.enc -lib/tcl8.1/encoding/cp1256.enc -lib/tcl8.1/encoding/cp1257.enc -lib/tcl8.1/encoding/cp1258.enc -lib/tcl8.1/encoding/cp437.enc -lib/tcl8.1/encoding/cp737.enc -lib/tcl8.1/encoding/cp775.enc -lib/tcl8.1/encoding/cp850.enc -lib/tcl8.1/encoding/cp852.enc -lib/tcl8.1/encoding/cp855.enc -lib/tcl8.1/encoding/cp857.enc -lib/tcl8.1/encoding/cp860.enc -lib/tcl8.1/encoding/cp861.enc -lib/tcl8.1/encoding/cp862.enc -lib/tcl8.1/encoding/cp863.enc -lib/tcl8.1/encoding/cp864.enc -lib/tcl8.1/encoding/cp865.enc -lib/tcl8.1/encoding/cp866.enc -lib/tcl8.1/encoding/cp869.enc -lib/tcl8.1/encoding/cp874.enc -lib/tcl8.1/encoding/cp932.enc -lib/tcl8.1/encoding/cp936.enc -lib/tcl8.1/encoding/cp949.enc -lib/tcl8.1/encoding/cp950.enc -lib/tcl8.1/encoding/dingbats.enc -lib/tcl8.1/encoding/euc-cn.enc -lib/tcl8.1/encoding/euc-jp.enc -lib/tcl8.1/encoding/euc-kr.enc -lib/tcl8.1/encoding/gb12345.enc -lib/tcl8.1/encoding/gb1988.enc -lib/tcl8.1/encoding/gb2312.enc -lib/tcl8.1/encoding/iso2022-jp.enc -lib/tcl8.1/encoding/iso2022-kr.enc -lib/tcl8.1/encoding/iso2022.enc -lib/tcl8.1/encoding/iso8859-1.enc -lib/tcl8.1/encoding/iso8859-2.enc -lib/tcl8.1/encoding/iso8859-3.enc -lib/tcl8.1/encoding/iso8859-4.enc -lib/tcl8.1/encoding/iso8859-5.enc -lib/tcl8.1/encoding/iso8859-6.enc -lib/tcl8.1/encoding/iso8859-7.enc -lib/tcl8.1/encoding/iso8859-8.enc -lib/tcl8.1/encoding/iso8859-9.enc -lib/tcl8.1/encoding/jis0201.enc -lib/tcl8.1/encoding/jis0208.enc -lib/tcl8.1/encoding/jis0212.enc -lib/tcl8.1/encoding/koi8-r.enc -lib/tcl8.1/encoding/ksc5601.enc -lib/tcl8.1/encoding/macCentEuro.enc -lib/tcl8.1/encoding/macCroatian.enc -lib/tcl8.1/encoding/macCyrillic.enc -lib/tcl8.1/encoding/macDingbats.enc -lib/tcl8.1/encoding/macGreek.enc -lib/tcl8.1/encoding/macIceland.enc -lib/tcl8.1/encoding/macJapan.enc -lib/tcl8.1/encoding/macRoman.enc -lib/tcl8.1/encoding/macRomania.enc -lib/tcl8.1/encoding/macThai.enc -lib/tcl8.1/encoding/macTurkish.enc -lib/tcl8.1/encoding/macUkraine.enc -lib/tcl8.1/encoding/shiftjis.enc -lib/tcl8.1/encoding/symbol.enc -lib/tcl8.1/history.tcl -lib/tcl8.1/http1.0/http.tcl -lib/tcl8.1/http1.0/pkgIndex.tcl -lib/tcl8.1/http2.0/http.tcl -lib/tcl8.1/http2.0/pkgIndex.tcl -lib/tcl8.1/init.tcl -lib/tcl8.1/ldAix -lib/tcl8.1/ldAout.tcl -lib/tcl8.1/msgcat1.0/msgcat.tcl -lib/tcl8.1/msgcat1.0/pkgIndex.tcl -lib/tcl8.1/opt0.4/optparse.tcl -lib/tcl8.1/opt0.4/pkgIndex.tcl -lib/tcl8.1/package.tcl -lib/tcl8.1/parray.tcl -lib/tcl8.1/safe.tcl -lib/tcl8.1/tclAppInit.c -lib/tcl8.1/tclConfig.sh -lib/tcl8.1/tclIndex -lib/tcl8.1/word.tcl -@dirrm lib/tcl8.1/opt0.4 -@dirrm lib/tcl8.1/msgcat1.0 -@dirrm lib/tcl8.1/http2.0 -@dirrm lib/tcl8.1/http1.0 -@dirrm lib/tcl8.1/encoding -@dirrm lib/tcl8.1 -@dirrm include/tcl8.1/unix -@dirrm include/tcl8.1/generic -@dirrm include/tcl8.1 +lib/tcl%%TCL_VER%%/auto.tcl +lib/tcl%%TCL_VER%%/encoding/ascii.enc +lib/tcl%%TCL_VER%%/encoding/big5.enc +lib/tcl%%TCL_VER%%/encoding/cp1250.enc +lib/tcl%%TCL_VER%%/encoding/cp1251.enc +lib/tcl%%TCL_VER%%/encoding/cp1252.enc +lib/tcl%%TCL_VER%%/encoding/cp1253.enc +lib/tcl%%TCL_VER%%/encoding/cp1254.enc +lib/tcl%%TCL_VER%%/encoding/cp1255.enc +lib/tcl%%TCL_VER%%/encoding/cp1256.enc +lib/tcl%%TCL_VER%%/encoding/cp1257.enc +lib/tcl%%TCL_VER%%/encoding/cp1258.enc +lib/tcl%%TCL_VER%%/encoding/cp437.enc +lib/tcl%%TCL_VER%%/encoding/cp737.enc +lib/tcl%%TCL_VER%%/encoding/cp775.enc +lib/tcl%%TCL_VER%%/encoding/cp850.enc +lib/tcl%%TCL_VER%%/encoding/cp852.enc +lib/tcl%%TCL_VER%%/encoding/cp855.enc +lib/tcl%%TCL_VER%%/encoding/cp857.enc +lib/tcl%%TCL_VER%%/encoding/cp860.enc +lib/tcl%%TCL_VER%%/encoding/cp861.enc +lib/tcl%%TCL_VER%%/encoding/cp862.enc +lib/tcl%%TCL_VER%%/encoding/cp863.enc +lib/tcl%%TCL_VER%%/encoding/cp864.enc +lib/tcl%%TCL_VER%%/encoding/cp865.enc +lib/tcl%%TCL_VER%%/encoding/cp866.enc +lib/tcl%%TCL_VER%%/encoding/cp869.enc +lib/tcl%%TCL_VER%%/encoding/cp874.enc +lib/tcl%%TCL_VER%%/encoding/cp932.enc +lib/tcl%%TCL_VER%%/encoding/cp936.enc +lib/tcl%%TCL_VER%%/encoding/cp949.enc +lib/tcl%%TCL_VER%%/encoding/cp950.enc +lib/tcl%%TCL_VER%%/encoding/dingbats.enc +lib/tcl%%TCL_VER%%/encoding/euc-cn.enc +lib/tcl%%TCL_VER%%/encoding/euc-jp.enc +lib/tcl%%TCL_VER%%/encoding/euc-kr.enc +lib/tcl%%TCL_VER%%/encoding/gb12345.enc +lib/tcl%%TCL_VER%%/encoding/gb1988.enc +lib/tcl%%TCL_VER%%/encoding/gb2312.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc +lib/tcl%%TCL_VER%%/encoding/iso2022.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-5.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc +lib/tcl%%TCL_VER%%/encoding/jis0201.enc +lib/tcl%%TCL_VER%%/encoding/jis0208.enc +lib/tcl%%TCL_VER%%/encoding/jis0212.enc +lib/tcl%%TCL_VER%%/encoding/koi8-r.enc +lib/tcl%%TCL_VER%%/encoding/ksc5601.enc +lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc +lib/tcl%%TCL_VER%%/encoding/macCroatian.enc +lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc +lib/tcl%%TCL_VER%%/encoding/macDingbats.enc +lib/tcl%%TCL_VER%%/encoding/macGreek.enc +lib/tcl%%TCL_VER%%/encoding/macIceland.enc +lib/tcl%%TCL_VER%%/encoding/macJapan.enc +lib/tcl%%TCL_VER%%/encoding/macRoman.enc +lib/tcl%%TCL_VER%%/encoding/macRomania.enc +lib/tcl%%TCL_VER%%/encoding/macThai.enc +lib/tcl%%TCL_VER%%/encoding/macTurkish.enc +lib/tcl%%TCL_VER%%/encoding/macUkraine.enc +lib/tcl%%TCL_VER%%/encoding/shiftjis.enc +lib/tcl%%TCL_VER%%/encoding/symbol.enc +lib/tcl%%TCL_VER%%/history.tcl +lib/tcl%%TCL_VER%%/http1.0/http.tcl +lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/http2.1/http.tcl +lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl +lib/tcl%%TCL_VER%%/init.tcl +lib/tcl%%TCL_VER%%/ldAix +lib/tcl%%TCL_VER%%/ldAout.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl +lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl +lib/tcl%%TCL_VER%%/package.tcl +lib/tcl%%TCL_VER%%/parray.tcl +lib/tcl%%TCL_VER%%/safe.tcl +lib/tcl%%TCL_VER%%/tclAppInit.c +lib/tcl%%TCL_VER%%/tclConfig.sh +lib/tcl%%TCL_VER%%/tclIndex +lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl +lib/tcl%%TCL_VER%%/word.tcl +@dirrm lib/tcl%%TCL_VER%%/tcltest1.0 +@dirrm lib/tcl%%TCL_VER%%/opt0.4 +@dirrm lib/tcl%%TCL_VER%%/msgcat1.0 +@dirrm lib/tcl%%TCL_VER%%/http2.1 +@dirrm lib/tcl%%TCL_VER%%/http1.0 +@dirrm lib/tcl%%TCL_VER%%/encoding +@dirrm lib/tcl%%TCL_VER%% +@dirrm include/tcl%%TCL_VER%%/unix +@dirrm include/tcl%%TCL_VER%%/generic +@dirrm include/tcl%%TCL_VER%% diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index 9c8bf656b4ab..ee4d27fbc1d5 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: tcl8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tcl8.2.0 +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tcl8.1.1 -PKGNAME= tcl-8.1.1 -CATEGORIES= lang tcl81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tcl8.2.0 +PKGNAME= tcl-8.2.0 +CATEGORIES= lang tcl82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org @@ -23,22 +23,25 @@ CONFIGURE_ARGS= --enable-shared CONFIGURE_ENV= PORTSDIR=${PORTSDIR} PKGINSTALL= ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh +PLIST_SUB= TCL_VER=8.2 SHORT_TCL_VER=82 + MAN1= tclsh.1 MAN3= Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \ Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \ - CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 CrtCloseHdlr.3 \ - CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 CrtObjCmd.3 \ - CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 DetachPids.3 \ - DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 Exit.3 \ - ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 GetInt.3 \ - GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 Interp.3 \ - LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 OpenFileChnl.3 \ - OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 PrintDbl.3 RecEvalObj.3 \ - RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 SetRecLmt.3 SetResult.3 \ - SetVar.3 Sleep.3 SplitList.3 SplitPath.3 StaticPkg.3 StrMatch.3 \ - StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 TclInitStubs.3 Thread.3 \ - ToUpper.3 TraceVar.3 Translate.3 UpVar.3 Utf.3 WrongNumArgs.3 + ChnlStack.3 CmdCmplt.3 Concat.3 CrtChannel.3 CrtChnlHdlr.3 \ + CrtCloseHdlr.3 CrtCommand.3 CrtFileHdlr.3 CrtInterp.3 CrtMathFnc.3 \ + CrtObjCmd.3 CrtSlave.3 CrtTimerHdlr.3 CrtTrace.3 DString.3 \ + DetachPids.3 DoOneEvent.3 DoWhenIdle.3 DoubleObj.3 Encoding.3 Eval.3 \ + Exit.3 ExprLong.3 ExprLongObj.3 FindExec.3 GetCwd.3 GetIndex.3 \ + GetInt.3 GetOpnFl.3 GetStdChan.3 GetVersion.3 Hash.3 IntObj.3 \ + Interp.3 LinkVar.3 ListObj.3 Notifier.3 Object.3 ObjectType.3 \ + OpenFileChnl.3 OpenTcp.3 ParseCmd.3 PkgRequire.3 Preserve.3 \ + PrintDbl.3 RecEvalObj.3 RecordEval.3 RegExp.3 SaveResult.3 SetErrno.3 \ + SetRecLmt.3 SetResult.3 SetVar.3 Sleep.3 SplitList.3 SplitPath.3 \ + StaticPkg.3 StrMatch.3 StringObj.3 Tcl_InitStubs.3 Tcl_Main.3 \ + TclInitStubs.3 Thread.3 ToUpper.3 TraceVar.3 Translate.3 UpVar.3 \ + Utf.3 WrongNumArgs.3 MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ catch.n cd.n clock.n close.n concat.n continue.n dde.n encoding.n \ @@ -48,10 +51,10 @@ MANN= Tcl.n after.n append.n array.n bgerror.n binary.n break.n case.n \ interp.n join.n lappend.n library.n lindex.n linsert.n list.n \ llength.n load.n lrange.n lreplace.n lsearch.n lsort.n msgcat.n \ namespace.n open.n package.n pid.n pkgMkIndex.n proc.n puts.n pwd.n \ - read.n regexp.n registry.n regsub.n rename.n resource.n return.n \ - safe.n scan.n seek.n set.n socket.n source.n split.n string.n subst.n \ - switch.n tclvars.n tell.n time.n trace.n unknown.n unset.n update.n \ - uplevel.n upvar.n variable.n vwait.n while.n + re_syntax.n read.n regexp.n registry.n regsub.n rename.n resource.n \ + return.n safe.n scan.n seek.n set.n socket.n source.n split.n \ + string.n subst.n switch.n tcltest.n tclvars.n tell.n time.n trace.n \ + unknown.n unset.n update.n uplevel.n upvar.n variable.n vwait.n while.n # MLINKS generated via awk '/ln/ {print "\t" $2,$3,"\\"}' unix/mkLinks MLINKS= Access.3 Tcl_Access.3 \ @@ -362,11 +365,9 @@ MLINKS= Access.3 Tcl_Access.3 \ pkgMkIndex.n pkg_mkIndex.n \ safe.n Safe\Base.n -MANCOMPRESSED= yes - .include <bsd.port.pre.mk> -post-extract: +post-extract: ${MV} ${WRKDIR}/${DISTNAME}/doc/InitStubs.3 \ ${WRKDIR}/${DISTNAME}/doc/Tcl_InitStubs.3 post-install: diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index 8dad15681844..6550a1b09da9 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1 +1 @@ -MD5 (tcl8.1.1.tar.gz) = fd85414ffca58be880a40f1e699653b2 +MD5 (tcl8.2.0.tar.gz) = acaa5113663ed3fc10b8ae5baf9e904d diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index b158373c4290..05f24146fb78 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,26 +1,35 @@ ---- Makefile.in.orig Fri Apr 30 08:23:33 1999 -+++ Makefile.in Tue May 11 01:48:45 1999 -@@ -55,7 +55,9 @@ - BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin +--- Makefile.in.orig Fri Aug 13 18:02:47 1999 ++++ Makefile.in Sun Sep 5 10:44:32 1999 +@@ -48,7 +48,9 @@ + SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION)/unix +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) ++GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic ++UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -86,7 +88,7 @@ + MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man +@@ -65,7 +67,7 @@ + MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann + + # Directory in which to install the include file tcl.h: +-INCLUDE_INSTALL_DIR = @includedir@ ++#INCLUDE_INSTALL_DIR = @includedir@ + + # Package search path. + TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@ +@@ -85,7 +87,7 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ +CFLAGS? = @CFLAGS@ - # To disable ANSI-C procedure prototypes reverse the comment characters -@@ -161,7 +163,7 @@ + # on the following lines: +@@ -159,7 +161,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,53 +38,45 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -391,15 +393,21 @@ +@@ -386,7 +388,7 @@ + + all: binaries libraries doc - SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(STUB_SRCS) +-binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh ++binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh --all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh -+all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) libtcl81.a tclsh + libraries: - # The following target is configured by autoconf to generate either - # a shared library or non-shared library for Tcl. +@@ -397,8 +399,14 @@ ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f ${TCL_LIB_FILE} @MAKE_LIB@ -+ ln -sf ${TCL_LIB_FILE} libtcl81.so ++ ln -sf ${TCL_LIB_FILE} libtcl82.so $(RANLIB) ${TCL_LIB_FILE} -+libtcl81.a: ${OBJS} -+ rm -f libtcl81.a -+ ar cr libtcl81.a ${OBJS} -+ $(RANLIB) libtcl81.a ++libtcl82.a: ${OBJS} ++ rm -f libtcl82.a ++ ar cr libtcl82.a ${OBJS} ++ $(RANLIB) libtcl82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -499,7 +507,7 @@ - # possible (e.g. if installing as root). - - install-binaries: $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -- tclsh -+ libtcl81.a tclsh - @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -511,8 +519,13 @@ - done; +@@ -504,8 +512,13 @@ @echo "Installing $(TCL_LIB_FILE)" + chmod +x $(SRC_DIR)/install-sh @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl81.so ++ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @echo "Installing libtcl81.a" -+ @$(INSTALL_DATA) libtcl81.a $(LIB_INSTALL_DIR)/libtcl81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl81.a ++ @echo "Installing libtcl82.a" ++ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE)"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -521,7 +534,8 @@ +@@ -514,7 +527,8 @@ @echo "Installing tclsh" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @echo "Installing tclConfig.sh" @@ -85,7 +86,7 @@ @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ echo "Installing $(TCL_STUB_LIB_FILE)"; \ $(INSTALL_DATA) $(STUB_LIB_FILE) \ -@@ -529,8 +543,8 @@ +@@ -522,8 +536,8 @@ fi install-libraries: @@ -96,10 +97,10 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -548,11 +562,16 @@ - else true; \ +@@ -542,11 +556,20 @@ fi; \ done; + chmod +x $(SRC_DIR)/install-sh - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ + @echo "Installing libraries, tcl.h and other headers" + @for i in $(GENERIC_DIR)/*.h ; \ @@ -108,48 +109,44 @@ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ + $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h -+ @echo "Installing $(TOP_DIR)unix/tclUnixPort.h" -+ @$(INSTALL_DATA) $(TOP_DIR)/unix/tclUnixPort.h $(UNIX_INCLUDE_INSTALL_DIR) ++ @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ do \ echo "Installing $$i"; \ -@@ -584,30 +603,35 @@ +@@ -579,21 +602,19 @@ @cd $(TOP_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN1_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz ; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(TOP_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -602,7 +623,14 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) + @echo "**********" diff --git a/lang/tcl84/files/patch-ab b/lang/tcl84/files/patch-ab index 551b0c24760a..d3d9bb55b69f 100644 --- a/lang/tcl84/files/patch-ab +++ b/lang/tcl84/files/patch-ab @@ -1,59 +1,98 @@ ---- configure.orig Fri Apr 30 08:23:33 1999 -+++ configure Tue May 11 01:25:32 1999 -@@ -4384,7 +4384,7 @@ - LD_FLAGS="-Wl,-Bexport" - LD_SEARCH_FLAGS="" - ;; -- NetBSD-*|FreeBSD-12.*|OpenBSD-*) -+ NetBSD-*|FreeBSD-*|OpenBSD-*) - # Not available on all versions: check for include file. - ac_safe=`echo "dlfcn.h" | tr './\055' '___'` +--- configure.orig Fri Aug 13 18:02:47 1999 ++++ configure Sat Sep 4 13:15:50 1999 +@@ -4648,7 +4648,7 @@ + EXTRA_CFLAGS="" + TCL_EXPORT_FILE_SUFFIX="" + UNSHARED_LIB_SUFFIX="" +- TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' ++ TCL_TRIM_DOTS=82 + ECHO_VERSION='`echo ${VERSION}`' + TCL_LIB_VERSIONS_OK=ok + CFLAGS_DEBUG=-g +@@ -4892,7 +4892,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -4413,14 +4413,19 @@ +@@ -4922,16 +4922,21 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - - SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" - SHLIB_LD_LIBS="" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - LD_FLAGS="" - LD_SEARCH_FLAGS="" -- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' -+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' -+ SHLIB_LD="ld -shared -x -soname \$@" -+ else -+ TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -+ SHLIB_LD="ld -Bshareable -x" -+ fi - +- + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ echo "SHARED_LIB_SUFFIX JSEGER" ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else echo "$ac_t""no" 1>&6 -@@ -4443,17 +4448,6 @@ - TCL_UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- FreeBSD-*) -- # FreeBSD 3.* and greater have ELF. -- SHLIB_CFLAGS="-fpic" -- SHLIB_LD="ld -Bshareable -x" -- SHLIB_LD_LIBS="" -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- LD_FLAGS="" -- LD_SEARCH_FLAGS="" -- ;; - NEXTSTEP-*) - SHLIB_CFLAGS="" - SHLIB_LD="cc -nostdlib -r" -@@ -5100,6 +5094,7 @@ - # stub support. - #-------------------------------------------------------------------- - # Replace ${VERSION} with contents of ${TCL_VERSION} -+${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0 - eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}" - # Replace DBGX with TCL_DBGX - eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\"" +@@ -4954,17 +4959,6 @@ + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' + TCL_LIB_VERSIONS_OK=nodots + ;; +- FreeBSD-*) +- # FreeBSD 3.* and greater have ELF. +- SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" +- SHLIB_LD_LIBS="" +- SHLIB_SUFFIX=".so" +- DL_OBJS="tclLoadDl.o" +- DL_LIBS="" +- LDFLAGS="" +- LD_SEARCH_FLAGS="" +- ;; + NEXTSTEP-*) + SHLIB_CFLAGS="" + SHLIB_LD="cc -nostdlib -r" +@@ -5371,7 +5365,7 @@ + SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}' + fi + if test "$UNSHARED_LIB_SUFFIX" = "" ; then +- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + fi + + +@@ -5628,11 +5622,7 @@ + # up the Tcl library. + + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then +- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" +- else +- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +- fi ++ TCL_LIB_FLAG="-ltcl${TCL_TRIM_DOTS}\${TCL_DBGX}" + TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}" + else +@@ -5678,11 +5668,7 @@ + + TCL_STUB_LIB_FILE=${STUB_LIB_FILE} + +-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then +- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" +-else +- TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" +-fi ++TCL_STUB_LIB_FLAG="-ltclstub${TCL_TRIM_DOTS}\${TCL_DBGX}" + + TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" + TCL_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TCL_STUB_LIB_FLAG}" diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist index 8eb81b29bd43..4280ebbf81a5 100644 --- a/lang/tcl84/pkg-plist +++ b/lang/tcl84/pkg-plist @@ -1,123 +1,127 @@ -bin/tclsh8.1 -include/tcl8.1/generic/regcustom.h -include/tcl8.1/generic/regerrs.h -include/tcl8.1/generic/regex.h -include/tcl8.1/generic/regguts.h -include/tcl8.1/generic/tcl.h -include/tcl8.1/generic/tclCompile.h -include/tcl8.1/generic/tclDecls.h -include/tcl8.1/generic/tclInitScript.h -include/tcl8.1/generic/tclInt.h -include/tcl8.1/generic/tclIntDecls.h -include/tcl8.1/generic/tclIntPlatDecls.h -include/tcl8.1/generic/tclMath.h -include/tcl8.1/generic/tclPlatDecls.h -include/tcl8.1/generic/tclPort.h -include/tcl8.1/generic/tclRegexp.h -include/tcl8.1/tcl.h -include/tcl8.1/tclDecls.h -include/tcl8.1/unix/tclUnixPort.h -lib/libtcl81.a -lib/libtcl81.so -lib/libtcl81.so.1 -lib/libtclstub81.a +bin/tclsh%%TCL_VER%% +include/tcl%%TCL_VER%%/generic/regcustom.h +include/tcl%%TCL_VER%%/generic/regerrs.h +include/tcl%%TCL_VER%%/generic/regex.h +include/tcl%%TCL_VER%%/generic/regguts.h +include/tcl%%TCL_VER%%/generic/tcl.h +include/tcl%%TCL_VER%%/generic/tclCompile.h +include/tcl%%TCL_VER%%/generic/tclDecls.h +include/tcl%%TCL_VER%%/generic/tclInitScript.h +include/tcl%%TCL_VER%%/generic/tclInt.h +include/tcl%%TCL_VER%%/generic/tclIntDecls.h +include/tcl%%TCL_VER%%/generic/tclIntPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclMath.h +include/tcl%%TCL_VER%%/generic/tclPlatDecls.h +include/tcl%%TCL_VER%%/generic/tclPort.h +include/tcl%%TCL_VER%%/generic/tclRegexp.h +include/tcl%%TCL_VER%%/tcl.h +include/tcl%%TCL_VER%%/tclDecls.h +include/tcl%%TCL_VER%%/unix/tclUnixPort.h +include/tcl%%TCL_VER%%/unix/tclUnixThrd.h +lib/libtcl%%SHORT_TCL_VER%%.a +lib/libtcl%%SHORT_TCL_VER%%.so +lib/libtcl%%SHORT_TCL_VER%%.so.1 +lib/libtclstub%%SHORT_TCL_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tcl8.1/auto.tcl -lib/tcl8.1/encoding/ascii.enc -lib/tcl8.1/encoding/big5.enc -lib/tcl8.1/encoding/cp1250.enc -lib/tcl8.1/encoding/cp1251.enc -lib/tcl8.1/encoding/cp1252.enc -lib/tcl8.1/encoding/cp1253.enc -lib/tcl8.1/encoding/cp1254.enc -lib/tcl8.1/encoding/cp1255.enc -lib/tcl8.1/encoding/cp1256.enc -lib/tcl8.1/encoding/cp1257.enc -lib/tcl8.1/encoding/cp1258.enc -lib/tcl8.1/encoding/cp437.enc -lib/tcl8.1/encoding/cp737.enc -lib/tcl8.1/encoding/cp775.enc -lib/tcl8.1/encoding/cp850.enc -lib/tcl8.1/encoding/cp852.enc -lib/tcl8.1/encoding/cp855.enc -lib/tcl8.1/encoding/cp857.enc -lib/tcl8.1/encoding/cp860.enc -lib/tcl8.1/encoding/cp861.enc -lib/tcl8.1/encoding/cp862.enc -lib/tcl8.1/encoding/cp863.enc -lib/tcl8.1/encoding/cp864.enc -lib/tcl8.1/encoding/cp865.enc -lib/tcl8.1/encoding/cp866.enc -lib/tcl8.1/encoding/cp869.enc -lib/tcl8.1/encoding/cp874.enc -lib/tcl8.1/encoding/cp932.enc -lib/tcl8.1/encoding/cp936.enc -lib/tcl8.1/encoding/cp949.enc -lib/tcl8.1/encoding/cp950.enc -lib/tcl8.1/encoding/dingbats.enc -lib/tcl8.1/encoding/euc-cn.enc -lib/tcl8.1/encoding/euc-jp.enc -lib/tcl8.1/encoding/euc-kr.enc -lib/tcl8.1/encoding/gb12345.enc -lib/tcl8.1/encoding/gb1988.enc -lib/tcl8.1/encoding/gb2312.enc -lib/tcl8.1/encoding/iso2022-jp.enc -lib/tcl8.1/encoding/iso2022-kr.enc -lib/tcl8.1/encoding/iso2022.enc -lib/tcl8.1/encoding/iso8859-1.enc -lib/tcl8.1/encoding/iso8859-2.enc -lib/tcl8.1/encoding/iso8859-3.enc -lib/tcl8.1/encoding/iso8859-4.enc -lib/tcl8.1/encoding/iso8859-5.enc -lib/tcl8.1/encoding/iso8859-6.enc -lib/tcl8.1/encoding/iso8859-7.enc -lib/tcl8.1/encoding/iso8859-8.enc -lib/tcl8.1/encoding/iso8859-9.enc -lib/tcl8.1/encoding/jis0201.enc -lib/tcl8.1/encoding/jis0208.enc -lib/tcl8.1/encoding/jis0212.enc -lib/tcl8.1/encoding/koi8-r.enc -lib/tcl8.1/encoding/ksc5601.enc -lib/tcl8.1/encoding/macCentEuro.enc -lib/tcl8.1/encoding/macCroatian.enc -lib/tcl8.1/encoding/macCyrillic.enc -lib/tcl8.1/encoding/macDingbats.enc -lib/tcl8.1/encoding/macGreek.enc -lib/tcl8.1/encoding/macIceland.enc -lib/tcl8.1/encoding/macJapan.enc -lib/tcl8.1/encoding/macRoman.enc -lib/tcl8.1/encoding/macRomania.enc -lib/tcl8.1/encoding/macThai.enc -lib/tcl8.1/encoding/macTurkish.enc -lib/tcl8.1/encoding/macUkraine.enc -lib/tcl8.1/encoding/shiftjis.enc -lib/tcl8.1/encoding/symbol.enc -lib/tcl8.1/history.tcl -lib/tcl8.1/http1.0/http.tcl -lib/tcl8.1/http1.0/pkgIndex.tcl -lib/tcl8.1/http2.0/http.tcl -lib/tcl8.1/http2.0/pkgIndex.tcl -lib/tcl8.1/init.tcl -lib/tcl8.1/ldAix -lib/tcl8.1/ldAout.tcl -lib/tcl8.1/msgcat1.0/msgcat.tcl -lib/tcl8.1/msgcat1.0/pkgIndex.tcl -lib/tcl8.1/opt0.4/optparse.tcl -lib/tcl8.1/opt0.4/pkgIndex.tcl -lib/tcl8.1/package.tcl -lib/tcl8.1/parray.tcl -lib/tcl8.1/safe.tcl -lib/tcl8.1/tclAppInit.c -lib/tcl8.1/tclConfig.sh -lib/tcl8.1/tclIndex -lib/tcl8.1/word.tcl -@dirrm lib/tcl8.1/opt0.4 -@dirrm lib/tcl8.1/msgcat1.0 -@dirrm lib/tcl8.1/http2.0 -@dirrm lib/tcl8.1/http1.0 -@dirrm lib/tcl8.1/encoding -@dirrm lib/tcl8.1 -@dirrm include/tcl8.1/unix -@dirrm include/tcl8.1/generic -@dirrm include/tcl8.1 +lib/tcl%%TCL_VER%%/auto.tcl +lib/tcl%%TCL_VER%%/encoding/ascii.enc +lib/tcl%%TCL_VER%%/encoding/big5.enc +lib/tcl%%TCL_VER%%/encoding/cp1250.enc +lib/tcl%%TCL_VER%%/encoding/cp1251.enc +lib/tcl%%TCL_VER%%/encoding/cp1252.enc +lib/tcl%%TCL_VER%%/encoding/cp1253.enc +lib/tcl%%TCL_VER%%/encoding/cp1254.enc +lib/tcl%%TCL_VER%%/encoding/cp1255.enc +lib/tcl%%TCL_VER%%/encoding/cp1256.enc +lib/tcl%%TCL_VER%%/encoding/cp1257.enc +lib/tcl%%TCL_VER%%/encoding/cp1258.enc +lib/tcl%%TCL_VER%%/encoding/cp437.enc +lib/tcl%%TCL_VER%%/encoding/cp737.enc +lib/tcl%%TCL_VER%%/encoding/cp775.enc +lib/tcl%%TCL_VER%%/encoding/cp850.enc +lib/tcl%%TCL_VER%%/encoding/cp852.enc +lib/tcl%%TCL_VER%%/encoding/cp855.enc +lib/tcl%%TCL_VER%%/encoding/cp857.enc +lib/tcl%%TCL_VER%%/encoding/cp860.enc +lib/tcl%%TCL_VER%%/encoding/cp861.enc +lib/tcl%%TCL_VER%%/encoding/cp862.enc +lib/tcl%%TCL_VER%%/encoding/cp863.enc +lib/tcl%%TCL_VER%%/encoding/cp864.enc +lib/tcl%%TCL_VER%%/encoding/cp865.enc +lib/tcl%%TCL_VER%%/encoding/cp866.enc +lib/tcl%%TCL_VER%%/encoding/cp869.enc +lib/tcl%%TCL_VER%%/encoding/cp874.enc +lib/tcl%%TCL_VER%%/encoding/cp932.enc +lib/tcl%%TCL_VER%%/encoding/cp936.enc +lib/tcl%%TCL_VER%%/encoding/cp949.enc +lib/tcl%%TCL_VER%%/encoding/cp950.enc +lib/tcl%%TCL_VER%%/encoding/dingbats.enc +lib/tcl%%TCL_VER%%/encoding/euc-cn.enc +lib/tcl%%TCL_VER%%/encoding/euc-jp.enc +lib/tcl%%TCL_VER%%/encoding/euc-kr.enc +lib/tcl%%TCL_VER%%/encoding/gb12345.enc +lib/tcl%%TCL_VER%%/encoding/gb1988.enc +lib/tcl%%TCL_VER%%/encoding/gb2312.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc +lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc +lib/tcl%%TCL_VER%%/encoding/iso2022.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-5.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc +lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc +lib/tcl%%TCL_VER%%/encoding/jis0201.enc +lib/tcl%%TCL_VER%%/encoding/jis0208.enc +lib/tcl%%TCL_VER%%/encoding/jis0212.enc +lib/tcl%%TCL_VER%%/encoding/koi8-r.enc +lib/tcl%%TCL_VER%%/encoding/ksc5601.enc +lib/tcl%%TCL_VER%%/encoding/macCentEuro.enc +lib/tcl%%TCL_VER%%/encoding/macCroatian.enc +lib/tcl%%TCL_VER%%/encoding/macCyrillic.enc +lib/tcl%%TCL_VER%%/encoding/macDingbats.enc +lib/tcl%%TCL_VER%%/encoding/macGreek.enc +lib/tcl%%TCL_VER%%/encoding/macIceland.enc +lib/tcl%%TCL_VER%%/encoding/macJapan.enc +lib/tcl%%TCL_VER%%/encoding/macRoman.enc +lib/tcl%%TCL_VER%%/encoding/macRomania.enc +lib/tcl%%TCL_VER%%/encoding/macThai.enc +lib/tcl%%TCL_VER%%/encoding/macTurkish.enc +lib/tcl%%TCL_VER%%/encoding/macUkraine.enc +lib/tcl%%TCL_VER%%/encoding/shiftjis.enc +lib/tcl%%TCL_VER%%/encoding/symbol.enc +lib/tcl%%TCL_VER%%/history.tcl +lib/tcl%%TCL_VER%%/http1.0/http.tcl +lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/http2.1/http.tcl +lib/tcl%%TCL_VER%%/http2.1/pkgIndex.tcl +lib/tcl%%TCL_VER%%/init.tcl +lib/tcl%%TCL_VER%%/ldAix +lib/tcl%%TCL_VER%%/ldAout.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/msgcat.tcl +lib/tcl%%TCL_VER%%/msgcat1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl +lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl +lib/tcl%%TCL_VER%%/package.tcl +lib/tcl%%TCL_VER%%/parray.tcl +lib/tcl%%TCL_VER%%/safe.tcl +lib/tcl%%TCL_VER%%/tclAppInit.c +lib/tcl%%TCL_VER%%/tclConfig.sh +lib/tcl%%TCL_VER%%/tclIndex +lib/tcl%%TCL_VER%%/tcltest1.0/pkgIndex.tcl +lib/tcl%%TCL_VER%%/tcltest1.0/tcltest.tcl +lib/tcl%%TCL_VER%%/word.tcl +@dirrm lib/tcl%%TCL_VER%%/tcltest1.0 +@dirrm lib/tcl%%TCL_VER%%/opt0.4 +@dirrm lib/tcl%%TCL_VER%%/msgcat1.0 +@dirrm lib/tcl%%TCL_VER%%/http2.1 +@dirrm lib/tcl%%TCL_VER%%/http1.0 +@dirrm lib/tcl%%TCL_VER%%/encoding +@dirrm lib/tcl%%TCL_VER%% +@dirrm include/tcl%%TCL_VER%%/unix +@dirrm include/tcl%%TCL_VER%%/generic +@dirrm include/tcl%%TCL_VER%% diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 948e2427a609..a8651667f7cf 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -37,6 +37,7 @@ SUBDIR += tk42 SUBDIR += tk80 SUBDIR += tk81 + SUBDIR += tk82 SUBDIR += tkstep80 SUBDIR += v SUBDIR += wxgtk diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile index c5c1428f839f..97b5bd60cf80 100644 --- a/x11-toolkits/tk82/Makefile +++ b/x11-toolkits/tk82/Makefile @@ -1,28 +1,32 @@ -# New ports collection makefile for: tk8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tk +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tk8.1.1 -PKGNAME= tk-8.1.1 -CATEGORIES= x11-toolkits tk81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tk8.2.0 +PKGNAME= tk-8.2.0 +CATEGORIES= x11-toolkits tk82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81 +LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk81.so.1 +CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1 PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +PLIST_SUB= TK_VER=8.2 SHORT_TK_VER=82 + +MANCOMPRESSED= no + MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ @@ -288,7 +292,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ palette.n tk_setPalette.n \ palette.n tk_bisque.n \ popup.n tk_popup.n -MANCOMPRESSED= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/tk82/distinfo b/x11-toolkits/tk82/distinfo index 8189d7a403f7..bf1630df20e2 100644 --- a/x11-toolkits/tk82/distinfo +++ b/x11-toolkits/tk82/distinfo @@ -1 +1 @@ -MD5 (tk8.1.1.tar.gz) = 0677449e344e7720cfa37660d070de8c +MD5 (tk8.2.0.tar.gz) = 574e112ddca4330eea01b0e26d3ed6eb diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa index 9938b28f6787..1f33895446d2 100644 --- a/x11-toolkits/tk82/files/patch-aa +++ b/x11-toolkits/tk82/files/patch-aa @@ -1,48 +1,41 @@ ---- configure.orig Fri Apr 30 08:27:45 1999 -+++ configure Mon May 10 00:20:26 1999 -@@ -956,14 +956,14 @@ - withval="$with_tcl" - TCL_BIN_DIR=$withval +--- configure.orig Fri Aug 13 18:06:14 1999 ++++ configure Sat Sep 4 15:22:21 1999 +@@ -1756,7 +1756,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -1788,14 +1788,19 @@ + echo "$ac_t""yes" 1>&6 + + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else -- TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl8.1 - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -1004,6 +1004,8 @@ - CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE - EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS + echo "$ac_t""no" 1>&6 +@@ -2266,6 +2271,7 @@ + echo "$ac_t""no" 1>&6 + fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} -+ - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - # If Tcl and Tk are installed in different places, adjust the library -@@ -2450,8 +2452,8 @@ - if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then - TK_SHARED_BUILD=1 - TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" -- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} -- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}" -+ TK_LIB_FILE=${TK_LIB_FILE} -+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" - RANLIB=":" + LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" -@@ -2729,6 +2731,7 @@ - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_DBGX@%$TCL_DBGX%g - s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab index d907e5809b46..3c9fb1cf6c6c 100644 --- a/x11-toolkits/tk82/files/patch-ab +++ b/x11-toolkits/tk82/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Apr 30 08:27:45 1999 -+++ Makefile.in Mon May 10 01:18:32 1999 +--- Makefile.in.orig Fri Aug 13 18:06:14 1999 ++++ Makefile.in Sat Sep 4 19:47:43 1999 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin @@ -11,16 +11,7 @@ # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -98,7 +100,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = $(@CFLAGS_DEFAULT@) -+CFLAGS = @CFLAGS@ - - # A "-I" switch that can be used when compiling to make all of the - # X11 include files accessible (the configure script will try to -@@ -152,7 +154,7 @@ +@@ -153,7 +155,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,51 +20,50 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -188,7 +190,7 @@ +@@ -190,7 +192,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc ++WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -348,8 +350,14 @@ +@@ -356,8 +358,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk81.so ++ ln -sf @TK_LIB_FILE@ libtk82.so $(RANLIB) ${TK_LIB_FILE} -+libtk81.a: ${OBJS} -+ rm -f libtk81.a -+ ar cr libtk81.a ${OBJS} -+ $(RANLIB) libtk81.a ++libtk82.a: ${OBJS} ++ rm -f libtk82.a ++ ar cr libtk82.a ${OBJS} ++ $(RANLIB) libtk82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -410,7 +418,8 @@ +@@ -418,7 +426,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \ -+ libtk81.a wish ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -422,12 +431,18 @@ - done; - @echo "Installing $(TK_LIB_FILE)" +@@ -432,12 +440,18 @@ + chmod +x $(UNIX_DIR)/install-sh + chmod +x $(UNIX_DIR)/mkLinks @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so ++ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk81.a" -+ @$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.a ++ @echo "Installing libtk82.a" ++ @$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtk82.a @echo "Installing wish" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) @echo "Installing tkConfig.sh" @@ -83,7 +73,7 @@ @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TK_EXP_FILE)"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -441,6 +456,7 @@ +@@ -451,6 +465,7 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -91,63 +81,49 @@ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ do \ if [ ! -d $$i ] ; then \ -@@ -450,11 +466,19 @@ - else true; \ +@@ -461,11 +476,19 @@ fi; \ done; + chmod +x $(UNIX_DIR)/install-sh - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + @echo "Installing headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ do \ echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done ; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ + for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ do \ - echo "Installing $$i"; \ -@@ -513,30 +537,27 @@ - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ +@@ -530,16 +553,14 @@ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -548,7 +569,6 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) diff --git a/x11-toolkits/tk82/pkg-plist b/x11-toolkits/tk82/pkg-plist index b87d4c576803..b5afedf961fd 100644 --- a/x11-toolkits/tk82/pkg-plist +++ b/x11-toolkits/tk82/pkg-plist @@ -1,140 +1,140 @@ -bin/wish8.1 -include/tk8.1/generic/default.h -include/tk8.1/generic/ks_names.h -include/tk8.1/generic/tk.h -include/tk8.1/generic/tk3d.h -include/tk8.1/generic/tkButton.h -include/tk8.1/generic/tkCanvas.h -include/tk8.1/generic/tkColor.h -include/tk8.1/generic/tkDecls.h -include/tk8.1/generic/tkFileFilter.h -include/tk8.1/generic/tkFont.h -include/tk8.1/generic/tkInitScript.h -include/tk8.1/generic/tkInt.h -include/tk8.1/generic/tkIntDecls.h -include/tk8.1/generic/tkIntPlatDecls.h -include/tk8.1/generic/tkIntXlibDecls.h -include/tk8.1/generic/tkMenu.h -include/tk8.1/generic/tkMenubutton.h -include/tk8.1/generic/tkPlatDecls.h -include/tk8.1/generic/tkPort.h -include/tk8.1/generic/tkScale.h -include/tk8.1/generic/tkScrollbar.h -include/tk8.1/generic/tkSelect.h -include/tk8.1/generic/tkText.h -include/tk8.1/tk.h -include/tk8.1/tkDecls.h -include/tk8.1/unix/tkUnixDefault.h -include/tk8.1/unix/tkUnixInt.h -include/tk8.1/unix/tkUnixPort.h -lib/libtk81.a -lib/libtk81.so -lib/libtk81.so.1 -lib/libtkstub81.a +bin/wish%%TK_VER%% +include/tk%%TK_VER%%/generic/default.h +include/tk%%TK_VER%%/generic/ks_names.h +include/tk%%TK_VER%%/generic/tk.h +include/tk%%TK_VER%%/generic/tk3d.h +include/tk%%TK_VER%%/generic/tkButton.h +include/tk%%TK_VER%%/generic/tkCanvas.h +include/tk%%TK_VER%%/generic/tkColor.h +include/tk%%TK_VER%%/generic/tkDecls.h +include/tk%%TK_VER%%/generic/tkFileFilter.h +include/tk%%TK_VER%%/generic/tkFont.h +include/tk%%TK_VER%%/generic/tkInitScript.h +include/tk%%TK_VER%%/generic/tkInt.h +include/tk%%TK_VER%%/generic/tkIntDecls.h +include/tk%%TK_VER%%/generic/tkIntPlatDecls.h +include/tk%%TK_VER%%/generic/tkIntXlibDecls.h +include/tk%%TK_VER%%/generic/tkMenu.h +include/tk%%TK_VER%%/generic/tkMenubutton.h +include/tk%%TK_VER%%/generic/tkPlatDecls.h +include/tk%%TK_VER%%/generic/tkPort.h +include/tk%%TK_VER%%/generic/tkScale.h +include/tk%%TK_VER%%/generic/tkScrollbar.h +include/tk%%TK_VER%%/generic/tkSelect.h +include/tk%%TK_VER%%/generic/tkText.h +include/tk%%TK_VER%%/tk.h +include/tk%%TK_VER%%/tkDecls.h +include/tk%%TK_VER%%/unix/tkUnixDefault.h +include/tk%%TK_VER%%/unix/tkUnixInt.h +include/tk%%TK_VER%%/unix/tkUnixPort.h +lib/libtk%%SHORT_TK_VER%%.a +lib/libtk%%SHORT_TK_VER%%.so +lib/libtk%%SHORT_TK_VER%%.so.1 +lib/libtkstub%%SHORT_TK_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tk8.1/bgerror.tcl -lib/tk8.1/button.tcl -lib/tk8.1/clrpick.tcl -lib/tk8.1/comdlg.tcl -lib/tk8.1/console.tcl -lib/tk8.1/demos/README -lib/tk8.1/demos/arrow.tcl -lib/tk8.1/demos/bind.tcl -lib/tk8.1/demos/bitmap.tcl -lib/tk8.1/demos/browse -lib/tk8.1/demos/button.tcl -lib/tk8.1/demos/check.tcl -lib/tk8.1/demos/clrpick.tcl -lib/tk8.1/demos/colors.tcl -lib/tk8.1/demos/cscroll.tcl -lib/tk8.1/demos/ctext.tcl -lib/tk8.1/demos/dialog1.tcl -lib/tk8.1/demos/dialog2.tcl -lib/tk8.1/demos/entry1.tcl -lib/tk8.1/demos/entry2.tcl -lib/tk8.1/demos/filebox.tcl -lib/tk8.1/demos/floor.tcl -lib/tk8.1/demos/form.tcl -lib/tk8.1/demos/hello -lib/tk8.1/demos/hscale.tcl -lib/tk8.1/demos/icon.tcl -lib/tk8.1/demos/image1.tcl -lib/tk8.1/demos/image2.tcl -lib/tk8.1/demos/images/earth.gif -lib/tk8.1/demos/images/earthris.gif -lib/tk8.1/demos/images/face.bmp -lib/tk8.1/demos/images/flagdown.bmp -lib/tk8.1/demos/images/flagup.bmp -lib/tk8.1/demos/images/gray25.bmp -lib/tk8.1/demos/images/letters.bmp -lib/tk8.1/demos/images/noletter.bmp -lib/tk8.1/demos/images/pattern.bmp -lib/tk8.1/demos/images/tcllogo.gif -lib/tk8.1/demos/images/teapot.ppm -lib/tk8.1/demos/items.tcl -lib/tk8.1/demos/ixset -lib/tk8.1/demos/label.tcl -lib/tk8.1/demos/license.terms -lib/tk8.1/demos/menu.tcl -lib/tk8.1/demos/menubu.tcl -lib/tk8.1/demos/msgbox.tcl -lib/tk8.1/demos/plot.tcl -lib/tk8.1/demos/puzzle.tcl -lib/tk8.1/demos/radio.tcl -lib/tk8.1/demos/rmt -lib/tk8.1/demos/rolodex -lib/tk8.1/demos/ruler.tcl -lib/tk8.1/demos/sayings.tcl -lib/tk8.1/demos/search.tcl -lib/tk8.1/demos/square -lib/tk8.1/demos/states.tcl -lib/tk8.1/demos/style.tcl -lib/tk8.1/demos/tclIndex -lib/tk8.1/demos/tcolor -lib/tk8.1/demos/text.tcl -lib/tk8.1/demos/timer -lib/tk8.1/demos/twind.tcl -lib/tk8.1/demos/vscale.tcl -lib/tk8.1/demos/widget -lib/tk8.1/dialog.tcl -lib/tk8.1/entry.tcl -lib/tk8.1/focus.tcl -lib/tk8.1/images/README -lib/tk8.1/images/logo.eps -lib/tk8.1/images/logo100.gif -lib/tk8.1/images/logo64.gif -lib/tk8.1/images/logoLarge.gif -lib/tk8.1/images/logoMed.gif -lib/tk8.1/images/pspbrwse.jbf -lib/tk8.1/images/pwrdLogo.eps -lib/tk8.1/images/pwrdLogo100.gif -lib/tk8.1/images/pwrdLogo150.gif -lib/tk8.1/images/pwrdLogo175.gif -lib/tk8.1/images/pwrdLogo200.gif -lib/tk8.1/images/pwrdLogo75.gif -lib/tk8.1/images/tai-ku.gif -lib/tk8.1/listbox.tcl -lib/tk8.1/menu.tcl -lib/tk8.1/msgbox.tcl -lib/tk8.1/obsolete.tcl -lib/tk8.1/optMenu.tcl -lib/tk8.1/palette.tcl -lib/tk8.1/safetk.tcl -lib/tk8.1/scale.tcl -lib/tk8.1/scrlbar.tcl -lib/tk8.1/tclIndex -lib/tk8.1/tearoff.tcl -lib/tk8.1/text.tcl -lib/tk8.1/tk.tcl -lib/tk8.1/tkAppInit.c -lib/tk8.1/tkConfig.sh -lib/tk8.1/tkfbox.tcl -lib/tk8.1/xmfbox.tcl -@dirrm lib/tk8.1/demos/images -@dirrm lib/tk8.1/demos -@dirrm lib/tk8.1/images -@dirrm lib/tk8.1 -@dirrm include/tk8.1/unix -@dirrm include/tk8.1/generic -@dirrm include/tk8.1 +lib/tk%%TK_VER%%/bgerror.tcl +lib/tk%%TK_VER%%/button.tcl +lib/tk%%TK_VER%%/clrpick.tcl +lib/tk%%TK_VER%%/comdlg.tcl +lib/tk%%TK_VER%%/console.tcl +lib/tk%%TK_VER%%/demos/README +lib/tk%%TK_VER%%/demos/arrow.tcl +lib/tk%%TK_VER%%/demos/bind.tcl +lib/tk%%TK_VER%%/demos/bitmap.tcl +lib/tk%%TK_VER%%/demos/browse +lib/tk%%TK_VER%%/demos/button.tcl +lib/tk%%TK_VER%%/demos/check.tcl +lib/tk%%TK_VER%%/demos/clrpick.tcl +lib/tk%%TK_VER%%/demos/colors.tcl +lib/tk%%TK_VER%%/demos/cscroll.tcl +lib/tk%%TK_VER%%/demos/ctext.tcl +lib/tk%%TK_VER%%/demos/dialog1.tcl +lib/tk%%TK_VER%%/demos/dialog2.tcl +lib/tk%%TK_VER%%/demos/entry1.tcl +lib/tk%%TK_VER%%/demos/entry2.tcl +lib/tk%%TK_VER%%/demos/filebox.tcl +lib/tk%%TK_VER%%/demos/floor.tcl +lib/tk%%TK_VER%%/demos/form.tcl +lib/tk%%TK_VER%%/demos/hello +lib/tk%%TK_VER%%/demos/hscale.tcl +lib/tk%%TK_VER%%/demos/icon.tcl +lib/tk%%TK_VER%%/demos/image1.tcl +lib/tk%%TK_VER%%/demos/image2.tcl +lib/tk%%TK_VER%%/demos/images/earth.gif +lib/tk%%TK_VER%%/demos/images/earthris.gif +lib/tk%%TK_VER%%/demos/images/face.bmp +lib/tk%%TK_VER%%/demos/images/flagdown.bmp +lib/tk%%TK_VER%%/demos/images/flagup.bmp +lib/tk%%TK_VER%%/demos/images/gray25.bmp +lib/tk%%TK_VER%%/demos/images/letters.bmp +lib/tk%%TK_VER%%/demos/images/noletter.bmp +lib/tk%%TK_VER%%/demos/images/pattern.bmp +lib/tk%%TK_VER%%/demos/images/tcllogo.gif +lib/tk%%TK_VER%%/demos/images/teapot.ppm +lib/tk%%TK_VER%%/demos/items.tcl +lib/tk%%TK_VER%%/demos/ixset +lib/tk%%TK_VER%%/demos/label.tcl +lib/tk%%TK_VER%%/demos/license.terms +lib/tk%%TK_VER%%/demos/menu.tcl +lib/tk%%TK_VER%%/demos/menubu.tcl +lib/tk%%TK_VER%%/demos/msgbox.tcl +lib/tk%%TK_VER%%/demos/plot.tcl +lib/tk%%TK_VER%%/demos/puzzle.tcl +lib/tk%%TK_VER%%/demos/radio.tcl +lib/tk%%TK_VER%%/demos/rmt +lib/tk%%TK_VER%%/demos/rolodex +lib/tk%%TK_VER%%/demos/ruler.tcl +lib/tk%%TK_VER%%/demos/sayings.tcl +lib/tk%%TK_VER%%/demos/search.tcl +lib/tk%%TK_VER%%/demos/square +lib/tk%%TK_VER%%/demos/states.tcl +lib/tk%%TK_VER%%/demos/style.tcl +lib/tk%%TK_VER%%/demos/tclIndex +lib/tk%%TK_VER%%/demos/tcolor +lib/tk%%TK_VER%%/demos/text.tcl +lib/tk%%TK_VER%%/demos/timer +lib/tk%%TK_VER%%/demos/twind.tcl +lib/tk%%TK_VER%%/demos/vscale.tcl +lib/tk%%TK_VER%%/demos/widget +lib/tk%%TK_VER%%/dialog.tcl +lib/tk%%TK_VER%%/entry.tcl +lib/tk%%TK_VER%%/focus.tcl +lib/tk%%TK_VER%%/images/README +lib/tk%%TK_VER%%/images/logo.eps +lib/tk%%TK_VER%%/images/logo100.gif +lib/tk%%TK_VER%%/images/logo64.gif +lib/tk%%TK_VER%%/images/logoLarge.gif +lib/tk%%TK_VER%%/images/logoMed.gif +lib/tk%%TK_VER%%/images/pwrdLogo.eps +lib/tk%%TK_VER%%/images/pwrdLogo100.gif +lib/tk%%TK_VER%%/images/pwrdLogo150.gif +lib/tk%%TK_VER%%/images/pwrdLogo175.gif +lib/tk%%TK_VER%%/images/pwrdLogo200.gif +lib/tk%%TK_VER%%/images/pwrdLogo75.gif +lib/tk%%TK_VER%%/images/tai-ku.gif +lib/tk%%TK_VER%%/listbox.tcl +lib/tk%%TK_VER%%/menu.tcl +lib/tk%%TK_VER%%/msgbox.tcl +lib/tk%%TK_VER%%/obsolete.tcl +lib/tk%%TK_VER%%/optMenu.tcl +lib/tk%%TK_VER%%/palette.tcl +lib/tk%%TK_VER%%/prolog.ps +lib/tk%%TK_VER%%/safetk.tcl +lib/tk%%TK_VER%%/scale.tcl +lib/tk%%TK_VER%%/scrlbar.tcl +lib/tk%%TK_VER%%/tclIndex +lib/tk%%TK_VER%%/tearoff.tcl +lib/tk%%TK_VER%%/text.tcl +lib/tk%%TK_VER%%/tk.tcl +lib/tk%%TK_VER%%/tkAppInit.c +lib/tk%%TK_VER%%/tkConfig.sh +lib/tk%%TK_VER%%/tkfbox.tcl +lib/tk%%TK_VER%%/xmfbox.tcl +@dirrm lib/tk%%TK_VER%%/demos/images +@dirrm lib/tk%%TK_VER%%/demos +@dirrm lib/tk%%TK_VER%%/images +@dirrm lib/tk%%TK_VER%% +@dirrm include/tk%%TK_VER%%/unix +@dirrm include/tk%%TK_VER%%/generic +@dirrm include/tk%%TK_VER%% diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile index c5c1428f839f..97b5bd60cf80 100644 --- a/x11-toolkits/tk83/Makefile +++ b/x11-toolkits/tk83/Makefile @@ -1,28 +1,32 @@ -# New ports collection makefile for: tk8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tk +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tk8.1.1 -PKGNAME= tk-8.1.1 -CATEGORIES= x11-toolkits tk81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tk8.2.0 +PKGNAME= tk-8.2.0 +CATEGORIES= x11-toolkits tk82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81 +LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk81.so.1 +CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1 PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +PLIST_SUB= TK_VER=8.2 SHORT_TK_VER=82 + +MANCOMPRESSED= no + MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ @@ -288,7 +292,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ palette.n tk_setPalette.n \ palette.n tk_bisque.n \ popup.n tk_popup.n -MANCOMPRESSED= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo index 8189d7a403f7..bf1630df20e2 100644 --- a/x11-toolkits/tk83/distinfo +++ b/x11-toolkits/tk83/distinfo @@ -1 +1 @@ -MD5 (tk8.1.1.tar.gz) = 0677449e344e7720cfa37660d070de8c +MD5 (tk8.2.0.tar.gz) = 574e112ddca4330eea01b0e26d3ed6eb diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa index 9938b28f6787..1f33895446d2 100644 --- a/x11-toolkits/tk83/files/patch-aa +++ b/x11-toolkits/tk83/files/patch-aa @@ -1,48 +1,41 @@ ---- configure.orig Fri Apr 30 08:27:45 1999 -+++ configure Mon May 10 00:20:26 1999 -@@ -956,14 +956,14 @@ - withval="$with_tcl" - TCL_BIN_DIR=$withval +--- configure.orig Fri Aug 13 18:06:14 1999 ++++ configure Sat Sep 4 15:22:21 1999 +@@ -1756,7 +1756,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -1788,14 +1788,19 @@ + echo "$ac_t""yes" 1>&6 + + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else -- TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl8.1 - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -1004,6 +1004,8 @@ - CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE - EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS + echo "$ac_t""no" 1>&6 +@@ -2266,6 +2271,7 @@ + echo "$ac_t""no" 1>&6 + fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} -+ - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - # If Tcl and Tk are installed in different places, adjust the library -@@ -2450,8 +2452,8 @@ - if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then - TK_SHARED_BUILD=1 - TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" -- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} -- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}" -+ TK_LIB_FILE=${TK_LIB_FILE} -+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" - RANLIB=":" + LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" -@@ -2729,6 +2731,7 @@ - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_DBGX@%$TCL_DBGX%g - s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab index d907e5809b46..3c9fb1cf6c6c 100644 --- a/x11-toolkits/tk83/files/patch-ab +++ b/x11-toolkits/tk83/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Apr 30 08:27:45 1999 -+++ Makefile.in Mon May 10 01:18:32 1999 +--- Makefile.in.orig Fri Aug 13 18:06:14 1999 ++++ Makefile.in Sat Sep 4 19:47:43 1999 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin @@ -11,16 +11,7 @@ # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -98,7 +100,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = $(@CFLAGS_DEFAULT@) -+CFLAGS = @CFLAGS@ - - # A "-I" switch that can be used when compiling to make all of the - # X11 include files accessible (the configure script will try to -@@ -152,7 +154,7 @@ +@@ -153,7 +155,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,51 +20,50 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -188,7 +190,7 @@ +@@ -190,7 +192,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc ++WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -348,8 +350,14 @@ +@@ -356,8 +358,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk81.so ++ ln -sf @TK_LIB_FILE@ libtk82.so $(RANLIB) ${TK_LIB_FILE} -+libtk81.a: ${OBJS} -+ rm -f libtk81.a -+ ar cr libtk81.a ${OBJS} -+ $(RANLIB) libtk81.a ++libtk82.a: ${OBJS} ++ rm -f libtk82.a ++ ar cr libtk82.a ${OBJS} ++ $(RANLIB) libtk82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -410,7 +418,8 @@ +@@ -418,7 +426,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \ -+ libtk81.a wish ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -422,12 +431,18 @@ - done; - @echo "Installing $(TK_LIB_FILE)" +@@ -432,12 +440,18 @@ + chmod +x $(UNIX_DIR)/install-sh + chmod +x $(UNIX_DIR)/mkLinks @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so ++ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk81.a" -+ @$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.a ++ @echo "Installing libtk82.a" ++ @$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtk82.a @echo "Installing wish" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) @echo "Installing tkConfig.sh" @@ -83,7 +73,7 @@ @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TK_EXP_FILE)"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -441,6 +456,7 @@ +@@ -451,6 +465,7 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -91,63 +81,49 @@ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ do \ if [ ! -d $$i ] ; then \ -@@ -450,11 +466,19 @@ - else true; \ +@@ -461,11 +476,19 @@ fi; \ done; + chmod +x $(UNIX_DIR)/install-sh - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + @echo "Installing headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ do \ echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done ; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ + for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ do \ - echo "Installing $$i"; \ -@@ -513,30 +537,27 @@ - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ +@@ -530,16 +553,14 @@ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -548,7 +569,6 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) diff --git a/x11-toolkits/tk83/pkg-plist b/x11-toolkits/tk83/pkg-plist index b87d4c576803..b5afedf961fd 100644 --- a/x11-toolkits/tk83/pkg-plist +++ b/x11-toolkits/tk83/pkg-plist @@ -1,140 +1,140 @@ -bin/wish8.1 -include/tk8.1/generic/default.h -include/tk8.1/generic/ks_names.h -include/tk8.1/generic/tk.h -include/tk8.1/generic/tk3d.h -include/tk8.1/generic/tkButton.h -include/tk8.1/generic/tkCanvas.h -include/tk8.1/generic/tkColor.h -include/tk8.1/generic/tkDecls.h -include/tk8.1/generic/tkFileFilter.h -include/tk8.1/generic/tkFont.h -include/tk8.1/generic/tkInitScript.h -include/tk8.1/generic/tkInt.h -include/tk8.1/generic/tkIntDecls.h -include/tk8.1/generic/tkIntPlatDecls.h -include/tk8.1/generic/tkIntXlibDecls.h -include/tk8.1/generic/tkMenu.h -include/tk8.1/generic/tkMenubutton.h -include/tk8.1/generic/tkPlatDecls.h -include/tk8.1/generic/tkPort.h -include/tk8.1/generic/tkScale.h -include/tk8.1/generic/tkScrollbar.h -include/tk8.1/generic/tkSelect.h -include/tk8.1/generic/tkText.h -include/tk8.1/tk.h -include/tk8.1/tkDecls.h -include/tk8.1/unix/tkUnixDefault.h -include/tk8.1/unix/tkUnixInt.h -include/tk8.1/unix/tkUnixPort.h -lib/libtk81.a -lib/libtk81.so -lib/libtk81.so.1 -lib/libtkstub81.a +bin/wish%%TK_VER%% +include/tk%%TK_VER%%/generic/default.h +include/tk%%TK_VER%%/generic/ks_names.h +include/tk%%TK_VER%%/generic/tk.h +include/tk%%TK_VER%%/generic/tk3d.h +include/tk%%TK_VER%%/generic/tkButton.h +include/tk%%TK_VER%%/generic/tkCanvas.h +include/tk%%TK_VER%%/generic/tkColor.h +include/tk%%TK_VER%%/generic/tkDecls.h +include/tk%%TK_VER%%/generic/tkFileFilter.h +include/tk%%TK_VER%%/generic/tkFont.h +include/tk%%TK_VER%%/generic/tkInitScript.h +include/tk%%TK_VER%%/generic/tkInt.h +include/tk%%TK_VER%%/generic/tkIntDecls.h +include/tk%%TK_VER%%/generic/tkIntPlatDecls.h +include/tk%%TK_VER%%/generic/tkIntXlibDecls.h +include/tk%%TK_VER%%/generic/tkMenu.h +include/tk%%TK_VER%%/generic/tkMenubutton.h +include/tk%%TK_VER%%/generic/tkPlatDecls.h +include/tk%%TK_VER%%/generic/tkPort.h +include/tk%%TK_VER%%/generic/tkScale.h +include/tk%%TK_VER%%/generic/tkScrollbar.h +include/tk%%TK_VER%%/generic/tkSelect.h +include/tk%%TK_VER%%/generic/tkText.h +include/tk%%TK_VER%%/tk.h +include/tk%%TK_VER%%/tkDecls.h +include/tk%%TK_VER%%/unix/tkUnixDefault.h +include/tk%%TK_VER%%/unix/tkUnixInt.h +include/tk%%TK_VER%%/unix/tkUnixPort.h +lib/libtk%%SHORT_TK_VER%%.a +lib/libtk%%SHORT_TK_VER%%.so +lib/libtk%%SHORT_TK_VER%%.so.1 +lib/libtkstub%%SHORT_TK_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tk8.1/bgerror.tcl -lib/tk8.1/button.tcl -lib/tk8.1/clrpick.tcl -lib/tk8.1/comdlg.tcl -lib/tk8.1/console.tcl -lib/tk8.1/demos/README -lib/tk8.1/demos/arrow.tcl -lib/tk8.1/demos/bind.tcl -lib/tk8.1/demos/bitmap.tcl -lib/tk8.1/demos/browse -lib/tk8.1/demos/button.tcl -lib/tk8.1/demos/check.tcl -lib/tk8.1/demos/clrpick.tcl -lib/tk8.1/demos/colors.tcl -lib/tk8.1/demos/cscroll.tcl -lib/tk8.1/demos/ctext.tcl -lib/tk8.1/demos/dialog1.tcl -lib/tk8.1/demos/dialog2.tcl -lib/tk8.1/demos/entry1.tcl -lib/tk8.1/demos/entry2.tcl -lib/tk8.1/demos/filebox.tcl -lib/tk8.1/demos/floor.tcl -lib/tk8.1/demos/form.tcl -lib/tk8.1/demos/hello -lib/tk8.1/demos/hscale.tcl -lib/tk8.1/demos/icon.tcl -lib/tk8.1/demos/image1.tcl -lib/tk8.1/demos/image2.tcl -lib/tk8.1/demos/images/earth.gif -lib/tk8.1/demos/images/earthris.gif -lib/tk8.1/demos/images/face.bmp -lib/tk8.1/demos/images/flagdown.bmp -lib/tk8.1/demos/images/flagup.bmp -lib/tk8.1/demos/images/gray25.bmp -lib/tk8.1/demos/images/letters.bmp -lib/tk8.1/demos/images/noletter.bmp -lib/tk8.1/demos/images/pattern.bmp -lib/tk8.1/demos/images/tcllogo.gif -lib/tk8.1/demos/images/teapot.ppm -lib/tk8.1/demos/items.tcl -lib/tk8.1/demos/ixset -lib/tk8.1/demos/label.tcl -lib/tk8.1/demos/license.terms -lib/tk8.1/demos/menu.tcl -lib/tk8.1/demos/menubu.tcl -lib/tk8.1/demos/msgbox.tcl -lib/tk8.1/demos/plot.tcl -lib/tk8.1/demos/puzzle.tcl -lib/tk8.1/demos/radio.tcl -lib/tk8.1/demos/rmt -lib/tk8.1/demos/rolodex -lib/tk8.1/demos/ruler.tcl -lib/tk8.1/demos/sayings.tcl -lib/tk8.1/demos/search.tcl -lib/tk8.1/demos/square -lib/tk8.1/demos/states.tcl -lib/tk8.1/demos/style.tcl -lib/tk8.1/demos/tclIndex -lib/tk8.1/demos/tcolor -lib/tk8.1/demos/text.tcl -lib/tk8.1/demos/timer -lib/tk8.1/demos/twind.tcl -lib/tk8.1/demos/vscale.tcl -lib/tk8.1/demos/widget -lib/tk8.1/dialog.tcl -lib/tk8.1/entry.tcl -lib/tk8.1/focus.tcl -lib/tk8.1/images/README -lib/tk8.1/images/logo.eps -lib/tk8.1/images/logo100.gif -lib/tk8.1/images/logo64.gif -lib/tk8.1/images/logoLarge.gif -lib/tk8.1/images/logoMed.gif -lib/tk8.1/images/pspbrwse.jbf -lib/tk8.1/images/pwrdLogo.eps -lib/tk8.1/images/pwrdLogo100.gif -lib/tk8.1/images/pwrdLogo150.gif -lib/tk8.1/images/pwrdLogo175.gif -lib/tk8.1/images/pwrdLogo200.gif -lib/tk8.1/images/pwrdLogo75.gif -lib/tk8.1/images/tai-ku.gif -lib/tk8.1/listbox.tcl -lib/tk8.1/menu.tcl -lib/tk8.1/msgbox.tcl -lib/tk8.1/obsolete.tcl -lib/tk8.1/optMenu.tcl -lib/tk8.1/palette.tcl -lib/tk8.1/safetk.tcl -lib/tk8.1/scale.tcl -lib/tk8.1/scrlbar.tcl -lib/tk8.1/tclIndex -lib/tk8.1/tearoff.tcl -lib/tk8.1/text.tcl -lib/tk8.1/tk.tcl -lib/tk8.1/tkAppInit.c -lib/tk8.1/tkConfig.sh -lib/tk8.1/tkfbox.tcl -lib/tk8.1/xmfbox.tcl -@dirrm lib/tk8.1/demos/images -@dirrm lib/tk8.1/demos -@dirrm lib/tk8.1/images -@dirrm lib/tk8.1 -@dirrm include/tk8.1/unix -@dirrm include/tk8.1/generic -@dirrm include/tk8.1 +lib/tk%%TK_VER%%/bgerror.tcl +lib/tk%%TK_VER%%/button.tcl +lib/tk%%TK_VER%%/clrpick.tcl +lib/tk%%TK_VER%%/comdlg.tcl +lib/tk%%TK_VER%%/console.tcl +lib/tk%%TK_VER%%/demos/README +lib/tk%%TK_VER%%/demos/arrow.tcl +lib/tk%%TK_VER%%/demos/bind.tcl +lib/tk%%TK_VER%%/demos/bitmap.tcl +lib/tk%%TK_VER%%/demos/browse +lib/tk%%TK_VER%%/demos/button.tcl +lib/tk%%TK_VER%%/demos/check.tcl +lib/tk%%TK_VER%%/demos/clrpick.tcl +lib/tk%%TK_VER%%/demos/colors.tcl +lib/tk%%TK_VER%%/demos/cscroll.tcl +lib/tk%%TK_VER%%/demos/ctext.tcl +lib/tk%%TK_VER%%/demos/dialog1.tcl +lib/tk%%TK_VER%%/demos/dialog2.tcl +lib/tk%%TK_VER%%/demos/entry1.tcl +lib/tk%%TK_VER%%/demos/entry2.tcl +lib/tk%%TK_VER%%/demos/filebox.tcl +lib/tk%%TK_VER%%/demos/floor.tcl +lib/tk%%TK_VER%%/demos/form.tcl +lib/tk%%TK_VER%%/demos/hello +lib/tk%%TK_VER%%/demos/hscale.tcl +lib/tk%%TK_VER%%/demos/icon.tcl +lib/tk%%TK_VER%%/demos/image1.tcl +lib/tk%%TK_VER%%/demos/image2.tcl +lib/tk%%TK_VER%%/demos/images/earth.gif +lib/tk%%TK_VER%%/demos/images/earthris.gif +lib/tk%%TK_VER%%/demos/images/face.bmp +lib/tk%%TK_VER%%/demos/images/flagdown.bmp +lib/tk%%TK_VER%%/demos/images/flagup.bmp +lib/tk%%TK_VER%%/demos/images/gray25.bmp +lib/tk%%TK_VER%%/demos/images/letters.bmp +lib/tk%%TK_VER%%/demos/images/noletter.bmp +lib/tk%%TK_VER%%/demos/images/pattern.bmp +lib/tk%%TK_VER%%/demos/images/tcllogo.gif +lib/tk%%TK_VER%%/demos/images/teapot.ppm +lib/tk%%TK_VER%%/demos/items.tcl +lib/tk%%TK_VER%%/demos/ixset +lib/tk%%TK_VER%%/demos/label.tcl +lib/tk%%TK_VER%%/demos/license.terms +lib/tk%%TK_VER%%/demos/menu.tcl +lib/tk%%TK_VER%%/demos/menubu.tcl +lib/tk%%TK_VER%%/demos/msgbox.tcl +lib/tk%%TK_VER%%/demos/plot.tcl +lib/tk%%TK_VER%%/demos/puzzle.tcl +lib/tk%%TK_VER%%/demos/radio.tcl +lib/tk%%TK_VER%%/demos/rmt +lib/tk%%TK_VER%%/demos/rolodex +lib/tk%%TK_VER%%/demos/ruler.tcl +lib/tk%%TK_VER%%/demos/sayings.tcl +lib/tk%%TK_VER%%/demos/search.tcl +lib/tk%%TK_VER%%/demos/square +lib/tk%%TK_VER%%/demos/states.tcl +lib/tk%%TK_VER%%/demos/style.tcl +lib/tk%%TK_VER%%/demos/tclIndex +lib/tk%%TK_VER%%/demos/tcolor +lib/tk%%TK_VER%%/demos/text.tcl +lib/tk%%TK_VER%%/demos/timer +lib/tk%%TK_VER%%/demos/twind.tcl +lib/tk%%TK_VER%%/demos/vscale.tcl +lib/tk%%TK_VER%%/demos/widget +lib/tk%%TK_VER%%/dialog.tcl +lib/tk%%TK_VER%%/entry.tcl +lib/tk%%TK_VER%%/focus.tcl +lib/tk%%TK_VER%%/images/README +lib/tk%%TK_VER%%/images/logo.eps +lib/tk%%TK_VER%%/images/logo100.gif +lib/tk%%TK_VER%%/images/logo64.gif +lib/tk%%TK_VER%%/images/logoLarge.gif +lib/tk%%TK_VER%%/images/logoMed.gif +lib/tk%%TK_VER%%/images/pwrdLogo.eps +lib/tk%%TK_VER%%/images/pwrdLogo100.gif +lib/tk%%TK_VER%%/images/pwrdLogo150.gif +lib/tk%%TK_VER%%/images/pwrdLogo175.gif +lib/tk%%TK_VER%%/images/pwrdLogo200.gif +lib/tk%%TK_VER%%/images/pwrdLogo75.gif +lib/tk%%TK_VER%%/images/tai-ku.gif +lib/tk%%TK_VER%%/listbox.tcl +lib/tk%%TK_VER%%/menu.tcl +lib/tk%%TK_VER%%/msgbox.tcl +lib/tk%%TK_VER%%/obsolete.tcl +lib/tk%%TK_VER%%/optMenu.tcl +lib/tk%%TK_VER%%/palette.tcl +lib/tk%%TK_VER%%/prolog.ps +lib/tk%%TK_VER%%/safetk.tcl +lib/tk%%TK_VER%%/scale.tcl +lib/tk%%TK_VER%%/scrlbar.tcl +lib/tk%%TK_VER%%/tclIndex +lib/tk%%TK_VER%%/tearoff.tcl +lib/tk%%TK_VER%%/text.tcl +lib/tk%%TK_VER%%/tk.tcl +lib/tk%%TK_VER%%/tkAppInit.c +lib/tk%%TK_VER%%/tkConfig.sh +lib/tk%%TK_VER%%/tkfbox.tcl +lib/tk%%TK_VER%%/xmfbox.tcl +@dirrm lib/tk%%TK_VER%%/demos/images +@dirrm lib/tk%%TK_VER%%/demos +@dirrm lib/tk%%TK_VER%%/images +@dirrm lib/tk%%TK_VER%% +@dirrm include/tk%%TK_VER%%/unix +@dirrm include/tk%%TK_VER%%/generic +@dirrm include/tk%%TK_VER%% diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index c5c1428f839f..97b5bd60cf80 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -1,28 +1,32 @@ -# New ports collection makefile for: tk8.1.1 -# Version required: 8.1.1 +# New ports collection makefile for: tk +# Version required: 8.2.0 # Date created: 19 August 1997 # Whom: jkh # # $FreeBSD$ # -DISTNAME= tk8.1.1 -PKGNAME= tk-8.1.1 -CATEGORIES= x11-toolkits tk81 -MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/ +DISTNAME= tk8.2.0 +PKGNAME= tk-8.2.0 +CATEGORIES= x11-toolkits tk82 +MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_2/ MAINTAINER= jseger@FreeBSD.org -LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81 +LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80 USE_XLIB= yes WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-shared -CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk81.so.1 +CONFIGURE_ARGS= --enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 +CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1 PKGINSTALL= ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish +PLIST_SUB= TK_VER=8.2 SHORT_TK_VER=82 + +MANCOMPRESSED= no + MAN1= wish.1 MAN3= 3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \ Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 CoordToWin.3 \ @@ -288,7 +292,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ palette.n tk_setPalette.n \ palette.n tk_bisque.n \ popup.n tk_popup.n -MANCOMPRESSED= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo index 8189d7a403f7..bf1630df20e2 100644 --- a/x11-toolkits/tk84/distinfo +++ b/x11-toolkits/tk84/distinfo @@ -1 +1 @@ -MD5 (tk8.1.1.tar.gz) = 0677449e344e7720cfa37660d070de8c +MD5 (tk8.2.0.tar.gz) = 574e112ddca4330eea01b0e26d3ed6eb diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index 9938b28f6787..1f33895446d2 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,48 +1,41 @@ ---- configure.orig Fri Apr 30 08:27:45 1999 -+++ configure Mon May 10 00:20:26 1999 -@@ -956,14 +956,14 @@ - withval="$with_tcl" - TCL_BIN_DIR=$withval +--- configure.orig Fri Aug 13 18:06:14 1999 ++++ configure Sat Sep 4 15:22:21 1999 +@@ -1756,7 +1756,7 @@ + LDFLAGS="-Wl,-Bexport" + LD_SEARCH_FLAGS="" + ;; +- NetBSD-*|FreeBSD-[12].*|OpenBSD-*) ++ NetBSD-*|FreeBSD-*|OpenBSD-*) + # Not available on all versions: check for include file. + ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 +@@ -1788,14 +1788,19 @@ + echo "$ac_t""yes" 1>&6 + + SHLIB_CFLAGS="-fpic" +- SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS="" +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' ++ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1' ++ SHLIB_LD="ld -shared -x -soname \$@" ++ else ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' ++ SHLIB_LD="ld -Bshareable -x" ++ fi + else -- TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl8.1 - fi - - if test ! -d $TCL_BIN_DIR; then - { echo "configure: error: Tcl directory $TCL_BIN_DIR doesn't exist" 1>&2; exit 1; } - fi --if test ! -f $TCL_BIN_DIR/Makefile; then -- { echo "configure: error: There's no Makefile in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } -+if test ! -f $TCL_BIN_DIR/tclConfig.sh; then -+ { echo "configure: error: There's no tclConfig.sh in $TCL_BIN_DIR; perhaps you didn't specify the Tcl *build* directory (not the toplevel Tcl directory) or you forgot to configure Tcl?" 1>&2; exit 1; } - fi - - #-------------------------------------------------------------------- -@@ -1004,6 +1004,8 @@ - CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE - EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS + echo "$ac_t""no" 1>&6 +@@ -2266,6 +2271,7 @@ + echo "$ac_t""no" 1>&6 + fi +TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION} -+ - LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - # If Tcl and Tk are installed in different places, adjust the library -@@ -2450,8 +2452,8 @@ - if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then - TK_SHARED_BUILD=1 - TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" -- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} -- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}" -+ TK_LIB_FILE=${TK_LIB_FILE} -+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}" - RANLIB=":" + LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' - TCL_STUB_FLAGS="-DUSE_TCL_STUBS" -@@ -2729,6 +2731,7 @@ - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g - s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g - s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_DBGX@%$TCL_DBGX%g - s%@TCL_LIB_FLAG@%$TCL_LIB_FLAG%g - s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index d907e5809b46..3c9fb1cf6c6c 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Apr 30 08:27:45 1999 -+++ Makefile.in Mon May 10 01:18:32 1999 +--- Makefile.in.orig Fri Aug 13 18:06:14 1999 ++++ Makefile.in Sat Sep 4 19:47:43 1999 @@ -56,7 +56,9 @@ BIN_DIR = $(exec_prefix)/bin @@ -11,16 +11,7 @@ # Top-level directory for manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -98,7 +100,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = $(@CFLAGS_DEFAULT@) -+CFLAGS = @CFLAGS@ - - # A "-I" switch that can be used when compiling to make all of the - # X11 include files accessible (the configure script will try to -@@ -152,7 +154,7 @@ +@@ -153,7 +155,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -29,51 +20,50 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -188,7 +190,7 @@ +@@ -190,7 +192,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+WISH_LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc ++WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. -@@ -348,8 +350,14 @@ +@@ -356,8 +358,14 @@ ${TK_LIB_FILE}: ${OBJS} rm -f ${TK_LIB_FILE} @MAKE_LIB@ -+ ln -sf @TK_LIB_FILE@ libtk81.so ++ ln -sf @TK_LIB_FILE@ libtk82.so $(RANLIB) ${TK_LIB_FILE} -+libtk81.a: ${OBJS} -+ rm -f libtk81.a -+ ar cr libtk81.a ${OBJS} -+ $(RANLIB) libtk81.a ++libtk82.a: ${OBJS} ++ rm -f libtk82.a ++ ar cr libtk82.a ${OBJS} ++ $(RANLIB) libtk82.a + ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f ${STUB_LIB_FILE} @MAKE_STUB_LIB@ -@@ -410,7 +418,8 @@ +@@ -418,7 +426,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish -+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \ -+ libtk81.a wish ++install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -422,12 +431,18 @@ - done; - @echo "Installing $(TK_LIB_FILE)" +@@ -432,12 +440,18 @@ + chmod +x $(UNIX_DIR)/install-sh + chmod +x $(UNIX_DIR)/mkLinks @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @ln -sf $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk81.so ++ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk81.a" -+ @$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.a ++ @echo "Installing libtk82.a" ++ @$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtk82.a @echo "Installing wish" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) @echo "Installing tkConfig.sh" @@ -83,7 +73,7 @@ @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TK_EXP_FILE)"; \ $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -441,6 +456,7 @@ +@@ -451,6 +465,7 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ @@ -91,63 +81,49 @@ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ do \ if [ ! -d $$i ] ; then \ -@@ -450,11 +466,19 @@ - else true; \ +@@ -461,11 +476,19 @@ fi; \ done; + chmod +x $(UNIX_DIR)/install-sh - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + @echo "Installing headers" + @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ do \ echo "Installing $$i"; \ - $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ done; ++ @for i in $(UNIX_DIR)/*.h ; \ ++ do \ ++ echo "Installing $$i"; \ ++ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done ; + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h - for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ + for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \ + $(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \ do \ - echo "Installing $$i"; \ -@@ -513,30 +537,27 @@ - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ +@@ -530,16 +553,14 @@ + $$i > $(MAN1_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.3; \ do \ echo "Installing doc/$$i"; \ - rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i $(MAN3_INSTALL_DIR)/$$i.gz; \ ++ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ + $$i > $(MAN3_INSTALL_DIR)/$$i; \ + chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) @cd $(SRC_DIR)/doc; for i in *.n; \ do \ echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ +@@ -548,7 +569,6 @@ + $$i > $(MANN_INSTALL_DIR)/$$i; \ + chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist index b87d4c576803..b5afedf961fd 100644 --- a/x11-toolkits/tk84/pkg-plist +++ b/x11-toolkits/tk84/pkg-plist @@ -1,140 +1,140 @@ -bin/wish8.1 -include/tk8.1/generic/default.h -include/tk8.1/generic/ks_names.h -include/tk8.1/generic/tk.h -include/tk8.1/generic/tk3d.h -include/tk8.1/generic/tkButton.h -include/tk8.1/generic/tkCanvas.h -include/tk8.1/generic/tkColor.h -include/tk8.1/generic/tkDecls.h -include/tk8.1/generic/tkFileFilter.h -include/tk8.1/generic/tkFont.h -include/tk8.1/generic/tkInitScript.h -include/tk8.1/generic/tkInt.h -include/tk8.1/generic/tkIntDecls.h -include/tk8.1/generic/tkIntPlatDecls.h -include/tk8.1/generic/tkIntXlibDecls.h -include/tk8.1/generic/tkMenu.h -include/tk8.1/generic/tkMenubutton.h -include/tk8.1/generic/tkPlatDecls.h -include/tk8.1/generic/tkPort.h -include/tk8.1/generic/tkScale.h -include/tk8.1/generic/tkScrollbar.h -include/tk8.1/generic/tkSelect.h -include/tk8.1/generic/tkText.h -include/tk8.1/tk.h -include/tk8.1/tkDecls.h -include/tk8.1/unix/tkUnixDefault.h -include/tk8.1/unix/tkUnixInt.h -include/tk8.1/unix/tkUnixPort.h -lib/libtk81.a -lib/libtk81.so -lib/libtk81.so.1 -lib/libtkstub81.a +bin/wish%%TK_VER%% +include/tk%%TK_VER%%/generic/default.h +include/tk%%TK_VER%%/generic/ks_names.h +include/tk%%TK_VER%%/generic/tk.h +include/tk%%TK_VER%%/generic/tk3d.h +include/tk%%TK_VER%%/generic/tkButton.h +include/tk%%TK_VER%%/generic/tkCanvas.h +include/tk%%TK_VER%%/generic/tkColor.h +include/tk%%TK_VER%%/generic/tkDecls.h +include/tk%%TK_VER%%/generic/tkFileFilter.h +include/tk%%TK_VER%%/generic/tkFont.h +include/tk%%TK_VER%%/generic/tkInitScript.h +include/tk%%TK_VER%%/generic/tkInt.h +include/tk%%TK_VER%%/generic/tkIntDecls.h +include/tk%%TK_VER%%/generic/tkIntPlatDecls.h +include/tk%%TK_VER%%/generic/tkIntXlibDecls.h +include/tk%%TK_VER%%/generic/tkMenu.h +include/tk%%TK_VER%%/generic/tkMenubutton.h +include/tk%%TK_VER%%/generic/tkPlatDecls.h +include/tk%%TK_VER%%/generic/tkPort.h +include/tk%%TK_VER%%/generic/tkScale.h +include/tk%%TK_VER%%/generic/tkScrollbar.h +include/tk%%TK_VER%%/generic/tkSelect.h +include/tk%%TK_VER%%/generic/tkText.h +include/tk%%TK_VER%%/tk.h +include/tk%%TK_VER%%/tkDecls.h +include/tk%%TK_VER%%/unix/tkUnixDefault.h +include/tk%%TK_VER%%/unix/tkUnixInt.h +include/tk%%TK_VER%%/unix/tkUnixPort.h +lib/libtk%%SHORT_TK_VER%%.a +lib/libtk%%SHORT_TK_VER%%.so +lib/libtk%%SHORT_TK_VER%%.so.1 +lib/libtkstub%%SHORT_TK_VER%%.a @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/tk8.1/bgerror.tcl -lib/tk8.1/button.tcl -lib/tk8.1/clrpick.tcl -lib/tk8.1/comdlg.tcl -lib/tk8.1/console.tcl -lib/tk8.1/demos/README -lib/tk8.1/demos/arrow.tcl -lib/tk8.1/demos/bind.tcl -lib/tk8.1/demos/bitmap.tcl -lib/tk8.1/demos/browse -lib/tk8.1/demos/button.tcl -lib/tk8.1/demos/check.tcl -lib/tk8.1/demos/clrpick.tcl -lib/tk8.1/demos/colors.tcl -lib/tk8.1/demos/cscroll.tcl -lib/tk8.1/demos/ctext.tcl -lib/tk8.1/demos/dialog1.tcl -lib/tk8.1/demos/dialog2.tcl -lib/tk8.1/demos/entry1.tcl -lib/tk8.1/demos/entry2.tcl -lib/tk8.1/demos/filebox.tcl -lib/tk8.1/demos/floor.tcl -lib/tk8.1/demos/form.tcl -lib/tk8.1/demos/hello -lib/tk8.1/demos/hscale.tcl -lib/tk8.1/demos/icon.tcl -lib/tk8.1/demos/image1.tcl -lib/tk8.1/demos/image2.tcl -lib/tk8.1/demos/images/earth.gif -lib/tk8.1/demos/images/earthris.gif -lib/tk8.1/demos/images/face.bmp -lib/tk8.1/demos/images/flagdown.bmp -lib/tk8.1/demos/images/flagup.bmp -lib/tk8.1/demos/images/gray25.bmp -lib/tk8.1/demos/images/letters.bmp -lib/tk8.1/demos/images/noletter.bmp -lib/tk8.1/demos/images/pattern.bmp -lib/tk8.1/demos/images/tcllogo.gif -lib/tk8.1/demos/images/teapot.ppm -lib/tk8.1/demos/items.tcl -lib/tk8.1/demos/ixset -lib/tk8.1/demos/label.tcl -lib/tk8.1/demos/license.terms -lib/tk8.1/demos/menu.tcl -lib/tk8.1/demos/menubu.tcl -lib/tk8.1/demos/msgbox.tcl -lib/tk8.1/demos/plot.tcl -lib/tk8.1/demos/puzzle.tcl -lib/tk8.1/demos/radio.tcl -lib/tk8.1/demos/rmt -lib/tk8.1/demos/rolodex -lib/tk8.1/demos/ruler.tcl -lib/tk8.1/demos/sayings.tcl -lib/tk8.1/demos/search.tcl -lib/tk8.1/demos/square -lib/tk8.1/demos/states.tcl -lib/tk8.1/demos/style.tcl -lib/tk8.1/demos/tclIndex -lib/tk8.1/demos/tcolor -lib/tk8.1/demos/text.tcl -lib/tk8.1/demos/timer -lib/tk8.1/demos/twind.tcl -lib/tk8.1/demos/vscale.tcl -lib/tk8.1/demos/widget -lib/tk8.1/dialog.tcl -lib/tk8.1/entry.tcl -lib/tk8.1/focus.tcl -lib/tk8.1/images/README -lib/tk8.1/images/logo.eps -lib/tk8.1/images/logo100.gif -lib/tk8.1/images/logo64.gif -lib/tk8.1/images/logoLarge.gif -lib/tk8.1/images/logoMed.gif -lib/tk8.1/images/pspbrwse.jbf -lib/tk8.1/images/pwrdLogo.eps -lib/tk8.1/images/pwrdLogo100.gif -lib/tk8.1/images/pwrdLogo150.gif -lib/tk8.1/images/pwrdLogo175.gif -lib/tk8.1/images/pwrdLogo200.gif -lib/tk8.1/images/pwrdLogo75.gif -lib/tk8.1/images/tai-ku.gif -lib/tk8.1/listbox.tcl -lib/tk8.1/menu.tcl -lib/tk8.1/msgbox.tcl -lib/tk8.1/obsolete.tcl -lib/tk8.1/optMenu.tcl -lib/tk8.1/palette.tcl -lib/tk8.1/safetk.tcl -lib/tk8.1/scale.tcl -lib/tk8.1/scrlbar.tcl -lib/tk8.1/tclIndex -lib/tk8.1/tearoff.tcl -lib/tk8.1/text.tcl -lib/tk8.1/tk.tcl -lib/tk8.1/tkAppInit.c -lib/tk8.1/tkConfig.sh -lib/tk8.1/tkfbox.tcl -lib/tk8.1/xmfbox.tcl -@dirrm lib/tk8.1/demos/images -@dirrm lib/tk8.1/demos -@dirrm lib/tk8.1/images -@dirrm lib/tk8.1 -@dirrm include/tk8.1/unix -@dirrm include/tk8.1/generic -@dirrm include/tk8.1 +lib/tk%%TK_VER%%/bgerror.tcl +lib/tk%%TK_VER%%/button.tcl +lib/tk%%TK_VER%%/clrpick.tcl +lib/tk%%TK_VER%%/comdlg.tcl +lib/tk%%TK_VER%%/console.tcl +lib/tk%%TK_VER%%/demos/README +lib/tk%%TK_VER%%/demos/arrow.tcl +lib/tk%%TK_VER%%/demos/bind.tcl +lib/tk%%TK_VER%%/demos/bitmap.tcl +lib/tk%%TK_VER%%/demos/browse +lib/tk%%TK_VER%%/demos/button.tcl +lib/tk%%TK_VER%%/demos/check.tcl +lib/tk%%TK_VER%%/demos/clrpick.tcl +lib/tk%%TK_VER%%/demos/colors.tcl +lib/tk%%TK_VER%%/demos/cscroll.tcl +lib/tk%%TK_VER%%/demos/ctext.tcl +lib/tk%%TK_VER%%/demos/dialog1.tcl +lib/tk%%TK_VER%%/demos/dialog2.tcl +lib/tk%%TK_VER%%/demos/entry1.tcl +lib/tk%%TK_VER%%/demos/entry2.tcl +lib/tk%%TK_VER%%/demos/filebox.tcl +lib/tk%%TK_VER%%/demos/floor.tcl +lib/tk%%TK_VER%%/demos/form.tcl +lib/tk%%TK_VER%%/demos/hello +lib/tk%%TK_VER%%/demos/hscale.tcl +lib/tk%%TK_VER%%/demos/icon.tcl +lib/tk%%TK_VER%%/demos/image1.tcl +lib/tk%%TK_VER%%/demos/image2.tcl +lib/tk%%TK_VER%%/demos/images/earth.gif +lib/tk%%TK_VER%%/demos/images/earthris.gif +lib/tk%%TK_VER%%/demos/images/face.bmp +lib/tk%%TK_VER%%/demos/images/flagdown.bmp +lib/tk%%TK_VER%%/demos/images/flagup.bmp +lib/tk%%TK_VER%%/demos/images/gray25.bmp +lib/tk%%TK_VER%%/demos/images/letters.bmp +lib/tk%%TK_VER%%/demos/images/noletter.bmp +lib/tk%%TK_VER%%/demos/images/pattern.bmp +lib/tk%%TK_VER%%/demos/images/tcllogo.gif +lib/tk%%TK_VER%%/demos/images/teapot.ppm +lib/tk%%TK_VER%%/demos/items.tcl +lib/tk%%TK_VER%%/demos/ixset +lib/tk%%TK_VER%%/demos/label.tcl +lib/tk%%TK_VER%%/demos/license.terms +lib/tk%%TK_VER%%/demos/menu.tcl +lib/tk%%TK_VER%%/demos/menubu.tcl +lib/tk%%TK_VER%%/demos/msgbox.tcl +lib/tk%%TK_VER%%/demos/plot.tcl +lib/tk%%TK_VER%%/demos/puzzle.tcl +lib/tk%%TK_VER%%/demos/radio.tcl +lib/tk%%TK_VER%%/demos/rmt +lib/tk%%TK_VER%%/demos/rolodex +lib/tk%%TK_VER%%/demos/ruler.tcl +lib/tk%%TK_VER%%/demos/sayings.tcl +lib/tk%%TK_VER%%/demos/search.tcl +lib/tk%%TK_VER%%/demos/square +lib/tk%%TK_VER%%/demos/states.tcl +lib/tk%%TK_VER%%/demos/style.tcl +lib/tk%%TK_VER%%/demos/tclIndex +lib/tk%%TK_VER%%/demos/tcolor +lib/tk%%TK_VER%%/demos/text.tcl +lib/tk%%TK_VER%%/demos/timer +lib/tk%%TK_VER%%/demos/twind.tcl +lib/tk%%TK_VER%%/demos/vscale.tcl +lib/tk%%TK_VER%%/demos/widget +lib/tk%%TK_VER%%/dialog.tcl +lib/tk%%TK_VER%%/entry.tcl +lib/tk%%TK_VER%%/focus.tcl +lib/tk%%TK_VER%%/images/README +lib/tk%%TK_VER%%/images/logo.eps +lib/tk%%TK_VER%%/images/logo100.gif +lib/tk%%TK_VER%%/images/logo64.gif +lib/tk%%TK_VER%%/images/logoLarge.gif +lib/tk%%TK_VER%%/images/logoMed.gif +lib/tk%%TK_VER%%/images/pwrdLogo.eps +lib/tk%%TK_VER%%/images/pwrdLogo100.gif +lib/tk%%TK_VER%%/images/pwrdLogo150.gif +lib/tk%%TK_VER%%/images/pwrdLogo175.gif +lib/tk%%TK_VER%%/images/pwrdLogo200.gif +lib/tk%%TK_VER%%/images/pwrdLogo75.gif +lib/tk%%TK_VER%%/images/tai-ku.gif +lib/tk%%TK_VER%%/listbox.tcl +lib/tk%%TK_VER%%/menu.tcl +lib/tk%%TK_VER%%/msgbox.tcl +lib/tk%%TK_VER%%/obsolete.tcl +lib/tk%%TK_VER%%/optMenu.tcl +lib/tk%%TK_VER%%/palette.tcl +lib/tk%%TK_VER%%/prolog.ps +lib/tk%%TK_VER%%/safetk.tcl +lib/tk%%TK_VER%%/scale.tcl +lib/tk%%TK_VER%%/scrlbar.tcl +lib/tk%%TK_VER%%/tclIndex +lib/tk%%TK_VER%%/tearoff.tcl +lib/tk%%TK_VER%%/text.tcl +lib/tk%%TK_VER%%/tk.tcl +lib/tk%%TK_VER%%/tkAppInit.c +lib/tk%%TK_VER%%/tkConfig.sh +lib/tk%%TK_VER%%/tkfbox.tcl +lib/tk%%TK_VER%%/xmfbox.tcl +@dirrm lib/tk%%TK_VER%%/demos/images +@dirrm lib/tk%%TK_VER%%/demos +@dirrm lib/tk%%TK_VER%%/images +@dirrm lib/tk%%TK_VER%% +@dirrm include/tk%%TK_VER%%/unix +@dirrm include/tk%%TK_VER%%/generic +@dirrm include/tk%%TK_VER%% |