Date: Sat, 25 Jun 2005 19:46:31 +0400 From: Vsevolod Stakhov <vsevolod@highsecure.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82645: Update port: lang/tcl84 to 8.4.10 Message-ID: <E1DmCrX-0002Po-8q@spray.anyhost.ru> Resent-Message-ID: <200506251550.j5PFo17F045219@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82645
>Category: ports
>Synopsis: Update port: lang/tcl84 to 8.4.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 25 15:50:00 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Vsevolod Stakhov
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
>Description:
Update to 8.4.10 that contains a number of bugfixes and some improvements. Also I've changed
includedir to ${PREFIX}/include, not ${LOCALBASE}/include to respect PREFIX. This update
does not require update of shared library version, so other ports seems to work all right.
>How-To-Repeat:
>Fix:
diff -ruPN tcl84.orig/Makefile tcl84/Makefile
--- tcl84.orig/Makefile Sat Jun 25 19:40:07 2005
+++ tcl84/Makefile Sat Jun 25 19:40:28 2005
@@ -6,8 +6,7 @@
#
PORTNAME= tcl
-PORTVERSION= 8.4.7
-PORTREVISION= 0
+PORTVERSION= 8.4.10
PORTEPOCH= 1
CATEGORIES= lang tcl84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -23,7 +22,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-shared --includedir=${LOCALBASE}/include/tcl${TCL_VER}
+CONFIGURE_ARGS= --enable-shared --includedir=${PREFIX}/include/tcl${TCL_VER}
CONFIGURE_ENV= PORTSDIR=${PORTSDIR}
MAKE_ENV= SHORT_TCL_VER=84
PKGINSTALL= ${PKGDIR}/pkg-install.tclsh
diff -ruPN tcl84.orig/distinfo tcl84/distinfo
--- tcl84.orig/distinfo Sat Jun 25 19:40:07 2005
+++ tcl84/distinfo Sat Jun 25 19:40:28 2005
@@ -1,2 +1,2 @@
-MD5 (tcl8.4.7-src.tar.gz) = 07e256e21bd0d05887770318b540c36f
-SIZE (tcl8.4.7-src.tar.gz) = 3472974
+MD5 (tcl8.4.10-src.tar.gz) = 409488e199a51803199d72b5dc534bb0
+SIZE (tcl8.4.10-src.tar.gz) = 3525737
diff -ruPN tcl84.orig/files/patch-aa tcl84/files/patch-aa
--- tcl84.orig/files/patch-aa Sat Jun 25 19:40:07 2005
+++ tcl84/files/patch-aa Sat Jun 25 19:40:28 2005
@@ -1,22 +1,36 @@
---- Makefile.in.orig Mon Jul 26 14:40:46 2004
-+++ Makefile.in Thu Oct 28 10:51:40 2004
-@@ -59,2 +59,4 @@
+--- Makefile.in.orig Sun Jun 5 00:39:25 2005
++++ Makefile.in Sat Jun 25 19:25:44 2005
+@@ -57,6 +57,8 @@
+
+ # Directory in which to install the include file tcl.h:
INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
-@@ -92,3 +94,3 @@
+ # Path to the private tcl header dir:
+ PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
+@@ -102,7 +104,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX)
-@@ -447,3 +449,4 @@
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+@@ -461,7 +463,8 @@
+
+ all: binaries libraries doc
-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
-@@ -458,2 +461,11 @@
+ libraries:
+
+@@ -472,6 +475,15 @@
+ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ rm -f $@
@MAKE_LIB@
+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so
+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \
@@ -28,7 +42,11 @@
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+ $(RANLIB) libtcl${SHORT_TCL_VER}.a
-@@ -604,2 +616,8 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ rm -f $@
+@@ -620,6 +632,12 @@
+ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
+ @@INSTALL_LIB@
@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"
@@ -37,7 +55,11 @@
+ @(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 \
-@@ -611,4 +629,5 @@
+ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
+ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
+@@ -627,8 +645,9 @@
+ fi
+ @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
@$(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
@@ -45,40 +67,60 @@
+ @mkdir -p $(SCRIPT_INSTALL_DIR)
+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh
@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -619,3 +638,4 @@
+ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
+ @INSTALL_STUB_LIB@ ; \
+@@ -636,7 +655,8 @@
+ @EXTRA_INSTALL_BINARIES@
+
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 \
-@@ -641,7 +661,13 @@
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+@@ -658,11 +678,17 @@
+ chmod +x $(SRC_DIR)/install-sh; \
+ fi
@echo "Installing header files";
- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-- $(GENERIC_DIR)/tclPlatDecls.h ; \
-+ @for i in $(GENERIC_DIR)/*.h ; \
- do \
+- $(GENERIC_DIR)/tclPlatDecls.h; \
+- do \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
-+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
- done;
+- done;
++ @for i in $(GENERIC_DIR)/*.h ; \
++ do \
++ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
++ done;
+ @for i in $(UNIX_DIR)/*.h ; \
-+ do \
-+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
-+ done;
++ do \
++ $(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
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
-@@ -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";
-@@ -713,3 +738,2 @@
- @echo "Cross-linking C API (.3) docs";
-- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MAN3_INSTALL_DIR)
- @echo "Installing command (.n) docs";
-@@ -723,3 +747,10 @@
- @echo "Cross-linking command (.n) docs";
-- @$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
+ @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
+ do \
+@@ -713,18 +739,25 @@
+ done;
+ @echo "Installing and cross-linking top-level (.1) docs";
+ @for i in $(TOP_DIR)/doc/*.1; do \
+- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \
++ cp $$i $(MAN1_INSTALL_DIR); \
+ done
+-
+ @echo "Installing and cross-linking C API (.3) docs";
+ @for i in $(TOP_DIR)/doc/*.3; do \
+- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
++ cp $$i $(MAN3_INSTALL_DIR); \
+ done
+-
+ @echo "Installing and cross-linking command (.n) docs";
+ @for i in $(TOP_DIR)/doc/*.n; do \
+- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
++ cp $$i $(MANN_INSTALL_DIR); \
+ done
+ @echo "**********"
+ @echo "IMPORTANT:"
+ @echo "**********"
@@ -87,4 +129,7 @@
+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h"
+ @echo "There are NOT default place, but good place to avoid"
+ @echo "conflicting with another version of Tcl/Tks."
++
+ # Optional target to install private headers
+ install-private-headers: libraries
diff -ruPN tcl84.orig/pkg-plist tcl84/pkg-plist
--- tcl84.orig/pkg-plist Sat Jun 25 19:40:07 2005
+++ tcl84/pkg-plist Sat Jun 25 19:40:28 2005
@@ -106,8 +106,8 @@
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.4/http.tcl
-lib/tcl%%TCL_VER%%/http2.4/pkgIndex.tcl
+lib/tcl%%TCL_VER%%/http2.5/http.tcl
+lib/tcl%%TCL_VER%%/http2.5/pkgIndex.tcl
lib/tcl%%TCL_VER%%/init.tcl
lib/tcl%%TCL_VER%%/ldAix
lib/tcl%%TCL_VER%%/ldAout.tcl
@@ -127,7 +127,7 @@
@dirrm lib/tcl%%TCL_VER%%/tcltest2.2
@dirrm lib/tcl%%TCL_VER%%/opt0.4
@dirrm lib/tcl%%TCL_VER%%/msgcat1.3
-@dirrm lib/tcl%%TCL_VER%%/http2.4
+@dirrm lib/tcl%%TCL_VER%%/http2.5
@dirrm lib/tcl%%TCL_VER%%/http1.0
@dirrm lib/tcl%%TCL_VER%%/encoding
@dirrm lib/tcl%%TCL_VER%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1DmCrX-0002Po-8q>