make this build and install on irix64

4 files changed, 197 insertions, 98 deletions

diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
index f87346ed8f2..8e2ba4753ee 100644
--- a/x11/tk83/Makefile
+++ b/x11/tk83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/08 20:07:38 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/06 22:41:28 jschauma Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -27,6 +27,12 @@ TEST_TARGET=		test
 #
 CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(ABI) && ${ABI} == "64"
+CONFIGURE_ARGS+=	--enable-64bit
+.endif
+
 # Modify mkLinks script to remove the short-filename manpage if it was
 # linked to a longer filename.
 #
diff --git a/x11/tk83/distinfo b/x11/tk83/distinfo
index 8d48c1f487d..ce93577e5b8 100644
--- a/x11/tk83/distinfo
+++ b/x11/tk83/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 17:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2005/03/06 22:41:28 jschauma Exp $
 
 SHA1 (tk8.3.4.tar.gz) = d52bf5cedb73e9b817ba8d6a2b00701f4f82fad2
 RMD160 (tk8.3.4.tar.gz) = f154fd9b2eedcff732b9cdabee48bd9af1b3dd26
 Size (tk8.3.4.tar.gz) = 2589635 bytes
 SHA1 (patch-aa) = 213c82956f692cc493215e222c08da76cf18841e
-SHA1 (patch-ab) = b99c7a48dc525a45305ad6265735de56df4b5d9c
-SHA1 (patch-ac) = 172762efa65eb05345d70cf38893bc96b56a2481
+SHA1 (patch-ab) = 0a75ddf9d30ba4e4800f8139674f712785ae83af
+SHA1 (patch-ac) = 4b2b967030998dc108457258ee603fa94185cfe5
 SHA1 (patch-ad) = 1815fc19986674cb2ea03a8d60cd1514ff47fba9
diff --git a/x11/tk83/patches/patch-ab b/x11/tk83/patches/patch-ab
index e9d4d1c7b3e..e26a32591f3 100644
--- a/x11/tk83/patches/patch-ab
+++ b/x11/tk83/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/06 22:41:28 jschauma Exp $
 
 --- configure.orig	Fri Oct 19 20:24:40 2001
-+++ configure	Sun Mar 16 13:25:15 2003
++++ configure	Sun Mar  6 16:52:43 2005
 @@ -1746,6 +1746,7 @@
  
      do64bit_ok=no
@@ -100,7 +100,53 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -2136,20 +2137,23 @@
+@@ -2084,8 +2085,11 @@
+ 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    EXTRA_CFLAGS=""
+ 	    LDFLAGS=""
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+-	IRIX-6.*|IRIX64-6.5*)
++	IRIX-6.*)
+ 	    SHLIB_CFLAGS=""
+ 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+@@ -2108,6 +2112,9 @@
+ 		esac
+ 		LDFLAGS="-n32"
+ 	    fi
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	IRIX64-6.*)
+ 	    SHLIB_CFLAGS=""
+@@ -2118,6 +2125,22 @@
+ 	    DL_LIBS=""
+ 	    LDFLAGS=""
+ 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++
++            # Check to enable 64-bit flags for compiler/linker
++
++	    if test "$do64bit" = "yes" ; then
++                if test "$GCC" = "yes" ; then
++                    echo "configure: warning: 64bit mode not supported by gcc" 1>&2
++                else
++                    do64bit_ok=yes
++                    SHLIB_LD="ld -64 -shared -rdata_shared"
++                    CFLAGS="$CFLAGS -64"
++                    LDFLAGS="$LDFLAGS -64"
++                fi
++            fi
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Linux*)
+ 	    SHLIB_CFLAGS="-fPIC"
+@@ -2136,20 +2159,23 @@
  		DL_LIBS="-ldl"
  		LDFLAGS="-rdynamic"
  		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -127,7 +173,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2206,17 +2210,17 @@
+@@ -2206,17 +2232,17 @@
  	    else
  		ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dld.h""... $ac_c" 1>&6
@@ -148,7 +194,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2271,17 +2275,17 @@
+@@ -2271,17 +2297,17 @@
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
@@ -169,7 +215,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2300,7 +2304,6 @@
+@@ -2300,7 +2326,6 @@
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -177,7 +223,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2321,13 +2324,23 @@
+@@ -2321,13 +2346,23 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    egrep "yes" >/dev/null 2>&1; then
    rm -rf conftest*
@@ -201,7 +247,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  fi
  rm -f conftest*
  
-@@ -2539,6 +2552,9 @@
+@@ -2539,6 +2574,9 @@
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -211,7 +257,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  	    ;;
  	SunOS-5*)
  
