Tue Aug 21 21:51:07 2012 UTC ()
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.


(marino)
diff -r1.4 -r1.5 pkgsrc/mbone/wbd/Makefile
diff -r1.2 -r1.3 pkgsrc/mbone/wbd/distinfo
diff -r1.2 -r1.3 pkgsrc/mbone/wbd/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/mbone/wbd/Makefile (expand / switch to unified diff)

--- pkgsrc/mbone/wbd/Makefile 2010/01/25 21:01:03 1.4
+++ pkgsrc/mbone/wbd/Makefile 2012/08/21 21:51:07 1.5
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.4 2010/01/25 21:01:03 is Exp $ 1# $NetBSD: Makefile,v 1.5 2012/08/21 21:51:07 marino Exp $
2# 2#
3 3
4DISTNAME= wbd-1.0ucl4 4DISTNAME= wbd-1.0ucl4
5PKGNAME= wbd-1.0p4 5PKGNAME= wbd-1.0p4
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= mbone tk 7CATEGORIES= mbone tk
8MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/ 8MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/1.0ucl4/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/ 11HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/wbd/
12COMMENT= Multicast WhiteBoarD 12COMMENT= Multicast WhiteBoarD
13 13
14MAKE_FILE= makefile 14MAKE_FILE= makefile
15WRKSRC= ${WRKDIR}/wbd 15WRKSRC= ${WRKDIR}/wbd
16BUILD_TARGET= wbd 16BUILD_TARGET= wbd
17NO_CONFIGURE= yes 17NO_CONFIGURE= yes
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
cvs diff -r1.2 -r1.3 pkgsrc/mbone/wbd/distinfo (expand / switch to unified diff)

--- pkgsrc/mbone/wbd/distinfo 2010/01/25 20:55:45 1.2
+++ pkgsrc/mbone/wbd/distinfo 2012/08/21 21:51:07 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2010/01/25 20:55:45 is Exp $ 1$NetBSD: distinfo,v 1.3 2012/08/21 21:51:07 marino Exp $
2 2
3SHA1 (wbd-1.0ucl4.tar.gz) = 09a399ed435372d7a62fd1c98c6a06aca15cb4e3 3SHA1 (wbd-1.0ucl4.tar.gz) = 09a399ed435372d7a62fd1c98c6a06aca15cb4e3
4RMD160 (wbd-1.0ucl4.tar.gz) = ae094420243f35edc664b1be5c496e4f504e277e 4RMD160 (wbd-1.0ucl4.tar.gz) = ae094420243f35edc664b1be5c496e4f504e277e
5Size (wbd-1.0ucl4.tar.gz) = 53591 bytes 5Size (wbd-1.0ucl4.tar.gz) = 53591 bytes
6SHA1 (patch-aa) = 23ea6b5bc0e987293a2bd3d12a7127da81bb49f6 6SHA1 (patch-aa) = d66e9a3c0999b723c42e1177968b27bc686317d7
7SHA1 (patch-ab) = 70c932caacddb93aacbf245ea8aab3ed685fed8c 7SHA1 (patch-ab) = 70c932caacddb93aacbf245ea8aab3ed685fed8c
8SHA1 (patch-ac) = 8e72488495f29bc42d9572901d1d766025b11c9e 8SHA1 (patch-ac) = 8e72488495f29bc42d9572901d1d766025b11c9e
cvs diff -r1.2 -r1.3 pkgsrc/mbone/wbd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mbone/wbd/patches/patch-aa 2010/01/25 20:55:46 1.2
+++ pkgsrc/mbone/wbd/patches/patch-aa 2012/08/21 21:51:07 1.3
@@ -1,31 +1,34 @@ @@ -1,31 +1,34 @@
1$NetBSD: patch-aa,v 1.2 2010/01/25 20:55:46 is Exp $ 1$NetBSD: patch-aa,v 1.3 2012/08/21 21:51:07 marino Exp $
 2
 3Patch hardcoded with libtcl85. Previously it was hardcoded to libtcl84.
 4
2--- makefile.orig 1998-01-29 11:46:41.000000000 +0000 5--- makefile.orig 1998-01-29 11:46:41.000000000 +0000
3+++ makefile 2005-12-22 16:43:59.000000000 +0000 6+++ makefile 2005-12-22 16:43:59.000000000 +0000
4@@ -3,12 +3,13 @@ 7@@ -3,12 +3,13 @@
5  8
6 YFLAGS = -dv 9 YFLAGS = -dv
7 CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE 10 CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DSTAND_ALONE
8-LIBDIR = /cs/research/mice/starship/common/solaris/lib 11-LIBDIR = /cs/research/mice/starship/common/solaris/lib
9-INCDIR = /cs/research/mice/starship/common/solaris/include 12-INCDIR = /cs/research/mice/starship/common/solaris/include
10+LIBDIR = ${PREFIX}/lib 13+LIBDIR = ${PREFIX}/lib
11+INCDIR = ${PREFIIX}/include 14+INCDIR = ${PREFIIX}/include
12+LIBS = -ll -ltk84 -ltcl84 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib 15+LIBS = -ll -ltk85 -ltcl85 -lm -lX11 -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
13  16
14 # The files needed from the tcl/tk library directories... 17 # The files needed from the tcl/tk library directories...
15-LIBRARY_TK = $(LIBDIR)/tk4.2 18-LIBRARY_TK = $(LIBDIR)/tk4.2
16-LIBRARY_TCL = $(LIBDIR)/tcl7.6 19-LIBRARY_TCL = $(LIBDIR)/tcl7.6
17+LIBRARY_TK = $(LIBDIR)/tk8.4 20+LIBRARY_TK = $(LIBDIR)/tk8.5
18+LIBRARY_TCL = $(LIBDIR)/tcl8.4 21+LIBRARY_TCL = $(LIBDIR)/tcl8.5
19  22
20  23
21 # Uncomment these lines for SGI (IRIX 5.3). 24 # Uncomment these lines for SGI (IRIX 5.3).
22@@ -32,10 +33,10 @@ 25@@ -32,10 +33,10 @@
23 #LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 26 #LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11
24  27
25 # Uncomment these lines for Sun (SunOS 5.5.1). 28 # Uncomment these lines for Sun (SunOS 5.5.1).
26-CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi 29-CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
27-LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib 30-LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib
28-IFLAGS = -I$(INCDIR) -I/usr/openwin/include 31-IFLAGS = -I$(INCDIR) -I/usr/openwin/include
29-LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl 32-LIBS = -ll -ltk4.2 -ltcl7.6 -lm -lX11 -lsocket -lnsl -ldl
30+#CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi 33+#CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi
31+#LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib 34+#LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib