Rework this package so that the BLT extension can be loaded into any running

tcl interpreter (as intended), instead of requiring users to use the bltwish
interpreter.

5 files changed, 183 insertions, 153 deletions

diff --git a/x11/blt/files/patch-sum b/x11/blt/files/patch-sum
index 568cb531b2e..ecf8ed6d7e1 100644
--- a/x11/blt/files/patch-sum
+++ b/x11/blt/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/09/01 17:26:55 jwise Exp $
+$NetBSD: patch-sum,v 1.4 2000/09/08 02:48:04 jwise Exp $
 
-MD5 (patch-aa) = 104cf453439e93ae27ef8f9dedd69b9b
-MD5 (patch-ab) = 1f355fe81506934e437b954c8d3d8c06
+MD5 (patch-aa) = 1eb397cff83923adf093d02681269f34
+MD5 (patch-ab) = 0ffc7735be93479bee4c64219c8bbcf4
 MD5 (patch-ac) = abb8a0f2e2d2f58c237560adcb274d0f
+MD5 (patch-ad) = b39e9040beb5fe0caec6faddd6370116
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index 5a1746d8aa1..cb2a8a6b163 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2000/09/03 14:54:56 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2000/09/08 02:48:05 jwise Exp $
 --- configure.in.orig	Wed Jan 12 15:15:36 2000
-+++ configure.in	Fri Sep  1 13:03:55 2000
++++ configure.in	Thu Sep  7 21:56:11 2000
 @@ -580,9 +580,9 @@
  TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
@@ -26,3 +26,12 @@ $NetBSD: patch-aa,v 1.4 2000/09/03 14:54:56 wiz Exp $
      fi
      ;;
  
+@@ -1084,7 +1085,7 @@
+ #	Propagate prefix argument as installation directory.
+ #--------------------------------------------------------------------
+ 
+-BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
++BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
+ AC_SUBST(BLT_LIBRARY)
+ 
+ #--------------------------------------------------------------------
diff --git a/x11/blt/patches/patch-ab b/x11/blt/patches/patch-ab
index 1fe9003eca4..a2c474d38fb 100644
--- a/x11/blt/patches/patch-ab
+++ b/x11/blt/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2000/09/03 14:54:56 wiz Exp $
+$NetBSD: patch-ab,v 1.5 2000/09/08 02:48:05 jwise Exp $
 --- configure.orig	Wed Jan 12 15:15:36 2000
-+++ configure	Fri Sep  1 13:03:47 2000
++++ configure	Thu Sep  7 21:55:22 2000
 @@ -2694,13 +2694,13 @@
  TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
@@ -30,3 +30,12 @@ $NetBSD: patch-ab,v 1.4 2000/09/03 14:54:56 wiz Exp $
      fi
      ;;
  
+@@ -3542,7 +3543,7 @@
+ #	Propagate prefix argument as installation directory.
+ #--------------------------------------------------------------------
+ 
+-BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
++BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
+ 
+ 
+ #--------------------------------------------------------------------
diff --git a/x11/blt/patches/patch-ad b/x11/blt/patches/patch-ad
new file mode 100644
index 00000000000..45bfe65f7d9
--- /dev/null
+++ b/x11/blt/patches/patch-ad
@@ -0,0 +1,11 @@
+--- library/pkgIndex.tcl.in.orig	Thu Sep  7 22:06:25 2000
++++ library/pkgIndex.tcl.in	Thu Sep  7 22:06:59 2000
+@@ -10,7 +10,7 @@
+     set library BLT${version_no_dots}${suffix}
+     global tcl_platform
+     if { $tcl_platform(platform) == "unix" } {
+-	set library [file join [file dirname $dir] lib${library}]
++	set library [file join [file dirname $dir] .. lib${library}]
+     } 
+     package ifneeded BLT ${version} [list load $library BLT]
+ }
diff --git a/x11/blt/pkg/PLIST b/x11/blt/pkg/PLIST
index a6621e644c1..62f0e96f6c8 100644
--- a/x11/blt/pkg/PLIST
+++ b/x11/blt/pkg/PLIST
@@ -1,144 +1,144 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/03/12 01:43:57 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/09/08 02:48:05 jwise Exp $
 bin/bltwish
 bin/bltwish24
 include/blt.h
