Update blt to 2.4z, update MASTER_SITES and HOMEPAGE, bl3ify, and

enable pkgviews installation.

Many new features and bug fixes since 2.4.o.  See NEWS in the distfile
for the complete list.

9 files changed, 275 insertions, 237 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 61ed947db77..b319c982adc 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,24 +1,28 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:28:26 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/06 06:26:21 minskim Exp $
 #
 
-DISTNAME=	BLT2.4o
-PKGNAME=	blt-2.4o
+DISTNAME=	BLT2.4z
+PKGNAME=	blt-2.4z
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.tcltk.com/aa004735/pub/blt/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blt/}
 
 MAINTAINER=	brook@nmsu.edu
-HOMEPAGE=	http://www.tcltk.com/blt/index.html
+HOMEPAGE=	http://blt.sourceforge.net/
 COMMENT=	Extension to Tcl/Tk
 
-WRKSRC=			${WRKDIR}/blt2.4o
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/blt2.4z
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
+MAKE_ENV+=		CP=${CP}
 
-.include "../../lang/tcl/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/PLIST b/x11/blt/PLIST
index cd74fdea8e5..21e8e421b3a 100644
--- a/x11/blt/PLIST
+++ b/x11/blt/PLIST
@@ -1,147 +1,184 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/06 06:26:21 minskim Exp $
+bin/bltsh
+bin/bltsh24
 bin/bltwish
 bin/bltwish24
 include/blt.h
-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
+include/bltBind.h
+include/bltChain.h
+include/bltHash.h
+include/bltList.h
+include/bltPool.h
+include/bltTree.h
+include/bltVector.h
+lib/blt2.4/NEWS
+lib/blt2.4/PROBLEMS
+lib/blt2.4/README
+lib/blt2.4/bltCanvEps.pro
+lib/blt2.4/bltGraph.pro
+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/busy2.tcl
+lib/blt2.4/demos/dnd1.tcl
+lib/blt2.4/demos/dnd2.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/hiertable2.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/tabnotebook1.tcl
+lib/blt2.4/demos/tabnotebook2.tcl
+lib/blt2.4/demos/tabnotebook3.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/treeview1.tcl
+lib/blt2.4/demos/winop1.tcl
+lib/blt2.4/demos/winop2.tcl
+lib/blt2.4/dnd.tcl
+lib/blt2.4/dragdrop.tcl
+lib/blt2.4/graph.tcl
+lib/blt2.4/hierbox.tcl
+lib/blt2.4/pkgIndex.tcl
+lib/blt2.4/tabnotebook.tcl
+lib/blt2.4/tabset.tcl
+lib/blt2.4/tclIndex
+lib/blt2.4/treeview.tcl
+lib/blt2.4/treeview.xbm
+lib/blt2.4/treeview_m.xbm
 lib/libBLT.a
 lib/libBLT24.a
 lib/libBLT24.so
+lib/libBLTlite.a
+lib/libBLTlite24.a
+lib/libBLTlite24.so
+man/man3/Blt_Tree.3
+man/man3/Blt_TreeCreate.3
+man/man3/Blt_TreeCreateNode.3
+man/man3/Blt_TreeDeleteNode.3
+man/man3/Blt_TreeExists.3
+man/man3/Blt_TreeGetNode.3
+man/man3/Blt_TreeGetToken.3
+man/man3/Blt_TreeName.3
+man/man3/Blt_TreeNodeId.3
+man/man3/Blt_TreeReleaseToken.3
 man/mann/BLT.n
 man/mann/barchart.n
 man/mann/beep.n
@@ -149,6 +186,7 @@ man/mann/bgexec.n
 man/mann/bltbitmap.n
 man/mann/bltdebug.n
 man/mann/busy.n
+man/mann/container.n
 man/mann/cutbuffer.n
 man/mann/dragdrop.n
 man/mann/eps.n
@@ -161,14 +199,16 @@ man/mann/stripchart.n
 man/mann/table.n
 man/mann/tabset.n
 man/mann/tile.n
+man/mann/tree.n
+man/mann/treeview.n
 man/mann/vector.n
 man/mann/watch.n
 man/mann/winop.n
