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). Fix: Please apply the following patches: 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 --- How-To-Repeat: make && make regression-test
State Changed From-To: open->closed Committed. The regression failures were the same with the previous version and tests failure seem usual.