5 files changed, 60 insertions, 38 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 9ee8914f2f1d..c5b082033c75 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tcl
-PORTVERSION=	8.4.11
+PORTVERSION=	8.4.13
 PORTEPOCH=	1
 CATEGORIES=	lang tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -33,12 +33,19 @@ PLIST_SUB=	TCL_VER=${TCL_VER} SHORT_TCL_VER=84
 .if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
 THREADS_SUFFIX=		-threads
 CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 .endif
 
 LATEST_LINK=	tcl84${THREADS_SUFFIX}
-.include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_TCL84_MAN)
+.if defined(WITHOUT_TCL84_MAN)
+
+PLIST_SUB+=	INSTMAN='@comment '
+
+.else
+
+DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
+PLIST_SUB+=	INSTMAN=''
 
 MAN1=	tclsh.1
 
@@ -593,15 +600,15 @@ MLINKS=	Access.3 Tcl_Access.3 \
 
 .endif
 
+TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
+
 .if defined(TCL_WITH_THREADS) || defined(WITH_THREADS)
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 
 .endif
 
-TCLBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
-
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \
@@ -609,14 +616,22 @@ post-configure:
 .if defined(WITHOUT_TCL84_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
 		${WRKSRC}/Makefile
+. for mp in ${MAN1} ${MAN3} ${MANN}
+	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
+		${WRKSRC}/../doc/${mp}
+. endfor
 .endif
 
 post-install:
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
+.if !defined(WITHOUT_TCL84_MAN)
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
+.endif
 
-test:
-	cd ${WRKSRC} && ${MAKE} test
+regression-test:	build
+	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo
index 971f33910033..74f44c43a146 100644
--- a/lang/tcl84/distinfo
+++ b/lang/tcl84/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcl8.4.11-src.tar.gz) = 629dfea34e4087eb4683f834060abb63
-SHA256 (tcl8.4.11-src.tar.gz) = 8dcfa54b58a6aaf4853fc27752c25d6c2592c485952b2fad25a9bea4b52bed33
-SIZE (tcl8.4.11-src.tar.gz) = 3474428
+MD5 (tcl8.4.13-src.tar.gz) = c6b655ad5db095ee73227113220c0523
+SHA256 (tcl8.4.13-src.tar.gz) = c650124caf4785bb532720cb9d2902358ee9a9d6c71852ef4cdbdd6b7c5db4fc
+SIZE (tcl8.4.13-src.tar.gz) = 3513852
diff --git a/lang/tcl84/files/patch-configure b/lang/tcl84/files/patch-configure
index a831a83163f7..0272fb1ea667 100644
--- a/lang/tcl84/files/patch-configure
+++ b/lang/tcl84/files/patch-configure
@@ -1,22 +1,38 @@
---- configure.orig	Mon Jul 26 14:40:46 2004
-+++ configure	Thu Oct 28 10:54:24 2004
-@@ -2081,3 +2081,3 @@
+--- configure.orig	Thu Apr 20 16:42:21 2006
++++ configure	Mon May  1 17:31:03 2006
+@@ -2560,7 +2560,7 @@
+     LDFLAGS_ORIG="$LDFLAGS"
+     TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
 -    TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
 +    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
      ECHO_VERSION='`echo ${VERSION}`'
-@@ -2878,3 +2878,4 @@
+     TCL_LIB_VERSIONS_OK=ok
+     CFLAGS_DEBUG=-g
+@@ -3384,25 +3384,26 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
 +	    SHLIB_LD="ld -shared -x"
 +	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
  	    SHLIB_LD_LIBS='${LIBS}'
-@@ -2883,3 +2884,3 @@
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -2893,6 +2894,6 @@
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+-		# The -pthread needs to go in the CFLAGS, not LIBS
++		# The -pthread needs to go in the LDFLAGS, not LIBS
+ 		LIBS=`echo $LIBS | sed s/-pthread//`
+-		CFLAGS="$CFLAGS -pthread"
+-	    	LDFLAGS="$LDFLAGS -pthread"
++		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ 	    fi
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)
@@ -25,3 +41,5 @@
 -	    	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/tcl84/files/patch-tclUnixInit.c b/lang/tcl84/files/patch-tclUnixInit.c
