ports/178050: [patch] devel/tclmore -- fix build

[Pietro Cerutti]

>Number:         178050
>Category:       ports
>Synopsis:       [patch] devel/tclmore -- fix build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 22 12:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        
>Organization:
The FreeBSD Project
>Environment:
>Description:
The patch attached fixes the build of devel/tclmore on CURRENT. Please note that 11 of the test cases fail here:

==== do-2.1 wrong num args FAILED
---- Result was:
wrong # args: should be "do body expr"
---- Result should have been (exact matching):
wrong # args: should be "more do body expr"
==== do-2.1 FAILED

==== do-2.2 wrong num args FAILED
---- Result was:
wrong # args: should be "do body expr"
---- Result should have been (exact matching):
wrong # args: should be "more do body expr"
==== do-2.2 FAILED

==== do-2.4 invalid argument FAILED
---- Result was:
invalid bareword "b"
in expression "b";
should be "$b" or "{b}" or "b(...)" or ...
---- Result should have been (glob matching):
syntax error *
==== do-2.4 FAILED

==== pipechan-4.1 write with no flush, close reader, data discarded, forward FAILED
---- Test generated error; Return code was: 1
---- Return code should have been one of: 0 2
---- errorInfo: broken pipe
    while executing
"close $writable"
    ("uplevel" body line 7)
    invoked from within
"uplevel 1 $script"
---- errorCode: POSIX EPIPE {broken pipe}
==== pipechan-4.1 FAILED

==== pipechan-4.2 write with no flush, close reader, data discarded, backward FAILED
---- Test generated error; Return code was: 1
---- Return code should have been one of: 0 2
---- errorInfo: broken pipe
    while executing
"close $writable"
    ("uplevel" body line 7)
    invoked from within
"uplevel 1 $script"
---- errorCode: POSIX EPIPE {broken pipe}
==== pipechan-4.2 FAILED

==== teechan-7.5 underlying channel option FAILED
---- Result was:
1000l
---- Result should have been (glob matching):
1000
==== teechan-7.5 FAILED

==== teechan-7.6 underlying channel options FAILED
---- Result was:
-blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -invar {} -outvar {} -inputBufferSize 1000l -outputBufferSize 1000l
---- Result should have been (glob matching):
* -inputBufferSize 1000 -outputBufferSize 1000
==== teechan-7.6 FAILED

==== varchan-8.1 option FAILED
---- Result was:
5l
---- Result should have been (exact matching):
5
==== varchan-8.1 FAILED

==== varchan-8.2 option FAILED
---- Result was:
-blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -inputBufferSize 5l -outputBufferSize 4096l
---- Result should have been (glob matching):
* -inputBufferSize 5 *
==== varchan-8.2 FAILED
==== varchan-8.3 option FAILED
---- Result was:
5l
---- Result should have been (exact matching):
5
==== varchan-8.3 FAILED

==== varchan-8.4 option FAILED
---- Result was:
-blocking 1 -buffering full -buffersize 4096 -encoding utf-8 -eofchar {{} {}} -translation {auto lf} -inputBufferSize 4096l -outputBufferSize 5l
---- Result should have been (glob matching):
* -outputBufferSize 5
==== varchan-8.4 FAILED

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 313650)
+++ Makefile	(working copy)
@@ -19,18 +19,11 @@
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_TCL=	yes
-USE_TCL_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_src$//}
 
 INFO=		${PORTNAME}
 
-CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR}
+CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
+		--enable-threads
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 900000
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 313650)
+++ files/patch-configure	(working copy)
@@ -1,5 +1,18 @@
---- configure.orig	Fri May 21 20:24:40 2004
-+++ configure	Wed Apr 26 10:55:55 2006
+--- configure.orig	2004-05-21 18:24:40.000000000 +0200
++++ configure	2013-04-22 13:44:49.000000000 +0200
+@@ -6702,9 +6702,9 @@
+ 	    # Special check for weird MP-RAS system (uname returns weird
+ 	    # results, and the version is kept in special file).
+ 
+-	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+-	    fi
++#	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
++#		system=MP-RAS-`awk '{print $1}' /etc/.relid'`
++#	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+ 	    fi
 @@ -7847,11 +7847,12 @@
  		EXTRA_CFLAGS="-pthread"
  	    	LDFLAGS="$LDFLAGS -pthread"


>Release-Note:
>Audit-Trail:
>Unformatted: