Fri Jul 10 13:33:41 2015 UTC ()
Remove $Date: $ and $Revision: $ from scsi_netbsd.c, so that the
file's checkup remains consistent after commits. Pointed out by Joerg
While there add $NetBSD: $ to all patch files


(bouyer)
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-Makefile.in
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-mtx.h
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-mtxl.c
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-scsi_netbsd.c
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/mtx/distinfo 2015/07/09 10:27:39 1.1.1.1
+++ pkgsrc/sysutils/mtx/distinfo 2015/07/10 13:33:41 1.2
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.1.1.1 2015/07/09 10:27:39 bouyer Exp $ 1$NetBSD: distinfo,v 1.2 2015/07/10 13:33:41 bouyer Exp $
2 2
3SHA1 (mtx-1.3.12.tar.gz) = 9823426934261c9186ed5954f67068e44d3f7cf3 3SHA1 (mtx-1.3.12.tar.gz) = 9823426934261c9186ed5954f67068e44d3f7cf3
4RMD160 (mtx-1.3.12.tar.gz) = 7c9a762b489c1923e5508225cf8a5da8c53cc50f 4RMD160 (mtx-1.3.12.tar.gz) = 7c9a762b489c1923e5508225cf8a5da8c53cc50f
5Size (mtx-1.3.12.tar.gz) = 235214 bytes 5Size (mtx-1.3.12.tar.gz) = 235214 bytes
6SHA1 (patch-Makefile.in) = d503b4af0c3c4681ec8c0b46873715f32ccc3a98 6SHA1 (patch-Makefile.in) = 4a526c1b362c08a7c5bd5a39b16ecf336e4b31c1
7SHA1 (patch-mtx.h) = 5781cc7f2df760f1329a666ab00c81b6f69dcc3c 7SHA1 (patch-mtx.h) = 0b1a35ea5dc4dd639cf2bdc79bcfb06d2a551427
8SHA1 (patch-mtxl.c) = f745d030caad76e8d73b88c9d494ae39fadf49db 8SHA1 (patch-mtxl.c) = 6e1318d3501d49c670439da36f3654fc0e6d54f2
9SHA1 (patch-scsi_netbsd.c) = 80bdcf3cea4d654b1750401d8b575245a6719b27 9SHA1 (patch-scsi_netbsd.c) = f763530fbac164a33f7704d0b0a80f135f18bb24
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/sysutils/mtx/patches/patch-Makefile.in 2015/07/09 10:27:39 1.1.1.1
+++ pkgsrc/sysutils/mtx/patches/patch-Makefile.in 2015/07/10 13:33:41 1.2
@@ -1,13 +1,17 @@ @@ -1,13 +1,17 @@
 1$NetBSD: patch-Makefile.in,v 1.2 2015/07/10 13:33:41 bouyer Exp $
 2
 3Fix DESTDIR support
 4
1--- Makefile.in.orig 2015-07-08 16:29:12.000000000 +0200 5--- Makefile.in.orig 2015-07-08 16:29:12.000000000 +0200
2+++ Makefile.in 2015-07-08 17:04:46.000000000 +0200 6+++ Makefile.in 2015-07-08 17:04:46.000000000 +0200
3@@ -62,6 +62,10 @@ 7@@ -62,6 +62,10 @@
4 LIBS += -lcam 8 LIBS += -lcam
5 endif 9 endif
6  10
7+ifeq ($(TARGET),netbsd) 11+ifeq ($(TARGET),netbsd)
8+CPPFLAGS += -DLONG_PRINT_REQUEST_SENSE=1 12+CPPFLAGS += -DLONG_PRINT_REQUEST_SENSE=1
9+endif 13+endif
10+ 14+
11 ifeq ($(TARGET),hpux) 15 ifeq ($(TARGET),hpux)
12 CFLAGS += -O -D_HPUX_SOURCE -D __hpux__  16 CFLAGS += -O -D_HPUX_SOURCE -D __hpux__
13 endif 17 endif
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-mtx.h (expand / switch to unified diff)

--- pkgsrc/sysutils/mtx/patches/patch-mtx.h 2015/07/09 10:27:39 1.1.1.1
+++ pkgsrc/sysutils/mtx/patches/patch-mtx.h 2015/07/10 13:33:41 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
 1$NetBSD: patch-mtx.h,v 1.2 2015/07/10 13:33:41 bouyer Exp $
 2