deleted file mode 100644
index 1226e0138053..000000000000
--- a/lang/tcl84/files/patch-tclUnixInit.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- tclUnixInit.c	Thu May 15 13:29:41 2003
-+++ tclUnixInit.c	Sun Oct 19 12:39:44 2003
-@@ -184,5 +184,9 @@
- #endif /* SIGPIPE */
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && defined(__GNUC__)
-+/*
-+ * FreeBSD only provides the __fpsetreg() used by the following two
-+ * for the GNU Compiler. When using, say, Intel's icc they break.
-+ */
-     fpsetround(FP_RN);
-     fpsetmask(0L);
diff --git a/lang/tcl84/pkg-plist b/lang/tcl84/pkg-plist
index 98481d43c0e4..fec21e20316f 100644
--- a/lang/tcl84/pkg-plist
+++ b/lang/tcl84/pkg-plist
@@ -6,6 +6,7 @@ include/tcl%%TCL_VER%%/generic/regguts.h
 include/tcl%%TCL_VER%%/generic/tcl.h
 include/tcl%%TCL_VER%%/generic/tclCompile.h
 include/tcl%%TCL_VER%%/generic/tclDecls.h
+include/tcl%%TCL_VER%%/generic/tclIO.h
 include/tcl%%TCL_VER%%/generic/tclInitScript.h
 include/tcl%%TCL_VER%%/generic/tclInt.h
 include/tcl%%TCL_VER%%/generic/tclIntDecls.h
@@ -14,7 +15,6 @@ include/tcl%%TCL_VER%%/generic/tclMath.h
 include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
 include/tcl%%TCL_VER%%/generic/tclPort.h
 include/tcl%%TCL_VER%%/generic/tclRegexp.h
-include/tcl%%TCL_VER%%/generic/tclIO.h
 include/tcl%%TCL_VER%%/tcl.h
 include/tcl%%TCL_VER%%/tclDecls.h
 include/tcl%%TCL_VER%%/tclPlatDecls.h
@@ -63,12 +63,17 @@ lib/tcl%%TCL_VER%%/encoding/euc-jp.enc
 lib/tcl%%TCL_VER%%/encoding/euc-kr.enc
 lib/tcl%%TCL_VER%%/encoding/gb12345.enc
 lib/tcl%%TCL_VER%%/encoding/gb1988.enc
-lib/tcl%%TCL_VER%%/encoding/gb2312.enc
 lib/tcl%%TCL_VER%%/encoding/gb2312-raw.enc
+lib/tcl%%TCL_VER%%/encoding/gb2312.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-jp.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022-kr.enc
 lib/tcl%%TCL_VER%%/encoding/iso2022.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-1.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
+lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-2.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-3.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-4.enc
@@ -77,11 +82,6 @@ lib/tcl%%TCL_VER%%/encoding/iso8859-6.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-7.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-8.enc
 lib/tcl%%TCL_VER%%/encoding/iso8859-9.enc
-lib/tcl%%TCL_VER%%/encoding/iso8859-10.enc
-lib/tcl%%TCL_VER%%/encoding/iso8859-13.enc
-lib/tcl%%TCL_VER%%/encoding/iso8859-14.enc
-lib/tcl%%TCL_VER%%/encoding/iso8859-15.enc
-lib/tcl%%TCL_VER%%/encoding/iso8859-16.enc
 lib/tcl%%TCL_VER%%/encoding/jis0201.enc
 lib/tcl%%TCL_VER%%/encoding/jis0208.enc
 lib/tcl%%TCL_VER%%/encoding/jis0212.enc
@@ -124,6 +124,8 @@ lib/tcl%%TCL_VER%%/tclIndex
 lib/tcl%%TCL_VER%%/tcltest2.2/pkgIndex.tcl
 lib/tcl%%TCL_VER%%/tcltest2.2/tcltest.tcl
 lib/tcl%%TCL_VER%%/word.tcl
+%%INSTMAN%%%%DATADIR%%/man.macros
+%%INSTMAN%%@dirrm %%DATADIR%%
 @dirrm lib/tcl%%TCL_VER%%/tcltest2.2
 @dirrm lib/tcl%%TCL_VER%%/opt0.4
 @dirrm lib/tcl%%TCL_VER%%/msgcat1.3