Adapt this package to tk-8.3.2. There is actually a newer blt out there

(2.4u), but the master site has been down all week, so I am adapting the
old one, as the new one has few major changes...

4 files changed, 45 insertions, 26 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index e3a79aa8963..f6f98c1a3e2 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/12 01:43:55 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2000/09/01 17:26:54 jwise Exp $
 #
 
 DISTNAME=	BLT2.4o
@@ -9,13 +9,12 @@ MASTER_SITES=	ftp://ftp.tcltk.com/aa004735/pub/blt/
 MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://www.tcltk.com/blt/index.html
 
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl8.0
-CONFIGURE_ARGS+=	--with-tk=${LOCALBASE}/lib/tk8.0
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-tk=${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/blt2.4o
 
diff --git a/x11/blt/files/patch-sum b/x11/blt/files/patch-sum
index 188e7648001..568cb531b2e 100644
--- a/x11/blt/files/patch-sum
+++ b/x11/blt/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/05/22 03:47:54 sakamoto Exp $
+$NetBSD: patch-sum,v 1.3 2000/09/01 17:26:55 jwise Exp $
 
-MD5 (patch-aa) = 0d8592056a1863d7af6ab72457b53315
-MD5 (patch-ab) = 93897198d3568403edf279e9ecfd97e6
+MD5 (patch-aa) = 104cf453439e93ae27ef8f9dedd69b9b
+MD5 (patch-ab) = 1f355fe81506934e437b954c8d3d8c06
 MD5 (patch-ac) = abb8a0f2e2d2f58c237560adcb274d0f
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index 8868d0e3b59..6f2aafd0535 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,19 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2000/05/22 03:47:55 sakamoto Exp $
---- configure.in.orig	Thu Jan 13 05:15:36 2000
-+++ configure.in	Mon May 22 11:52:47 2000
-@@ -581,5 +581,7 @@
+--- configure.in.orig	Wed Jan 12 15:15:36 2000
++++ configure.in	Fri Sep  1 13:03:55 2000
+@@ -580,9 +580,9 @@
+ TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
  case $target in
 -  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
+-    TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+-    TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 +  *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*)
-+    TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
-+    TK_INC_DIR=${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}
-     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-@@ -936,5 +938,5 @@
++    TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
++    TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+   *)
+     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+@@ -933,9 +933,10 @@
+     # Not available on all versions:  check for include file.
+     AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
+     if test "$test_ok" = yes; then
++      LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib"
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
 -      SHLIB_LD_FLAGS="-Bshareable -x"
-+      SHLIB_LD_FLAGS="-Bshareable -x -rpath ${LD_RUN_PATH}"
++      SHLIB_LD_FLAGS="-Bshareable -x -R${PREFIX}/lib -R${X11BASE}/lib"
      fi
      ;;
+ 
diff --git a/x11/blt/patches/patch-ab b/x11/blt/patches/patch-ab
index 6d7d64c2d25..243d5b50ba6 100644
--- a/x11/blt/patches/patch-ab
+++ b/x11/blt/patches/patch-ab
@@ -1,19 +1,31 @@
-$NetBSD: patch-ab,v 1.2 2000/05/22 03:47:55 sakamoto Exp $
---- configure.orig	Thu Jan 13 05:15:36 2000
-+++ configure	Mon May 22 11:53:05 2000
-@@ -2695,5 +2695,7 @@
+--- configure.orig	Wed Jan 12 15:15:36 2000
++++ configure	Fri Sep  1 13:03:47 2000
+@@ -2694,13 +2694,13 @@
+ TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
  case $target in
 -  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
 +  *-sunos4*|*-*-netbsd|FreeBSD-*|OpenBSD-*)
-+    TCL_INC_DIR=${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
-+    TK_INC_DIR=${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}
      TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
      TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-@@ -3394,5 +3396,5 @@
+     ;;
+   *)
+-    TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+-    TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++    TCL_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
++    TK_LIB_SPEC="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
+     ;;
+ esac
+ 
+@@ -3391,9 +3391,10 @@
+ fi
+ 
+     if test "$test_ok" = yes; then
++      LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib"
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
 -      SHLIB_LD_FLAGS="-Bshareable -x"
-+      SHLIB_LD_FLAGS="-Bshareable -x -rpath ${LD_RUN_PATH}"
++      SHLIB_LD_FLAGS="-Bshareable -x -R${PREFIX}/lib -R${X11BASE}/lib"
      fi
      ;;
+