-lib/blt2.4/bltCanvEps.pro
-lib/blt2.4/bltDnd.tcl
-lib/blt2.4/bltDragdrop.tcl
-lib/blt2.4/bltGraph.pro
-lib/blt2.4/bltGraph.tcl
-lib/blt2.4/bltHierbox.tcl
-lib/blt2.4/bltHiertable.tcl
-lib/blt2.4/bltTabset.tcl
-lib/blt2.4/dd_protocols/dd-color.tcl
-lib/blt2.4/dd_protocols/dd-file.tcl
-lib/blt2.4/dd_protocols/dd-number.tcl
-lib/blt2.4/dd_protocols/dd-text.tcl
-lib/blt2.4/dd_protocols/tclIndex
-lib/blt2.4/demos/barchart1.tcl
-lib/blt2.4/demos/barchart2.tcl
-lib/blt2.4/demos/barchart3.tcl
-lib/blt2.4/demos/barchart4.tcl
-lib/blt2.4/demos/barchart5.tcl
-lib/blt2.4/demos/bgexec1.tcl
-lib/blt2.4/demos/bgexec2.tcl
-lib/blt2.4/demos/bgexec3.tcl
-lib/blt2.4/demos/bgexec4.tcl
-lib/blt2.4/demos/bitmap.tcl
-lib/blt2.4/demos/bitmaps/face.xbm
-lib/blt2.4/demos/bitmaps/fish/left.xbm
-lib/blt2.4/demos/bitmaps/fish/left1.xbm
-lib/blt2.4/demos/bitmaps/fish/left1m.xbm
-lib/blt2.4/demos/bitmaps/fish/leftm.xbm
-lib/blt2.4/demos/bitmaps/fish/mid.xbm
-lib/blt2.4/demos/bitmaps/fish/midm.xbm
-lib/blt2.4/demos/bitmaps/fish/right.xbm
-lib/blt2.4/demos/bitmaps/fish/right1.xbm
-lib/blt2.4/demos/bitmaps/fish/right1m.xbm
-lib/blt2.4/demos/bitmaps/fish/rightm.xbm
-lib/blt2.4/demos/bitmaps/greenback.xbm
-lib/blt2.4/demos/bitmaps/hand/hand01.xbm
-lib/blt2.4/demos/bitmaps/hand/hand01m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand02.xbm
-lib/blt2.4/demos/bitmaps/hand/hand02m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand03.xbm
-lib/blt2.4/demos/bitmaps/hand/hand03m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand04.xbm
-lib/blt2.4/demos/bitmaps/hand/hand04m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand05.xbm
-lib/blt2.4/demos/bitmaps/hand/hand05m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand06.xbm
-lib/blt2.4/demos/bitmaps/hand/hand06m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand07.xbm
-lib/blt2.4/demos/bitmaps/hand/hand07m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand08.xbm
-lib/blt2.4/demos/bitmaps/hand/hand08m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand09.xbm
-lib/blt2.4/demos/bitmaps/hand/hand09m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand10.xbm
-lib/blt2.4/demos/bitmaps/hand/hand10m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand11.xbm
-lib/blt2.4/demos/bitmaps/hand/hand11m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand12.xbm
-lib/blt2.4/demos/bitmaps/hand/hand12m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand13.xbm
-lib/blt2.4/demos/bitmaps/hand/hand13m.xbm
-lib/blt2.4/demos/bitmaps/hand/hand14.xbm
-lib/blt2.4/demos/bitmaps/hand/hand14m.xbm
-lib/blt2.4/demos/bitmaps/hobbes.xbm
-lib/blt2.4/demos/bitmaps/hobbes_mask.xbm
-lib/blt2.4/demos/bitmaps/sharky.xbm
-lib/blt2.4/demos/bitmaps/xbob.xbm
-lib/blt2.4/demos/busy1.tcl
-lib/blt2.4/demos/dragdrop1.tcl
-lib/blt2.4/demos/dragdrop2.tcl
-lib/blt2.4/demos/eps.tcl
-lib/blt2.4/demos/graph1.tcl
-lib/blt2.4/demos/graph2.tcl
-lib/blt2.4/demos/graph3.tcl
-lib/blt2.4/demos/graph4.tcl
-lib/blt2.4/demos/graph5.tcl
-lib/blt2.4/demos/graph6.tcl
-lib/blt2.4/demos/graph7.tcl
-lib/blt2.4/demos/hierbox1.tcl
-lib/blt2.4/demos/hierbox2.tcl
-lib/blt2.4/demos/hierbox3.tcl
-lib/blt2.4/demos/hierbox4.tcl
-lib/blt2.4/demos/hiertable1.tcl
-lib/blt2.4/demos/htext.txt
-lib/blt2.4/demos/htext1.tcl
-lib/blt2.4/demos/images/blt98.gif
-lib/blt2.4/demos/images/buckskin.gif
-lib/blt2.4/demos/images/chalk.gif
-lib/blt2.4/demos/images/close.gif
-lib/blt2.4/demos/images/close2.gif
-lib/blt2.4/demos/images/clouds.gif
-lib/blt2.4/demos/images/corrugated_metal.gif
-lib/blt2.4/demos/images/folder.gif
-lib/blt2.4/demos/images/mini-book1.gif
-lib/blt2.4/demos/images/mini-book2.gif
-lib/blt2.4/demos/images/mini-display.gif
-lib/blt2.4/demos/images/mini-doc.gif
-lib/blt2.4/demos/images/mini-filemgr.gif
-lib/blt2.4/demos/images/mini-ofolder.gif
-lib/blt2.4/demos/images/mini-windows.gif
-lib/blt2.4/demos/images/ofolder.gif
-lib/blt2.4/demos/images/open.gif
-lib/blt2.4/demos/images/open2.gif
-lib/blt2.4/demos/images/out.ps
-lib/blt2.4/demos/images/qv100.t.gif
-lib/blt2.4/demos/images/rain.gif
-lib/blt2.4/demos/images/sample.gif
-lib/blt2.4/demos/images/smblue_rock.gif
-lib/blt2.4/demos/images/stopsign.gif
-lib/blt2.4/demos/images/tan_paper.gif
-lib/blt2.4/demos/images/tan_paper2.gif
-lib/blt2.4/demos/images/txtrflag.gif
-lib/blt2.4/demos/scripts/barchart2.tcl
-lib/blt2.4/demos/scripts/bgtest.tcl
-lib/blt2.4/demos/scripts/clone.tcl
-lib/blt2.4/demos/scripts/demo.tcl
-lib/blt2.4/demos/scripts/globe.tcl
-lib/blt2.4/demos/scripts/graph1.tcl
-lib/blt2.4/demos/scripts/graph2.tcl
-lib/blt2.4/demos/scripts/graph3.tcl
-lib/blt2.4/demos/scripts/graph5.tcl
-lib/blt2.4/demos/scripts/graph8.tcl
-lib/blt2.4/demos/scripts/page.tcl
-lib/blt2.4/demos/scripts/patterns.tcl
-lib/blt2.4/demos/scripts/ps.tcl
-lib/blt2.4/demos/scripts/send.tcl
-lib/blt2.4/demos/scripts/stipples.tcl
-lib/blt2.4/demos/scripts/xcolors.tcl
-lib/blt2.4/demos/spline.tcl
-lib/blt2.4/demos/stripchart1.tcl
-lib/blt2.4/demos/tabset1.tcl
-lib/blt2.4/demos/tabset2.tcl
-lib/blt2.4/demos/tabset3.tcl
-lib/blt2.4/demos/tabset4.tcl
-lib/blt2.4/demos/winop1.tcl
-lib/blt2.4/pkgIndex.tcl
-lib/blt2.4/tclIndex
+lib/tcl/blt2.4/bltCanvEps.pro
+lib/tcl/blt2.4/bltDnd.tcl
+lib/tcl/blt2.4/bltDragdrop.tcl
+lib/tcl/blt2.4/bltGraph.pro
+lib/tcl/blt2.4/bltGraph.tcl
+lib/tcl/blt2.4/bltHierbox.tcl
+lib/tcl/blt2.4/bltHiertable.tcl
+lib/tcl/blt2.4/bltTabset.tcl
+lib/tcl/blt2.4/dd_protocols/dd-color.tcl
+lib/tcl/blt2.4/dd_protocols/dd-file.tcl
+lib/tcl/blt2.4/dd_protocols/dd-number.tcl
+lib/tcl/blt2.4/dd_protocols/dd-text.tcl
+lib/tcl/blt2.4/dd_protocols/tclIndex
+lib/tcl/blt2.4/demos/barchart1.tcl
+lib/tcl/blt2.4/demos/barchart2.tcl
+lib/tcl/blt2.4/demos/barchart3.tcl
+lib/tcl/blt2.4/demos/barchart4.tcl
+lib/tcl/blt2.4/demos/barchart5.tcl
+lib/tcl/blt2.4/demos/bgexec1.tcl
+lib/tcl/blt2.4/demos/bgexec2.tcl
+lib/tcl/blt2.4/demos/bgexec3.tcl
+lib/tcl/blt2.4/demos/bgexec4.tcl
+lib/tcl/blt2.4/demos/bitmap.tcl
+lib/tcl/blt2.4/demos/bitmaps/face.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/left.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/left1.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/left1m.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/leftm.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/mid.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/midm.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/right.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/right1.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/right1m.xbm
+lib/tcl/blt2.4/demos/bitmaps/fish/rightm.xbm
+lib/tcl/blt2.4/demos/bitmaps/greenback.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand01.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand01m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand02.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand02m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand03.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand03m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand04.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand04m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand05.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand05m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand06.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand06m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand07.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand07m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand08.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand08m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand09.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand09m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand10.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand10m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand11.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand11m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand12.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand12m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand13.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand13m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand14.xbm
+lib/tcl/blt2.4/demos/bitmaps/hand/hand14m.xbm
+lib/tcl/blt2.4/demos/bitmaps/hobbes.xbm
+lib/tcl/blt2.4/demos/bitmaps/hobbes_mask.xbm
+lib/tcl/blt2.4/demos/bitmaps/sharky.xbm
+lib/tcl/blt2.4/demos/bitmaps/xbob.xbm
+lib/tcl/blt2.4/demos/busy1.tcl
+lib/tcl/blt2.4/demos/dragdrop1.tcl
+lib/tcl/blt2.4/demos/dragdrop2.tcl
+lib/tcl/blt2.4/demos/eps.tcl
+lib/tcl/blt2.4/demos/graph1.tcl
+lib/tcl/blt2.4/demos/graph2.tcl
+lib/tcl/blt2.4/demos/graph3.tcl
+lib/tcl/blt2.4/demos/graph4.tcl
+lib/tcl/blt2.4/demos/graph5.tcl
+lib/tcl/blt2.4/demos/graph6.tcl
+lib/tcl/blt2.4/demos/graph7.tcl
+lib/tcl/blt2.4/demos/hierbox1.tcl
+lib/tcl/blt2.4/demos/hierbox2.tcl
+lib/tcl/blt2.4/demos/hierbox3.tcl
+lib/tcl/blt2.4/demos/hierbox4.tcl
+lib/tcl/blt2.4/demos/hiertable1.tcl
+lib/tcl/blt2.4/demos/htext.txt
+lib/tcl/blt2.4/demos/htext1.tcl
+lib/tcl/blt2.4/demos/images/blt98.gif
+lib/tcl/blt2.4/demos/images/buckskin.gif
+lib/tcl/blt2.4/demos/images/chalk.gif
+lib/tcl/blt2.4/demos/images/close.gif
+lib/tcl/blt2.4/demos/images/close2.gif
+lib/tcl/blt2.4/demos/images/clouds.gif
+lib/tcl/blt2.4/demos/images/corrugated_metal.gif
+lib/tcl/blt2.4/demos/images/folder.gif
+lib/tcl/blt2.4/demos/images/mini-book1.gif
+lib/tcl/blt2.4/demos/images/mini-book2.gif
+lib/tcl/blt2.4/demos/images/mini-display.gif
+lib/tcl/blt2.4/demos/images/mini-doc.gif
+lib/tcl/blt2.4/demos/images/mini-filemgr.gif
+lib/tcl/blt2.4/demos/images/mini-ofolder.gif
+lib/tcl/blt2.4/demos/images/mini-windows.gif
+lib/tcl/blt2.4/demos/images/ofolder.gif
+lib/tcl/blt2.4/demos/images/open.gif
+lib/tcl/blt2.4/demos/images/open2.gif
+lib/tcl/blt2.4/demos/images/out.ps
+lib/tcl/blt2.4/demos/images/qv100.t.gif
+lib/tcl/blt2.4/demos/images/rain.gif
+lib/tcl/blt2.4/demos/images/sample.gif
+lib/tcl/blt2.4/demos/images/smblue_rock.gif
+lib/tcl/blt2.4/demos/images/stopsign.gif
+lib/tcl/blt2.4/demos/images/tan_paper.gif
+lib/tcl/blt2.4/demos/images/tan_paper2.gif
+lib/tcl/blt2.4/demos/images/txtrflag.gif
+lib/tcl/blt2.4/demos/scripts/barchart2.tcl
+lib/tcl/blt2.4/demos/scripts/bgtest.tcl
+lib/tcl/blt2.4/demos/scripts/clone.tcl
+lib/tcl/blt2.4/demos/scripts/demo.tcl
+lib/tcl/blt2.4/demos/scripts/globe.tcl
+lib/tcl/blt2.4/demos/scripts/graph1.tcl
+lib/tcl/blt2.4/demos/scripts/graph2.tcl
+lib/tcl/blt2.4/demos/scripts/graph3.tcl
+lib/tcl/blt2.4/demos/scripts/graph5.tcl
+lib/tcl/blt2.4/demos/scripts/graph8.tcl
+lib/tcl/blt2.4/demos/scripts/page.tcl
+lib/tcl/blt2.4/demos/scripts/patterns.tcl
+lib/tcl/blt2.4/demos/scripts/ps.tcl
+lib/tcl/blt2.4/demos/scripts/send.tcl
+lib/tcl/blt2.4/demos/scripts/stipples.tcl
+lib/tcl/blt2.4/demos/scripts/xcolors.tcl
+lib/tcl/blt2.4/demos/spline.tcl
+lib/tcl/blt2.4/demos/stripchart1.tcl
+lib/tcl/blt2.4/demos/tabset1.tcl
+lib/tcl/blt2.4/demos/tabset2.tcl
+lib/tcl/blt2.4/demos/tabset3.tcl
+lib/tcl/blt2.4/demos/tabset4.tcl
+lib/tcl/blt2.4/demos/winop1.tcl
+lib/tcl/blt2.4/pkgIndex.tcl
+lib/tcl/blt2.4/tclIndex
 lib/libBLT.a
 lib/libBLT24.a
 lib/libBLT24.so
@@ -164,11 +164,11 @@ man/mann/tile.n
 man/mann/vector.n
 man/mann/watch.n
 man/mann/winop.n
-@dirrm lib/blt2.4/demos/scripts
-@dirrm lib/blt2.4/demos/images
-@dirrm lib/blt2.4/demos/bitmaps/hand
-@dirrm lib/blt2.4/demos/bitmaps/fish
-@dirrm lib/blt2.4/demos/bitmaps
-@dirrm lib/blt2.4/demos
-@dirrm lib/blt2.4/dd_protocols
-@dirrm lib/blt2.4
+@dirrm lib/tcl/blt2.4/demos/scripts
+@dirrm lib/tcl/blt2.4/demos/images
+@dirrm lib/tcl/blt2.4/demos/bitmaps/hand
+@dirrm lib/tcl/blt2.4/demos/bitmaps/fish
+@dirrm lib/tcl/blt2.4/demos/bitmaps
+@dirrm lib/tcl/blt2.4/demos
+@dirrm lib/tcl/blt2.4/dd_protocols
+@dirrm lib/tcl/blt2.4