Attachment #208921 for bug #241225




# $FreeBSD$

PORTNAME=	sane-backends
PORTVERSION=	1.0.28
PORTREVISION=	0
CATEGORIES=	graphics
MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/
		http://fossies.org/linux/misc/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	API for access to scanners, digitals camera, frame grabbers etc

USES=		gmake jpeg libtool localbase pathfix pkgconfig

GNU_CONFIGURE=	yes

CONFIGURE_ARGS=	--disable-locking \
		--enable-pthread \
		--without-api-spec \

USERS=		saned
GROUPS=		saned

PORTDOCS=	*

OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
OPTIONS_DEFAULT=	USB
OPTIONS_SUB=		yes


post-patch:
	@${REINPLACE_CMD} -e '/for ac_header in/s|libc.h|sys/endian.h| ; \
		 s|"$${have_linux_ioctl_defines}"|"$${have_libv4l1}"| ; \
		 /pthread_t[[:space:]]k;[[:space:]]/s|pthread_t[[:space:]]k;[[:space:]]k[[:space:]]\*[[:space:]]1|pthread_t k; k = (pthread_t) -1|' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
		${WRKSRC}/Makefile.in

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535340348	1	TIMESTAMP = 1569562258
2	SHA256 (sane-backends-1.0.27.tar.gz) = 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9	2	SHA256 (sane-backends-1.0.28.tar.gz) = 31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
3	SIZE (sane-backends-1.0.27.tar.gz) = 6430188	3	SIZE (sane-backends-1.0.28.tar.gz) = 6753880




--- backend/Makefile.in.orig	2018-08-28 15:10:08 UTC
+++ backend/Makefile.in
@@ -1518,7 +1518,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
+DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
@@ -5609,7 +5609,7 @@ install-becfg:
 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.  
 	@# Having two libsane's can cause issues so get rid of it.
 	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
-	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+	test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
 	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
 	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
 	  if test ! -r $${cfg}; then continue; fi; \
@@ -5617,7 +5617,7 @@ install-becfg:
 	  echo NOT overwriting $${cfg} in $(configdir)...; \
 	  else \
 	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
-	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
+	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
 	  || exit 1; \
 	  fi; \
 	  done




--- backend/epson2-ops.c.orig	2015-09-19 15:18:44 UTC
+++ backend/epson2-ops.c
@@ -1286,6 +1286,7 @@ e2_setup_block_mode(Epson_Scanner * s)
 
 	DBG(1, "max req size: %d, line count: %d\n", maxreq, s->lcount);
 
+#if 0
 	/* XXX investigate this */
 	if (s->lcount < 3 && (e2_model(s, "GT-X800") || e2_model(s, "GT-X900") || e2_model(s, "GT-X980"))) {
 		s->lcount = 21;
@@ -1293,6 +1294,7 @@ e2_setup_block_mode(Epson_Scanner * s)
 		    "%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
 		    __func__, s->lcount);
 	}
+#endif
 
 	if (s->lcount >= 255)
 		s->lcount = 255;

Lines 1-11 Link Here

(-)files/patch-backend__epsonds.c (-11 lines)
1	--- backend/epsonds.c.orig 2017-05-15 01:19:11 UTC
2	+++ backend/epsonds.c
3	@@ -40,6 +40,8 @@
4
5	#include "sane/config.h"
6
7	+#include <sys/types.h>
8	+#include <sys/socket.h>
9	#include <ctype.h>
10	#include <unistd.h>
11

Lines 1-10 Link Here

(-)files/patch-backend__kvs40xx_opt.c (-10 lines)
1	--- backend/kvs40xx_opt.c.orig 2013-08-25 21:22:58 UTC
2	+++ backend/kvs40xx_opt.c
3	@@ -8,6 +8,7 @@
4
5	#include "../include/sane/config.h"
6
7	+#include <stdlib.h>
8	#include <string.h>
9	#define DEBUG_DECLARE_ONLY
10	#define BACKEND_NAME kvs40xx

Line 0 Link Here

(-)files/patch-backend_epsonds.c (+11 lines)
	1	--- backend/epsonds.c.orig 2019-10-09 14:38:54 UTC
	2	+++ backend/epsonds.c
	3	@@ -48,6 +48,8 @@
	4	# include <sys/time.h>
	5	#endif
	6	#include <unistd.h>
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9
	10	#include "sane/saneopts.h"
	11	#include "sane/sanei_config.h"

Line 0 Link Here

(-)files/patch-backend_ricoh2__buffer.c (+11 lines)
	1	--- backend/ricoh2_buffer.c.orig 2019-10-09 14:45:51 UTC
	2	+++ backend/ricoh2_buffer.c
	3	@@ -46,7 +46,7 @@
	4
	5	#include <memory.h>
	6	#include <assert.h>
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9
	10	#include "../include/sane/sanei_debug.h"
	11