-@@ -2586,6 +2602,9 @@
+@@ -2586,6 +2624,9 @@
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -221,7 +267,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -2611,17 +2630,17 @@
+@@ -2611,10 +2652,10 @@
  	    # that don't grok the -Bexport option.  Test that it does.
  	    hold_ldflags=$LDFLAGS
  	    echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
@@ -234,6 +280,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -2621,7 +2662,7 @@
  int i;
  ; return 0; }
  EOF
@@ -242,7 +289,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    found=yes
  else
-@@ -2667,9 +2686,9 @@
+@@ -2667,9 +2708,9 @@
  
      if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
  	echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
@@ -254,7 +301,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/exec.h>
  int main() {
-@@ -2687,7 +2706,7 @@
+@@ -2687,7 +2728,7 @@
      
  ; return 0; }
  EOF
@@ -263,7 +310,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    tcl_ok=usable
  else
-@@ -2705,9 +2724,9 @@
+@@ -2705,9 +2746,9 @@
  
  	else
  	    echo $ac_n "checking a.out.h""... $ac_c" 1>&6
@@ -275,7 +322,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <a.out.h>
  int main() {
-@@ -2725,7 +2744,7 @@
+@@ -2725,7 +2766,7 @@
  	    
  ; return 0; }
  EOF
@@ -284,7 +331,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    tcl_ok=usable
  else
-@@ -2743,9 +2762,9 @@
+@@ -2743,9 +2784,9 @@
  
  	    else
  		echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
@@ -296,7 +343,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/exec_aout.h>
  int main() {
-@@ -2763,7 +2782,7 @@
+@@ -2763,7 +2804,7 @@
  		
  ; return 0; }
  EOF
@@ -305,7 +352,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    tcl_ok=usable
  else
-@@ -2860,7 +2879,7 @@
+@@ -2860,7 +2901,7 @@
  
  
      echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
@@ -314,7 +361,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
      # Check whether --enable-symbols or --disable-symbols was given.
  if test "${enable_symbols+set}" = set; then
    enableval="$enable_symbols"
-@@ -2904,12 +2923,12 @@
+@@ -2904,12 +2945,12 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking for sin""... $ac_c" 1>&6
@@ -329,7 +376,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char sin(); below.  */
-@@ -2932,7 +2951,7 @@
+@@ -2932,7 +2973,7 @@
  
  ; return 0; }
  EOF
@@ -338,7 +385,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_sin=yes"
  else
-@@ -2953,7 +2972,7 @@
+@@ -2953,7 +2994,7 @@
  fi
  
  echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
@@ -347,7 +394,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2961,14 +2980,14 @@
+@@ -2961,7 +3002,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lieee  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -356,6 +403,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -2968,7 +3009,7 @@
  main()
  ; return 0; }
  EOF
@@ -364,7 +412,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -2999,7 +3018,7 @@
+@@ -2999,7 +3040,7 @@
  libbsd=no
  if test "`uname -s`" = "AIX" ; then
      echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
@@ -373,7 +421,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3007,7 +3026,7 @@
+@@ -3007,7 +3048,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -382,7 +430,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3018,7 +3037,7 @@
+@@ -3018,7 +3059,7 @@
  gettimeofday()
  ; return 0; }
  EOF
@@ -391,7 +439,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3049,9 +3068,9 @@
+@@ -3049,9 +3090,9 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking stdlib.h""... $ac_c" 1>&6
@@ -403,7 +451,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -3066,7 +3085,7 @@
+@@ -3066,7 +3107,7 @@
  rm -f conftest*
  
  cat > conftest.$ac_ext <<EOF
@@ -412,7 +460,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -3080,7 +3099,7 @@
+@@ -3080,7 +3121,7 @@
  rm -f conftest*
  
  cat > conftest.$ac_ext <<EOF
@@ -421,7 +469,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -3112,16 +3131,16 @@
+@@ -3112,9 +3153,9 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
@@ -433,6 +481,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  int main() {
+@@ -3121,7 +3162,7 @@
  fd_set readMask, writeMask;
  ; return 0; }
  EOF
@@ -441,7 +490,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    tk_ok=yes
  else
-@@ -3133,7 +3152,7 @@
+@@ -3133,7 +3174,7 @@
  rm -f conftest*
  if test $tk_ok = no; then
      cat > conftest.$ac_ext <<EOF
@@ -450,7 +499,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/select.h>
  EOF