-@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
+@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
diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk
new file mode 100644
index 00000000000..14df28580cf
--- /dev/null
+++ b/x11/blt/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/06 06:26:21 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+BLT_BUILDLINK3_MK:=	${BLT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	blt
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nblt}
+BUILDLINK_PACKAGES+=	blt
+
+.if !empty(BLT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.blt+=	blt>=2.4o
+BUILDLINK_PKGSRCDIR.blt?=	../../x11/blt
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
+.endif	# BLT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/blt/distinfo b/x11/blt/distinfo
index 2dd29fe4aa9..49645e4fd9e 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/09/23 22:39:23 jlam Exp $
+$NetBSD: distinfo,v 1.6 2004/03/06 06:26:21 minskim Exp $
 
-SHA1 (BLT2.4o.tar.gz) = bcec9ec0ddcf9f49d8f6de6f02e86988af41d2d2
-Size (BLT2.4o.tar.gz) = 1779872 bytes
-SHA1 (patch-aa) = 11e422d56a617d8782ff2279ce41ae128c675ea8
-SHA1 (patch-ab) = d197a96d4047b021d2c8117f39fd6334bbbe141c
-SHA1 (patch-ac) = f3f418a0481c20c707c1a8b58506049eecd3bb27
-SHA1 (patch-ad) = beb29451ddb9c84d723ad78a8728fdb867838a63
-SHA1 (patch-ae) = d812e88e1ed3f2fad67e092f1be1ed0e1664b745
+SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f
+Size (BLT2.4z.tar.gz) = 2200973 bytes
+SHA1 (patch-aa) = 97b967b8b0cda8e30bd24b8d89fd0b5679a9edd4
+SHA1 (patch-ab) = 37320a45666c5cb3a0da08cd7f74e9dcee5a66a0
+SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234
+SHA1 (patch-ae) = bda9a14a3e65230fb214498c2265d83056df88a7
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index 51b77ddf34b..62193bf2597 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.7 2002/03/31 14:37:30 abs Exp $
+$NetBSD: patch-aa,v 1.8 2004/03/06 06:26:21 minskim Exp $
 
---- configure.in.orig	Wed Jan 12 20:15:36 2000
+--- configure.in.orig	2002-10-04 00:33:23.000000000 -0500
 +++ configure.in
-@@ -580,7 +580,7 @@
- TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
- 
- case $target in
--  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+  *-sunos4*|*-*-netbsd*|FreeBSD-*|OpenBSD-*)
-     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+@@ -716,8 +716,8 @@ case $target in
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+   *)
+-    TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+-    TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++    TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
++    TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
-@@ -933,9 +933,10 @@
+ esac
+ 
+@@ -1238,9 +1238,10 @@ case $target in
      # 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
@@ -23,12 +25,3 @@ $NetBSD: patch-aa,v 1.7 2002/03/31 14:37:30 abs 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 1a96c4e5e4a..414297d82f4 100644
--- a/x11/blt/patches/patch-ab
+++ b/x11/blt/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2002/03/31 14:37:31 abs Exp $
+$NetBSD: patch-ab,v 1.8 2004/03/06 06:26:21 minskim Exp $
 
---- library/Makefile.in.orig	Thu Jan 27 00:42:13 2000
+--- library/Makefile.in.orig	2002-07-14 18:33:24.000000000 -0500
 +++ library/Makefile.in
-@@ -31,7 +31,7 @@
- 
- mkdirs:
- 	@for i in $(instdirs) ; do \
--	    if test -d $$i ; then : ; else mkdir $$i ; fi ; \
-+	    if test -d $$i ; then : ; else mkdir -p $$i ; fi ; \
+@@ -66,7 +66,7 @@ mkdirs:
+             : ; \
+           else \
+             echo " mkdir $(INSTALL_ROOT)$$i" ; \
+-            mkdir $(INSTALL_ROOT)$$i ; \
++            mkdir -p $(INSTALL_ROOT)$$i ; \
+           fi ; \
          done
  