--- backend/umax_pp_low.c.orig	2019-10-09 14:50:00 UTC
+++ backend/umax_pp_low.c
@@ -939,6 +939,10 @@ sanei_umax_pp_initPort (int port, char *name)
   int found = 0;
   int fd;
 # endif
+# ifdef HAVE_DEV_PPBUS_PPI_H
+  int found = 0;
+  int fd;
+# endif
 # ifdef HAVE_IOPERM
   int ectr;
 # endif

Lines 1-10 Link Here

(-)files/patch-include__sane__sane.h (-10 lines)
1	--- include/sane/sane.h.orig 2014-04-09 01:46:04 UTC
2	+++ include/sane/sane.h
3	@@ -115,6 +115,7 @@ SANE_Device;
4	#define SANE_CAP_AUTOMATIC (1 << 4)
5	#define SANE_CAP_INACTIVE (1 << 5)
6	#define SANE_CAP_ADVANCED (1 << 6)
7	+#define SANE_CAP_ALWAYS_SETTABLE (1 << 7)
8
9	#define SANE_OPTION_IS_ACTIVE(cap) (((cap) & SANE_CAP_INACTIVE) == 0)
10	#define SANE_OPTION_IS_SETTABLE(cap) (((cap) & SANE_CAP_SOFT_SELECT) != 0)




--- include/sane/sanei_backend.h.orig	2016-10-06 00:02:58 UTC
+++ include/sane/sanei_backend.h
@@ -64,9 +64,11 @@
 
 /* Just enough backwards compatibility that we get by in the backends
    without making handstands.  */
+#if 0
 # ifdef sigset_t
 #  undef sigset_t
 # endif
+#endif
 # ifdef sigemptyset
 #  undef sigemptyset
 # endif
@@ -92,7 +94,9 @@
 #  undef SIG_SETMASK
 # endif
 
+#if 0
 # define sigset_t               int
+#endif
 # define sigemptyset(set)       do { *(set) = 0; } while (0)
 # define sigfillset(set)        do { *(set) = ~0; } while (0)
 # define sigaddset(set,signal)  do { *(set) |= sigmask (signal); } while (0)




--- sanei/sanei_pa4s2.c.orig	2017-05-15 01:19:11 UTC
+++ sanei/sanei_pa4s2.c
@@ -112,6 +112,12 @@ inb (u_long port)
 
 #endif /* HAVE_LIBIEEE1284 */
 
+#if defined(__FreeBSD__) && defined(__i386__)
+#define HAVE_IOPERM
+#define ioperm i386_set_ioperm
+#include <machine/sysarch.h>
+#endif
+
 #include "../include/sane/sane.h"
 #include "../include/sane/sanei.h"
 #include "../include/sane/sanei_pa4s2.h"




