s/ttyS/tty0/ for NetBSD

8 files changed, 147 insertions, 5 deletions

diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 74ed2c17112..57f8b860783 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/11/30 00:01:37 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 1999/11/30 01:30:48 hubertf Exp $
 
 DISTNAME=	gphoto-0.4.1
 CATEGORIES=	graphics
@@ -8,9 +8,9 @@ MAINTAINER=	jmcm@cs.cmu.edu
 HOMEPAGE=	http://www.gphoto.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	gtk+-1.2.6:../../x11/gtk
-DEPENDS+=	glib-1.2.6:../../devel/glib
-DEPENDS+=	imlib-1.9.8:../../graphics/imlib
+DEPENDS+=	gtk+-1.2.?:../../x11/gtk
+DEPENDS+=	glib-1.2.?:../../devel/glib
+DEPENDS+=	imlib-1.9.?:../../graphics/imlib
 
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
diff --git a/graphics/gphoto/files/patch-sum b/graphics/gphoto/files/patch-sum
index 66cc2702859..7b7d1c2e049 100644
--- a/graphics/gphoto/files/patch-sum
+++ b/graphics/gphoto/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/11/30 00:01:37 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/30 01:30:49 hubertf Exp $
 
 MD5 (patch-aa) = 85227f4cef9a13ab224368aacee3d1d0
 MD5 (patch-ab) = 20fc68c9144effe838d23541b053d65c
@@ -8,3 +8,9 @@ MD5 (patch-ae) = dbecdf80f8640724095ca982ad99e1d4
 MD5 (patch-af) = 1c5d9c7050d49dd9b593fb2926a705f4
 MD5 (patch-ag) = f3d9aa4043e11309d92b002aa9e2a968
 MD5 (patch-ah) = fd297eaf6f68a4163c94b6c508a45c73
