diff options
Diffstat (limited to 'lang/tcl82/files')
-rw-r--r-- | lang/tcl82/files/patch-aa | 123 | ||||
-rw-r--r-- | lang/tcl82/files/patch-ab | 149 |
2 files changed, 154 insertions, 118 deletions
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}" |