bin/sane-find-scanner
bin/scanimage
bin/umax_pp
@sample etc/sane.d/abaton.conf etc/sane.d/abaton.conf
@sample etc/sane.d/agfafocus.conf etc/sane.d/agfafocus.conf
@sample etc/sane.d/apple.conf etc/sane.d/apple.conf
@sample etc/sane.d/artec.conf etc/sane.d/artec.conf
@sample etc/sane.d/artec_eplus48u.conf etc/sane.d/artec_eplus48u.conf
@sample etc/sane.d/avision.conf etc/sane.d/avision.conf
@sample etc/sane.d/bh.conf etc/sane.d/bh.conf
@sample etc/sane.d/canon.conf etc/sane.d/canon.conf
@sample etc/sane.d/canon630u.conf etc/sane.d/canon630u.conf
@sample etc/sane.d/canon_dr.conf etc/sane.d/canon_dr.conf
%%IEEE1284%%@sample etc/sane.d/canon_pp.conf etc/sane.d/canon_pp.conf
@sample etc/sane.d/cardscan.conf etc/sane.d/cardscan.conf
@sample etc/sane.d/coolscan.conf etc/sane.d/coolscan.conf
@sample etc/sane.d/coolscan2.conf etc/sane.d/coolscan2.conf
@sample etc/sane.d/coolscan3.conf etc/sane.d/coolscan3.conf
@sample etc/sane.d/dc210.conf etc/sane.d/dc210.conf
@sample etc/sane.d/dc240.conf etc/sane.d/dc240.conf
@sample etc/sane.d/dc25.conf etc/sane.d/dc25.conf
@sample etc/sane.d/dell1600n_net.conf etc/sane.d/dell1600n_net.conf
@sample etc/sane.d/dll.conf etc/sane.d/dll.conf
@sample etc/sane.d/dmc.conf etc/sane.d/dmc.conf
@sample etc/sane.d/epjitsu.conf etc/sane.d/epjitsu.conf
@sample etc/sane.d/epson.conf etc/sane.d/epson.conf
@sample etc/sane.d/epson2.conf etc/sane.d/epson2.conf
@sample etc/sane.d/epsonds.conf etc/sane.d/epsonds.conf
@sample etc/sane.d/fujitsu.conf etc/sane.d/fujitsu.conf
@sample etc/sane.d/genesys.conf etc/sane.d/genesys.conf
%%GPHOTO%%@sample etc/sane.d/gphoto2.conf etc/sane.d/gphoto2.conf
@sample etc/sane.d/gt68xx.conf etc/sane.d/gt68xx.conf
@sample etc/sane.d/hp.conf etc/sane.d/hp.conf
@sample etc/sane.d/hp3900.conf etc/sane.d/hp3900.conf
@sample etc/sane.d/hp4200.conf etc/sane.d/hp4200.conf
@sample etc/sane.d/hp5400.conf etc/sane.d/hp5400.conf
%%IEEE1284%%@sample etc/sane.d/hpsj5s.conf etc/sane.d/hpsj5s.conf
@sample etc/sane.d/hs2p.conf etc/sane.d/hs2p.conf
@sample etc/sane.d/ibm.conf etc/sane.d/ibm.conf
@sample etc/sane.d/kodak.conf etc/sane.d/kodak.conf
@sample etc/sane.d/kodakaio.conf etc/sane.d/kodakaio.conf
@sample etc/sane.d/kvs1025.conf etc/sane.d/kvs1025.conf
@sample etc/sane.d/leo.conf etc/sane.d/leo.conf
@sample etc/sane.d/lexmark.conf etc/sane.d/lexmark.conf
@sample etc/sane.d/ma1509.conf etc/sane.d/ma1509.conf
@sample etc/sane.d/magicolor.conf etc/sane.d/magicolor.conf
@sample etc/sane.d/matsushita.conf etc/sane.d/matsushita.conf
@sample etc/sane.d/microtek.conf etc/sane.d/microtek.conf
@sample etc/sane.d/microtek2.conf etc/sane.d/microtek2.conf
@sample etc/sane.d/mustek.conf etc/sane.d/mustek.conf
%%IEEE1284%%@sample etc/sane.d/mustek_pp.conf etc/sane.d/mustek_pp.conf
@sample etc/sane.d/mustek_usb.conf etc/sane.d/mustek_usb.conf
@sample etc/sane.d/nec.conf etc/sane.d/nec.conf
@sample etc/sane.d/net.conf etc/sane.d/net.conf
@sample etc/sane.d/p5.conf etc/sane.d/p5.conf
@sample etc/sane.d/pie.conf etc/sane.d/pie.conf
@sample etc/sane.d/pieusb.conf etc/sane.d/pieusb.conf
@sample etc/sane.d/pixma.conf etc/sane.d/pixma.conf
@sample etc/sane.d/plustek.conf etc/sane.d/plustek.conf
@sample etc/sane.d/plustek_pp.conf etc/sane.d/plustek_pp.conf
@sample etc/sane.d/ricoh.conf etc/sane.d/ricoh.conf
@sample etc/sane.d/rts8891.conf etc/sane.d/rts8891.conf
@sample etc/sane.d/s9036.conf etc/sane.d/s9036.conf
@sample etc/sane.d/saned.conf etc/sane.d/saned.conf
@sample etc/sane.d/sceptre.conf etc/sane.d/sceptre.conf
@sample etc/sane.d/sharp.conf etc/sane.d/sharp.conf
@sample etc/sane.d/sm3840.conf etc/sane.d/sm3840.conf
@sample etc/sane.d/snapscan.conf etc/sane.d/snapscan.conf
@sample etc/sane.d/sp15c.conf etc/sane.d/sp15c.conf
@sample etc/sane.d/st400.conf etc/sane.d/st400.conf
@sample etc/sane.d/stv680.conf etc/sane.d/stv680.conf
@sample etc/sane.d/tamarack.conf etc/sane.d/tamarack.conf
@sample etc/sane.d/teco1.conf etc/sane.d/teco1.conf
@sample etc/sane.d/teco2.conf etc/sane.d/teco2.conf
@sample etc/sane.d/teco3.conf etc/sane.d/teco3.conf
@sample etc/sane.d/test.conf etc/sane.d/test.conf
@sample etc/sane.d/u12.conf etc/sane.d/u12.conf
@sample etc/sane.d/umax.conf etc/sane.d/umax.conf
@sample etc/sane.d/umax1220u.conf etc/sane.d/umax1220u.conf
@sample etc/sane.d/umax_pp.conf etc/sane.d/umax_pp.conf
%%V4L%%@sample etc/sane.d/v4l.conf etc/sane.d/v4l.conf
@sample etc/sane.d/xerox_mfp.conf etc/sane.d/xerox_mfp.conf
include/sane/sane.h
include/sane/saneopts.h
lib/libsane.so
lib/libsane.so.1
lib/libsane.so.1.0.28
lib/sane/libsane-abaton.so
lib/sane/libsane-abaton.so.1
lib/sane/libsane-abaton.so.1.0.28
lib/sane/libsane-agfafocus.so
lib/sane/libsane-agfafocus.so.1
lib/sane/libsane-agfafocus.so.1.0.28
lib/sane/libsane-apple.so
lib/sane/libsane-apple.so.1
lib/sane/libsane-apple.so.1.0.28
lib/sane/libsane-artec.so
lib/sane/libsane-artec.so.1
lib/sane/libsane-artec.so.1.0.28
lib/sane/libsane-artec_eplus48u.so
lib/sane/libsane-artec_eplus48u.so.1
lib/sane/libsane-artec_eplus48u.so.1.0.28
lib/sane/libsane-as6e.so
lib/sane/libsane-as6e.so.1
lib/sane/libsane-as6e.so.1.0.28
lib/sane/libsane-avision.so
lib/sane/libsane-avision.so.1
lib/sane/libsane-avision.so.1.0.28
lib/sane/libsane-bh.so
lib/sane/libsane-bh.so.1
lib/sane/libsane-bh.so.1.0.28
lib/sane/libsane-canon.so
lib/sane/libsane-canon.so.1
lib/sane/libsane-canon.so.1.0.28
lib/sane/libsane-canon630u.so
lib/sane/libsane-canon630u.so.1
lib/sane/libsane-canon630u.so.1.0.28
lib/sane/libsane-canon_dr.so
lib/sane/libsane-canon_dr.so.1
lib/sane/libsane-canon_dr.so.1.0.28
%%IEEE1284%%lib/sane/libsane-canon_pp.so
%%IEEE1284%%lib/sane/libsane-canon_pp.so.1
%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.28
lib/sane/libsane-cardscan.so
lib/sane/libsane-cardscan.so.1
lib/sane/libsane-cardscan.so.1.0.28
lib/sane/libsane-coolscan.so
lib/sane/libsane-coolscan.so.1
lib/sane/libsane-coolscan.so.1.0.28
lib/sane/libsane-coolscan2.so
lib/sane/libsane-coolscan2.so.1
lib/sane/libsane-coolscan2.so.1.0.28
lib/sane/libsane-coolscan3.so
lib/sane/libsane-coolscan3.so.1
lib/sane/libsane-coolscan3.so.1.0.28
lib/sane/libsane-dc210.so
lib/sane/libsane-dc210.so.1
lib/sane/libsane-dc210.so.1.0.28
lib/sane/libsane-dc240.so
lib/sane/libsane-dc240.so.1
lib/sane/libsane-dc240.so.1.0.28
lib/sane/libsane-dc25.so
lib/sane/libsane-dc25.so.1
lib/sane/libsane-dc25.so.1.0.28
lib/sane/libsane-dell1600n_net.so
lib/sane/libsane-dell1600n_net.so.1
lib/sane/libsane-dell1600n_net.so.1.0.28
lib/sane/libsane-dll.so
lib/sane/libsane-dll.so.1
lib/sane/libsane-dll.so.1.0.28
lib/sane/libsane-dmc.so
lib/sane/libsane-dmc.so.1
lib/sane/libsane-dmc.so.1.0.28
lib/sane/libsane-epjitsu.so
lib/sane/libsane-epjitsu.so.1
lib/sane/libsane-epjitsu.so.1.0.28
lib/sane/libsane-epson.so
lib/sane/libsane-epson.so.1
lib/sane/libsane-epson.so.1.0.28
lib/sane/libsane-epson2.so
lib/sane/libsane-epson2.so.1
lib/sane/libsane-epson2.so.1.0.28
lib/sane/libsane-epsonds.so
lib/sane/libsane-epsonds.so.1
lib/sane/libsane-epsonds.so.1.0.28
lib/sane/libsane-fujitsu.so
lib/sane/libsane-fujitsu.so.1
lib/sane/libsane-fujitsu.so.1.0.28
lib/sane/libsane-genesys.so
lib/sane/libsane-genesys.so.1
lib/sane/libsane-genesys.so.1.0.28
%%GPHOTO%%lib/sane/libsane-gphoto2.so
%%GPHOTO%%lib/sane/libsane-gphoto2.so.1
%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.28
lib/sane/libsane-gt68xx.so
lib/sane/libsane-gt68xx.so.1
lib/sane/libsane-gt68xx.so.1.0.28
lib/sane/libsane-hp.so
lib/sane/libsane-hp.so.1
lib/sane/libsane-hp.so.1.0.28
lib/sane/libsane-hp3500.so
lib/sane/libsane-hp3500.so.1
lib/sane/libsane-hp3500.so.1.0.28
lib/sane/libsane-hp3900.so
lib/sane/libsane-hp3900.so.1
lib/sane/libsane-hp3900.so.1.0.28
lib/sane/libsane-hp4200.so
lib/sane/libsane-hp4200.so.1
lib/sane/libsane-hp4200.so.1.0.28
lib/sane/libsane-hp5400.so
lib/sane/libsane-hp5400.so.1
lib/sane/libsane-hp5400.so.1.0.28
lib/sane/libsane-hp5590.so
lib/sane/libsane-hp5590.so.1
lib/sane/libsane-hp5590.so.1.0.28
lib/sane/libsane-hpljm1005.so
lib/sane/libsane-hpljm1005.so.1
lib/sane/libsane-hpljm1005.so.1.0.28
%%IEEE1284%%lib/sane/libsane-hpsj5s.so
%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.28
lib/sane/libsane-hs2p.so
lib/sane/libsane-hs2p.so.1
lib/sane/libsane-hs2p.so.1.0.28
lib/sane/libsane-ibm.so
lib/sane/libsane-ibm.so.1
lib/sane/libsane-ibm.so.1.0.28
lib/sane/libsane-kodak.so
lib/sane/libsane-kodak.so.1
lib/sane/libsane-kodak.so.1.0.28
lib/sane/libsane-kodakaio.so
lib/sane/libsane-kodakaio.so.1
lib/sane/libsane-kodakaio.so.1.0.28
lib/sane/libsane-kvs1025.so
lib/sane/libsane-kvs1025.so.1
lib/sane/libsane-kvs1025.so.1.0.28
lib/sane/libsane-kvs20xx.so
lib/sane/libsane-kvs20xx.so.1
lib/sane/libsane-kvs20xx.so.1.0.28
lib/sane/libsane-kvs40xx.so
lib/sane/libsane-kvs40xx.so.1
lib/sane/libsane-kvs40xx.so.1.0.28
lib/sane/libsane-leo.so
lib/sane/libsane-leo.so.1
lib/sane/libsane-leo.so.1.0.28
lib/sane/libsane-lexmark.so
lib/sane/libsane-lexmark.so.1
lib/sane/libsane-lexmark.so.1.0.28
lib/sane/libsane-ma1509.so
lib/sane/libsane-ma1509.so.1
lib/sane/libsane-ma1509.so.1.0.28
lib/sane/libsane-magicolor.so
lib/sane/libsane-magicolor.so.1
lib/sane/libsane-magicolor.so.1.0.28
lib/sane/libsane-matsushita.so
lib/sane/libsane-matsushita.so.1
lib/sane/libsane-matsushita.so.1.0.28
lib/sane/libsane-microtek.so
lib/sane/libsane-microtek.so.1
lib/sane/libsane-microtek.so.1.0.28
lib/sane/libsane-microtek2.so
lib/sane/libsane-microtek2.so.1
lib/sane/libsane-microtek2.so.1.0.28
lib/sane/libsane-mustek.so
lib/sane/libsane-mustek.so.1
lib/sane/libsane-mustek.so.1.0.28
%%IEEE1284%%lib/sane/libsane-mustek_pp.so
%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.28
lib/sane/libsane-mustek_usb.so
lib/sane/libsane-mustek_usb.so.1
lib/sane/libsane-mustek_usb.so.1.0.28
lib/sane/libsane-mustek_usb2.so
lib/sane/libsane-mustek_usb2.so.1
lib/sane/libsane-mustek_usb2.so.1.0.28
lib/sane/libsane-nec.so
lib/sane/libsane-nec.so.1
lib/sane/libsane-nec.so.1.0.28
lib/sane/libsane-net.so
lib/sane/libsane-net.so.1
lib/sane/libsane-net.so.1.0.28
lib/sane/libsane-niash.so
lib/sane/libsane-niash.so.1
lib/sane/libsane-niash.so.1.0.28
lib/sane/libsane-p5.so
lib/sane/libsane-p5.so.1
lib/sane/libsane-p5.so.1.0.28
lib/sane/libsane-pie.so
lib/sane/libsane-pie.so.1
lib/sane/libsane-pie.so.1.0.28
lib/sane/libsane-pieusb.so
lib/sane/libsane-pieusb.so.1
lib/sane/libsane-pieusb.so.1.0.28
lib/sane/libsane-pixma.so
lib/sane/libsane-pixma.so.1
lib/sane/libsane-pixma.so.1.0.28
lib/sane/libsane-plustek.so
lib/sane/libsane-plustek.so.1
lib/sane/libsane-plustek.so.1.0.28
lib/sane/libsane-plustek_pp.so
lib/sane/libsane-plustek_pp.so.1
lib/sane/libsane-plustek_pp.so.1.0.28
lib/sane/libsane-ricoh.so
lib/sane/libsane-ricoh.so.1
lib/sane/libsane-ricoh.so.1.0.28
lib/sane/libsane-ricoh2.so
lib/sane/libsane-ricoh2.so.1
lib/sane/libsane-ricoh2.so.1.0.28
lib/sane/libsane-rts8891.so
lib/sane/libsane-rts8891.so.1
lib/sane/libsane-rts8891.so.1.0.28
lib/sane/libsane-s9036.so
lib/sane/libsane-s9036.so.1
lib/sane/libsane-s9036.so.1.0.28
lib/sane/libsane-sceptre.so
lib/sane/libsane-sceptre.so.1
lib/sane/libsane-sceptre.so.1.0.28
lib/sane/libsane-sharp.so
lib/sane/libsane-sharp.so.1
lib/sane/libsane-sharp.so.1.0.28
lib/sane/libsane-sm3600.so
lib/sane/libsane-sm3600.so.1
lib/sane/libsane-sm3600.so.1.0.28
lib/sane/libsane-sm3840.so
lib/sane/libsane-sm3840.so.1
lib/sane/libsane-sm3840.so.1.0.28
lib/sane/libsane-snapscan.so
lib/sane/libsane-snapscan.so.1
lib/sane/libsane-snapscan.so.1.0.28
lib/sane/libsane-sp15c.so
lib/sane/libsane-sp15c.so.1
lib/sane/libsane-sp15c.so.1.0.28
lib/sane/libsane-st400.so
lib/sane/libsane-st400.so.1
lib/sane/libsane-st400.so.1.0.28
lib/sane/libsane-stv680.so
lib/sane/libsane-stv680.so.1
lib/sane/libsane-stv680.so.1.0.28
lib/sane/libsane-tamarack.so
lib/sane/libsane-tamarack.so.1
lib/sane/libsane-tamarack.so.1.0.28
lib/sane/libsane-teco1.so
lib/sane/libsane-teco1.so.1
lib/sane/libsane-teco1.so.1.0.28
lib/sane/libsane-teco2.so
lib/sane/libsane-teco2.so.1
lib/sane/libsane-teco2.so.1.0.28
lib/sane/libsane-teco3.so
lib/sane/libsane-teco3.so.1
lib/sane/libsane-teco3.so.1.0.28
lib/sane/libsane-test.so
lib/sane/libsane-test.so.1
lib/sane/libsane-test.so.1.0.28
lib/sane/libsane-u12.so
lib/sane/libsane-u12.so.1
lib/sane/libsane-u12.so.1.0.28
lib/sane/libsane-umax.so
lib/sane/libsane-umax.so.1
lib/sane/libsane-umax.so.1.0.28
lib/sane/libsane-umax1220u.so
lib/sane/libsane-umax1220u.so.1
lib/sane/libsane-umax1220u.so.1.0.28
lib/sane/libsane-umax_pp.so
lib/sane/libsane-umax_pp.so.1
lib/sane/libsane-umax_pp.so.1.0.28
%%V4L%%lib/sane/libsane-v4l.so
%%V4L%%lib/sane/libsane-v4l.so.1
%%V4L%%lib/sane/libsane-v4l.so.1.0.28
lib/sane/libsane-xerox_mfp.so
lib/sane/libsane-xerox_mfp.so.1
lib/sane/libsane-xerox_mfp.so.1.0.28
libdata/pkgconfig/sane-backends.pc
man/man1/gamma4scanimage.1.gz
man/man1/sane-config.1.gz

