Switch to Tcl/Tk-8.4.

Bump PKGREVISION due to dependency changes.

5 files changed, 49 insertions, 11 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index ebb23ec8c3b..5acf6e34be6 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:14:49 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/01/22 03:04:31 minskim Exp $
 #
 
 DISTNAME=		cqcam-0.45a
-PKGREVISION=	1
+PKGREVISION=		2
 CATEGORIES=    		graphics x11
 MASTER_SITES=		http://www.cs.duke.edu/~reynolds/cqcam/
 EXTRACT_SUFX=		.tgz
@@ -15,16 +15,26 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-alpha
 
 LICENSE=		no-profit
 
+HAS_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_LANGUAGES=		c c++
 USE_X11=		YES
 
+CONFIGURE_ENV+=		CAT=${CAT:Q} ECHO=${ECHO:Q}			\
+			TCLCONFIG_SH=${TCLCONFIG_SH:Q}
+
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
+post-patch:
+	${CHMOD} a+x ${WRKSRC}/configure
+	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in
+
 post-install:
 	${RM} ${PREFIX}/man/man1/webcam.1.gz
 	${RM} ${PREFIX}/man/man1/xcqcam.1.gz
 	${LN} ${PREFIX}/man/man1/cqcam.1 ${PREFIX}/man/man1/webcam.1
 	${LN} ${PREFIX}/man/man1/cqcam.1 ${PREFIX}/man/man1/xcqcam.1
 
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index bee7158726d..e8b831f307f 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.5 2004/07/10 22:18:23 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/01/22 03:04:31 minskim Exp $
 
 SHA1 (cqcam-0.45a.tgz) = 39affec6ad3e81cc837ab583d01207767d4f7273
 Size (cqcam-0.45a.tgz) = 40163 bytes
-SHA1 (patch-aa) = b41972ad82dda61283e04aa1a70e0b01fce2d797
+SHA1 (patch-aa) = dc64d8f880ef5d9807f476ff4840c80bbe8508a2
 SHA1 (patch-ab) = a81c6bc06146065cf6cccd377276a3bc5a3b2686
 SHA1 (patch-ac) = 868cedbdb0e866013079408d2260eb5084121da7
 SHA1 (patch-ad) = 79c73e48ed2dbfdf13286afe1959e1d1fdcacb0d
 SHA1 (patch-ae) = 3b07a7df2428f6275af449abded061bbed9f23db
-SHA1 (patch-af) = 9524836545e64372445cb05bc63b649221c649fd
+SHA1 (patch-af) = 2f786a6c3aec812c1c446735756b46dbc70ebd15
 SHA1 (patch-ag) = a6446bb7c03ebd6525173fbb72dc011dda09ce30
+SHA1 (patch-ah) = f0b370ee03774e315861c1948d2e3b2723f385f8
diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index c717fbb18eb..955435d2b36 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2004/07/10 22:18:23 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2005/01/22 03:04:31 minskim Exp $
 
 --- Makefile.orig	1997-10-28 00:07:06.000000000 +0100
 +++ Makefile
@@ -80,7 +80,7 @@ $NetBSD: patch-aa,v 1.7 2004/07/10 22:18:23 wiz Exp $
 -#REMOTE_CFLAGS =
 +REMOTE_OBJS = xqcctl-tk.o            # code module for the remote
 +REMOTE_DEFS = -DREMOTE
-+REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk83 -ltcl83    # libraries necessary for the remote
++REMOTE_LIBS = -lm -L${PREFIX}/lib -ltk -ltcl    # libraries necessary for the remote
 +REMOTE_LDFLAGS =
 +REMOTE_CFLAGS = -I${PREFIX}/include
  ######################################################################
diff --git a/graphics/cqcam/patches/patch-af b/graphics/cqcam/patches/patch-af
index 228f3fe5bdd..51d2d631600 100644
--- a/graphics/cqcam/patches/patch-af
+++ b/graphics/cqcam/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2004/07/10 22:18:23 wiz Exp $
+$NetBSD: patch-af,v 1.2 2005/01/22 03:04:31 minskim Exp $
 
---- xqcctl-tk.C.orig	1997-10-27 03:31:30.000000000 +0100
+--- xqcctl-tk.C.orig	1997-10-26 20:31:30.000000000 -0600
 +++ xqcctl-tk.C
 @@ -6,6 +6,7 @@
  
@@ -10,3 +10,21 @@ $NetBSD: patch-af,v 1.1 2004/07/10 22:18:23 wiz Exp $
  #include <unistd.h>
  #include <fcntl.h>
  #include <errno.h>
+@@ -148,7 +149,7 @@ void xqc_quit(void) {
+ }
+ 
+ int SetCamValCmd(ClientData clientdata, Tcl_Interp *interp,
+-		 int argc, char *argv[])
++		 int argc, const char *argv[])
+ {
+   char type;
+   long value = atoi(argv[2]);
+@@ -163,7 +164,7 @@ int SetCamValCmd(ClientData clientdata, 
+ }
+ 
+ int CamButtonCmd(ClientData clientdata, Tcl_Interp *interp,
+-		 int argc, char *argv[])
++		 int argc, const char *argv[])
+ {
+   char type;
+   long value = 0;
diff --git a/graphics/cqcam/patches/patch-ah b/graphics/cqcam/patches/patch-ah
new file mode 100644
index 00000000000..4d96ed7cdf4
--- /dev/null
+++ b/graphics/cqcam/patches/patch-ah
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1 2005/01/22 03:04:31 minskim Exp $
+
+--- configure.orig	2005-01-21 20:52:15.000000000 -0600
++++ configure
+@@ -0,0 +1,4 @@
++#! /bin/sh
++. $TCLCONFIG_SH
++$ECHO "LDLIBS+=	$TCL_LIBS" > Makefile
++$CAT Makefile.in >> Makefile