Fix build problem on hosts identified as 'netbsdelf'. Does not change anything

on systems that already worked, so no PKGREVISION bump.

5 files changed, 40 insertions, 38 deletions

diff --git a/x11/blt/distinfo b/x11/blt/distinfo
index b892cfc5640..174ce216aff 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/12/16 07:39:10 jmc Exp $
+$NetBSD: distinfo,v 1.4 2002/03/31 14:37:30 abs Exp $
 
 SHA1 (BLT2.4o.tar.gz) = bcec9ec0ddcf9f49d8f6de6f02e86988af41d2d2
 Size (BLT2.4o.tar.gz) = 1779872 bytes
-SHA1 (patch-aa) = bf5c376b509038037edaf1a756e95876004fdacd
-SHA1 (patch-ac) = 04f4866afc7677fd146fa91e278bf873616d57f4
-SHA1 (patch-ad) = 6a9d78ab895f6ef7625b50a869c11a05c4e2aba6
-SHA1 (patch-ae) = cf881e793e8a9aa385bab39b13bef3a76d0ac092
+SHA1 (patch-aa) = 11e422d56a617d8782ff2279ce41ae128c675ea8
+SHA1 (patch-ab) = d197a96d4047b021d2c8117f39fd6334bbbe141c
+SHA1 (patch-ac) = f3f418a0481c20c707c1a8b58506049eecd3bb27
+SHA1 (patch-ad) = beb29451ddb9c84d723ad78a8728fdb867838a63
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index 6696321b5a8..51b77ddf34b 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2001/12/16 07:39:11 jmc Exp $
+$NetBSD: patch-aa,v 1.7 2002/03/31 14:37:30 abs Exp $
 
 --- configure.in.orig	Wed Jan 12 20:15:36 2000
-+++ configure.in	Sun Dec 16 07:16:49 2001
++++ configure.in
 @@ -580,7 +580,7 @@
  TK_LIB_DIR=${TK_EXEC_PREFIX}/lib
  
  case $target in
 -  *-sunos4*|NetBSD-*|FreeBSD-*|OpenBSD-*)
-+  *-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}"
      ;;
diff --git a/x11/blt/patches/patch-ae b/x11/blt/patches/patch-ab
index c5a9d29cef2..1a96c4e5e4a 100644
--- a/x11/blt/patches/patch-ae
+++ b/x11/blt/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2000/10/01 14:32:57 rh Exp $
+$NetBSD: patch-ab,v 1.7 2002/03/31 14:37:31 abs Exp $
 
---- library/Makefile.in.orig	Sun Oct  1 16:28:43 2000
+--- library/Makefile.in.orig	Thu Jan 27 00:42:13 2000
 +++ library/Makefile.in
 @@ -31,7 +31,7 @@
  
diff --git a/x11/blt/patches/patch-ac b/x11/blt/patches/patch-ac
index 12542cc5f55..67d8048d165 100644
--- a/x11/blt/patches/patch-ac
+++ b/x11/blt/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/03/12 01:43:56 hubertf Exp $
---- man/Makefile.in.orig	Tue Feb  8 14:40:26 2000
-+++ man/Makefile.in	Fri Mar 10 13:12:23 2000
+$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 @@
- 
- instdirs	= $(mandir) $(sectiondir)
- 
--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 @@
- distclean: clean
- 	$(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
- 
-+bltbitmap.man: bitmap.man
-+	cp bitmap.man bltbitmap.man
+     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 dbdd0b1c5a2..61a1d69329d 100644
--- a/x11/blt/patches/patch-ad
+++ b/x11/blt/patches/patch-ad
@@ -1,12 +1,19 @@
-$NetBSD: patch-ad,v 1.2 2000/10/21 23:05:15 wiz Exp $
---- library/pkgIndex.tcl.in.orig	Thu Sep  7 22:06:25 2000
-+++ library/pkgIndex.tcl.in	Thu Sep  7 22:06:59 2000
+$NetBSD: patch-ad,v 1.3 2002/03/31 14:37:31 abs Exp $
+
+--- man/Makefile.in.orig	Tue Feb  8 21:40:26 2000
++++ man/Makefile.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]
- }
+ 
+ instdirs	= $(mandir) $(sectiondir)
+ 
+-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 @@
+ distclean: clean
+ 	$(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
+ 
++bltbitmap.man: bitmap.man
++	cp bitmap.man bltbitmap.man