Date: Mon, 1 May 2006 21:24:26 +0200 (CEST) From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/96622: Update port: lang/tcl84 & x11-toolkits/tk84 - upgrade to 8.4.13. Message-ID: <20060501192426.3B6CB1145B@graf.pompo.net> Resent-Message-ID: <200605011930.k41JULgY083293@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96622 >Category: ports >Synopsis: Update port: lang/tcl84 & x11-toolkits/tk84 - upgrade to 8.4.13. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon May 01 19:30:21 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #1: Fri Mar 17 22:38:26 CET 2006 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF060317 i386 >Description: Upgrade lang/tcl84 & x11-toolkits/tk84 to 8.4.13. Changelog at <http://sourceforge.net/project/shownotes.php?release_id=399452&group_id=10894>. Peer review will be appreciated: on my machines, some tests fail (idem with 8.4.11). >How-To-Repeat: make && make regression-test >Fix: Please apply the following patches: --- tcl84.diff begins here --- 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 --- tcl84.diff ends here --- --- tk84.diff begins here --- diff -urN x11-toolkits/tk84.orig/Makefile x11-toolkits/tk84/Makefile --- x11-toolkits/tk84.orig/Makefile Tue Jul 5 19:30:51 2005 +++ x11-toolkits/tk84/Makefile Mon May 1 17:58:54 2006 @@ -6,7 +6,7 @@ # PORTNAME= tk -PORTVERSION= 8.4.11 +PORTVERSION= 8.4.13 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -33,17 +33,17 @@ PKGINSTALL= ${PKGDIR}/pkg-install.wish PKGDEINSTALL= ${PKGDIR}/pkg-deinstall.wish NOPRECIOUSMAKEVARS= yes # Otherwise 'make readmes' is broken -TCL84_PORT?= lang/tcl84 -USE_REINPLACE= YES MANCOMPRESSED= no .ifdef (WITH_THREADS) CONFIGURE_ARGS+= --enable-threads +CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PKGNAMESUFFIX?= -threads +TCL84_PORT?= lang/tcl84-thread +.else +TCL84_PORT?= lang/tcl84 .endif -.include <bsd.port.pre.mk> - .if !defined(WITHOUT_TK84_MAN) MAN1= wish.1 @@ -354,7 +354,7 @@ pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi -post-patch: +pre-configure: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure @@ -373,9 +373,9 @@ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} .endif -test: +regression-test: cd ${WRKSRC}; ${MAKE} test ${ECHO_CMD} "package require Tk" | tclsh${TK_VER} ${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN x11-toolkits/tk84.orig/distinfo x11-toolkits/tk84/distinfo --- x11-toolkits/tk84.orig/distinfo Sat Nov 26 14:13:14 2005 +++ x11-toolkits/tk84/distinfo Mon May 1 11:57:45 2006 @@ -1,3 +1,3 @@ -MD5 (tk8.4.11-src.tar.gz) = 408e34fe8a1cec497f98f05bbe89b348 -SHA256 (tk8.4.11-src.tar.gz) = 8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba -SIZE (tk8.4.11-src.tar.gz) = 3236334 +MD5 (tk8.4.13-src.tar.gz) = 0a16d4d9398e43cbb85784c85fb807a4 +SHA256 (tk8.4.13-src.tar.gz) = 1beb64f178c644bae251c61639b461fe6c632717dc8bfb0339db68cc336f1b0f +SIZE (tk8.4.13-src.tar.gz) = 3253070 diff -urN x11-toolkits/tk84.orig/files/patch-aa x11-toolkits/tk84/files/patch-aa --- x11-toolkits/tk84.orig/files/patch-aa Fri Nov 12 02:15:44 2004 +++ x11-toolkits/tk84/files/patch-aa Mon May 1 18:01:34 2006 @@ -1,17 +1,29 @@ ---- configure.orig Thu Jul 29 14:57:48 2004 -+++ configure Thu Oct 28 11:16:40 2004 -@@ -2590,3 +2590,4 @@ +--- configure.orig Wed Apr 19 14:29:37 2006 ++++ configure Mon May 1 17:59:53 2006 +@@ -2881,25 +2881,26 @@ + FreeBSD-*) + # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" + TCL_SHLIB_LD_EXTRAS="-soname \$@" + SHLIB_LD="ld -shared -x" SHLIB_LD_LIBS='${LIBS}' -@@ -2595,3 +2596,3 @@ + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -export-dynamic" + LDFLAGS="" CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -@@ -2605,6 +2606,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-*) @@ -20,7 +32,13 @@ - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1' TCL_LIB_VERSIONS_OK=nodots -@@ -2841,2 +2842,3 @@ + ;; + esac +@@ -3472,6 +3473,7 @@ + #define _POSIX_PTHREAD_SEMANTICS 1 + EOF +TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION} + + SHLIB_CFLAGS="-KPIC" diff -urN x11-toolkits/tk84.orig/pkg-plist x11-toolkits/tk84/pkg-plist --- x11-toolkits/tk84.orig/pkg-plist Fri Jul 1 16:05:36 2005 +++ x11-toolkits/tk84/pkg-plist Mon May 1 13:48:33 2006 @@ -122,28 +122,29 @@ lib/tk%%TK_VER%%/images/pwrdLogo200.gif lib/tk%%TK_VER%%/images/pwrdLogo75.gif lib/tk%%TK_VER%%/images/tai-ku.gif +lib/tk%%TK_VER%%/listbox.tcl +lib/tk%%TK_VER%%/menu.tcl +lib/tk%%TK_VER%%/mkpsenc.tcl +lib/tk%%TK_VER%%/msgbox.tcl lib/tk%%TK_VER%%/msgs/cs.msg lib/tk%%TK_VER%%/msgs/de.msg lib/tk%%TK_VER%%/msgs/el.msg lib/tk%%TK_VER%%/msgs/en.msg lib/tk%%TK_VER%%/msgs/en_gb.msg +lib/tk%%TK_VER%%/msgs/eo.msg lib/tk%%TK_VER%%/msgs/es.msg lib/tk%%TK_VER%%/msgs/es_ES.msg -lib/tk%%TK_VER%%/msgs/eo.msg lib/tk%%TK_VER%%/msgs/fr.msg lib/tk%%TK_VER%%/msgs/it.msg lib/tk%%TK_VER%%/msgs/nl.msg lib/tk%%TK_VER%%/msgs/pl.msg +lib/tk%%TK_VER%%/msgs/pt.msg lib/tk%%TK_VER%%/msgs/ru.msg -lib/tk%%TK_VER%%/listbox.tcl -lib/tk%%TK_VER%%/menu.tcl -lib/tk%%TK_VER%%/msgbox.tcl -lib/tk%%TK_VER%%/mkpsenc.tcl lib/tk%%TK_VER%%/obsolete.tcl lib/tk%%TK_VER%%/optMenu.tcl lib/tk%%TK_VER%%/palette.tcl -lib/tk%%TK_VER%%/pkgIndex.tcl lib/tk%%TK_VER%%/panedwindow.tcl +lib/tk%%TK_VER%%/pkgIndex.tcl lib/tk%%TK_VER%%/prolog.ps lib/tk%%TK_VER%%/safetk.tcl lib/tk%%TK_VER%%/scale.tcl --- tk84.diff ends here --- --- tk84-thread.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # x11-toolkits/tk84-thread # x11-toolkits/tk84-thread/Makefile # echo c - x11-toolkits/tk84-thread mkdir -p x11-toolkits/tk84-thread > /dev/null 2>&1 echo x - x11-toolkits/tk84-thread/Makefile sed 's/^X//' >x11-toolkits/tk84-thread/Makefile << 'END-of-x11-toolkits/tk84-thread/Makefile' X# New ports collection makefile for: tk84-thread X# Date created: 1 May 2006 X# Whom: Thierry Thomas <thierry@pompo.net> X# X# $FreeBSD$ X# X XWITH_THREADS= yes X XMASTERDIR= ${.CURDIR}/../tk84 X X.include "${MASTERDIR}/Makefile" END-of-x11-toolkits/tk84-thread/Makefile exit --- tk84-thread.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060501192426.3B6CB1145B>