man/man7/sane.7.gz
man/man8/saned.8.gz
sbin/saned
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
%%PORTDOCS%%%%DOCSDIR%%/PROJECTS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.aix
%%PORTDOCS%%%%DOCSDIR%%/README.beos
%%PORTDOCS%%%%DOCSDIR%%/README.darwin
%%PORTDOCS%%%%DOCSDIR%%/README.djpeg
%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
%%PORTDOCS%%%%DOCSDIR%%/README.hp-ux
%%PORTDOCS%%%%DOCSDIR%%/README.linux
%%PORTDOCS%%%%DOCSDIR%%/README.netbsd
%%PORTDOCS%%%%DOCSDIR%%/README.openbsd
%%PORTDOCS%%%%DOCSDIR%%/README.os2
%%PORTDOCS%%%%DOCSDIR%%/README.solaris
%%PORTDOCS%%%%DOCSDIR%%/README.unixware2
%%PORTDOCS%%%%DOCSDIR%%/README.unixware7
%%PORTDOCS%%%%DOCSDIR%%/README.windows
%%PORTDOCS%%%%DOCSDIR%%/README.zeta
%%PORTDOCS%%%%DOCSDIR%%/backend-writing.txt
%%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes
%%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt
%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES
%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.TODO
%%PORTDOCS%%%%DOCSDIR%%/leo/leo.txt
%%PORTDOCS%%%%DOCSDIR%%/matsushita/matsushita.txt
%%PORTDOCS%%%%DOCSDIR%%/mustek/mustek.CHANGES
%%PORTDOCS%%%%DOCSDIR%%/mustek_usb/mustek_usb.CHANGES
%%PORTDOCS%%%%DOCSDIR%%/mustek_usb/mustek_usb.TODO
%%PORTDOCS%%%%DOCSDIR%%/mustek_usb2/mustek_usb2.CHANGES
%%PORTDOCS%%%%DOCSDIR%%/mustek_usb2/mustek_usb2.TODO
%%PORTDOCS%%%%DOCSDIR%%/niash/niash.TODO
%%PORTDOCS%%%%DOCSDIR%%/plustek/FAQ
%%PORTDOCS%%%%DOCSDIR%%/plustek/MakeModule.sh
%%PORTDOCS%%%%DOCSDIR%%/plustek/Makefile.kernel24
%%PORTDOCS%%%%DOCSDIR%%/plustek/Makefile.kernel26
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT-TODO.txt
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT.changes
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT.txt
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB-TODO.txt
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB.changes
%%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB.txt
%%PORTDOCS%%%%DOCSDIR%%/sane-backends-external.html
%%PORTDOCS%%%%DOCSDIR%%/sane-backends.html
%%PORTDOCS%%%%DOCSDIR%%/sane-mfgs-external.html
%%PORTDOCS%%%%DOCSDIR%%/sane-mfgs.html
%%PORTDOCS%%%%DOCSDIR%%/sceptre/s1200.txt
%%PORTDOCS%%%%DOCSDIR%%/teco/teco1.txt
%%PORTDOCS%%%%DOCSDIR%%/teco/teco2.txt
%%PORTDOCS%%%%DOCSDIR%%/teco/teco3.txt
%%PORTDOCS%%%%DOCSDIR%%/u12/U12.changes
%%PORTDOCS%%%%DOCSDIR%%/u12/U12.todo
%%PORTDOCS%%%%DOCSDIR%%/umax/negative-types.txt
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-logo.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-advanced-options-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-advanced.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-astra-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-config-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-histogram.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-mirage-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-not-listed-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-others-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-parport-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-powerlook-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-scanner-clones-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-speed-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-standard-options-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-standard.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-text.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-text2.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-text4.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-uc-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax-vista-doc.html
%%PORTDOCS%%%%DOCSDIR%%/umax/sane-umax.jpg
%%PORTDOCS%%%%DOCSDIR%%/umax/umax.BUGS
%%PORTDOCS%%%%DOCSDIR%%/umax/umax.CHANGES
%%PORTDOCS%%%%DOCSDIR%%/umax/umax.FAQ
%%PORTDOCS%%%%DOCSDIR%%/umax/umax.TODO
%%NLS%%share/locale/bg/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/ca/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/ca@valencia/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo

