aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/tcl83/Makefile7
-rw-r--r--lang/tcl83/distinfo2
-rw-r--r--lang/tcl83/files/patch-aa40
-rw-r--r--lang/tcl83/files/patch-configure36
-rw-r--r--lang/tcl83/files/patch-tcl.m422
-rw-r--r--x11-toolkits/tk83/Makefile5
-rw-r--r--x11-toolkits/tk83/distinfo2
-rw-r--r--x11-toolkits/tk83/files/patch-aa45
-rw-r--r--x11-toolkits/tk83/files/patch-ab46
9 files changed, 96 insertions, 109 deletions
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 73194f6f5002..f339a91baef4 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -6,18 +6,17 @@
#
PORTNAME= tcl
-PORTVERSION= 8.3.4
-PORTREVISION= 4
+PORTVERSION= 8.3.5
CATEGORIES= lang tcl83
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
-DISTNAME= ${PORTNAME}${PORTVERSION}
+DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= dinoex@FreeBSD.org
LATEST_LINK= tcl83
PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
-WRKSRC= ${WRKDIR}/${DISTNAME}/unix
+WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index f914cacee8b8..ce4508cf3ce4 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1 +1 @@
-MD5 (tcl8.3.4.tar.gz) = 8777250e03d6be9be7551bfc6e99d252
+MD5 (tcl8.3.5-src.tar.gz) = 5cb79f8b90cf1322cb1286b9fe67f7a2
diff --git a/lang/tcl83/files/patch-aa b/lang/tcl83/files/patch-aa
index 0ff89d9eade2..671ab4f73df7 100644
--- a/lang/tcl83/files/patch-aa
+++ b/lang/tcl83/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sat Oct 20 02:24:15 2001
-+++ Makefile.in Sat Oct 20 11:21:50 2001
+--- Makefile.in.orig Fri Oct 18 22:44:46 2002
++++ Makefile.in Tue Nov 12 21:45:50 2002
@@ -53,7 +53,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -30,32 +30,28 @@
libraries:
-@@ -418,10 +421,16 @@
+@@ -418,7 +421,15 @@
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
rm -f ${TCL_LIB_FILE}
@MAKE_LIB@
+- $(RANLIB) ${TCL_LIB_FILE}
+ @ln -sf $(TCL_LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
- if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- $(RANLIB) ${TCL_LIB_FILE}; \
- fi
-
++ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
++ $(RANLIB) ${TCL_LIB_FILE}; \
++ fi
++
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+ rm -f libtcl${SHORT_TCL_VER}.a
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+ $(RANLIB) libtcl${SHORT_TCL_VER}.a
-+
+
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
- @MAKE_STUB_LIB@
-@@ -539,10 +548,16 @@
- fi
- @echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
+@@ -561,6 +572,12 @@
@$(INSTALL_LIBRARY) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
-+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
- @if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
- (cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)); \
- fi
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
++ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so
+ @echo "Installing libtcl${SHORT_TCL_VER}.a"
+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \
+ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a
@@ -64,7 +60,7 @@
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
-@@ -550,8 +565,9 @@
+@@ -568,8 +585,9 @@
fi
@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
@@ -76,7 +72,7 @@
@if test "$(TCL_STUB_LIB_FILE)" != "" ; then \
echo "Installing $(TCL_STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_LIBRARY) $(STUB_LIB_FILE) \
-@@ -559,7 +575,8 @@
+@@ -577,7 +595,8 @@
fi
install-libraries: libraries
@@ -86,7 +82,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
-@@ -581,11 +598,16 @@
+@@ -599,11 +618,16 @@
chmod +x $(SRC_DIR)/install-sh; \
fi
@echo "Installing header files";
@@ -106,7 +102,7 @@
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
do \
-@@ -643,7 +665,6 @@
+@@ -661,7 +685,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@@ -114,7 +110,7 @@
@echo "Installing C API (.3) docs";
@cd $(TOP_DIR)/doc; for i in *.3; \
do \
-@@ -653,7 +674,6 @@
+@@ -671,7 +694,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking C API (.3) docs";
@@ -122,7 +118,7 @@
@echo "Installing command (.n) docs";
@cd $(TOP_DIR)/doc; for i in *.n; \
do \
-@@ -663,7 +683,14 @@
+@@ -681,7 +703,14 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
diff --git a/lang/tcl83/files/patch-configure b/lang/tcl83/files/patch-configure
index 10d1e458ad04..77f71fb0133e 100644
--- a/lang/tcl83/files/patch-configure
+++ b/lang/tcl83/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Sat Oct 20 02:24:15 2001
-+++ configure Sun Jan 27 14:52:09 2002
-@@ -4779,7 +4779,7 @@
+--- configure.orig Fri Oct 18 22:44:46 2002
++++ configure Tue Nov 12 21:40:13 2002
+@@ -4831,7 +4831,7 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
@@ -9,24 +9,32 @@
ECHO_VERSION='`echo ${VERSION}`'
TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g
-@@ -5386,16 +5386,17 @@
+@@ -5499,12 +5499,13 @@
FreeBSD-*)
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
-+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
- SHLIB_LD_LIBS=""
++ TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
- LD_SEARCH_FLAGS=""
- # FreeBSD doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
- Rhapsody-*|Darwin-*)
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ if test "${TCL_THREADS}" = "1" ; then
+ # The -pthread needs to go in the CFLAGS, not LIBS
+@@ -5513,10 +5514,10 @@
+ LDFLAGS="$LDFLAGS -pthread"
+ fi
+ case $system in
+- FreeBSD-3.*)
++ FreeBSD-*)
+ # FreeBSD-3 doesn't handle version numbers with dots.
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
diff --git a/lang/tcl83/files/patch-tcl.m4 b/lang/tcl83/files/patch-tcl.m4
deleted file mode 100644
index 7341faab013e..000000000000
--- a/lang/tcl83/files/patch-tcl.m4
+++ /dev/null
@@ -1,22 +0,0 @@
---- tcl.m4.orig Sat Oct 20 02:24:15 2001
-+++ tcl.m4 Sat Nov 10 20:17:34 2001
-@@ -952,16 +952,16 @@
- FreeBSD-*)
- # FreeBSD 3.* and greater have ELF.
- SHLIB_CFLAGS="-fPIC"
-- SHLIB_LD="ld -Bshareable -x"
-+ SHLIB_LD="ld -shared -x -soname \$@"
- SHLIB_LD_LIBS=""
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS="-export-dynamic"
-+ LDFLAGS=""
- LD_SEARCH_FLAGS=""
- # FreeBSD doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
- Rhapsody-*|Darwin-*)
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 3b406ca21a98..772d63f6c724 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= tk
-PORTVERSION= 8.3.4
-PORTREVISION= 3
+PORTVERSION= 8.3.5
CATEGORIES= x11-toolkits tk83
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
-DISTNAME= ${PORTNAME}${PORTVERSION}
+DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= dinoex@FreeBSD.org
diff --git a/x11-toolkits/tk83/distinfo b/x11-toolkits/tk83/distinfo
index d54f9190c057..3eba00a8f483 100644
--- a/x11-toolkits/tk83/distinfo
+++ b/x11-toolkits/tk83/distinfo
@@ -1 +1 @@
-MD5 (tk8.3.4.tar.gz) = 02311d8f90734c4f5eaa62e9b36fe535
+MD5 (tk8.3.5-src.tar.gz) = 363a55d31d94e05159e9212074c68004
diff --git a/x11-toolkits/tk83/files/patch-aa b/x11-toolkits/tk83/files/patch-aa
index ee05cb4304c3..f3fc92f3e2d5 100644
--- a/x11-toolkits/tk83/files/patch-aa
+++ b/x11-toolkits/tk83/files/patch-aa
@@ -1,34 +1,35 @@
---- configure.orig Sat Oct 20 02:24:40 2001
-+++ configure Sat Nov 10 21:53:28 2001
-@@ -2351,21 +2351,22 @@
- # FreeBSD doesn't handle version numbers with dots.
-
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
+--- configure.orig Wed Oct 23 19:45:50 2002
++++ configure Tue Nov 12 21:51:56 2002
+@@ -2496,12 +2496,12 @@
FreeBSD-*)
# FreeBSD 3.* and greater have ELF.
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="ld -Bshareable -x"
-- SHLIB_LD_LIBS=""
-+ SHLIB_LD="ld -shared -x -soname \$@"
-+ SHLIB_LD_LIBS='${LIBS}'
++ SHLIB_LD="ld -shared -x -soname \$@"
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS="-export-dynamic"
+ LDFLAGS=""
- LD_SEARCH_FLAGS=""
- # FreeBSD doesn't handle version numbers with dots.
- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
- TCL_LIB_VERSIONS_OK=nodots
- ;;
- Rhapsody-*|Darwin-*)
-@@ -2882,6 +2883,7 @@
- echo "$ac_t""no" 1>&6
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ if test "${TCL_THREADS}" = "1" ; then
+ # The -pthread needs to go in the CFLAGS, not LIBS
+@@ -2510,10 +2510,10 @@
+ LDFLAGS="$LDFLAGS -pthread"
+ fi
+ case $system in
+- FreeBSD-3.*)
++ FreeBSD-*)
+ # FreeBSD-3 doesn't handle version numbers with dots.
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ esac
+@@ -3074,6 +3074,7 @@
+ fi
fi
+TCL_SRC_DIR=${prefix}/include/tcl${TCL_VERSION}
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index c4405ddb29cc..244e54dbb8b6 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig Fri Apr 6 04:03:05 2001
-+++ Makefile.in Fri Apr 13 21:59:30 2001
+--- Makefile.in.orig Wed Oct 23 19:45:50 2002
++++ Makefile.in Tue Nov 12 21:56:31 2002
@@ -57,7 +57,9 @@
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
@@ -11,19 +11,25 @@
# Top-level directory for manual entries:
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
-@@ -103,1 +103,1 @@
--CFLAGS = @CFLAGS@
+@@ -100,7 +102,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
+ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
+CFLAGS ?= @CFLAGS@
-@@ -197,7 +199,7 @@
+
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+@@ -203,7 +205,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
+ LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
+-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@
+WISH_LIBS = -L${PREFIX}/lib -ltcl${SHORT_TK_VER} @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.
-@@ -346,6 +348,8 @@
+@@ -352,6 +354,8 @@
default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \
tkPort.h tkScrollbar.h tkText.h
@@ -32,7 +38,7 @@
DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
all: binaries libraries doc
-@@ -365,8 +369,14 @@
+@@ -371,8 +375,14 @@
${TK_LIB_FILE}: ${OBJS}
rm -f ${TK_LIB_FILE}
@MAKE_LIB@
@@ -47,7 +53,7 @@
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
rm -f ${STUB_LIB_FILE}
@MAKE_STUB_LIB@
-@@ -438,7 +448,7 @@
+@@ -460,7 +470,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
@@ -56,7 +62,7 @@
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
do \
if [ ! -d $$i ] ; then \
-@@ -456,12 +466,18 @@
+@@ -478,12 +488,18 @@
fi
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -76,7 +82,7 @@
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
-@@ -475,6 +491,7 @@
+@@ -497,6 +513,7 @@
install-libraries:
@for i in $(INCLUDE_INSTALL_DIR) \
@@ -84,14 +90,15 @@
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
do \
if [ ! -d $$i ] ; then \
-@@ -488,10 +505,18 @@
+@@ -510,10 +527,18 @@
chmod +x $(UNIX_DIR)/install-sh; \
fi
@echo "Installing header files";
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
-- $(GENERIC_DIR)/tkDecls.h $(GENERIC_DIR)/tkIntXlibDecls.h ; \
+- $(GENERIC_DIR)/tkDecls.h ; \
+ @for i in $(GENERIC_DIR)/*.h ; \
-+ do \
+ do \
+- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(UNIX_DIR)/*.h ; \
@@ -99,14 +106,13 @@
+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
+ done;
+ @for i in $(INSTALL_HDRS) ; \
- do \
-- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
++ do \
+ j=`basename $$i` ; \
+ ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
done;
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
-@@ -558,7 +583,6 @@
+@@ -580,7 +605,6 @@
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.1) docs";
@@ -114,7 +120,7 @@
@echo "Installing C API (.3) docs";
@cd $(SRC_DIR)/doc; for i in *.3; \
do \
-@@ -568,7 +592,6 @@
+@@ -590,7 +614,6 @@
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking top-level (.3) docs";
@@ -122,7 +128,7 @@
@echo "Installing command (.n) docs";
@cd $(SRC_DIR)/doc; for i in *.n; \
do \
-@@ -578,7 +601,6 @@
+@@ -600,7 +623,6 @@
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
done;
@echo "Cross-linking command (.n) docs";
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 09:27:24 +0000