Split patch-aa (one patch per file) and add DragonFly support.

6 files changed, 97 insertions, 19 deletions

diff --git a/graphics/cnxtview/distinfo b/graphics/cnxtview/distinfo
index 22d2808f09a..d1ba6c3884b 100644
--- a/graphics/cnxtview/distinfo
+++ b/graphics/cnxtview/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 08:45:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/04/22 17:24:27 joerg Exp $
 
 SHA1 (cnxtutil-0.00-alpha.tar.gz) = bd151410026a307562ed928d72feb8aa57b2cb51
 RMD160 (cnxtutil-0.00-alpha.tar.gz) = a9ef8504c8254c2f6e99cea2a1345dcdc48a6bda
 Size (cnxtutil-0.00-alpha.tar.gz) = 21087 bytes
-SHA1 (patch-aa) = 18829cc00accda0e31144def1e6180f981cfb500
+SHA1 (patch-aa) = e4b06174c37d573ecdaa67b0ab4fb41bb9a894c1
+SHA1 (patch-ab) = e9277d522b02191e49a9d0b8ef9057b64ae0ae6b
+SHA1 (patch-ac) = f9502c50575ca5b8917a3c78cbcdf0bb3afe1bcf
+SHA1 (patch-ad) = 89fa87ebbe611e05cda5dc8087aa6d5179bbe01a
+SHA1 (patch-ae) = eff3d6b1c2c6e94c7d6edd5ef8375beb86b71241
diff --git a/graphics/cnxtview/patches/patch-aa b/graphics/cnxtview/patches/patch-aa
index 5c52b6acbd4..8f6b9cfd796 100644
--- a/graphics/cnxtview/patches/patch-aa
+++ b/graphics/cnxtview/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/07 08:13:56 hamajima Exp $
+$NetBSD: patch-aa,v 1.2 2006/04/22 17:24:27 joerg Exp $
 
---- cnxtshot.c.orig	2004-01-14 02:16:20.000000000 +0900
-+++ cnxtshot.c	2004-03-07 08:21:38.000000000 +0900
-@@ -61,7 +61,7 @@
+--- cnxtshot.c.orig	2004-01-13 17:16:20.000000000 +0000
++++ cnxtshot.c
+@@ -39,7 +39,11 @@
+ #include <string.h>
+ #include <err.h>
+ 
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "cnxt.h"
+ 
+@@ -61,7 +65,7 @@ int main(int argc, char *argv[])
  {
      int i;
      int ret;
@@ -11,16 +23,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/07 08:13:56 hamajima Exp $
  
      /* check option */
      if (argc == 1) {
---- cnxtview.c.orig	2004-01-14 02:20:15.000000000 +0900
-+++ cnxtview.c	2004-03-07 08:22:03.000000000 +0900
-@@ -78,8 +78,8 @@
-     int i;
-     int ret;
-     
--    fd = NULL;
--    efd = NULL;
-+    fd = 0;
-+    efd = 0;
- 
-     gtk_init(&argc, &argv);
-     gdk_imlib_init();
diff --git a/graphics/cnxtview/patches/patch-ab b/graphics/cnxtview/patches/patch-ab
new file mode 100644
index 00000000000..3597b468db8
--- /dev/null
+++ b/graphics/cnxtview/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2006/04/22 17:24:27 joerg Exp $
+
+--- cnxtview.c.orig	2004-01-13 17:20:15.000000000 +0000
++++ cnxtview.c
+@@ -45,7 +45,11 @@
+ #include <string.h>
+ #include <err.h>
+ 
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include <gtk/gtk.h>
+ #include <gdk_imlib.h>
+@@ -78,8 +82,8 @@ int main(int argc, char *argv[])
+     int i;
+     int ret;
+     
+-    fd = NULL;
+-    efd = NULL;
++    fd = 0;
++    efd = 0;
+ 
+     gtk_init(&argc, &argv);
+     gdk_imlib_init();
diff --git a/graphics/cnxtview/patches/patch-ac b/graphics/cnxtview/patches/patch-ac
new file mode 100644
index 00000000000..4ee58ac6cc1
--- /dev/null
+++ b/graphics/cnxtview/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2006/04/22 17:24:27 joerg Exp $
+
+--- cnxt.h.orig	2006-04-22 17:15:42.000000000 +0000
++++ cnxt.h
+@@ -7,7 +7,11 @@
+ #include <string.h>
+ #include <err.h>
+ 
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ struct usb_dev_info{
+     char	*productName;
diff --git a/graphics/cnxtview/patches/patch-ad b/graphics/cnxtview/patches/patch-ad
new file mode 100644
index 00000000000..a49b70ec69a
--- /dev/null
+++ b/graphics/cnxtview/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2006/04/22 17:24:27 joerg Exp $
+
+--- cnxt.c.orig	2006-04-22 17:16:17.000000000 +0000
++++ cnxt.c
+@@ -39,7 +39,11 @@
+ #include <string.h>
+ #include <err.h>
+ 
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "cnxt.h"
+ 
diff --git a/graphics/cnxtview/patches/patch-ae b/graphics/cnxtview/patches/patch-ae
new file mode 100644
index 00000000000..394290f7809
--- /dev/null
+++ b/graphics/cnxtview/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2006/04/22 17:24:27 joerg Exp $
+
+--- cnxtinit.c.orig	2006-04-22 17:16:58.000000000 +0000
++++ cnxtinit.c
+@@ -7,7 +7,11 @@
+ #include <string.h>
+ #include <err.h>
+ 
++#if defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "cnxt.h"
+