- DESTDIR support

- Fix build on !i386
- Fix build with modular Xorg
- Honour rpath flags
- Bump revision

6 files changed, 93 insertions, 18 deletions

diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index ada94dc9972..dbcac048154 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/01/17 02:25:45 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2008/10/01 22:12:01 joerg Exp $
 #
 
 DISTNAME=		cqcam-0.91
+PKGREVISION=		1
 CATEGORIES=		graphics x11
 MASTER_SITES=		http://www.cs.duke.edu/~reynolds/cqcam/
 
@@ -9,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.duke.edu/~reynolds/cqcam/
 COMMENT=		Free Color QuickCam control program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 #NOT_FOR_UNPRIVILEGED=	yes	# seems to need setuid for everything
@@ -18,13 +21,23 @@ COMMENT=		Free Color QuickCam control program
 NOT_FOR_UNPRIVILEGED=	yes
 .endif
 
+.if ${MACHINE_ARCH} != "i386"
+CONFIGURE_ARGS+=	--disable-asm
+.endif
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-xview
 USE_LANGUAGES=		c c++
 
 CONFIGURE_ENV+=		TCLCONFIG_SH=${TCLCONFIG_SH:Q}
+CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
+
+BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cqcam/distinfo b/graphics/cqcam/distinfo
index 6ae19930859..96475a49f4a 100644
--- a/graphics/cqcam/distinfo
+++ b/graphics/cqcam/distinfo
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.10 2007/01/17 02:25:45 rillig Exp $
+$NetBSD: distinfo,v 1.11 2008/10/01 22:12:01 joerg Exp $
 
 SHA1 (cqcam-0.91.tar.gz) = 28c78c9a24ae01b5a18d81e334f8c0dcab2ebe78
 RMD160 (cqcam-0.91.tar.gz) = 4ef62b01985f834063a0e0941391b8d06428af7e
 Size (cqcam-0.91.tar.gz) = 121252 bytes
-SHA1 (patch-ab) = 3fa3af81031ac4569e68416f2494c19bc5ce276d
-SHA1 (patch-ac) = 1c2f0c62ee192864ca6e25caf966b51ea37ed466
-SHA1 (patch-ai) = e61408d8804553741c41a5756cd70ed3a7cb9453
-SHA1 (patch-aj) = 416f7863477f9d752ee6dc4c7b94b913c053793b
+SHA1 (patch-aa) = 9602a446771eb577e82ef151532b6e189b46a907
+SHA1 (patch-ab) = ad64e221ee08994feb430e833c368226d26b9b56
+SHA1 (patch-ac) = d6f726daf197e7548e1aaf16d03a09508c9ae9a3
+SHA1 (patch-ad) = fd16f489c4f39457a1b9759af505286da4a1ea42
+SHA1 (patch-ae) = 233718279f45c8c65d5f629648ff9e8c95058df3
+SHA1 (patch-af) = b60947db4ddd7760d67f2be2e10473c2e15eefb2
+SHA1 (patch-ai) = a7983828e7e6836107a4e7567f79e47a13abb48d
+SHA1 (patch-aj) = b4f51a2e1653eb3a682e224fb241a312fbf922cf
 SHA1 (patch-ak) = 2eac9c0a00bc4ef06bf2eb9442784518eec4d1aa
 SHA1 (patch-al) = 1792f71c88564577ec89c35543d98cd149c65c94
 SHA1 (patch-am) = 2afb2a35b28df87536b6f48f1145e1eb624d276b
diff --git a/graphics/cqcam/patches/patch-ab b/graphics/cqcam/patches/patch-ab
index ccbac1eb023..eddc0c46d7e 100644
--- a/graphics/cqcam/patches/patch-ab
+++ b/graphics/cqcam/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2007/01/08 04:51:44 rillig Exp $
+$NetBSD: patch-ab,v 1.6 2008/10/01 22:12:01 joerg Exp $
 
 --- libcqcam/port.C.orig	2000-08-23 20:03:19.000000000 +0200
-+++ libcqcam/port.C	2007-01-08 05:25:04.000000000 +0100
++++ libcqcam/port.C
 @@ -30,6 +30,7 @@
  #include "config.h"
  
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.5 2007/01/08 04:51:44 rillig Exp $
  #elif defined(BSDI)
  #include <machine/inline.h>
  #elif defined(OPENBSD)
-@@ -90,6 +95,23 @@ port_t::port_t(int iport) {
+@@ -90,6 +95,28 @@ port_t::port_t(int iport) {
      perror("fopen /dev/io");
      return;
    }
@@ -36,6 +36,11 @@ $NetBSD: patch-ab,v 1.5 2007/01/08 04:51:44 rillig Exp $
 +    perror("i386_iopl");
 +    return;
 +  }
++# elif defined(__x86_64__)
++  if (x86_64_iopl(3) != 0) {
++    perror("x86_64_iopl");
++    return;
++  }
 +# else
 +#  error Not supported on this CPU.
 +# endif