-@@ -3165,12 +3184,12 @@
+@@ -3165,12 +3206,12 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
@@ -465,7 +514,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -3178,7 +3197,7 @@
+@@ -3178,7 +3219,7 @@
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -474,7 +523,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -3195,7 +3214,7 @@
+@@ -3195,7 +3236,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -483,7 +532,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -3213,7 +3232,7 @@
+@@ -3213,7 +3254,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -492,7 +541,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -3234,7 +3253,7 @@
+@@ -3234,7 +3275,7 @@
    :
  else
    cat > conftest.$ac_ext <<EOF
@@ -501,7 +550,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3245,7 +3264,7 @@
+@@ -3245,7 +3286,7 @@
  exit (0); }
  
  EOF
@@ -510,7 +559,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  then
    :
  else
-@@ -3269,12 +3288,12 @@
+@@ -3269,12 +3310,12 @@
  fi
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
@@ -525,7 +574,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -3302,12 +3321,12 @@
+@@ -3302,12 +3343,12 @@
  fi
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
@@ -540,7 +589,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -3335,12 +3354,12 @@
+@@ -3335,12 +3376,12 @@
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
@@ -555,7 +604,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -3368,12 +3387,12 @@
+@@ -3368,12 +3409,12 @@
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
@@ -570,7 +619,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
-@@ -3410,17 +3429,17 @@
+@@ -3410,17 +3451,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -591,7 +640,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -3447,12 +3466,12 @@
+@@ -3447,12 +3488,12 @@
  done
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
@@ -606,7 +655,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -3461,7 +3480,7 @@
+@@ -3461,7 +3502,7 @@
  struct tm *tp;
  ; return 0; }
  EOF
@@ -615,7 +664,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -3487,16 +3506,16 @@
+@@ -3487,9 +3528,9 @@
  #-------------------------------------------
  
  echo $ac_n "checking pw_gecos in struct pwd""... $ac_c" 1>&6
@@ -627,6 +676,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #include <pwd.h>
  int main() {
+@@ -3496,7 +3537,7 @@
  struct passwd pwd; pwd.pw_gecos;
  ; return 0; }
  EOF
@@ -635,7 +685,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    tk_ok=yes
  else
-@@ -3529,7 +3548,7 @@
+@@ -3529,7 +3570,7 @@
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
@@ -644,7 +694,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -3591,12 +3610,12 @@
+@@ -3591,12 +3632,12 @@
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
@@ -659,7 +709,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -3665,14 +3684,14 @@
+@@ -3665,7 +3706,7 @@
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -668,6 +718,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -3672,7 +3713,7 @@
  ${x_direct_test_function}()
  ; return 0; }
  EOF
@@ -676,7 +727,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
-@@ -3762,12 +3781,12 @@
+@@ -3762,12 +3803,12 @@
      if test "$no_x" = ""; then
  	if test "$x_includes" = ""; then
  	    cat > conftest.$ac_ext <<EOF
@@ -691,7 +742,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -3787,15 +3806,15 @@
+@@ -3787,15 +3828,15 @@
      fi
      if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
  	echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
@@ -710,7 +761,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -3831,13 +3850,17 @@
+@@ -3831,13 +3872,17 @@
  
      if test "$no_x" = yes; then
  	echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6
@@ -729,7 +780,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -3846,12 +3869,16 @@
+@@ -3846,12 +3891,16 @@
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -747,7 +798,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3859,7 +3886,7 @@
+@@ -3859,7 +3908,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXwindow  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -756,7 +807,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3870,7 +3897,7 @@
+@@ -3870,7 +3919,7 @@
  XCreateWindow()
  ; return 0; }
  EOF
@@ -765,7 +816,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3916,6 +3943,10 @@
+@@ -3916,6 +3965,10 @@
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -776,7 +827,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -3955,7 +3986,7 @@
+@@ -3955,7 +4008,7 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
@@ -785,7 +836,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3963,14 +3994,14 @@
+@@ -3963,7 +4016,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -794,6 +845,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -3970,7 +4023,7 @@
  main()
  ; return 0; }
  EOF
@@ -802,7 +854,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3993,12 +4024,12 @@
+@@ -3993,12 +4046,12 @@
  
  tk_checkBoth=0
  echo $ac_n "checking for connect""... $ac_c" 1>&6
@@ -817,7 +869,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
-@@ -4021,7 +4052,7 @@
+@@ -4021,7 +4074,7 @@
  
  ; return 0; }
  EOF
@@ -826,7 +878,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
  else
-@@ -4043,7 +4074,7 @@
+@@ -4043,7 +4096,7 @@
  
  if test "$tk_checkSocket" = 1; then
      echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