%%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/fr/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/gl/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/he/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/hu/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
%%NLS%%share/locale/ja/LC_MESSAGES/sane-backends.mo

Return to bug 241225

Lines 2-12 Link Here

(-)Makefile (-7 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sane-backends	4	PORTNAME= sane-backends
5	PORTVERSION= 1.0.27	5	PORTVERSION= 1.0.28
6	PORTREVISION= 5	6	PORTREVISION= 0
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/a3ba9fff29253a94e84074917bff581a/ \	8	MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/
9	http://fossies.org/linux/misc/
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
12	COMMENT= API for access to scanners, digitals camera, frame grabbers etc	11	COMMENT= API for access to scanners, digitals camera, frame grabbers etc
Lines 20-25 Link Here
20	USES= gmake jpeg libtool localbase pathfix pkgconfig	19	USES= gmake jpeg libtool localbase pathfix pkgconfig
21		20
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
		22
23	CONFIGURE_ARGS= --disable-locking \	23	CONFIGURE_ARGS= --disable-locking \
24	--enable-pthread \	24	--enable-pthread \
25	--without-api-spec \	25	--without-api-spec \
Lines 33-40 Link Here
33	USERS= saned	33	USERS= saned
34	GROUPS= saned	34	GROUPS= saned
35		35
36	PORTDOCS= *
37
38	OPTIONS_DEFINE= AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L	36	OPTIONS_DEFINE= AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
39	OPTIONS_DEFAULT= USB	37	OPTIONS_DEFAULT= USB
40	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
Lines 60-66 Link Here
60		58
61	post-patch:	59	post-patch:
62	@${REINPLACE_CMD} -e '/for ac_header in/s\|libc.h\|sys/endian.h\| ; \	60	@${REINPLACE_CMD} -e '/for ac_header in/s\|libc.h\|sys/endian.h\| ; \
63	s\|"$${have_linux_ioctl_defines}"\|"$${have_libv4l1}"\|' \	61	s\|"$${have_linux_ioctl_defines}"\|"$${have_libv4l1}"\| ; \
		62	/pthread_t[[:space:]]k;[[:space:]]/s\|pthread_t[[:space:]]k;[[:space:]]k[[:space:]]\*[[:space:]]1\|pthread_t k; k = (pthread_t) -1\|' \
64	${WRKSRC}/configure	63	${WRKSRC}/configure
65	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s\|COPYING\|\|' \	64	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s\|COPYING\|\|' \
66	${WRKSRC}/Makefile.in	65	${WRKSRC}/Makefile.in

Lines 1-29 Link Here

(-)files/patch-backend__Makefile.in (-29 lines)
1	--- backend/Makefile.in.orig 2018-08-28 15:10:08 UTC
2	+++ backend/Makefile.in
3	@@ -1518,7 +1518,7 @@ AM_V_at = $(am__v_at_@AM_V@)
4	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
5	am__v_at_0 = @
6	am__v_at_1 =
7	-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane
8	+DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@
9	depcomp = $(SHELL) $(top_srcdir)/depcomp
10	am__depfiles_maybe = depfiles
11	am__mv = mv -f
12	@@ -5609,7 +5609,7 @@ install-becfg:
13	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
14	@# Having two libsane's can cause issues so get rid of it.
15	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
16	- test -z "$(configdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)"
17	+ test -z "$(configdir)/dist" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
18	test -z "$(configdir)/dll.d" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
19	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
20	if test ! -r $${cfg}; then continue; fi; \
21	@@ -5617,7 +5617,7 @@ install-becfg:
22	echo NOT overwriting $${cfg} in $(configdir)...; \
23	else \
24	echo installing $${cfg} in $(configdir)/$${cfg}...; \
25	- $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
26	+ $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \
27	\|\| exit 1; \
28	fi; \
29	done

Lines 1-18 Link Here

(-)files/patch-backend__epson2-ops.c (-18 lines)
1	--- backend/epson2-ops.c.orig 2015-09-19 15:18:44 UTC
2	+++ backend/epson2-ops.c
3	@@ -1286,6 +1286,7 @@ e2_setup_block_mode(Epson_Scanner * s)
4
5	DBG(1, "max req size: %d, line count: %d\n", maxreq, s->lcount);
6
7	+#if 0
8	/* XXX investigate this */
9	if (s->lcount < 3 && (e2_model(s, "GT-X800") \|\| e2_model(s, "GT-X900") \|\| e2_model(s, "GT-X980"))) {
10	s->lcount = 21;
11	@@ -1293,6 +1294,7 @@ e2_setup_block_mode(Epson_Scanner * s)
12	"%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
13	__func__, s->lcount);
14	}
15	+#endif
16
17	if (s->lcount >= 255)
18	s->lcount = 255;

