Adapt this package to tk-8.3.2.

6 files changed, 23 insertions, 21 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 9864ba69be5..19053639c30 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2000/09/01 17:58:05 jwise Exp $
+# $NetBSD: Makefile,v 1.28 2000/09/08 18:58:05 jwise Exp $
 #
 
 DISTNAME=	sdr-2.7
-CATEGORIES=	mbone tk80
+CATEGORIES=	mbone tk
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
 
-BROKEN=		This package has not yet been updated to work with tcl-8.3.2.
-
 MAINTAINER=	is@netbsd.org
 HOMEPAGE=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
 
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 
 RESTRICTED=	"Uses encryption"
 NO_SRC_ON_FTP=	${RESTRICTED}
diff --git a/mbone/sdr/files/Makefile.netbsd b/mbone/sdr/files/Makefile.netbsd
index 2285985c37f..4b17ca6cfdc 100644
--- a/mbone/sdr/files/Makefile.netbsd
+++ b/mbone/sdr/files/Makefile.netbsd
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.netbsd,v 1.7 1999/10/04 20:57:00 is Exp $
+#	$NetBSD: Makefile.netbsd,v 1.8 2000/09/08 18:58:06 jwise Exp $
 
 CC          = gcc -g -O
-INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include/tcl8.0/generic -I../../common
-LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 ../../common/libcommon.a \
+INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk/generic -I${LOCALBASE}/include/tcl/generic -I../../common
+LIBS        = -L${LOCALBASE}/lib -ltk83 -ltcl83 ../../common/libcommon.a \
 		-lm -L${X11BASE}/lib -lX11 -lz  \
 		-Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
 CFLAGS      = $(INCLUDES) -DDIFF_BYTE_ORDER -DNORANDPROTO -DDEFINED_ERRLIST \
diff --git a/mbone/sdr/files/patch-sum b/mbone/sdr/files/patch-sum
index 14c81eafd70..89840c64e9e 100644
--- a/mbone/sdr/files/patch-sum
+++ b/mbone/sdr/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/03/15 07:17:41 bouyer Exp $
+$NetBSD: patch-sum,v 1.6 2000/09/08 18:58:06 jwise Exp $
 
 MD5 (patch-aa) = b10166bf243215b706006e9b5255f208
 MD5 (patch-ab) = 5d1e2bf629f06344db61bba29d14b555
@@ -11,4 +11,5 @@ MD5 (patch-ah) = 63512e42ca7b6a2c16e5440841b5f3ed
 MD5 (patch-aj) = 616a9c2ae2efc53196a94d2a89019a8c
 MD5 (patch-ak) = d013192600f69a313d6477ef47fac6de
 MD5 (patch-ao) = 5cbb4d6c6d77e02bd885307fdd406d4c
-MD5 (patch-ap) = a01a5ed0b4fb3fa40b9288398510a3d4
+MD5 (patch-ap) = c9452823b714e453e5b42350f65c508d
+MD5 (patch-aq) = 077a08610809ac7f777bf59a0cf58c9e
diff --git a/mbone/sdr/patches/patch-ap b/mbone/sdr/patches/patch-ap
index 3eae5dd0e3a..d43cb949638 100644
--- a/mbone/sdr/patches/patch-ap
+++ b/mbone/sdr/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1 2000/03/15 07:17:41 bouyer Exp $
+$NetBSD: patch-ap,v 1.2 2000/09/08 18:58:06 jwise Exp $
 
 --- sdr/solaris/Makefile.solaris.orig	Mon Mar 13 16:11:46 2000
 +++ sdr/solaris/Makefile.solaris	Mon Mar 13 16:13:20 2000
@@ -7,8 +7,8 @@ $NetBSD: patch-ap,v 1.1 2000/03/15 07:17:41 bouyer Exp $
 -INCLUDES    = -I/usr/openwin/include -I../../tcl-8.0/generic -I../../tk-8.0/generic -I../../common
 -LIBS        = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a \
 -             -L/usr/openwin/lib -lX11 -lm -lnsl -ldl -lsocket -lresolv 
-+INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.0/generic -I${LOCALBASE}/include/tcl8.0/generic -I../../common
-+LIBS        = -L${LOCALBASE}/lib -ltk80 -ltcl80 ../../common/libcommon.a \
++INCLUDES    = -I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tk/generic -I${LOCALBASE}/include/tcl/generic -I../../common
++LIBS        = -L${LOCALBASE}/lib -ltk83 -ltcl83 ../../common/libcommon.a \
 +		-lm -L${X11BASE}/lib -lX11 -lz  -lnsl -ldl -lsocket -lresolv \
 +		-Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
 -CFLAGS      = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris
diff --git a/mbone/sdr/patches/patch-aq b/mbone/sdr/patches/patch-aq
new file mode 100644
index 00000000000..8476e0ba7df
--- /dev/null
+++ b/mbone/sdr/patches/patch-aq
@@ -0,0 +1,11 @@
+--- sdr/src/Makefile.template.orig	Fri Sep  8 14:19:35 2000
++++ sdr/src/Makefile.template	Fri Sep  8 14:20:04 2000
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
+ 
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+-	tclsh8.0 ../src/plugin2tcl.tcl
++	tclsh ../src/plugin2tcl.tcl
+ 
+ uweb: $(WWWOBJS)
+ 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
diff --git a/mbone/sdr/scripts/configure b/mbone/sdr/scripts/configure
deleted file mode 100644
index be33ba644c6..00000000000
--- a/mbone/sdr/scripts/configure
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: configure,v 1.3 1998/08/07 11:10:02 agc Exp $
-#
-
-mkdir ${WRKSRC}/netbsd
-cat ${FILESDIR}/Makefile.netbsd ${WRKSRC}/src/Makefile.template > ${WRKSRC}/netbsd/Makefile
-cp ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile