Attachment 65146 Details for Bug 96622 – tcl84.diff

[patch] tcl84.diff

tcl84.diff (text/plain), 6.49 KB, created by Thierry Thomas on 2006-05-01 20:30:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2006-05-01 20:30:21 UTC

Size: 6.49 KB

patch

obsolete

>diff -urN lang/tcl84.orig/Makefile lang/tcl84/Makefile
>--- lang/tcl84.orig/Makefile	Fri Jul 22 09:36:00 2005
>+++ lang/tcl84/Makefile	Mon May  1 17:24:55 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tcl
>-PORTVERSION=	8.4.11
>+PORTVERSION=	8.4.13
> PORTEPOCH=	1
> CATEGORIES=	lang tcl84
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>@@ -28,16 +28,15 @@
> 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
> 
> .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)
> 
>@@ -594,15 +593,15 @@
> 
> .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}|' \
>@@ -617,7 +616,7 @@
> 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
> .endif
> 
>-test:
>-	cd ${WRKSRC} && ${MAKE} test
>+regression-test:
>+	cd ${WRKSRC} && LC_ALL=C ${MAKE} test
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN lang/tcl84.orig/distinfo lang/tcl84/distinfo
>--- lang/tcl84.orig/distinfo	Fri Nov 25 17:04:26 2005
>+++ lang/tcl84/distinfo	Mon May  1 11:07:02 2006
>@@ -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 -urN lang/tcl84.orig/files/patch-configure lang/tcl84/files/patch-configure
>--- lang/tcl84.orig/files/patch-configure	Fri Nov 12 02:15:00 2004
>+++ lang/tcl84/files/patch-configure	Mon May  1 17:33:14 2006
>@@ -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 -urN lang/tcl84.orig/files/patch-tclUnixInit.c lang/tcl84/files/patch-tclUnixInit.c
>--- lang/tcl84.orig/files/patch-tclUnixInit.c	Sat Oct 25 22:44:15 2003
>+++ lang/tcl84/files/patch-tclUnixInit.c	Thu Jan  1 01:00:00 1970
>@@ -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 -urN lang/tcl84.orig/pkg-plist lang/tcl84/pkg-plist
>--- lang/tcl84.orig/pkg-plist	Wed Jun 29 23:40:26 2005
>+++ lang/tcl84/pkg-plist	Mon May  1 11:35:30 2006
>@@ -6,6 +6,7 @@
> 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/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-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-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

Actions: View | Diff

Attachments on bug 96622: 65146 | 65147