@@ -835,7 +887,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4051,14 +4082,14 @@
+@@ -4051,7 +4104,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -844,6 +896,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -4058,7 +4111,7 @@
  main()
  ; return 0; }
  EOF
@@ -852,7 +905,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4084,12 +4115,12 @@
+@@ -4084,12 +4137,12 @@
      tk_oldLibs=$LIBS
      LIBS="$LIBS -lsocket -lnsl"
      echo $ac_n "checking for accept""... $ac_c" 1>&6
@@ -867,7 +920,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
-@@ -4112,7 +4143,7 @@
+@@ -4112,7 +4165,7 @@
  
  ; return 0; }
  EOF
@@ -876,7 +929,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
  else
-@@ -4134,12 +4165,12 @@
+@@ -4134,12 +4187,12 @@
  
  fi
  echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
@@ -891,7 +944,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
-@@ -4162,7 +4193,7 @@
+@@ -4162,7 +4215,7 @@
  
  ; return 0; }
  EOF
@@ -900,7 +953,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
  else
-@@ -4180,7 +4211,7 @@
+@@ -4180,7 +4233,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
@@ -909,7 +962,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4188,14 +4219,14 @@
+@@ -4188,7 +4241,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -918,6 +971,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -4195,7 +4248,7 @@
  main()
  ; return 0; }
  EOF
@@ -926,7 +980,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4235,13 +4266,13 @@
+@@ -4235,13 +4288,13 @@
  
  if test -d /usr/include/mit ; then
      echo $ac_n "checking MIT X libraries""... $ac_c" 1>&6
@@ -942,7 +996,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  	#include <X11/Xlib.h>
-@@ -4252,7 +4283,7 @@
+@@ -4252,7 +4305,7 @@
      
  ; return 0; }
  EOF
@@ -951,7 +1005,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    
  	echo "$ac_t""yes" 1>&6
-@@ -4279,12 +4310,12 @@
+@@ -4279,12 +4332,12 @@
  
  MATH_LIBS=""
  echo $ac_n "checking for sin""... $ac_c" 1>&6
@@ -966,7 +1020,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char sin(); below.  */
-@@ -4307,7 +4338,7 @@
+@@ -4307,7 +4360,7 @@
  
  ; return 0; }
  EOF
@@ -975,7 +1029,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_sin=yes"
  else
-@@ -4328,7 +4359,7 @@
+@@ -4328,7 +4381,7 @@
  fi
  
  echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
@@ -984,7 +1038,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4336,14 +4367,14 @@
+@@ -4336,7 +4389,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lieee  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -993,6 +1047,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  int main() {
+@@ -4343,7 +4396,7 @@
  main()
  ; return 0; }
  EOF
@@ -1001,7 +1056,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4370,14 +4401,14 @@
+@@ -4370,7 +4423,7 @@
  #--------------------------------------------------------------------
  
  echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
@@ -1010,6 +1065,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
+@@ -4377,7 +4430,7 @@
    if test "$GCC" = yes; then
    # GCC predefines this symbol on systems where it applies.
  cat > conftest.$ac_ext <<EOF
@@ -1018,7 +1074,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  #ifdef __CHAR_UNSIGNED__
    yes
-@@ -4399,7 +4430,7 @@
+@@ -4399,7 +4452,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
@@ -1027,7 +1083,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
  #if !defined(__STDC__) || __STDC__ != 1
-@@ -4409,7 +4440,7 @@
+@@ -4409,7 +4462,7 @@
    volatile char c = 255; exit(c < 0);
  }
  EOF
@@ -1036,7 +1092,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  then
    ac_cv_c_char_unsigned=yes
  else
-@@ -4442,12 +4473,12 @@
+@@ -4442,12 +4495,12 @@
  
  
      echo $ac_n "checking for strtod""... $ac_c" 1>&6
@@ -1051,7 +1107,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtod(); below.  */
-@@ -4470,7 +4501,7 @@
+@@ -4470,7 +4523,7 @@
  
  ; return 0; }
  EOF
@@ -1060,7 +1116,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
    rm -rf conftest*
    eval "ac_cv_func_strtod=yes"
  else
-@@ -4492,12 +4523,12 @@
+@@ -4492,12 +4545,12 @@
  
      if test "$tcl_strtod" = 1; then
  	echo $ac_n "checking for Solaris2.4/Tru64 strtod bugs""... $ac_c" 1>&6
@@ -1075,7 +1131,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  #include "confdefs.h"
  
  	    extern double strtod();
-@@ -4517,7 +4548,7 @@
+@@ -4517,7 +4570,7 @@
  		exit(0);
  	    }
  EOF
