From 7e63708d1ed9c2c5bf0c9f9b1033711ca77fb207 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 27 Oct 2015 11:29:35 +0000 Subject: Remove some obsolete patches. Add upstream bug report URLs for some others. XXX: patch-a[bhijk] are not sent upstream since I don't understand the need. --- graphics/sane-backends/distinfo | 20 ++++++++------------ graphics/sane-backends/patches/patch-aa | 4 +++- graphics/sane-backends/patches/patch-ab | 11 +---------- graphics/sane-backends/patches/patch-ac | 5 ++++- graphics/sane-backends/patches/patch-ae | 5 ++++- graphics/sane-backends/patches/patch-af | 19 ------------------- graphics/sane-backends/patches/patch-ag | 12 ------------ .../sane-backends/patches/patch-backend_kodakaio.c | 5 ++++- .../sane-backends/patches/patch-backend_magicolor.c | 18 ------------------ .../patches/patch-backend_pieusb__buffer.c | 6 +++++- .../patches/patch-backend_xerox__mfp-tcp.c | 17 ----------------- .../sane-backends/patches/patch-sanei_sanei__ir.c | 5 ++++- 12 files changed, 33 insertions(+), 94 deletions(-) delete mode 100644 graphics/sane-backends/patches/patch-af delete mode 100644 graphics/sane-backends/patches/patch-ag delete mode 100644 graphics/sane-backends/patches/patch-backend_magicolor.c delete mode 100644 graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c (limited to 'graphics/sane-backends') diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 4cb9909306b..ec74851b8ae 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,21 +1,17 @@ -$NetBSD: distinfo,v 1.37 2015/10/25 10:39:13 wiz Exp $ +$NetBSD: distinfo,v 1.38 2015/10/27 11:29:35 wiz Exp $ SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754 RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab SHA512 (sane-backends-1.0.25.tar.gz) = b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df Size (sane-backends-1.0.25.tar.gz) = 5955016 bytes -SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224 -SHA1 (patch-ab) = 58ef8bb791cfb043931e119a1cfe521d3bb346e0 -SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474 -SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9 -SHA1 (patch-af) = db4ba80826d76363ad28c22eea325e19868fd1e4 -SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834 +SHA1 (patch-aa) = 91f5838b7c455dc160ba22d15659c1b19a222668 +SHA1 (patch-ab) = 8fb594d82c2ecab3c7c73c28448831208fef8af9 +SHA1 (patch-ac) = 49e0cc0b6e0dfb96e5ee3cfc3f554b7e40492757 +SHA1 (patch-ae) = d374c33cad835d56fb9f2fbb2594a85e0a0d7158 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248 SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76 -SHA1 (patch-backend_kodakaio.c) = d15cb7af0a5cc506fc42e3a71fa0998329e6eef9 -SHA1 (patch-backend_magicolor.c) = e6cbb54a0ea0e688b0189b3d07d1dff34070a179 -SHA1 (patch-backend_pieusb__buffer.c) = 8d65f0f1927bb70af451fa9c04c7d535832b6ced -SHA1 (patch-backend_xerox__mfp-tcp.c) = 3818b623217f15ed7f30724d1d70b1614befb88f -SHA1 (patch-sanei_sanei__ir.c) = 35720c31542ed02238d59e6f5be908609c7dd85a +SHA1 (patch-backend_kodakaio.c) = f96af8b2fb0369f51d2320285253c5e67218e629 +SHA1 (patch-backend_pieusb__buffer.c) = eef6201f7c13b40398f254c4d84369aa0d1a61d5 +SHA1 (patch-sanei_sanei__ir.c) = fef80a2fe854b0afd20849213feaa0c6282582ce diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa index a3b13a6f9c7..edee652aebf 100644 --- a/graphics/sane-backends/patches/patch-aa +++ b/graphics/sane-backends/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.12 2009/08/15 17:53:11 wiz Exp $ +$NetBSD: patch-aa,v 1.13 2015/10/27 11:29:35 wiz Exp $ + +Adapt installation to pkgsrc example config file location. --- backend/Makefile.in.orig 2009-04-30 13:41:18.000000000 +0000 +++ backend/Makefile.in diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab index ab29c10d033..449b1d77f89 100644 --- a/graphics/sane-backends/patches/patch-ab +++ b/graphics/sane-backends/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.14 2015/10/25 10:39:13 wiz Exp $ +$NetBSD: patch-ab,v 1.15 2015/10/27 11:29:35 wiz Exp $ --- configure.orig 2015-10-04 13:18:39.000000000 +0000 +++ configure @@ -28,12 +28,3 @@ $NetBSD: patch-ab,v 1.14 2015/10/25 10:39:13 wiz Exp $ fi have_pthread=yes -@@ -18138,7 +18138,7 @@ for be in ${BACKENDS}; do - ;; - - mustek_pp) -- if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then -+ if test "${sane_cv_use_libieee1284}" != "yes" || test "${enable_parport_directio}" != "yes"; then - echo "*** $be backend requires libieee1284 or parport-directio libraries - $DISABLE_MSG" - backend_supported="no" - fi diff --git a/graphics/sane-backends/patches/patch-ac b/graphics/sane-backends/patches/patch-ac index d226ac17e63..56a9d5263e5 100644 --- a/graphics/sane-backends/patches/patch-ac +++ b/graphics/sane-backends/patches/patch-ac @@ -1,4 +1,7 @@ -$NetBSD: patch-ac,v 1.5 2010/09/19 15:06:18 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2015/10/27 11:29:35 wiz Exp $ + +DragonFly support. +https://alioth.debian.org/tracker/index.php?func=detail&aid=315205&group_id=30186&atid=410366 --- sanei/sanei_ab306.c.orig 2010-04-05 13:18:05.000000000 +0000 +++ sanei/sanei_ab306.c diff --git a/graphics/sane-backends/patches/patch-ae b/graphics/sane-backends/patches/patch-ae index 10ab250c31b..d4c7ec3d65c 100644 --- a/graphics/sane-backends/patches/patch-ae +++ b/graphics/sane-backends/patches/patch-ae @@ -1,4 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2006/08/05 22:41:49 wiz Exp $ +$NetBSD: patch-ae,v 1.6 2015/10/27 11:29:35 wiz Exp $ + +DragonFly support. +https://alioth.debian.org/tracker/index.php?func=detail&aid=315206&group_id=30186&atid=410366 --- tools/sane-find-scanner.c.orig 2006-03-11 12:45:29.000000000 +0000 +++ tools/sane-find-scanner.c diff --git a/graphics/sane-backends/patches/patch-af b/graphics/sane-backends/patches/patch-af deleted file mode 100644 index 9039255f9b5..00000000000 --- a/graphics/sane-backends/patches/patch-af +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-af,v 1.5 2011/01/30 18:04:23 rumko Exp $ - -Fix build on DragonFly, PR pkg/44193. -Upstream bug report: -https://alioth.debian.org/tracker/index.php?func=detail&aid=312965 - ---- backend/epson2.h.orig 2010-04-05 13:18:04.000000000 +0000 -+++ backend/epson2.h -@@ -36,6 +36,10 @@ - #include - #endif - -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+ - #include /* for memset and memcpy */ - #include - diff --git a/graphics/sane-backends/patches/patch-ag b/graphics/sane-backends/patches/patch-ag deleted file mode 100644 index 44f29f9b3ad..00000000000 --- a/graphics/sane-backends/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2009/09/04 23:09:06 wiz Exp $ - ---- include/sane/sane.h.orig 2009-04-23 19:59:23.000000000 +0000 -+++ include/sane/sane.h -@@ -115,6 +115,7 @@ SANE_Device; - #define SANE_CAP_AUTOMATIC (1 << 4) - #define SANE_CAP_INACTIVE (1 << 5) - #define SANE_CAP_ADVANCED (1 << 6) -+#define SANE_CAP_ALWAYS_SETTABLE (1 << 7) - - #define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0) - #define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0) diff --git a/graphics/sane-backends/patches/patch-backend_kodakaio.c b/graphics/sane-backends/patches/patch-backend_kodakaio.c index f0200d198de..c69938fa153 100644 --- a/graphics/sane-backends/patches/patch-backend_kodakaio.c +++ b/graphics/sane-backends/patches/patch-backend_kodakaio.c @@ -1,4 +1,7 @@ -$NetBSD: patch-backend_kodakaio.c,v 1.2 2015/08/16 20:24:23 leot Exp $ +$NetBSD: patch-backend_kodakaio.c,v 1.3 2015/10/27 11:29:35 wiz Exp $ + +DragonFly build fix. +https://alioth.debian.org/tracker/index.php?func=detail&aid=315207&group_id=30186&atid=410366 --- backend/kodakaio.c.orig 2013-08-25 21:22:58.000000000 +0000 +++ backend/kodakaio.c diff --git a/graphics/sane-backends/patches/patch-backend_magicolor.c b/graphics/sane-backends/patches/patch-backend_magicolor.c deleted file mode 100644 index 04f3962faff..00000000000 --- a/graphics/sane-backends/patches/patch-backend_magicolor.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-backend_magicolor.c,v 1.2 2012/12/10 12:06:51 ryoon Exp $ - -Fix for pkg/45196. Add sys/socket.h header. - ---- backend/magicolor.c.orig 2011-11-21 20:17:48.000000000 +0000 -+++ backend/magicolor.c -@@ -50,6 +50,11 @@ - #include - #include - #include -+ -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+ - #include - #include - #include diff --git a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c index 836c56d483e..32d45b28067 100644 --- a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c +++ b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c @@ -1,4 +1,8 @@ -$NetBSD: patch-backend_pieusb__buffer.c,v 1.1 2015/10/25 10:39:13 wiz Exp $ +$NetBSD: patch-backend_pieusb__buffer.c,v 1.2 2015/10/27 11:29:35 wiz Exp $ + +Remove unportable header inclusion. +XXX: should be fixed better, hope upstream does that. +https://alioth.debian.org/tracker/index.php?func=detail&aid=315209&group_id=30186&atid=410366 --- backend/pieusb_buffer.c.orig 2015-09-01 00:31:33.000000000 +0000 +++ backend/pieusb_buffer.c diff --git a/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c b/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c deleted file mode 100644 index f449ee4d399..00000000000 --- a/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-backend_xerox__mfp-tcp.c,v 1.2 2012/12/10 12:06:51 ryoon Exp $ - -Fix for pkg/45196. Add sys/socket.h header. - ---- backend/xerox_mfp-tcp.c.orig 2011-11-21 20:17:48.000000000 +0000 -+++ backend/xerox_mfp-tcp.c -@@ -32,6 +32,10 @@ - #include - #endif - -+#ifdef HAVE_SYS_SOCKET_H -+#include -+#endif -+ - #include "sane/saneopts.h" - #include "sane/sanei_scsi.h" - #include "sane/sanei_usb.h" diff --git a/graphics/sane-backends/patches/patch-sanei_sanei__ir.c b/graphics/sane-backends/patches/patch-sanei_sanei__ir.c index aaa50dfc9d3..9b2dae39430 100644 --- a/graphics/sane-backends/patches/patch-sanei_sanei__ir.c +++ b/graphics/sane-backends/patches/patch-sanei_sanei__ir.c @@ -1,4 +1,7 @@ -$NetBSD: patch-sanei_sanei__ir.c,v 1.1 2015/10/25 10:39:13 wiz Exp $ +$NetBSD: patch-sanei_sanei__ir.c,v 1.2 2015/10/27 11:29:35 wiz Exp $ + +Remove unportable header inclusion. +https://alioth.debian.org/tracker/index.php?func=detail&aid=315208&group_id=30186&atid=410366 --- sanei/sanei_ir.c.orig 2015-09-29 01:10:43.000000000 +0000 +++ sanei/sanei_ir.c -- cgit v1.2.3