+MD5 (patch-ai) = 5268101332e2fe8c397d5ca961554f4b
+MD5 (patch-aj) = 10fddef60133fe8d186d2ee12677c7c5
+MD5 (patch-ak) = 699f8728adf237cea6d2e8292f6fd3fe
+MD5 (patch-al) = 0198fb20ed09a9eed19cb5915652dfd9
+MD5 (patch-am) = dfa33810cce6f1472b5dccbf8cb897e8
+MD5 (patch-an) = a7fd9cb195fbb3807766351a6913d5e4
diff --git a/graphics/gphoto/patches/patch-ai b/graphics/gphoto/patches/patch-ai
new file mode 100644
index 00000000000..b9deafb30cc
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- kodak/kodak_dc2x.c.orig	Tue Nov 30 01:34:40 1999
++++ kodak/kodak_dc2x.c	Tue Nov 30 01:37:07 1999
+@@ -31,7 +31,11 @@
+   
+   /* Open the camera for reading/writing */
+ 
++#ifdef __NetBSD__
++  char *serial_port = "/dev/tty00"; 
++#else
+   char *serial_port = "/dev/ttyS0"; 
++#endif
+  
+   int tfd;
+ 
diff --git a/graphics/gphoto/patches/patch-aj b/graphics/gphoto/patches/patch-aj
new file mode 100644
index 00000000000..63fcb919bd9
--- /dev/null
+++ b/graphics/gphoto/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- konica/configDialog.c.orig	Tue Nov 30 01:34:40 1999
++++ konica/configDialog.c	Tue Nov 30 01:37:29 1999
+@@ -84,10 +84,17 @@
+ static char *PortLabel[] = 
+ {
+    "Autodetect",
++#ifdef __NetBSD__
++   "/dev/tty00",
++   "/dev/tty01",
++   "/dev/tty02",
++   "/dev/tty03"
++#else
+    "/dev/ttyS0",
+    "/dev/ttyS1",
+    "/dev/ttyS2",
+    "/dev/ttyS3"
++#endif
+ };
+ /*---------------------------------------------------------------------*
+  *                                                                     *
diff --git a/graphics/gphoto/patches/patch-ak b/graphics/gphoto/patches/patch-ak
new file mode 100644
index 00000000000..6ce78f5545f
--- /dev/null
+++ b/graphics/gphoto/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- konica/defs.h.orig	Tue Nov 30 01:34:40 1999
++++ konica/defs.h	Tue Nov 30 01:37:46 1999
+@@ -79,7 +79,11 @@
+ #define WHITEBAL      packet.packet[32]
+ #define PICNUM        packet.packet+0xf9
+ 
++#ifdef __NetBSD__
++#define DEFAULT_PORT	   "/dev/tty00"
++#else
+ #define DEFAULT_PORT	   "/dev/ttyS0"
++#endif
+ #define DEFAULT_SPEED   "57600"
+ #define DEFAULT_PACING  "1"
+ #define DEFAULT_TRACE   "Off"
diff --git a/graphics/gphoto/patches/patch-al b/graphics/gphoto/patches/patch-al
new file mode 100644
index 00000000000..aae3ce1f0f4
--- /dev/null
+++ b/graphics/gphoto/patches/patch-al
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- konica_qmxxx/dcx.c.orig	Tue Nov 30 01:34:40 1999
++++ konica_qmxxx/dcx.c	Tue Nov 30 01:38:17 1999
+@@ -2291,7 +2291,11 @@
+ {
+ 	//dcx_debug(1);
+ 	os_debug(1);
++#ifdef __NetBSD__
++	dcx_init("/dev/tty00", QM100 );
++#else
+ 	dcx_init("/dev/ttyS0", QM100 );
++#endif
+ 	dcx_open();
+ 	dcx_close();
+ }
diff --git a/graphics/gphoto/patches/patch-am b/graphics/gphoto/patches/patch-am
new file mode 100644
index 00000000000..f04e1099141
--- /dev/null
+++ b/graphics/gphoto/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- sony/common.h.orig	Tue Nov 30 01:34:40 1999
++++ sony/common.h	Tue Nov 30 01:38:47 1999
+@@ -17,7 +17,11 @@
+ #ifdef DOS
+ #define RSPORT "AUX1"
+ #else
++#ifdef __NetBSD__
++#define RSPORT	"/dev/tty00"     
++#else   
+ #define RSPORT	"/dev/ttyS0"     
++#endif
+ #endif 
+ #endif 
+ 
diff --git a/graphics/gphoto/patches/patch-an b/graphics/gphoto/patches/patch-an
new file mode 100644
index 00000000000..5a9c0be9ca6
--- /dev/null
+++ b/graphics/gphoto/patches/patch-an
@@ -0,0 +1,50 @@
+$NetBSD: patch-an,v 1.1 1999/11/30 01:30:50 hubertf Exp $
+
+--- src/callbacks.c.orig	Tue Nov 30 01:34:40 1999
++++ src/callbacks.c	Tue Nov 30 01:40:05 1999
+@@ -578,17 +578,33 @@
+ 	group = NULL;
+ 	label = gtk_label_new("Port:");
+ 	gtk_widget_show(label);
++#ifdef __NetBSD__
++	port0 = gtk_radio_button_new_with_label(NULL, "/dev/tty00 (COM1)");
++#else   
+ 	port0 = gtk_radio_button_new_with_label(NULL, "/dev/ttyS0 (COM1)");
++#endif
+         gtk_widget_show(port0);
+ 	gtk_button_clicked(GTK_BUTTON(port0));
+         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port0));
++#ifdef __NetBSD__
++        port1 = gtk_radio_button_new_with_label(group, "/dev/tty01 (COM2)");
++#else   
+         port1 = gtk_radio_button_new_with_label(group, "/dev/ttyS1 (COM2)");
++#endif
+         gtk_widget_show(port1);
+         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port1));
++#ifdef __NetBSD__
++        port2 = gtk_radio_button_new_with_label(group, "/dev/tty02 (COM3)");
++#else   
+         port2 = gtk_radio_button_new_with_label(group, "/dev/ttyS2 (COM3)");
++#endif
+         gtk_widget_show(port2);
+         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port2));
++#ifdef __NetBSD__
++        port3 = gtk_radio_button_new_with_label(group, "/dev/tty03 (COM4)");
++#else   
+         port3 = gtk_radio_button_new_with_label(group, "/dev/ttyS3 (COM4)");
++#endif
+         gtk_widget_show(port3);
+         group = gtk_radio_button_group(GTK_RADIO_BUTTON(port3));
+         other = gtk_radio_button_new_with_label(group, "other");
+@@ -704,7 +720,11 @@
+ 	}
+ 
+ 	/* reset to defaults, and save */
++#ifdef __NetBSD__
++	sprintf(serial_port, "/dev/tty00");
++#else   
+ 	sprintf(serial_port, "/dev/ttyS0");
++#endif
+ 	sprintf(camera_model, "Browse Directory");
+ 	sprintf(post_process_script, "");
+ 	save_config();