Adapt this package to tk-8.3.2.

7 files changed, 19 insertions, 19 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 1f423172c36..6a9377856a0 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/15 09:26:21 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/31 14:43:49 jwise Exp $
 #
 
 DISTNAME=		cqcam-0.45a
@@ -10,7 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.duke.edu/~reynolds/cqcam/
 
 DEPENDS=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		tk-8.0.5:../../x11/tk80
+DEPENDS+=		tk-8.3.2:../../x11/tk
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
diff --git a/graphics/cqcam/files/patch-sum b/graphics/cqcam/files/patch-sum
index 9b4e836fdfe..05d382240cc 100644
--- a/graphics/cqcam/files/patch-sum
+++ b/graphics/cqcam/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.2 2000/06/20 22:25:57 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 2000/08/31 14:43:52 jwise Exp $
 
-MD5 (patch-aa) = 542c6cc1afdb2414643acec1f8aac5a2
+MD5 (patch-aa) = 960c4e5a7713b48ce3811a386f4c9c05
 MD5 (patch-ab) = 7d33c419cf524e108a53213fd4f02fe9
 MD5 (patch-ac) = e4fa0ab6d99a51cdb2225eb274c4cb7c
diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index 0e3edd3ed31..5076ea20180 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/06/20 22:25:58 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
 
 --- Makefile.orig	Tue Oct 28 00:07:06 1997
 +++ Makefile	Wed Jun 21 00:20:49 2000
@@ -77,9 +77,9 @@ $NetBSD: patch-aa,v 1.3 2000/06/20 22:25:58 hubertf Exp $
 -#REMOTE_CFLAGS =
 +REMOTE_OBJS = xqcctl-tk.o            # code module for the remote
 +REMOTE_DEFS = -DREMOTE
-+REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk80 -ltcl80    # libraries necessary for the remote
++REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk83 -ltcl83    # libraries necessary for the remote
 +REMOTE_LDFLAGS =
-+REMOTE_CFLAGS = -I${PREFIX}/include/tcl8.0 -I${PREFIX}/include/tk8.0
++REMOTE_CFLAGS = -I${PREFIX}/include
  ######################################################################
  
  ######################################################################
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 8107d7f4a6d..17ccd50c367 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/24 22:32:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/31 14:46:31 jwise Exp $
 #
 
 DISTNAME=		ocaml-3.00
@@ -8,11 +8,11 @@ MASTER_SITES=		ftp://ftp.inria.fr/lang/caml-light/
 MAINTAINER=		groo@netbsd.org
 HOMEPAGE=		http://caml.inria.fr/ocaml/
 
-DEPENDS+=		tk-8.0.*:../../x11/tk80
+DEPENDS+=		tk-8.3.2:../../x11/tk
 
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	-prefix ${LOCALBASE} -tklibs -L${LOCALBASE}/lib -tkdefs "-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0" -libs "-Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	-prefix ${LOCALBASE} -tklibs -L${LOCALBASE}/lib -tkdefs "-I${LOCALBASE}/include " -libs "-Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib"
 
 ALL_TARGET=		world
 
diff --git a/misc/zorro/Makefile b/misc/zorro/Makefile
index 496aa460357..56f3ad7a286 100644
--- a/misc/zorro/Makefile
+++ b/misc/zorro/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.9 2000/03/16 13:52:20 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/31 14:51:51 jwise Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/22 19:55:25 jseger Exp
 #
 
 DISTNAME=	zorro-1.1p8
 PKGNAME=	zorro-1.1.8
-CATEGORIES=	misc tk80
+CATEGORIES=	misc tk
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/apps/zorro-1.1p8/
 
-MAINTAINER=	shanee@augusta.de
+MAINTAINER=	packages@netbsd.org
 
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 
 NO_BUILD=	yes
 USE_X11=	yes
 
 post-patch:
-	( cd ${WRKSRC} ; ${SED} 's|/usr/local|'${PREFIX}'|g' \
+	( cd ${WRKSRC} ; ${SED} 's|@PREFIX@|'${PREFIX}'|g' \
 		<zorro >zorro.BAK ; ${MV} zorro.BAK zorro )
 
 do-install:
diff --git a/misc/zorro/files/patch-sum b/misc/zorro/files/patch-sum
index 10b72ffd7f6..176fdd1cba2 100644
--- a/misc/zorro/files/patch-sum
+++ b/misc/zorro/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:21 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 14:51:52 jwise Exp $
 
-MD5 (patch-aa) = 55f46d06b099c9fb37911f36250b3f93
+MD5 (patch-aa) = 8a2ba64fcf14398c2e2a554a1b75c46d
 MD5 (patch-ab) = 2f3e3e47c2b64a4aafd4eeca0b4b357d
diff --git a/misc/zorro/patches/patch-aa b/misc/zorro/patches/patch-aa
index b07903464ed..0f17679a5bb 100644
--- a/misc/zorro/patches/patch-aa
+++ b/misc/zorro/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:10:34 agc Exp $
+$NetBSD: patch-aa,v 1.4 2000/08/31 14:51:52 jwise Exp $
 
 *** zorro.orig	Sat Aug  3 22:52:54 1996
 --- zorro	Sat Aug  3 22:53:10 1996
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:10:34 agc Exp $
   # ----------------------------------------------------------------------
   #   AUTHOR:  Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
 --- 1,6 ----
-! #!/usr/local/bin/wish8.0
+! #!/@PREFIX@/bin/wish
   #
 ! # Version 1.1 Patch 8
   #