1--- mtx.h.orig 2015-07-08 16:23:01.000000000 +0200 3--- mtx.h.orig 2015-07-08 16:23:01.000000000 +0200
2+++ mtx.h 2015-07-08 16:24:24.000000000 +0200 4+++ mtx.h 2015-07-08 16:24:24.000000000 +0200
3@@ -68,6 +68,13 @@ 5@@ -68,6 +68,13 @@
4 # include <sys/param.h> 6 # include <sys/param.h>
5 #endif 7 #endif
6  8
7+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
8+/* use NetBSD's scsiio interface */ 10+/* use NetBSD's scsiio interface */
9+#include <sys/scsiio.h> 11+#include <sys/scsiio.h>
10+typedef int DEVICE_TYPE; 12+typedef int DEVICE_TYPE;
11+#endif 13+#endif
12+ 14+
13+ 15+
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-mtxl.c (expand / switch to unified diff)

--- pkgsrc/sysutils/mtx/patches/patch-mtxl.c 2015/07/09 10:27:39 1.1.1.1
+++ pkgsrc/sysutils/mtx/patches/patch-mtxl.c 2015/07/10 13:33:41 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
 1$NetBSD: patch-mtxl.c,v 1.2 2015/07/10 13:33:41 bouyer Exp $
 2
1--- mtxl.c.orig 2015-07-08 16:25:32.000000000 +0200 3--- mtxl.c.orig 2015-07-08 16:25:32.000000000 +0200
2+++ mtxl.c 2015-07-08 16:26:04.000000000 +0200 4+++ mtxl.c 2015-07-08 16:26:04.000000000 +0200
3@@ -41,6 +41,10 @@ 5@@ -41,6 +41,10 @@
4  6
5 /* First, do some SCSI routines: */ 7 /* First, do some SCSI routines: */
6  8
7+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
8+# include "scsi_netbsd.c" 10+# include "scsi_netbsd.c"
9+#endif 11+#endif
10+ 12+
11 /* the camlib is used on FreeBSD. */ 13 /* the camlib is used on FreeBSD. */
12 #if HAVE_CAMLIB_H 14 #if HAVE_CAMLIB_H
13 # include "scsi_freebsd.c" 15 # include "scsi_freebsd.c"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/mtx/patches/patch-scsi_netbsd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/mtx/patches/patch-scsi_netbsd.c 2015/07/09 10:27:39 1.1.1.1
+++ pkgsrc/sysutils/mtx/patches/patch-scsi_netbsd.c 2015/07/10 13:33:41 1.2
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
 1$NetBSD: patch-scsi_netbsd.c,v 1.2 2015/07/10 13:33:41 bouyer Exp $
 2
1--- /dev/null 2015-07-08 16:44:57.000000000 +0200 3--- /dev/null 2015-07-08 16:44:57.000000000 +0200
2+++ scsi_netbsd.c 2015-07-08 16:58:09.000000000 +0200 4+++ scsi_netbsd.c 2015-07-08 16:58:09.000000000 +0200
3@@ -0,0 +1,159 @@ 5@@ -0,0 +1,156 @@
4+/* Changes 2003 Steve Heck <steve.heck@am.sony.com> 6+/* Changes 2003 Steve Heck <steve.heck@am.sony.com>
5+ Copyright 2007-2008 by Robert Nelson <robertn@the-nelsons.org> 7+ Copyright 2007-2008 by Robert Nelson <robertn@the-nelsons.org>
6+ 8+
7+$Date: 2015/07/09 10:27:39 $ 
8+$Revision: 1.1.1.1 $ 
9+ 
10+ This program is free software; you may redistribute and/or modify it under 9+ This program is free software; you may redistribute and/or modify it under
11+ the terms of the GNU General Public License Version 2 as published by the 10+ the terms of the GNU General Public License Version 2 as published by the
12+ Free Software Foundation. 11+ Free Software Foundation.
13+ 12+
14+ This program is distributed in the hope that it will be useful, but 13+ This program is distributed in the hope that it will be useful, but
15+ WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY 14+ WITHOUT ANY WARRANTY, without even the implied warranty of MERCHANTABILITY
16+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
17+ for complete details. 16+ for complete details.
18+ 17+
19+*/ 18+*/
20+ 19+
21+ 20+
22+/* This is the SCSI commands for NetBSD using scsiio Interface. */ 21+/* This is the SCSI commands for NetBSD using scsiio Interface. */