x11/tk: Ensure tkConfig.sh has embedded rpath

The version of the new tk package had some problems.
 - The x11 paths weren't coming through
 - The tkConfig.sh utility was missing runpath definition for TK_LIB_SPEC
 - Threading was automatically selected

The X11 problem was fixed with addition CONFIGURE_ARGS
The runpath for TK_LIB_SPEC was added in the configure patch
An options.mk file was added based on the tcl version.

Problems found and fixes suggested by he@

4 files changed, 56 insertions, 13 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 83056795b8d..3700028875c 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2012/08/21 21:32:34 marino Exp $
+# $NetBSD: Makefile,v 1.67 2012/08/22 22:05:05 marino Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -21,15 +22,14 @@ GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
 PTHREAD_OPTS+=		require
 
 TEST_TARGET=		test
 
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.include "options.mk"
 
 SUBST_CLASSES+=		tk-config
 SUBST_STAGE.tk-config=	post-build
@@ -40,8 +40,6 @@ SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 PLIST_SUBST+=		SONUM=${TK_SONUM}
 PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
-
-#post-install:
-#	ln -s wish${TK_BASEVER} ${DESTDIRPREFIX:Q}/bin/wish
-
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 03882772e71..8fcef437159 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.35 2012/08/21 21:32:34 marino Exp $
+$NetBSD: distinfo,v 1.36 2012/08/22 22:05:05 marino Exp $
 
 SHA1 (tk8.5.12-src.tar.gz) = 292a01a39e9378d2455e4492f39500baeb6b63db
 RMD160 (tk8.5.12-src.tar.gz) = fc864df9f1e1ebd4b4375cc46572834095e77372
 Size (tk8.5.12-src.tar.gz) = 3826062 bytes
 SHA1 (patch-unix_Makefile.in) = 0e1f8a8c20c426a042ab1c061cc6031283abe1d5
-SHA1 (patch-unix_configure) = 1ffe2b4d08b06dd6b67aaaeab412c10b067b4b3f
+SHA1 (patch-unix_configure) = 5bb82c26a00e0660d20ebe8d42aa9e4b1a0e6346
diff --git a/x11/tk/options.mk b/x11/tk/options.mk
new file mode 100644
index 00000000000..cf0cc61361e
--- /dev/null
+++ b/x11/tk/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2012/08/22 22:05:05 marino Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tk
+PKG_SUPPORTED_OPTIONS=	threads debug
+PKG_SUGGESTED_OPTIONS=	threads
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-symbols
+.endif
+
+.if !empty(PKG_OPTIONS:Mthreads)
+CONFIGURE_ARGS+=	--enable-threads
+. include "../../mk/pthread.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
diff --git a/x11/tk/patches/patch-unix_configure b/x11/tk/patches/patch-unix_configure
index a98f50a328b..40d008b2309 100644
--- a/x11/tk/patches/patch-unix_configure
+++ b/x11/tk/patches/patch-unix_configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $
+$NetBSD: patch-unix_configure,v 1.2 2012/08/22 22:05:06 marino Exp $
 
 --- unix/configure.orig	2012-07-25 16:45:53.000000000 +0000
 +++ unix/configure
@@ -78,7 +78,25 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $
  
  fi
  
-@@ -11383,11 +11377,7 @@ _ACEOF
+@@ -10358,7 +10352,7 @@ echo $ECHO_N "checking for X11 libraries
+ 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
+ 		echo "$as_me:$LINENO: result: $i" >&5
+ echo "${ECHO_T}$i" >&6
+-		XLIBSW="-L$i -lX11"
++		XLIBSW="-L$i ${COMPILER_RPATH_FLAG}$i -lX11"
+ 		x_libraries="$i"
+ 		break
+ 	    fi
+@@ -10367,7 +10361,7 @@ echo "${ECHO_T}$i" >&6
+ 	if test "$x_libraries" = ""; then
+ 	    XLIBSW=-lX11
+ 	else
+-	    XLIBSW="-L$x_libraries -lX11"
++	    XLIBSW="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries -lX11"
+ 	fi
+     fi
+     if test "$XLIBSW" = nope ; then
+@@ -11383,18 +11377,14 @@ _ACEOF
  else
      # libdir must be a fully qualified path and not ${exec_prefix}/lib
      eval libdir="$libdir"
@@ -91,6 +109,14 @@ $NetBSD: patch-unix_configure,v 1.1 2012/08/21 21:32:34 marino Exp $
      TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
  	if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
  	WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} \${TCL_LIB_SPEC}"
+     else
+ 	WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
+     fi
+-    TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
++    TK_LIB_SPEC="-L${libdir} ${COMPILER_RPATH_FLAG}${libdir} ${TK_LIB_FLAG}"
+ fi
+ 
+ # Support for building the Aqua resource files
 @@ -11422,11 +11412,7 @@ fi
  eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
  eval "TK_STUB_LIB_DIR=${libdir}"