@@ -45,3 +50,23 @@ $NetBSD: patch-ab,v 1.5 2007/01/08 04:51:44 rillig Exp $
  #elif defined(OPENBSD)
    if (i386_iopl(1) == -1) {
      perror("i386_iopl");
+@@ -196,3 +223,19 @@ void port_t::unlock(int portnum) {
+ #endif /* DEBUG */
+ }
+ #endif /* LOCKING */
++
++#if defined(NETBSD)
++void
++outb(unsigned port, uint8_t data)
++{
++	__asm volatile("outb %0,%w1" : : "a" (data), "d" (port));
++}
++
++uint8_t
++inb(unsigned port)
++{
++	uint8_t data;
++	__asm volatile("inb %w1,%0" : "=a" (data) : "d" (port));
++	return data;
++}
++#endif
diff --git a/graphics/cqcam/patches/patch-ac b/graphics/cqcam/patches/patch-ac
index 0233618568a..64997a7848c 100644
--- a/graphics/cqcam/patches/patch-ac
+++ b/graphics/cqcam/patches/patch-ac
@@ -1,14 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2007/01/08 04:51:44 rillig Exp $
+$NetBSD: patch-ac,v 1.5 2008/10/01 22:12:01 joerg Exp $
 
 --- libcqcam/port.h.orig	2000-08-23 20:03:19.000000000 +0200
 +++ libcqcam/port.h	2007-01-08 05:25:39.000000000 +0100
-@@ -43,6 +43,9 @@
+@@ -43,6 +43,12 @@
  #elif defined(FREEBSD)
  #include <machine/cpufunc.h>
  #include <stdio.h>
 +#elif defined(NETBSD)
 +#include <sys/types.h>
-+#include <machine/pio.h>
++
++void outb(unsigned port, uint8_t data);
++uint8_t inb(unsigned port);
++
  #elif defined(BSDI)
  #include <machine/inline.h>
  #elif defined(OPENBSD)
diff --git a/graphics/cqcam/patches/patch-ai b/graphics/cqcam/patches/patch-ai
index a510f922222..f12c473adce 100644
--- a/graphics/cqcam/patches/patch-ai
+++ b/graphics/cqcam/patches/patch-ai
@@ -1,16 +1,31 @@
-$NetBSD: patch-ai,v 1.1 2007/01/08 04:51:44 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2008/10/01 22:12:01 joerg Exp $
 
 --- configure.in.orig	2000-08-17 12:31:03.000000000 +0200
 +++ configure.in	2007-01-08 05:17:49.000000000 +0100
-@@ -145,6 +145,11 @@ case "$host_os" in
+@@ -145,6 +145,18 @@ case "$host_os" in
      OS_LDFLAGS='-L/usr/local/lib'
      OS_LIBCQCAM_OBJS=''
    ;;
 +  netbsd*)
 +    OS_CFLAGS="-DNETBSD"
-+    OS_LDFLAGS="-li386"
 +    OS_LIBCQCAM_OBJS=""
++    case "$host_cpu" in
++    i386)
++	OS_LDFLAGS="-li386"
++	;;
++    x86_64)
++	OS_LDFLAGS="-lx86_64"
++	;;
++    esac
 +  ;;
    openbsd*)
      OS_CFLAGS='-O2 -DOPENBSD'
      OS_LDFLAGS='-L/usr/local/lib'
+@@ -175,6 +187,7 @@ esac
+ if test "$no_asm" = "yes"; then
+   OS_CFLAGS=$OS_CFLAGS' -DNO_ASM'
+ fi
++OS_LDFLAGS="$OS_LDFLAGS $LDFLAGS"
+ 
+ AC_SUBST(JPEG_LIBS)
+ AC_SUBST(JPEG_CFLAGS)
diff --git a/graphics/cqcam/patches/patch-aj b/graphics/cqcam/patches/patch-aj
index af78fb18e19..1798e23bb44 100644
--- a/graphics/cqcam/patches/patch-aj
+++ b/graphics/cqcam/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2007/01/17 02:25:45 rillig Exp $
+$NetBSD: patch-aj,v 1.3 2008/10/01 22:12:01 joerg Exp $
 
 Tags: not-for-upstream
 
@@ -16,15 +16,30 @@ there is -lxview, but <xview/xview.h> is missing.
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -1951,6 +1951,11 @@ case "$host_os" in
+@@ -1951,6 +1951,18 @@ case "$host_os" in
      OS_LDFLAGS='-L/usr/local/lib'
      OS_LIBCQCAM_OBJS=''
    ;;
 +  netbsd*)
 +    OS_CFLAGS="-DNETBSD"
-+    OS_LDFLAGS="-li386"
 +    OS_LIBCQCAM_OBJS=""
++    case "$host_cpu" in
++    i386)
++	OS_LDFLAGS="-li386"
++	;;
++    x86_64)
++	OS_LDFLAGS="-lx86_64"
++	;;
++    esac
 +  ;;
    openbsd*)
      OS_CFLAGS='-O2 -DOPENBSD'
      OS_LDFLAGS='-L/usr/local/lib'
+@@ -1981,6 +1993,7 @@ esac
+ if test "$no_asm" = "yes"; then
+   OS_CFLAGS=$OS_CFLAGS' -DNO_ASM'
+ fi
++OS_LDFLAGS="$OS_LDFLAGS $LDFLAGS"
+ 
+ 
+