Fixed the build problems on Solaris. The next problem is that the

program tries to install a kernel driver allowing unrestricted access to
all hardware ports. Unprivileged users cannot do that anyway.

XXX: Should we disallow the installation on Solaris at all because of this?

6 files changed, 74 insertions, 5 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 406871c0cfb..ada94dc9972 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/01/08 04:51:44 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/17 02:25:45 rillig Exp $
 #
 
 DISTNAME=		cqcam-0.91
@@ -9,9 +9,17 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.duke.edu/~reynolds/cqcam/
 COMMENT=		Free Color QuickCam control program
 
+.include "../../mk/bsd.prefs.mk"
+
 #NOT_FOR_UNPRIVILEGED=	yes	# seems to need setuid for everything
+.if ${OPSYS} == "SunOS"
+# Tries to install a device driver with unrestricted access to all
+# hardware ports, which is also specific to i86pc platforms.
+NOT_FOR_UNPRIVILEGED=	yes
+.endif
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-xview
 USE_LANGUAGES=		c c++
 
 CONFIGURE_ENV+=		TCLCONFIG_SH=${TCLCONFIG_SH:Q}
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index 7985e142d62..6ae19930859 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2007/01/08 04:54:16 rillig Exp $
+$NetBSD: distinfo,v 1.10 2007/01/17 02:25:45 rillig Exp $
 
 SHA1 (cqcam-0.91.tar.gz) = 28c78c9a24ae01b5a18d81e334f8c0dcab2ebe78
 RMD160 (cqcam-0.91.tar.gz) = 4ef62b01985f834063a0e0941391b8d06428af7e
@@ -6,4 +6,7 @@ Size (cqcam-0.91.tar.gz) = 121252 bytes
 SHA1 (patch-ab) = 3fa3af81031ac4569e68416f2494c19bc5ce276d
 SHA1 (patch-ac) = 1c2f0c62ee192864ca6e25caf966b51ea37ed466
 SHA1 (patch-ai) = e61408d8804553741c41a5756cd70ed3a7cb9453
-SHA1 (patch-aj) = 4a11c8bc807c11f3b68971eb44b325e10b32b070
+SHA1 (patch-aj) = 416f7863477f9d752ee6dc4c7b94b913c053793b
+SHA1 (patch-ak) = 2eac9c0a00bc4ef06bf2eb9442784518eec4d1aa
+SHA1 (patch-al) = 1792f71c88564577ec89c35543d98cd149c65c94
+SHA1 (patch-am) = 2afb2a35b28df87536b6f48f1145e1eb624d276b
diff --git a/graphics/cqcam/patches/patch-aj b/graphics/cqcam/patches/patch-aj
index f9bbabdb62c..af78fb18e19 100644
--- a/graphics/cqcam/patches/patch-aj
+++ b/graphics/cqcam/patches/patch-aj
@@ -1,9 +1,21 @@
-$NetBSD: patch-aj,v 1.1 2007/01/08 04:51:44 rillig Exp $
+$NetBSD: patch-aj,v 1.2 2007/01/17 02:25:45 rillig Exp $
 
 Tags: not-for-upstream
 
+We don't want xview at all. An additional problem is that on Solaris 10,
+there is -lxview, but <xview/xview.h> is missing.
+
 --- configure.orig	2001-07-11 22:58:54.000000000 +0200
-+++ configure	2007-01-08 05:18:15.000000000 +0100
++++ configure	2007-01-17 03:12:56.435501068 +0100
+@@ -1634,7 +1634,7 @@ int main() {
+ xv_main_loop()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if false && { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
 @@ -1951,6 +1951,11 @@ case "$host_os" in
      OS_LDFLAGS='-L/usr/local/lib'
      OS_LIBCQCAM_OBJS=''
diff --git a/graphics/cqcam/patches/patch-ak b/graphics/cqcam/patches/patch-ak
new file mode 100644
index 00000000000..2b786df991f
--- /dev/null
+++ b/graphics/cqcam/patches/patch-ak
@@ -0,0 +1,9 @@
+$NetBSD: patch-ak,v 1.1 2007/01/17 02:25:45 rillig Exp $
+
+--- libcqcam/solaris-io.C.orig	2000-08-17 12:31:03.000000000 +0200
++++ libcqcam/solaris-io.C	2007-01-17 02:49:50.557066984 +0100
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
diff --git a/graphics/cqcam/patches/patch-al b/graphics/cqcam/patches/patch-al
new file mode 100644
index 00000000000..44c9305a244
--- /dev/null
+++ b/graphics/cqcam/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2007/01/17 02:25:45 rillig Exp $
+
+--- libcqcam/solaris-ioaccess.C.orig	2000-08-17 12:31:03.000000000 +0200
++++ libcqcam/solaris-ioaccess.C	2007-01-17 03:08:14.274891300 +0100
+@@ -4,8 +4,10 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#if defined(__i386)		/* XXX: Are these headers needed at all? */
+ #include <sys/sysi86.h>
+ #include <sys/v86.h>
++#endif
+ #include <sys/psw.h>
+ 
+ #include "solaris-io.h"
diff --git a/graphics/cqcam/patches/patch-am b/graphics/cqcam/patches/patch-am
new file mode 100644
index 00000000000..4d7468cf575
--- /dev/null
+++ b/graphics/cqcam/patches/patch-am
@@ -0,0 +1,22 @@
+$NetBSD: patch-am,v 1.1 2007/01/17 02:25:45 rillig Exp $
+
+--- xfe/xqcctl-tk.C.orig	2001-07-11 20:40:20.000000000 +0200
++++ xfe/xqcctl-tk.C	2007-01-17 03:15:04.671887928 +0100
+@@ -164,7 +164,7 @@ void xqc_quit(void) {
+ }
+ 
+ int SetCamValCmd(ClientData clientdata, Tcl_Interp *interp,
+-                 int argc, char *argv[])
++                 int argc, const char *argv[])
+ {
+   char type = '\0';
+   long value = atoi(argv[2]);
+@@ -179,7 +179,7 @@ int SetCamValCmd(ClientData clientdata, 
+ }
+ 
+ int CamButtonCmd(ClientData clientdata, Tcl_Interp *interp,
+-                 int argc, char *argv[])
++                 int argc, const char *argv[])
+ {
+   char type = '\0';
+   long value = 0;