Line 0 Link Here

(-)files/patch-backend_umax__pp__low.c (+13 lines)
	1	--- backend/umax_pp_low.c.orig 2019-10-09 14:50:00 UTC
	2	+++ backend/umax_pp_low.c
	3	@@ -939,6 +939,10 @@ sanei_umax_pp_initPort (int port, char *name)
	4	int found = 0;
	5	int fd;
	6	# endif
	7	+# ifdef HAVE_DEV_PPBUS_PPI_H
	8	+ int found = 0;
	9	+ int fd;
	10	+# endif
	11	# ifdef HAVE_IOPERM
	12	int ectr;
	13	# endif

Lines 1-24 Link Here

(-)files/patch-include__sane__sanei_backend.h (-24 lines)
1	--- include/sane/sanei_backend.h.orig 2016-10-06 00:02:58 UTC
2	+++ include/sane/sanei_backend.h
3	@@ -64,9 +64,11 @@
4
5	/* Just enough backwards compatibility that we get by in the backends
6	without making handstands. */
7	+#if 0
8	# ifdef sigset_t
9	# undef sigset_t
10	# endif
11	+#endif
12	# ifdef sigemptyset
13	# undef sigemptyset
14	# endif
15	@@ -92,7 +94,9 @@
16	# undef SIG_SETMASK
17	# endif
18
19	+#if 0
20	# define sigset_t int
21	+#endif
22	# define sigemptyset(set) do { *(set) = 0; } while (0)
23	# define sigfillset(set) do { *(set) = ~0; } while (0)
24	# define sigaddset(set,signal) do { *(set) \|= sigmask (signal); } while (0)

Lines 1-15 Link Here

(-)files/patch-sanei_sanei__pa4s2.c (-15 lines)
1	--- sanei/sanei_pa4s2.c.orig 2017-05-15 01:19:11 UTC
2	+++ sanei/sanei_pa4s2.c
3	@@ -112,6 +112,12 @@ inb (u_long port)
4
5	#endif /* HAVE_LIBIEEE1284 */
6
7	+#if defined(__FreeBSD__) && defined(__i386__)
8	+#define HAVE_IOPERM
9	+#define ioperm i386_set_ioperm
10	+#include <machine/sysarch.h>
11	+#endif
12	+
13	#include "../include/sane/sane.h"
14	#include "../include/sane/sanei.h"
15	#include "../include/sane/sanei_pa4s2.h"