fix so this package with tcl/tk 8.4

4 files changed, 30 insertions, 17 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 1a88e004dce..45843879fb1 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:27 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/10/07 17:39:26 perry Exp $
 #
 
 DISTNAME=	BLT2.4z
 PKGNAME=	blt-2.4z
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blt/}
 
@@ -20,7 +21,15 @@ CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
 MAKE_ENV+=		CP=${CP}
 
-.include "../../lang/tcl83/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+.if empty(OS_VERSION:M1.[56]*)
+.include "../../mk/pthread.buildlink3.mk"
+.endif
+.endif
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/blt/distinfo b/x11/blt/distinfo
index 5cf65de68f0..531a5820961 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2005/10/03 18:42:32 joerg Exp $
+$NetBSD: distinfo,v 1.10 2005/10/07 17:39:26 perry Exp $
 
 SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f
 RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b
 Size (BLT2.4z.tar.gz) = 2200973 bytes
-SHA1 (patch-aa) = 97b967b8b0cda8e30bd24b8d89fd0b5679a9edd4
+SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6
 SHA1 (patch-ab) = 37320a45666c5cb3a0da08cd7f74e9dcee5a66a0
 SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9
 SHA1 (patch-ad) = be6bd157a084f5ad38ff3787f53e7aa4fcf80234
-SHA1 (patch-ae) = 207a0bacfb9f6b1956f7e133c970910e385bd0c8
+SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad
diff --git a/x11/blt/patches/patch-aa b/x11/blt/patches/patch-aa
index 62193bf2597..096ed9e4bb3 100644
--- a/x11/blt/patches/patch-aa
+++ b/x11/blt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/03/06 06:26:21 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2005/10/07 17:39:26 perry Exp $
 
---- configure.in.orig	2002-10-04 00:33:23.000000000 -0500
-+++ configure.in
-@@ -716,8 +716,8 @@ case $target in
+--- configure.in.orig	2002-10-04 01:33:23.000000000 -0400
++++ configure.in	2005-10-07 13:12:02.000000000 -0400
+@@ -716,8 +716,8 @@
      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
    *)
@@ -13,8 +13,11 @@ $NetBSD: patch-aa,v 1.8 2004/03/06 06:26:21 minskim Exp $
      ;;
  esac
  
-@@ -1238,9 +1238,10 @@ case $target in
+@@ -1236,11 +1236,13 @@
+ 
+   *-netbsd*|*-freebsd*|*-openbsd*)
      # Not available on all versions:  check for include file.
++    EXTRA_LIB_SPECS="$PTHREAD_LDFLAGS"
      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"
diff --git a/x11/blt/patches/patch-ae b/x11/blt/patches/patch-ae
index 29b8a422634..6721db7f194 100644
--- a/x11/blt/patches/patch-ae
+++ b/x11/blt/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2005/10/03 18:42:33 joerg Exp $
+$NetBSD: patch-ae,v 1.6 2005/10/07 17:39:26 perry Exp $
 
---- configure.orig	2002-10-04 00:33:59.000000000 -0500
-+++ configure
-@@ -3384,8 +3384,8 @@ case $target in
+--- configure.orig	2002-10-04 01:33:59.000000000 -0400
++++ configure	2005-10-07 13:33:26.000000000 -0400
+@@ -3384,8 +3384,8 @@
      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
      ;;
    *)
@@ -13,16 +13,17 @@ $NetBSD: patch-ae,v 1.5 2005/10/03 18:42:33 joerg Exp $
      ;;
  esac
  
-@@ -4072,7 +4072,7 @@ fi
+@@ -4072,7 +4072,8 @@
      EXTRA_LIB_SPECS="-ldl"
      ;;
  
 -  *-netbsd*|*-freebsd*|*-openbsd*)
 +  *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*)
++    EXTRA_LIB_SPECS="$PTHREAD_LDFLAGS"
      # 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
-@@ -4109,9 +4109,10 @@ test_ok=no
+@@ -4109,9 +4110,10 @@
  fi
  
      if test "$test_ok" = yes; then