From 69a3203e1050093e4ce7aa1585317b8ee3bf4bd4 Mon Sep 17 00:00:00 2001
From: marino <marino@pkgsrc.org>
Date: Tue, 21 Aug 2012 21:51:07 +0000
Subject: mbone/wbd: Patch in tcl/tk 8.5 support

wbd's patches specify tcl/tk 8.4, so update the patches to specify 8.5
to fix build.
---
 mbone/wbd/Makefile         |  4 ++--
 mbone/wbd/distinfo         |  4 ++--
 mbone/wbd/patches/patch-aa | 11 +++++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'mbone/wbd')

diff --git a/mbone/wbd/Makefile b/mbone/wbd/Makefile
index 8834a237c40..ecf26c3efe4 100644
--- a/mbone/wbd/Makefile
+++ b/mbone/wbd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/01/25 21:01:03 is Exp $
+# $NetBSD: Makefile,v 1.5 2012/08/21 21:51:07 marino Exp $
 #
 
 DISTNAME=		wbd-1.0ucl4
 PKGNAME=		wbd-1.0p4
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mbone tk
 MASTER_SITES=		http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/
 
diff --git a/mbone/wbd/distinfo b/mbone/wbd/distinfo
index 76a9c384c66..45b6d4ab434 100644
--- a/mbone/wbd/distinfo
+++ b/mbone/wbd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/01/25 20:55:45 is Exp $
+$NetBSD: distinfo,v 1.3 2012/08/21 21:51:07 marino Exp $
 
 SHA1 (wbd-1.0ucl4.tar.gz) = 09a399ed435372d7a62fd1c98c6a06aca15cb4e3
 RMD160 (wbd-1.0ucl4.tar.gz) = ae094420243f35edc664b1be5c496e4f504e277e
 Size (wbd-1.0ucl4.tar.gz) = 53591 bytes
-SHA1 (patch-aa) = 23ea6b5bc0e987293a2bd3d12a7127da81bb49f6
+SHA1 (patch-aa) = d66e9a3c0999b723c42e1177968b27bc686317d7
 SHA1 (patch-ab) = 70c932caacddb93aacbf245ea8aab3ed685fed8c
 SHA1 (patch-ac) = 8e72488495f29bc42d9572901d1d766025b11c9e
diff --git a/mbone/wbd/patches/patch-aa b/mbone/wbd/patches/patch-aa
index d04482c4656..37ed98c6b59 100644
--- a/mbone/wbd/patches/patch-aa
+++ b/mbone/wbd/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2010/01/25 20:55:46 is Exp $
+$NetBSD: patch-aa,v 1.3 2012/08/21 21:51:07 marino Exp $
+
+Patch hardcoded with libtcl85.  Previously it was hardcoded to libtcl84.
+
 --- makefile.orig	1998-01-29 11:46:41.000000000 +0000
 +++ makefile	2005-12-22 16:43:59.000000000 +0000
 @@ -3,12 +3,13 @@
@@ -9,13 +12,13 @@ $NetBSD: patch-aa,v 1.2 2010/01/25 20:55:46 is Exp $
 -INCDIR		= /cs/research/mice/starship/common/solaris/include
 +LIBDIR		= ${PREFIX}/lib
 +INCDIR		= ${PREFIIX}/include
-+LIBS            = -ll -ltk84 -ltcl84 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
++LIBS            = -ll -ltk85 -ltcl85 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
  
  # The files needed from the tcl/tk library directories...
 -LIBRARY_TK	= $(LIBDIR)/tk4.2
 -LIBRARY_TCL	= $(LIBDIR)/tcl7.6
-+LIBRARY_TK	= $(LIBDIR)/tk8.4
-+LIBRARY_TCL	= $(LIBDIR)/tcl8.4
++LIBRARY_TK	= $(LIBDIR)/tk8.5
++LIBRARY_TCL	= $(LIBDIR)/tcl8.5
  
  
  # Uncomment these lines for SGI (IRIX 5.3).
-- 
cgit v1.2.3