@@ -1084,7 +1140,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  then
    tcl_ok=1
  else
-@@ -4549,7 +4580,7 @@
+@@ -4549,7 +4602,7 @@
  
  
      echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
@@ -1093,7 +1149,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
      # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
    enableval="$enable_shared"
-@@ -4588,7 +4619,7 @@
+@@ -4588,7 +4641,7 @@
  if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
@@ -1102,7 +1158,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
      RANLIB=":"
  
  #    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-@@ -4611,11 +4642,17 @@
+@@ -4611,11 +4664,17 @@
  if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
      if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
  	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk83/patches/patch-ac b/x11/tk83/patches/patch-ac
index 2cfe85253f8..429d0bc304e 100644
--- a/x11/tk83/patches/patch-ac
+++ b/x11/tk83/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2005/03/06 22:41:28 jschauma Exp $
 
---- tcl.m4.orig	Sat Oct 20 02:24:40 2001
-+++ tcl.m4
+--- tcl.m4.orig	Fri Oct 19 20:24:40 2001
++++ tcl.m4	Sun Mar  6 16:06:56 2005
 @@ -602,6 +602,7 @@
  
      do64bit_ok=no
@@ -10,7 +10,46 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
      EXTRA_CFLAGS=""
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -915,7 +916,6 @@
+@@ -791,8 +792,11 @@
+ 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 	    EXTRA_CFLAGS=""
+ 	    LDFLAGS=""
++            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++            TCL_LIB_VERSIONS_OK=nodots            
+ 	    ;;
+-	IRIX-6.*|IRIX64-6.5*)
++	IRIX-6.*)
+ 	    SHLIB_CFLAGS=""
+ 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
+ 	    SHLIB_LD_LIBS='${LIBS}'
+@@ -815,6 +819,9 @@
+ 		esac
+ 		LDFLAGS="-n32"
+ 	    fi
++            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++            TCL_LIB_VERSIONS_OK=nodots            
+ 	    ;;
+ 	IRIX64-6.*)
+ 	    SHLIB_CFLAGS=""
+@@ -825,6 +832,15 @@
+ 	    DL_LIBS=""
+ 	    LDFLAGS=""
+ 	    LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++            SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++            UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++            TCL_LIB_VERSIONS_OK=nodots            
++
++	    # Check to enable 64-bit flags for compiler/linker
++            if test "${ABI}" = "64" ; then                 
++                SHLIB_LD="ld -64 -shared -rdata_shared"
++                LDFLAGS="$LDFLAGS -64"                 
++            fi   
+ 	    ;;
+ 	Linux*)
+ 	    SHLIB_CFLAGS="-fPIC"
+@@ -915,7 +931,6 @@
  	    AC_CHECK_HEADER(dlfcn.h, [
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -18,7 +57,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  		SHLIB_LD_LIBS=""
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -927,11 +927,19 @@
+@@ -927,11 +942,19 @@
  #ifdef __ELF__
  	yes
  #endif
@@ -40,7 +79,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  		)
  	    ], [
  		SHLIB_CFLAGS=""
-@@ -1130,6 +1138,9 @@
+@@ -1130,6 +1153,9 @@
  	    DL_LIBS="-ldl"
  	    LDFLAGS=""
  	    LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -50,7 +89,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  	    ;;
  	SunOS-5*)
  
-@@ -1174,6 +1185,9 @@
+@@ -1174,6 +1200,9 @@
  	    else
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -60,28 +99,26 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/03/08 20:07:43 minskim Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -1652,7 +1666,11 @@
+@@ -1652,7 +1681,11 @@
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		AC_MSG_RESULT($i)
--		XLIBSW="-L$i -lX11"
 +		if test "${RPATH_FLAG}" != ""; then
 +		    XLIBSW="-L$i ${RPATH_FLAG}$i -lX11"
 +		else
-+		    XLIBSW="-L$i -lX11"
+ 		XLIBSW="-L$i -lX11"
 +		fi
  		x_libraries="$i"
  		break
  	    fi
-@@ -1661,7 +1679,11 @@
+@@ -1661,7 +1694,11 @@
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
--	    XLIBSW="-L$x_libraries -lX11"
 +	    if test "${RPATH_FLAG}" != ""; then
 +		XLIBSW="-L$x_libraries ${RPATH_FLAG}$x_libraries -lX11"
 +	    else
-+		XLIBSW="-L$x_libraries -lX11"
+ 	    XLIBSW="-L$x_libraries -lX11"
 +	    fi
  	fi
      fi