Add some missing header files so this compiles with gcc3.

Fix PLIST while here.

8 files changed, 81 insertions, 17 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 96e001988a5..c5c1a1b9495 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/04/25 02:49:22 snj Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/10 22:18:23 wiz Exp $
 #
 
 DISTNAME=		cqcam-0.45a
@@ -15,8 +15,15 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-alpha
 LICENSE=		no-profit
 
 USE_BUILDLINK3=		YES
+USE_LANGUAGES=		c c++
 USE_X11=		YES
 
+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/PLIST b/graphics/cqcam/PLIST
index f6e129dbab5..1a4b8123e52 100644
--- a/graphics/cqcam/PLIST
+++ b/graphics/cqcam/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:23 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/10 22:18:23 wiz Exp $
 bin/cqcam
 bin/xcqcam
 bin/webcam
 man/man1/cqcam.1
+man/man1/webcam.1
+man/man1/xcqcam.1
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index b658a671484..bee7158726d 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.4 2002/06/27 20:40:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2004/07/10 22:18:23 wiz Exp $
 
 SHA1 (cqcam-0.45a.tgz) = 39affec6ad3e81cc837ab583d01207767d4f7273
 Size (cqcam-0.45a.tgz) = 40163 bytes
-SHA1 (patch-aa) = f65eb6001abfc39fea3f5fdab1af445214748f9a
-SHA1 (patch-ab) = 69138220e26174d66e10310d247f9611b3e13471
+SHA1 (patch-aa) = b41972ad82dda61283e04aa1a70e0b01fce2d797
+SHA1 (patch-ab) = a81c6bc06146065cf6cccd377276a3bc5a3b2686
 SHA1 (patch-ac) = 868cedbdb0e866013079408d2260eb5084121da7
 SHA1 (patch-ad) = 79c73e48ed2dbfdf13286afe1959e1d1fdcacb0d
+SHA1 (patch-ae) = 3b07a7df2428f6275af449abded061bbed9f23db
+SHA1 (patch-af) = 9524836545e64372445cb05bc63b649221c649fd
+SHA1 (patch-ag) = a6446bb7c03ebd6525173fbb72dc011dda09ce30
diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index 0f958540caa..c717fbb18eb 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
+$NetBSD: patch-aa,v 1.7 2004/07/10 22:18:23 wiz Exp $
 
---- Makefile.orig	Tue Oct 28 00:07:06 1997
+--- Makefile.orig	1997-10-28 00:07:06.000000000 +0100
 +++ Makefile
-@@ -13,9 +13,9 @@
+@@ -13,9 +13,9 @@ PROGRAMS = cqcam xcqcam webcam
  # OS-specific stuff: uncomment all of the lines for your OS of choice
  
  # Linux (people with Alphas probably need to enable -DBROKEN_IO_H)
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
  
  # QNX
  #CFLAGS = -O2 -T1
-@@ -23,10 +23,21 @@
+@@ -23,10 +23,21 @@ DEFS += -DLINUX # -DBROKEN_IO_H
  #DEFS += -DQNX
  
  # FreeBSD
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
  # BSDI 3.0
  #CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include
  #LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
-@@ -44,15 +55,14 @@
+@@ -44,15 +55,14 @@ DEFS += -DLINUX # -DBROKEN_IO_H
  # JPEG stuff: do you want JPEG support?  Where is your JPEG library?
  
  LDLIBS += -ljpeg
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
  LIBS_X = -lX11 -lXext $(REMOTE_LIBS)
  ######################################################################
  
-@@ -67,27 +77,27 @@
+@@ -67,34 +77,34 @@ LIBS_X = -lX11 -lXext $(REMOTE_LIBS)
  #   If you're not compiling xcqcam, this section is irrelevant
  
  # xview remote
@@ -97,7 +97,15 @@ $NetBSD: patch-aa,v 1.6 2001/06/29 14:53:35 zuntum Exp $
  ######################################################################
  
  ######################################################################
-@@ -132,13 +142,14 @@
+ # Compiler information: where are CC and LD?
+ CC = cc
+ #CC = gcc
+-LD = cc
++LD = c++
+ #LD = gcc
+ ######################################################################
+ 
+@@ -132,13 +142,14 @@ install: bininstall maninstall
  
  bininstall: all
  	@echo -n Installing binaries...
diff --git a/graphics/cqcam/patches/patch-ab b/graphics/cqcam/patches/patch-ab
index 07e2c52f844..a78f64ca4f5 100644
--- a/graphics/cqcam/patches/patch-ab
+++ b/graphics/cqcam/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2001/01/07 04:05:03 thorpej Exp $
+$NetBSD: patch-ab,v 1.4 2004/07/10 22:18:23 wiz Exp $
 
---- port.C.orig	Mon Oct 27 09:29:35 1997
-+++ port.C	Sat Jan  6 19:52:36 2001
-@@ -30,6 +30,10 @@
+--- port.C.orig	1997-10-27 18:29:35.000000000 +0100
++++ port.C
+@@ -10,6 +10,7 @@
+ 
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include "config.h"
+ 
+@@ -30,6 +31,10 @@
    #endif
  #elif defined(FREEBSD)
  #include <machine/cpufunc.h>
@@ -13,7 +21,7 @@ $NetBSD: patch-ab,v 1.3 2001/01/07 04:05:03 thorpej Exp $
  #elif defined(BSDI)
  #include <machine/inline.h>
  #elif defined(LYNX)
-@@ -62,6 +66,20 @@
+@@ -62,6 +67,20 @@ port_t::port_t(int iport) {
      perror("fopen /dev/io");
      return;
    }
diff --git a/graphics/cqcam/patches/patch-ae b/graphics/cqcam/patches/patch-ae
new file mode 100644
index 00000000000..33ca9d2ad97
--- /dev/null
+++ b/graphics/cqcam/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2004/07/10 22:18:23 wiz Exp $
+
+--- camera.C.orig	1997-10-28 00:04:22.000000000 +0100
++++ camera.C
+@@ -3,6 +3,7 @@
+ // by Patrick Reynolds <patrickr@iname.com>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
diff --git a/graphics/cqcam/patches/patch-af b/graphics/cqcam/patches/patch-af
new file mode 100644
index 00000000000..228f3fe5bdd
--- /dev/null
+++ b/graphics/cqcam/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2004/07/10 22:18:23 wiz Exp $
+
+--- xqcctl-tk.C.orig	1997-10-27 03:31:30.000000000 +0100
++++ xqcctl-tk.C
+@@ -6,6 +6,7 @@
+ 
+ #include <stdlib.h>
+ #include <signal.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
diff --git a/graphics/cqcam/patches/patch-ag b/graphics/cqcam/patches/patch-ag
new file mode 100644
index 00000000000..5cee0ed675a
--- /dev/null
+++ b/graphics/cqcam/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2004/07/10 22:18:23 wiz Exp $
+
+--- imager.C.orig	1997-10-27 03:08:52.000000000 +0100
++++ imager.C
+@@ -9,6 +9,7 @@
+ //   Andre Jsemanowicz <andre@andrix.biophysics.mcw.edu>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "config.h"
+ #include <string.h>
+ #include <math.h>