svn commit: r363764 - in head/lang/tclX: . files

[Mikhail Teterin]

Author: mi
Date: Fri Aug  1 21:09:00 2014
New Revision: 363764
URL: http://svnweb.freebsd.org/changeset/ports/363764
QAT: https://qat.redports.org/buildarchive/r363764/

Log:
  Upgrade from 8.4 to 8.4.1. The "profile" functionality
  remains completely broken, when compiled against Tcl-8.6
  
  Fix the bundled self-tests.
  
  PR:		192287
  Submitted by:	gahr

Deleted:
  head/lang/tclX/files/patch-configure
  head/lang/tclX/files/patch-errorLine
Modified:
  head/lang/tclX/Makefile
  head/lang/tclX/distinfo
  head/lang/tclX/files/patch-profile
  head/lang/tclX/files/tcl85-test-patch

Modified: head/lang/tclX/Makefile
==============================================================================
--- head/lang/tclX/Makefile	Fri Aug  1 20:09:53 2014	(r363763)
+++ head/lang/tclX/Makefile	Fri Aug  1 21:09:00 2014	(r363764)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tclX
-PORTVERSION=	8.4
-PORTREVISION=	3
+PORTVERSION=	8.4.1
 CATEGORIES=	lang tcl devel
-MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}.0
+MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}
 DISTNAME=	tclx${PORTVERSION}
 
 MAINTAINER=	mi at aldan.algebra.com
@@ -16,17 +15,16 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}${PORTVERSION:R}
 
 USES=		tcl tar:bzip2
-USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION}
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${TCL_INCLUDEDIR}/unix\
-		-I${TCL_INCLUDEDIR}/generic
+USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION:R}
+USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--enable-shared \
 		--with-help=Help \
 		--with-tcl="${TCL_LIBDIR}"
-PLIST_SUB=	TCLX_VER=${PORTVERSION}
+PLIST_SUB=	TCLX_VER=${PORTVERSION:R}
 ALL_TARGET=	binaries libraries
 INSTALL_TARGET=	install-binaries install-libraries
 
@@ -34,17 +32,13 @@ INSTALL_TARGET=	install-binaries install
 
 .if ${TCL_VER} > 8.4
 EXTRA_PATCHES+=	${FILESDIR}/tcl85-test-patch
-PLIST_SUB+=	BELOW_85='@comment '
-.else
-PLIST_SUB+=	BELOW_85=''
 .endif
 
 post-configure:
-	${REINPLACE_CMD} -e	\
-	    's,^TCLSH_PROG.*,TCLSH_PROG=${TCLSH},' \
-	    -e 's,TCL_LIBRARY=.*,\\,' ${WRKSRC}/Makefile
-	# Disabling the failing help.test
-	${MV} ${WRKSRC}/tests/help.test ${WRKSRC}/tests/help.test.dis
+.if ${TCL_VER} == 8.6
+	# Disabling the failing profile.test
+	${MV} ${WRKSRC}/tests/profile.test ${WRKSRC}/tests/profile.test.dis
+.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/TclX.n ${STAGEDIR}${PREFIX}/man/mann
@@ -63,7 +57,7 @@ post-install:
 	${LN} -s TclXInit.3.gz ${STAGEDIR}${PREFIX}/man/man3/${l}.3.gz
 .endfor
 
-regression-test: build
+regression-test test: build
 	${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC} test
 
 .include <bsd.port.post.mk>

Modified: head/lang/tclX/distinfo
==============================================================================
--- head/lang/tclX/distinfo	Fri Aug  1 20:09:53 2014	(r363763)
+++ head/lang/tclX/distinfo	Fri Aug  1 21:09:00 2014	(r363764)
@@ -1,2 +1,2 @@
-SHA256 (tclx8.4.tar.bz2) = 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66
-SIZE (tclx8.4.tar.bz2) = 313595
+SHA256 (tclx8.4.1.tar.bz2) = a9b41f606ec6c1268b9c78512e6e1cb533bd9ae3e786e650d111fc16ffe758ec
+SIZE (tclx8.4.1.tar.bz2) = 330073

Modified: head/lang/tclX/files/patch-profile
==============================================================================
--- head/lang/tclX/files/patch-profile	Fri Aug  1 20:09:53 2014	(r363763)
+++ head/lang/tclX/files/patch-profile	Fri Aug  1 21:09:00 2014	(r363764)
@@ -1,28 +1,10 @@
-This first patch fixes a seg-fault at `make test' time -- profile.test crashes
-without this change.
-
-Submitted to maintainers:
-
-https://sourceforge.net/tracker/index.php?func=detail&aid=1925400&group_id=13247&atid=113247
-
-and committed upstream.
-
-The second changes TclXOSElapsedTime to better handles clock_t being too
-narrow (32-bit on FreeBSD).
+Change TclXOSElapsedTime to better handles clock_t being too narrow
+(32-bit on FreeBSD).
 
 Getting it committed upstream...
 
 	-mi
 
---- generic/tclXprofile.c	2004-11-22 19:12:54.000000000 -0500
-+++ generic/tclXprofile.c	2009-07-31 02:44:11.000000000 -0400
-@@ -674,5 +674,5 @@
-     CallFrame  *framePtr;
- {
--    if (framePtr == NULL)
-+    if (framePtr == NULL || framePtr->objv == NULL)
-         return;
-     InitializeProcStack (infoPtr, framePtr->callerPtr);
 --- unix/tclXunixOS.c	2005-07-12 15:03:15.000000000 -0400
 +++ unix/tclXunixOS.c	2009-11-27 02:00:57.000000000 -0500
 @@ -550,4 +550,10 @@

Modified: head/lang/tclX/files/tcl85-test-patch
==============================================================================
--- head/lang/tclX/files/tcl85-test-patch	Fri Aug  1 20:09:53 2014	(r363763)
+++ head/lang/tclX/files/tcl85-test-patch	Fri Aug  1 21:09:00 2014	(r363764)
@@ -56,20 +56,22 @@ Tcl-versions, should still do that...
  ERRORCODE]
 --- tests/string.test	2002-09-25 20:19:02.000000000 -0400
 +++ tests/string.test	2009-10-13 18:25:03.000000000 -0400
-@@ -47,9 +47,19 @@
+@@ -47,9 +47,21 @@
  } 0 {E}
  
 +switch $tcl_version {
 +8.3	{
 +	set anticipate "syntax error in expression \"4x-3\""
 +} 8.4 {
-+	puts stderr "tcl_version is $tcl_version"
 +	set anticipate "syntax error in expression \"4x-3\": extra tokens at end of expression"
-+} default {
++} 8.5 {
 +	set anticipate {invalid bareword "x"
 +in expression "4_ at _x-3";
 +should be "$x" or "{x}" or "x(...)" or ...}
-+}}
++} default {
++	set anticipate {invalid bareword "4x"
++in expression "4x-3";
++should be "$4x" or "{4x}" or "4x(...)" or ...}
 +
  Test string-1.7 {cindex tests} {
 -    cindex ABCDEFG lenx-3