lang/tcl: Ensure tclConfig.sh has embedded rpath

The runpath of the TCL_LIB_SPEC was missing as compared to version 8.4,
so the configure script was altered to add it back.
Also, the CONFIGURE_ARGS for thread options had unrecognized arguments.

Problems found and fixes suggested by he@

4 files changed, 20 insertions, 23 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index dd2a017e6d4..53779099c40 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2012/08/21 21:31:47 marino Exp $
+# $NetBSD: Makefile,v 1.68 2012/08/22 22:03:16 marino Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index c3b0ae724bc..9908accc27e 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2012/08/21 21:31:47 marino Exp $
+$NetBSD: distinfo,v 1.48 2012/08/22 22:03:17 marino Exp $
 
 SHA1 (tcl8.5.12-src.tar.gz) = 0ea293d27b1368cb5865e552ece348d02ff55adc
 RMD160 (tcl8.5.12-src.tar.gz) = ada42e22f7b12413c88d9ec7dbd3789926f362d2
@@ -9,7 +9,7 @@ SHA1 (patch-generic_tclPosixStr.c) = 8c252a4f3d8898fb48544d15123d6a8ddc3172f0
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
 SHA1 (patch-unix_Makefile.in) = 2b949d4290b3539916654381e5fdea6f26d0765e
-SHA1 (patch-unix_configure) = 801527d0d19a478476d2f8d506e8c18252d44777
+SHA1 (patch-unix_configure) = 15e41b0117773f815a334ba3332a5ebcd17f531c
 SHA1 (patch-unix_tclConfig.sh.in) = 5a32d8e97240d14f3a03e205637fe3bf8307d868
 SHA1 (patch-unix_tclUnixFCmd.c) = a56a12b8a0068e914d10336076347ca2b0ba9ac7
 SHA1 (patch-unix_tclUnixInit.c) = cceb75bc67a3b67620889cd92e5978ec8290af09
diff --git a/lang/tcl/options.mk b/lang/tcl/options.mk
index 5c332907d93..0df4c1e3e96 100644
--- a/lang/tcl/options.mk
+++ b/lang/tcl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/08/21 21:31:47 marino Exp $
+# $NetBSD: options.mk,v 1.2 2012/08/22 22:03:17 marino Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tcl
 PKG_SUPPORTED_OPTIONS=	threads debug
@@ -12,7 +12,7 @@ CONFIGURE_ARGS+=	--enable-symbols=mem
 .endif
 
 .if !empty(PKG_OPTIONS:Mthreads)
-CONFIGURE_ARGS+=	--enable-threads=on
+CONFIGURE_ARGS+=	--enable-threads
 .else
-CONFIGURE_ARGS+=	--enable-threads=off
+CONFIGURE_ARGS+=	--disable-threads
 .endif
diff --git a/lang/tcl/patches/patch-unix_configure b/lang/tcl/patches/patch-unix_configure
index 784f956b0bd..047ae44b840 100644
--- a/lang/tcl/patches/patch-unix_configure
+++ b/lang/tcl/patches/patch-unix_configure
@@ -1,16 +1,8 @@
-$NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
+$NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:03:17 marino Exp $
 
 --- unix/configure.orig	2012-07-25 16:45:05.000000000 +0000
 +++ unix/configure
-@@ -6630,6 +6630,7 @@ fi
-     # Step 3: set configuration options based on system name and version.
- 
-     do64bit_ok=no
-+    TCL_LIB_SPEC_RPATH=""
-     # default to '{$LIBS}' and set to "" on per-platform necessary basis
-     SHLIB_LD_LIBS='${LIBS}'
-     LDFLAGS_ORIG="$LDFLAGS"
-@@ -7631,7 +7632,7 @@ fi
+@@ -7631,7 +7631,7 @@ fi
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -19,7 +11,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    arch=`arch -s`
  	    case "$arch" in
  	    m88k|vax)
-@@ -7749,11 +7750,10 @@ fi
+@@ -7749,11 +7749,10 @@ fi
  		;;
  	    esac
  	    ;;
@@ -32,7 +24,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
-@@ -8953,7 +8953,7 @@ fi
+@@ -8953,7 +8952,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
@@ -41,7 +33,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    *) SHLIB_CFLAGS="-fPIC" ;;
-@@ -8984,7 +8984,7 @@ fi
+@@ -8984,7 +8983,7 @@ fi
  
  else
  
@@ -50,7 +42,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  
  fi
  
-@@ -9018,7 +9018,7 @@ fi
+@@ -9018,7 +9017,7 @@ fi
  else
  
          MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
@@ -59,7 +51,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  
  fi
  
-@@ -18893,9 +18893,9 @@ fi
+@@ -18893,9 +18892,9 @@ fi
  #	building libtcl as a shared library instead of a static library.
  #--------------------------------------------------------------------
  
@@ -72,7 +64,7 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
  
  # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
  # since on some platforms TCL_LIB_FILE contains shell escapes.
-@@ -19000,11 +19000,7 @@ _ACEOF
+@@ -19000,13 +18999,10 @@ _ACEOF
  else
      # libdir must be a fully qualified path and not ${exec_prefix}/lib
      eval libdir="$libdir"
@@ -83,8 +75,12 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:31:47 marino Exp $
 -    fi
 +    TCL_LIB_FLAG="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
      TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
-     TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
+-    TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++    TCL_LIB_SPEC_RPATH="${COMPILER_RPATH_FLAG}${libdir}"
++    TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
  fi
+ VERSION='${VERSION}'
+ eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
 @@ -19025,12 +19021,11 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
  	TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /System/Library/Frameworks"
      test -z "$TCL_MODULE_PATH"  && \