diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2003-03-23 20:29:46 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2003-03-23 20:29:46 +0000 |
commit | 0bb946dfefe31d10cc24b8ef470d97a6f966d4a1 (patch) | |
tree | 95da91d33c049461cd6c822285aa5d38fa634314 /lang/tcl84 | |
parent | - make SOURCE path in tclConfig.sh variable (diff) |
- Update to 8.4.2
- make SOURCE path in tclConfig.sh variable
PR: 48574
Notes
Notes:
svn path=/head/; revision=77309
Diffstat (limited to 'lang/tcl84')
-rw-r--r-- | lang/tcl84/Makefile | 10 | ||||
-rw-r--r-- | lang/tcl84/distinfo | 2 | ||||
-rw-r--r-- | lang/tcl84/files/patch-aa | 24 |
3 files changed, 21 insertions, 15 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index 7b80c8c78f3c..ced4e7ea3014 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -6,7 +6,7 @@ # PORTNAME= tcl -PORTVERSION= 8.4.1 +PORTVERSION= 8.4.2 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -28,6 +28,7 @@ PKGINSTALL= ${PKGDIR}/pkg-install.tclsh PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.tclsh TCL_VER= 8.4 NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html +USE_REINPLACE= YES PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=84 @@ -588,10 +589,15 @@ PKGNAMESUFFIX?= -threads USE_REINPLACE= YES post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure .endif +post-configure: + ${REINPLACE_CMD} -e 's=${WRKDIRPREFIX}=$${WRKDIRPREFIX}=' \ + ${WRKSRC}/tclConfig.sh + .include <bsd.port.pre.mk> post-install: diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index 8666e40e451e..97281708b3f7 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1 +1 @@ -MD5 (tcl8.4.1-src.tar.gz) = 42fa43432a3a2a25d45c7f650c8f78c8 +MD5 (tcl8.4.2-src.tar.gz) = 4be55d8ebfcc9773407537445edd2ae1 diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa index 43923e56b19a..8dd7dfad5e59 100644 --- a/lang/tcl84/files/patch-aa +++ b/lang/tcl84/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sat Aug 17 21:04:03 2002 -+++ Makefile.in Mon Sep 9 14:00:35 2002 +--- 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) @@ -15,12 +15,12 @@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -+CFLAGS ?= @CFLAGS@ @CFLAGS_DEFAULT@ +-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@ -@@ -436,7 +438,8 @@ +@@ -445,7 +447,8 @@ all: binaries libraries doc @@ -30,7 +30,7 @@ libraries: -@@ -447,6 +450,15 @@ +@@ -456,6 +459,15 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} rm -f $@ @MAKE_LIB@ @@ -46,7 +46,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -606,6 +618,12 @@ +@@ -602,6 +614,12 @@ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) @@ -59,7 +59,7 @@ @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -613,15 +631,17 @@ +@@ -609,15 +627,17 @@ fi @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) @@ -80,7 +80,7 @@ do \ if [ ! -d $$i ] ; then \ echo "Making directory $$i"; \ -@@ -643,11 +663,17 @@ +@@ -639,11 +659,17 @@ chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; @@ -101,7 +101,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 \ -@@ -705,7 +731,6 @@ +@@ -701,7 +727,6 @@ chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking top-level (.1) docs"; @@ -109,7 +109,7 @@ @echo "Installing C API (.3) docs"; @cd $(TOP_DIR)/doc; for i in *.3; \ do \ -@@ -715,7 +740,6 @@ +@@ -711,7 +736,6 @@ chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking C API (.3) docs"; @@ -117,7 +117,7 @@ @echo "Installing command (.n) docs"; @cd $(TOP_DIR)/doc; for i in *.n; \ do \ -@@ -725,7 +749,14 @@ +@@ -721,7 +745,14 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; @echo "Cross-linking command (.n) docs"; |