Make this build on the Alpha.

3 files changed, 33 insertions, 20 deletions

diff --git a/graphics/cqcam/patches/patch-aa b/graphics/cqcam/patches/patch-aa
index 5076ea20180..f2c7bf57857 100644
--- a/graphics/cqcam/patches/patch-aa
+++ b/graphics/cqcam/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
+$NetBSD: patch-aa,v 1.5 2001/01/07 04:05:03 thorpej Exp $
 
---- Makefile.orig	Tue Oct 28 00:07:06 1997
-+++ Makefile	Wed Jun 21 00:20:49 2000
+--- Makefile.orig	Mon Oct 27 15:07:06 1997
++++ Makefile	Sat Jan  6 19:59:45 2001
 @@ -13,9 +13,9 @@
  # OS-specific stuff: uncomment all of the lines for your OS of choice
  
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
  
  # QNX
  #CFLAGS = -O2 -T1
-@@ -23,10 +23,17 @@
+@@ -23,10 +23,21 @@
  #DEFS += -DQNX
  
  # FreeBSD
@@ -29,13 +29,17 @@ $NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
 +CFLAGS = -O2 -I${X11BASE}/include -I${PREFIX}/include
 +LDFLAGS = -L${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
 +DEFS += -DNETBSD
-+# XXX Until we work out a way to use this on non-x86
++# XXX
++.if (${MACHINE_ARCH} == "alpha")
++LDLIBS += -lalpha
++.elif (${MACHINE_ARCH} == "i386")
 +LDLIBS += -li386
++.endif
 +
  # BSDI 3.0
  #CFLAGS = -O2 -I/usr/X11R6/include -I/usr/local/include
  #LDFLAGS = -L/usr/local/lib -L/usr/X11R6/lib
-@@ -44,15 +51,15 @@
+@@ -44,15 +55,15 @@
  # JPEG stuff: do you want JPEG support?  Where is your JPEG library?
  
  LDLIBS += -ljpeg
@@ -54,7 +58,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
  LIBS_X = -lX11 -lXext $(REMOTE_LIBS)
  ######################################################################
  
-@@ -67,27 +74,27 @@
+@@ -67,27 +78,27 @@
  #   If you're not compiling xcqcam, this section is irrelevant
  
  # xview remote
@@ -94,7 +98,7 @@ $NetBSD: patch-aa,v 1.4 2000/08/31 14:43:52 jwise Exp $
  ######################################################################
  
  ######################################################################
-@@ -132,13 +139,14 @@
+@@ -132,13 +143,14 @@
  
  bininstall: all
  	@echo -n Installing binaries...
diff --git a/graphics/cqcam/patches/patch-ab b/graphics/cqcam/patches/patch-ab
index c3c95cb874d..07e2c52f844 100644
--- a/graphics/cqcam/patches/patch-ab
+++ b/graphics/cqcam/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 1998/08/24 11:47:35 frueauf Exp $
+$NetBSD: patch-ab,v 1.3 2001/01/07 04:05:03 thorpej Exp $
 
 --- port.C.orig	Mon Oct 27 09:29:35 1997
-+++ port.C	Sun Aug 23 21:11:00 1998
++++ port.C	Sat Jan  6 19:52:36 2001
 @@ -30,6 +30,10 @@
    #endif
  #elif defined(FREEBSD)
@@ -9,19 +9,28 @@ $NetBSD: patch-ab,v 1.2 1998/08/24 11:47:35 frueauf Exp $
 +#elif defined(NETBSD)
 +#include <sys/types.h>
 +#include <machine/sysarch.h>
-+#include <machine/pio.h>	/* XXX x86-specific */
++#include <machine/pio.h>	/* XXX */
  #elif defined(BSDI)
  #include <machine/inline.h>
  #elif defined(LYNX)
-@@ -60,6 +64,11 @@
- #elif defined(FREEBSD)
-   if ((devio = fopen("/dev/io", "r+")) == NULL) {
+@@ -62,6 +66,20 @@
      perror("fopen /dev/io");
+     return;
+   }
++#elif defined(NETBSD)
++# if defined(__alpha__)
++  if (alpha_pci_io_enable(1) != 0) {
++    perror("alpha_pci_io_enable");
 +    return;
 +  }
-+#elif defined(NETBSD)
++# elif defined(__i386__)
 +  if (i386_iopl(3) != 0) {
 +    perror("i386_iopl");
-     return;
-   }
++    return;
++  }
++# else
++#  error Not supported on this CPU.
++# endif
  #elif defined(LYNX)
+   if (io_access() < 0) {
+     perror("io_access");
diff --git a/graphics/cqcam/patches/patch-ac b/graphics/cqcam/patches/patch-ac
index 5b2b9f4ed25..ea31b32e887 100644
--- a/graphics/cqcam/patches/patch-ac
+++ b/graphics/cqcam/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 1998/08/24 11:47:36 frueauf Exp $
+$NetBSD: patch-ac,v 1.3 2001/01/07 04:05:03 thorpej Exp $
 
---- port.h.orig	Sun Aug 23 21:09:15 1998
-+++ port.h	Sun Aug 23 21:09:42 1998
+--- port.h.orig	Sun Oct 26 17:10:19 1997
++++ port.h	Sat Jan  6 19:46:26 2001
 @@ -28,6 +28,9 @@
  #elif defined(FREEBSD)
  #include <machine/cpufunc.h>