2 files changed, 16 insertions, 12 deletions

diff --git a/x11-toolkits/tk86/files/patch-unix::Makefile.in b/x11-toolkits/tk86/files/patch-unix::Makefile.in
index 41cb203401c0..0d659d3f789e 100644
--- a/x11-toolkits/tk86/files/patch-unix::Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix::Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-09-24 18:09:13.000000000 +0200
-+++ Makefile.in	2007-09-27 20:55:50.000000000 +0200
+--- Makefile.in.orig	2007-12-17 18:57:25.000000000 +0100
++++ Makefile.in	2007-12-29 22:02:15.000000000 +0100
 @@ -65,6 +65,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -23,7 +23,7 @@
  
  # Flag, 1: we're building a shared lib, 0 we're not
 -TK_SHARED_BUILD		= @TK_SHARED_BUILD@
-+TK_SHARED_BUILD		= #@TK_SHARED_BUILD@
++TK_SHARED_BUILD		= ##@TK_SHARED_BUILD@
  
  # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk
  TK_PKG_DIR		= @TK_PKG_DIR@
@@ -72,7 +72,7 @@
  	rm gdb.run
  
 -INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@
  
  install: $(INSTALL_TARGETS)
  
diff --git a/x11-toolkits/tk86/files/patch-unix::configure b/x11-toolkits/tk86/files/patch-unix::configure
index ea2ea6bed575..fe54d378c066 100644
--- a/x11-toolkits/tk86/files/patch-unix::configure
+++ b/x11-toolkits/tk86/files/patch-unix::configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-09-24 18:09:13.000000000 +0200
-+++ configure	2007-09-27 20:50:38.000000000 +0200
-@@ -3535,6 +3535,7 @@
+--- configure.orig	2007-12-17 18:57:25.000000000 +0100
++++ configure	2007-12-29 14:17:55.000000000 +0100
+@@ -3536,6 +3536,7 @@
  # Threads support - this auto-enables if Tcl was compiled threaded
  #------------------------------------------------------------------------
  
@@ -8,22 +8,26 @@
  
      # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
-@@ -5694,20 +5695,20 @@
+@@ -5828,7 +5829,7 @@
  	    SHLIB_SUFFIX=".so"
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
- 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "${TCL_THREADS}" = "1" ; then
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5839,16 +5840,16 @@
+ 
  		# The -pthread needs to go in the CFLAGS, not LIBS
  		LIBS=`echo $LIBS | sed s/-pthread//`
 -		CFLAGS="$CFLAGS -pthread"
 -	    	LDFLAGS="$LDFLAGS -pthread"
 +		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 +	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 	    fi
+ 
+ fi
+ 
  	    case $system in
 -	    FreeBSD-3.*)
 +	    FreeBSD-*)