- dragdrop: mkdirs
diff --git a/x11/blt/patches/patch-ac b/x11/blt/patches/patch-ac
deleted file mode 100644
index 67d8048d165..00000000000
--- a/x11/blt/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/03/31 14:37:31 abs Exp $
-
---- library/pkgIndex.tcl.in.orig	Fri Oct  8 07:40:46 1999
-+++ library/pkgIndex.tcl.in
-@@ -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/patches/patch-ad b/x11/blt/patches/patch-ad
index 61a1d69329d..87a5c48a961 100644
--- a/x11/blt/patches/patch-ad
+++ b/x11/blt/patches/patch-ad
@@ -1,19 +1,19 @@
-$NetBSD: patch-ad,v 1.3 2002/03/31 14:37:31 abs Exp $
+$NetBSD: patch-ad,v 1.4 2004/03/06 06:26:21 minskim Exp $
 
---- man/Makefile.in.orig	Tue Feb  8 21:40:26 2000
+--- man/Makefile.in.orig	2002-02-18 18:11:46.000000000 -0600
 +++ man/Makefile.in
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ version		= @BLT_VERSION@
  
- instdirs	= $(mandir) $(sectiondir)
+ instdirs	= $(mandir) $(mandir)/mann $(mandir)/man3
  
--MANPAGES	 = BLT.n barchart.n beep.n bgexec.n bitmap.n \
-+MANPAGES	 = BLT.n barchart.n beep.n bgexec.n bltbitmap.n \
- 		   bltdebug.n busy.n cutbuffer.n dragdrop.n eps.n \
- 		   graph.n hierbox.n hiertable.n htext.n spline.n \
- 		   stripchart.n table.n tabset.n tile.n vector.n \
-@@ -55,3 +55,5 @@
+-MAN_N		= BLT.n barchart.n beep.n bgexec.n bitmap.n \
++MAN_N		= BLT.n barchart.n beep.n bgexec.n bltbitmap.n \
+ 		  bltdebug.n busy.n container.n cutbuffer.n \
+ 		  dragdrop.n eps.n graph.n hierbox.n  \
+ 		  hiertable.n htext.n spline.n stripchart.n \
+@@ -72,3 +72,5 @@ clean:
  distclean: clean
  	$(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
  
-+bltbitmap.man: bitmap.man
-+	cp bitmap.man bltbitmap.man
++bltbitmap.mann: bitmap.mann
++	${CP} bitmap.mann bltbitmap.mann
diff --git a/x11/blt/patches/patch-ae b/x11/blt/patches/patch-ae
index 9c1fa038659..83b8207bb4c 100644
--- a/x11/blt/patches/patch-ae
+++ b/x11/blt/patches/patch-ae
@@ -1,17 +1,19 @@
-$NetBSD: patch-ae,v 1.3 2002/09/23 22:39:23 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2004/03/06 06:26:21 minskim Exp $
 
---- configure.orig	Wed Jan 12 12:15:36 2000
+--- configure.orig	2002-10-04 00:33:59.000000000 -0500
 +++ configure
-@@ -2694,7 +2694,7 @@ TCL_LIB_DIR=${TCL_EXEC_PREFIX}/lib
- TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
- 
- case $target in
--  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+  *-sunos4*|*-*-netbsd*|FreeBSD-*|OpenBSD-*)
-     TCL_LIB_SPEC="-ltcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-     TK_LIB_SPEC="-ltk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+@@ -3384,8 +3384,8 @@ case $target in
+     TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+     ;;
+   *)
+-    TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
+-    TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
++    TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
++    TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
-@@ -3391,9 +3391,10 @@ test_ok=no
+ esac
+ 
+@@ -4109,9 +4109,10 @@ test_ok=no
  fi
  
      if test "$test_ok" = yes; then
@@ -23,12 +25,3 @@ $NetBSD: patch-ae,v 1.3 2002/09/23 22:39:23 jlam Exp $
      fi
      ;;
  
-@@ -3542,7 +3543,7 @@ INCLUDES=${INC_SPECS}
- #	Propagate prefix argument as installation directory.
- #--------------------------------------------------------------------
- 
--BLT_LIBRARY="${prefix}/lib/blt${BLT_VERSION}"
-+BLT_LIBRARY="${prefix}/lib/tcl/blt${BLT_VERSION}"
- 
- 
- #--------------------------------------------------------------------