diff options
-rw-r--r-- | lang/tcl84/Makefile | 4 | ||||
-rw-r--r-- | lang/tcl84/distinfo | 4 | ||||
-rw-r--r-- | lang/tcl84/files/patch-aa | 77 | ||||
-rw-r--r-- | lang/tcl84/files/patch-configure | 27 | ||||
-rw-r--r-- | x11-toolkits/tk84/Makefile | 3 | ||||
-rw-r--r-- | x11-toolkits/tk84/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 27 | ||||
-rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 84 |
8 files changed, 54 insertions, 176 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index fc76b975402c..69aed54e1c97 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -6,8 +6,8 @@ # PORTNAME= tcl -PORTVERSION= 8.4.6 -PORTREVISION= 3 +PORTVERSION= 8.4.7 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= lang tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index e62871010091..1f2bc4ba2517 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1,2 +1,2 @@ -MD5 (tcl8.4.6-src.tar.gz) = 9009a92dc648775fb8a9b0789b995756 -SIZE (tcl8.4.6-src.tar.gz) = 3448711 +MD5 (tcl8.4.7-src.tar.gz) = 07e256e21bd0d05887770318b540c36f +SIZE (tcl8.4.7-src.tar.gz) = 3472974 diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index f887651e8fae..409bcd91ee10 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,38 +1,22 @@ ---- Makefile.in.orig Mon Mar 3 21:30:58 2003 -+++ Makefile.in Sun Mar 9 13:04:43 2003 -@@ -56,7 +56,9 @@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) - - # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +--- Makefile.in.orig Mon Jul 26 14:40:46 2004 ++++ Makefile.in Thu Oct 28 10:51:40 2004 +@@ -59,2 +59,4 @@ + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -90,7 +92,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) +@@ -92,3 +94,3 @@ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX) -+CFLAGS += @CFLAGS@ @CFLAGS_DEFAULT@ -DTCL_DBGX=$(TCL_DBGX) - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -445,7 +447,8 @@ +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) ++CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) - all: binaries libraries doc +@@ -447,3 +449,4 @@ -binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh +binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ + libtcl${SHORT_TCL_VER}.a tclsh - libraries: - -@@ -456,6 +459,15 @@ - ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f $@ +@@ -458,2 +461,11 @@ @MAKE_LIB@ + @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so + if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ @@ -44,11 +28,7 @@ + ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} + $(RANLIB) libtcl${SHORT_TCL_VER}.a - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -602,6 +614,12 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ +@@ -604,2 +616,8 @@ @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) + @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so + @echo "Installing libtcl${SHORT_TCL_VER}.a" @@ -57,11 +37,7 @@ + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -609,15 +627,17 @@ - fi - @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" +@@ -611,4 +629,5 @@ @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) - @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" - @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh @@ -69,20 +45,13 @@ + @mkdir -p $(SCRIPT_INSTALL_DIR) + @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - @INSTALL_STUB_LIB@ ; \ - fi - +@@ -619,3 +638,4 @@ install-libraries: libraries - @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ + @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ + $(SCRIPT_INSTALL_DIR); \ do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -@@ -639,11 +659,17 @@ - chmod +x $(SRC_DIR)/install-sh; \ - fi +@@ -641,7 +661,13 @@ @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ - $(GENERIC_DIR)/tclPlatDecls.h ; \ @@ -99,27 +68,15 @@ + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h + @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h @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 \ -@@ -701,7 +727,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; +@@ -703,3 +729,2 @@ @echo "Cross-linking top-level (.1) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR) @echo "Installing C API (.3) docs"; - @cd $(TOP_DIR)/doc; for i in *.3; \ - do \ -@@ -711,7 +736,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; +@@ -713,3 +738,2 @@ @echo "Cross-linking C API (.3) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR) @echo "Installing command (.n) docs"; - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ -@@ -721,7 +745,14 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; +@@ -723,3 +747,10 @@ @echo "Cross-linking command (.n) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR) + @echo "**********" @@ -131,5 +88,3 @@ + @echo "There are NOT default place, but good place to avoid" + @echo "conflicting with another version of Tcl/Tks." - Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in - $(SHELL) config.status diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure index 551fea9436bf..a831a83163f7 100644 --- a/lang/tcl84/files/patch-configure +++ b/lang/tcl84/files/patch-configure @@ -1,33 +1,22 @@ ---- configure.orig Sat Aug 17 21:04:03 2002 -+++ configure Mon Sep 9 12:59:14 2002 -@@ -5482,7 +5482,7 @@ - EXTRA_CFLAGS="" - TCL_EXPORT_FILE_SUFFIX="" +--- configure.orig Mon Jul 26 14:40:46 2004 ++++ configure Thu Oct 28 10:54:24 2004 +@@ -2081,3 +2081,3 @@ UNSHARED_LIB_SUFFIX="" - TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`' + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` ECHO_VERSION='`echo ${VERSION}`' - TCL_LIB_VERSIONS_OK=ok - CFLAGS_DEBUG=-g -@@ -6143,12 +6143,13 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. +@@ -2878,3 +2878,4 @@ SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + SHLIB_LD="ld -shared -x" + TCL_SHLIB_LD_EXTRAS="-soname \$@" SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" +@@ -2883,3 +2884,3 @@ DL_LIBS="" -- LDFLAGS="-export-dynamic" +- LDFLAGS="$LDFLAGS -export-dynamic" + LDFLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then -@@ -6156,10 +6157,10 @@ - LDFLAGS="$LDFLAGS -pthread" - fi +@@ -2893,6 +2894,6 @@ case $system in - FreeBSD-3.*) + FreeBSD-*) @@ -36,5 +25,3 @@ - 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/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index e2fb89858bf8..0e6a771581a5 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tk -PORTVERSION= 8.4.6 -PORTREVISION= 1 +PORTVERSION= 8.4.7 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo index 9df1205e9c6c..de63d54038c2 100644 --- a/x11-toolkits/tk84/distinfo +++ b/x11-toolkits/tk84/distinfo @@ -1,2 +1,2 @@ -MD5 (tk8.4.6-src.tar.gz) = 24b7774d54c1c568cabe16f3498ddccd -SIZE (tk8.4.6-src.tar.gz) = 3230760 +MD5 (tk8.4.7-src.tar.gz) = b86b0db1c28723e6d3139e88250353a6 +SIZE (tk8.4.7-src.tar.gz) = 3186531 diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index bdb028ce1079..c78536abc64a 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,24 +1,17 @@ ---- configure.orig Tue Sep 10 21:13:52 2002 -+++ configure Mon Sep 30 20:45:39 2002 -@@ -2669,12 +2669,13 @@ - FreeBSD-*) - # FreeBSD 3.* and greater have ELF. +--- configure.orig Thu Jul 29 14:57:48 2004 ++++ configure Thu Oct 28 11:16:40 2004 +@@ -2590,3 +2590,4 @@ SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + TCL_SHLIB_LD_EXTRAS="-soname \$@" + SHLIB_LD="ld -shared -x" SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" +@@ -2595,3 +2596,3 @@ DL_LIBS="" -- LDFLAGS="-export-dynamic" +- LDFLAGS="$LDFLAGS -export-dynamic" + LDFLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' - if test "${TCL_THREADS}" = "1" ; then -@@ -2684,10 +2685,10 @@ - LDFLAGS="$LDFLAGS -pthread" - fi +@@ -2605,6 +2606,6 @@ case $system in - FreeBSD-3.*) + FreeBSD-*) @@ -27,13 +20,7 @@ - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' TCL_LIB_VERSIONS_OK=nodots - ;; - esac -@@ -2913,6 +2914,7 @@ - #define _POSIX_PTHREAD_SEMANTICS 1 - EOF +@@ -2841,2 +2842,3 @@ +TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION} - SHLIB_CFLAGS="-KPIC" - LDFLAGS="" diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index ca655bca5bba..90a830db81d1 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -1,46 +1,26 @@ ---- Makefile.in.orig Tue Sep 10 21:13:52 2002 -+++ Makefile.in Mon Sep 30 21:11:16 2002 -@@ -61,7 +61,9 @@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) - - # Directory in which to install the include file tk.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +--- Makefile.in.orig Thu Jul 29 14:57:48 2004 ++++ Makefile.in Thu Oct 28 11:17:38 2004 +@@ -64,2 +64,4 @@ + INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - # Top-level directory for manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) -@@ -113,7 +115,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) +@@ -115,3 +117,3 @@ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -+CFLAGS ?= @CFLAGS@ @CFLAGS_DEFAULT@ +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ ++CFLAGS ?= @CFLAGS_DEFAULT@ @CFLAGS@ - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -232,7 +234,7 @@ - STLIB_LD = @STLIB_LD@ - SHLIB_LD = @SHLIB_LD@ +@@ -239,3 +241,3 @@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@ +TK_SHLIB_LD_EXTRAS = @TCL_SHLIB_LD_EXTRAS@ - # Additional search flags needed to find the various shared libraries - # at run-time. The first symbol is for use when creating a binary -@@ -381,6 +383,8 @@ - default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ - tkPort.h tkScrollbar.h tkText.h +@@ -388,2 +390,4 @@ +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h + DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget - - all: binaries libraries doc -@@ -400,6 +404,12 @@ - ${LIB_FILE}: ${OBJS} - rm -f $@ +@@ -407,2 +411,8 @@ @MAKE_LIB@ + ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so + @@ -49,21 +29,13 @@ + ar cr libtk${SHORT_TK_VER}.a ${OBJS} + $(RANLIB) libtk${SHORT_TK_VER}.a - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -497,7 +507,8 @@ - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). +@@ -509,3 +519,4 @@ -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) \ + libtk${SHORT_TK_VER}.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ -@@ -523,10 +534,15 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ +@@ -535,6 +546,11 @@ @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) + @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so + @echo "Installing libtk${SHORT_TK_VER}.a" @@ -77,19 +49,11 @@ + @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION) + @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ -@@ -539,6 +555,7 @@ - - install-libraries: +@@ -551,2 +567,3 @@ @for i in $(INCLUDE_INSTALL_DIR) \ + $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \ - $(SCRIPT_INSTALL_DIR)/msgs; \ - do \ -@@ -553,10 +570,18 @@ - chmod +x $(UNIX_DIR)/install-sh; \ - fi +@@ -565,6 +582,14 @@ @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ - $(GENERIC_DIR)/tkPlatDecls.h ; \ @@ -107,29 +71,15 @@ + 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 \ -@@ -633,7 +658,6 @@ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; +@@ -645,3 +670,2 @@ @echo "Cross-linking top-level (.1) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN1_INSTALL_DIR) @echo "Installing C API (.3) docs"; - @cd $(SRC_DIR)/doc; for i in *.3; \ - do \ -@@ -643,7 +667,6 @@ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; +@@ -655,3 +679,2 @@ @echo "Cross-linking top-level (.3) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR) @echo "Installing command (.n) docs"; - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ -@@ -653,7 +676,6 @@ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; +@@ -665,3 +688,2 @@ @echo "Cross-linking command (.n) docs"; - @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR) - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status |