- Update to 1.0.20

PR:		134627
Submitted by:	Ports Fury

12 files changed, 279 insertions, 63 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 43c3c551c164..c8a7a05b4b6d 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.19
-PORTREVISION=	1
+PORTVERSION=	1.0.20
 CATEGORIES=	graphics
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/2318/ \
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3026/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
@@ -25,14 +24,16 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 OPTIONS=	USB "USB support" on \
 		NLS "NLS support" on \
-		GPHOTO2 "gPhoto2 support" off
+		GPHOTO2 "gPhoto2 support" off \
+		AVAHI "Avahi support" off \
+		IEEE1284 "libieee1284 support" off
 
-USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
+		--disable-latex \
 		--disable-locking
 
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
@@ -59,15 +60,27 @@ PLIST_SUB+=		NLS=""
 
 .if defined(WITH_GPHOTO2)
 LIB_DEPENDS+=		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+MAN5+=			sane-gphoto2.5
 PLIST_SUB+=		GPHOTO2=""
 .else
 CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=		GPHOTO2="@comment "
 .endif
 
+.if defined(WITH_AVAHI)
+LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
+CONFIGURE_ARGS+=	--enable-avahi
+.endif
+
+.if defined(WITH_IEEE1284)
+LIB_DEPENDS+=		ieee1284.5:${PORTSDIR}/sysutils/libieee1284
+PLIST_SUB+=		IEEE1284=""
+.else
+CONFIGURE_ENV+=		sane_cv_use_libieee1284=no
+PLIST_SUB+=		IEEE1284="@comment "
+.endif
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|= \.\./libtool|= @LIBTOOL@|g'
 	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h||g ; \
 		 s|} -D_REENT|} ${PTHREAD_CFLAGS} -D_REENT|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index 6d0410731d60..2c4786c985da 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -12,10 +12,11 @@ MAN5+=	sane-avision.5
 MAN5+=	sane-bh.5
 MAN5+=	sane-canon.5
 MAN5+=	sane-canon630u.5
-MAN5+=	sane-canon_pp.5
+MAN5+=	sane-canon_dr.5
 MAN5+=	sane-cardscan.5
 MAN5+=	sane-coolscan.5
 MAN5+=	sane-coolscan2.5
+MAN5+=	sane-coolscan3.5
 MAN5+=	sane-dc210.5
 MAN5+=	sane-dc240.5
 MAN5+=	sane-dc25.5
@@ -23,9 +24,9 @@ MAN5+=	sane-dll.5
 MAN5+=	sane-dmc.5
 MAN5+=	sane-epjitsu.5
 MAN5+=	sane-epson.5
+MAN5+=	sane-epson2.5
 MAN5+=	sane-fujitsu.5
 MAN5+=	sane-genesys.5
-MAN5+=	sane-gphoto2.5
 MAN5+=	sane-gt68xx.5
 MAN5+=	sane-hp.5
 MAN5+=	sane-hp3500.5
@@ -34,7 +35,6 @@ MAN5+=	sane-hp4200.5
 MAN5+=	sane-hp5400.5
 MAN5+=	sane-hp5590.5
 MAN5+=	sane-hpljm1005.5
-MAN5+=	sane-hpsj5s.5
 MAN5+=	sane-hs2p.5
 MAN5+=	sane-ibm.5
 MAN5+=	sane-leo.5
@@ -44,20 +44,17 @@ MAN5+=	sane-matsushita.5
 MAN5+=	sane-microtek.5
 MAN5+=	sane-microtek2.5
 MAN5+=	sane-mustek.5
-MAN5+=	sane-mustek_pp.5
 MAN5+=	sane-mustek_usb.5
 MAN5+=	sane-mustek_usb2.5
 MAN5+=	sane-nec.5
 MAN5+=	sane-net.5
 MAN5+=	sane-niash.5
 MAN5+=	sane-pie.5
-MAN5+=	sane-pint.5
 MAN5+=	sane-pixma.5
 MAN5+=	sane-plustek.5
 MAN5+=	sane-plustek_pp.5
-MAN5+=	sane-pnm.5
-MAN5+=	sane-qcam.5
 MAN5+=	sane-ricoh.5
+MAN5+=	sane-rts8891.5
 MAN5+=	sane-s9036.5
 MAN5+=	sane-sceptre.5
 MAN5+=	sane-scsi.5
@@ -78,6 +75,6 @@ MAN5+=	sane-umax.5
 MAN5+=	sane-umax1220u.5
 MAN5+=	sane-umax_pp.5
 MAN5+=	sane-usb.5
-MAN5+=	sane-v4l.5
+MAN5+=	sane-xerox_mfp.5
 MAN7+=	sane.7
 MAN8+=	saned.8
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index dfd5f8c377c3..ea0dfd573090 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (sane-backends-1.0.19.tar.gz) = 8c0936272dcfd4e98c51512699f1c06f
-SHA256 (sane-backends-1.0.19.tar.gz) = 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
-SIZE (sane-backends-1.0.19.tar.gz) = 4293184
+MD5 (sane-backends-1.0.20.tar.gz) = a0cfdfdebca2feb4f2ba5d3418b15a42
+SHA256 (sane-backends-1.0.20.tar.gz) = 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
+SIZE (sane-backends-1.0.20.tar.gz) = 4760873
diff --git a/graphics/sane-backends/files/patch-Makefile.in b/graphics/sane-backends/files/patch-Makefile.in
new file mode 100644
index 000000000000..00e856d6edff
--- /dev/null
+++ b/graphics/sane-backends/files/patch-Makefile.in
@@ -0,0 +1,45 @@
+--- Makefile.in.orig	2009-04-30 22:41:20.000000000 +0900
++++ Makefile.in	2009-05-05 01:23:45.000000000 +0900
+@@ -64,7 +64,6 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(docdir)"
+ dist_docDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(dist_doc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+@@ -246,7 +245,7 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = include lib sanei backend frontend tools doc po
+ DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
+-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
++dist_doc_DATA = AUTHORS ChangeLog LICENSE NEWS PROBLEMS PROJECTS \
+  README README.aix README.beos README.darwin README.djpeg README.freebsd \
+  README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
+  README.solaris README.unixware2 README.unixware7 README.windows \
+@@ -327,6 +326,7 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ install-dist_docDATA: $(dist_doc_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ 	@list='$(dist_doc_DATA)'; for p in $$list; do \
+@@ -335,6 +335,7 @@
+ 	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++endif
+ 
+ uninstall-dist_docDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -627,9 +628,6 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(docdir)"; do \
+-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
diff --git a/graphics/sane-backends/files/patch-backend__Makefile.in b/graphics/sane-backends/files/patch-backend__Makefile.in
index 983f301b8a5b..1d603fd090fb 100644
--- a/graphics/sane-backends/files/patch-backend__Makefile.in
+++ b/graphics/sane-backends/files/patch-backend__Makefile.in
@@ -1,11 +1,19 @@
---- ./backend/Makefile.in.orig	Sun Feb 19 18:30:27 2006
-+++ ./backend/Makefile.in	Sun Feb 19 18:32:47 2006
-@@ -244,6 +244,8 @@
- 	    $(INSTALL_DATA) $(srcdir)/$${cfg} $(DESTDIR)$(configdir)/$${cfg} \
-               || exit 1; \
+--- backend/Makefile.in.orig	2009-04-30 22:41:18.000000000 +0900
++++ backend/Makefile.in	2009-05-13 15:25:25.000000000 +0900
+@@ -4432,7 +4433,7 @@
+ 	@# 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; \
+@@ -4443,6 +4444,7 @@
+ 	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
+ 	  || exit 1; \
  	  fi; \
-+	  if test ! -d $(DESTDIR)$(configdir)/dist; then $(MKDIR) $(DESTDIR)$(configdir)/dist; fi; \
-+	  $(INSTALL_DATA) $(srcdir)/$${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} ; \
- 	done
- 	for dir in $(FIRMWARE_DIRS) ; do \
- 	   $(MKDIR) $(DESTDIR)$(datadir)/sane/$${dir} ; \
++	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg}; \
+ 	  done
+ 
+ install-firmware-path:
diff --git a/graphics/sane-backends/files/patch-backend__epson2.c b/graphics/sane-backends/files/patch-backend__epson2.c
new file mode 100644
index 000000000000..ddb81c2ea236
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend__epson2.c
@@ -0,0 +1,17 @@
+--- backend/epson2.c.orig	2009-04-30 22:15:19.000000000 +0900
++++ backend/epson2.c	2009-05-05 02:16:46.000000000 +0900
+@@ -3446,12 +3446,14 @@
+ 	 */
+ 	DBG(1, "max req size: %d\n", sanei_scsi_max_request_size);
+ 
++#if 0
+ 	if (s->lcount < 3 && e2_model(s, "GT-X800")) {
+ 		s->lcount = 21;
+ 		DBG(17,
+ 		    "%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
+ 		    __func__, s->lcount);
+ 	}
++#endif
+ 
+ 	if (s->lcount >= 255) {
+ 		s->lcount = 255;
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index 918549d3f577..5a8ac83c8dbc 100644
--- a/graphics/sane-backends/files/patch-doc_Makefile.in
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -1,41 +1,60 @@
---- doc/Makefile.in.orig	Sat Jul 16 06:19:07 2005
-+++ doc/Makefile.in	Mon Aug  8 03:19:18 2005
-@@ -56,7 +56,7 @@
- SECT7   = sane.7
- SECT8	= saned.8
- MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8)
--READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \
-+READMES = README AUTHORS ChangeLog LICENSE NEWS PROBLEMS \
-           PROJECTS README README.aix README.beos README.darwin README.freebsd \
- 	  README.djpeg \
-           README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
-@@ -78,7 +78,7 @@
- ifeq (@USE_LATEX@,no)
- STANDARD =
- else
--STANDARD = sane.ps
-+STANDARD =
- endif
+--- doc/Makefile.in.orig	2009-04-30 22:41:18.000000000 +0900
++++ doc/Makefile.in	2009-05-05 01:22:08.000000000 +0900
+@@ -49,8 +49,7 @@
+ DIST_SOURCES =
+ man1dir = $(mandir)/man1
+ am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
+-	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \
+-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
++	"$(DESTDIR)$(man8dir)"
+ man7dir = $(mandir)/man7
+ man8dir = $(mandir)/man8
+ NROFF = nroff
+@@ -573,6 +572,7 @@
+ 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+ 	done
+ install-dist_docDATA: $(dist_doc_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ 	@list='$(dist_doc_DATA)'; for p in $$list; do \
+@@ -581,6 +581,7 @@
+ 	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++endif
+ 
+ uninstall-dist_docDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -590,6 +591,7 @@
+ 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
+ install-docDATA: $(doc_DATA)
++ifndef NOPORTDOCS
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ 	@list='$(doc_DATA)'; for p in $$list; do \
+@@ -598,6 +600,7 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+ 	done
++endif
  
- SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external
-@@ -139,6 +139,7 @@
- 	  echo installing $${page} in $(mandir)/man8/$${page}...; \
- 	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man8/$${page} || exit 1; \
+ uninstall-docDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -607,6 +610,7 @@
+ 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
  	done
+ install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
 +ifndef NOPORTDOCS
- 	$(MKDIR) $(DESTDIR)$(docdir)
- 	@for readme in $(READMES); do \
- 	  echo installing $${readme} in $(docdir)/$${readme}...; \
-@@ -155,10 +156,11 @@
- 	    fi \
- 	  done \
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+ 	@$(am__vpath_adj_setup) \
+@@ -616,6 +620,7 @@
+ 	  echo " $(nobase_dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(nobase_dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
--	@-for doc in $(DOCS) $(HTML_PAGES); do \
-+	@-for doc in $(HTML_PAGES); do \
- 	    echo installing $${doc} in $(docdir)/$${doc}...; \
- 	    $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
- 	  done
 +endif
  
- uninstall:
- 	@for page in $(SECT1); do \
+ uninstall-nobase_dist_docDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/sane-backends/files/patch-frontend__Makefile.in b/graphics/sane-backends/files/patch-frontend__Makefile.in
new file mode 100644
index 000000000000..131de5a6c3b0
--- /dev/null
+++ b/graphics/sane-backends/files/patch-frontend__Makefile.in
@@ -0,0 +1,11 @@
+--- frontend/Makefile.in.orig	2009-04-30 22:41:19.000000000 +0900
++++ frontend/Makefile.in	2009-05-13 15:21:53.000000000 +0900
+@@ -254,7 +254,7 @@
+ scanimage_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
+ saned_SOURCES = saned.c
+ saned_LDADD = ../sanei/libsanei.la ../lib/liblib.la ../lib/libfelib.la \
+-  ../backend/libsane.la @SYSLOG_LIBS@
++  ../backend/libsane.la @SYSLOG_LIBS@ @AVAHI_LIBS@
+ 
+ test_SOURCES = test.c
+ test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
diff --git a/graphics/sane-backends/files/patch-frontend__saned.c b/graphics/sane-backends/files/patch-frontend__saned.c
new file mode 100644
index 000000000000..a1acae947f7a
--- /dev/null
+++ b/graphics/sane-backends/files/patch-frontend__saned.c
@@ -0,0 +1,44 @@
+--- frontend/saned.c.orig	2009-03-15 02:35:54.000000000 +0900
++++ frontend/saned.c	2009-05-13 15:18:09.000000000 +0900
+@@ -2338,7 +2338,7 @@
+ 
+ #ifdef WITH_AVAHI
+ static void
+-saned_avahi (void);
++saned_avahi (struct pollfd *fds, int nfds);
+ 
+ static void
+ saned_create_avahi_services (AvahiClient *c);
+@@ -2351,8 +2351,9 @@
+ 
+ 
+ static void
+-saned_avahi (void)
++saned_avahi (struct pollfd *fds, int nfds)
+ {
++  struct pollfd *fdp = NULL;
+   int error;
+ 
+   avahi_pid = fork ();
+@@ -2371,6 +2372,12 @@
+   signal (SIGINT, NULL);
+   signal (SIGTERM, NULL);
+ 
++  /* Close network fds */
++  for (fdp = fds; nfds > 0; nfds--, fdp++)
++    close (fdp->fd);
++
++  free(fds);
++
+   avahi_svc_name = avahi_strdup(SANED_NAME);
+ 
+   avahi_poll = avahi_simple_poll_new ();
+@@ -3055,7 +3062,7 @@
+ 
+ #ifdef WITH_AVAHI
+   DBG (DBG_INFO, "run_standalone: spawning Avahi process\n");
+-  saned_avahi ();
++  saned_avahi (fds, nfds);
+ #endif /* WITH_AVAHI */
+ 
+   DBG (DBG_MSG, "run_standalone: waiting for control connection\n");
diff --git a/graphics/sane-backends/files/patch-include__sane__sane.h b/graphics/sane-backends/files/patch-include__sane__sane.h
new file mode 100644
index 000000000000..440d3d71146e
--- /dev/null
+++ b/graphics/sane-backends/files/patch-include__sane__sane.h
@@ -0,0 +1,10 @@
+--- include/sane/sane.h.orig	2009-04-24 04:59:23.000000000 +0900
++++ include/sane/sane.h	2009-05-13 15:15:50.000000000 +0900
+@@ -115,6 +115,7 @@
+ #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/files/patch-tools__Makefile.in b/graphics/sane-backends/files/patch-tools__Makefile.in
new file mode 100644
index 000000000000..e24f492fe155
--- /dev/null
+++ b/graphics/sane-backends/files/patch-tools__Makefile.in
@@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig	2009-04-30 22:41:19.000000000 +0900
++++ tools/Makefile.in	2009-05-15 17:37:48.000000000 +0900
+@@ -270,7 +270,7 @@
+ 			    ../backend/sane_strstatus.c
+ 
+ sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
+-			  @USB_LIBS@ @IEEE1284_LIBS@
++			  @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
+ 
+ gamma4scanimage_SOURCES = gamma4scanimage.c
+ gamma4scanimage_LDADD = @MATH_LIB@
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 11eddffc1578..41fba7930d77 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -11,9 +11,12 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/bh.conf %D/etc/sane.d/dist/bh.conf; then rm -f %D/etc/sane.d/bh.conf; fi
 @unexec if cmp -s %D/etc/sane.d/canon.conf %D/etc/sane.d/dist/canon.conf; then rm -f %D/etc/sane.d/canon.conf; fi
 @unexec if cmp -s %D/etc/sane.d/canon630u.conf %D/etc/sane.d/dist/canon630u.conf; then rm -f %D/etc/sane.d/canon630u.conf; fi
+%%IEEE1284%%@unexec if cmp -s %D/etc/sane.d/canon_pp.conf %D/etc/sane.d/dist/canon_pp.conf; then rm -f %D/etc/sane.d/canon_pp.conf; fi
+@unexec if cmp -s %D/etc/sane.d/canon_dr.conf %D/etc/sane.d/dist/canon_dr.conf; then rm -f %D/etc/sane.d/canon_dr.conf; fi
 @unexec if cmp -s %D/etc/sane.d/cardscan.conf %D/etc/sane.d/dist/cardscan.conf; then rm -f %D/etc/sane.d/cardscan.conf; fi
 @unexec if cmp -s %D/etc/sane.d/coolscan.conf %D/etc/sane.d/dist/coolscan.conf; then rm -f %D/etc/sane.d/coolscan.conf; fi
 @unexec if cmp -s %D/etc/sane.d/coolscan2.conf %D/etc/sane.d/dist/coolscan2.conf; then rm -f %D/etc/sane.d/coolscan2.conf; fi
+@unexec if cmp -s %D/etc/sane.d/coolscan3.conf %D/etc/sane.d/dist/coolscan3.conf; then rm -f %D/etc/sane.d/coolscan3.conf; fi
 @unexec if cmp -s %D/etc/sane.d/dc210.conf %D/etc/sane.d/dist/dc210.conf; then rm -f %D/etc/sane.d/dc210.conf; fi
 @unexec if cmp -s %D/etc/sane.d/dc240.conf %D/etc/sane.d/dist/dc240.conf; then rm -f %D/etc/sane.d/dc240.conf; fi
 @unexec if cmp -s %D/etc/sane.d/dc25.conf %D/etc/sane.d/dist/dc25.conf; then rm -f %D/etc/sane.d/dc25.conf; fi
@@ -31,6 +34,7 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/hp3900.conf %D/etc/sane.d/dist/hp3900.conf; then rm -f %D/etc/sane.d/hp3900.conf; fi
 @unexec if cmp -s %D/etc/sane.d/hp4200.conf %D/etc/sane.d/dist/hp4200.conf; then rm -f %D/etc/sane.d/hp4200.conf; fi
 @unexec if cmp -s %D/etc/sane.d/hp5400.conf %D/etc/sane.d/dist/hp5400.conf; then rm -f %D/etc/sane.d/hp5400.conf; fi
+%%IEEE1284%%@unexec if cmp -s %D/etc/sane.d/hpsj5s.conf %D/etc/sane.d/dist/hpsj5s.conf; then rm -f %D/etc/sane.d/hpsj5s.conf; fi
 @unexec if cmp -s %D/etc/sane.d/hs2p.conf %D/etc/sane.d/dist/hs2p.conf; then rm -f %D/etc/sane.d/hs2p.conf; fi
 @unexec if cmp -s %D/etc/sane.d/ibm.conf %D/etc/sane.d/dist/ibm.conf; then rm -f %D/etc/sane.d/ibm.conf; fi
 @unexec if cmp -s %D/etc/sane.d/leo.conf %D/etc/sane.d/dist/leo.conf; then rm -f %D/etc/sane.d/leo.conf; fi
@@ -40,13 +44,16 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/microtek.conf %D/etc/sane.d/dist/microtek.conf; then rm -f %D/etc/sane.d/microtek.conf; fi
 @unexec if cmp -s %D/etc/sane.d/microtek2.conf %D/etc/sane.d/dist/microtek2.conf; then rm -f %D/etc/sane.d/microtek2.conf; fi
 @unexec if cmp -s %D/etc/sane.d/mustek.conf %D/etc/sane.d/dist/mustek.conf; then rm -f %D/etc/sane.d/mustek.conf; fi
+%%IEEE1284%%@unexec if cmp -s %D/etc/sane.d/mustek_pp.conf %D/etc/sane.d/dist/mustek_pp.conf; then rm -f %D/etc/sane.d/mustek_pp.conf; fi
 @unexec if cmp -s %D/etc/sane.d/mustek_usb.conf %D/etc/sane.d/dist/mustek_usb.conf; then rm -f %D/etc/sane.d/mustek_usb.conf; fi
 @unexec if cmp -s %D/etc/sane.d/nec.conf %D/etc/sane.d/dist/nec.conf; then rm -f %D/etc/sane.d/nec.conf; fi
 @unexec if cmp -s %D/etc/sane.d/net.conf %D/etc/sane.d/dist/net.conf; then rm -f %D/etc/sane.d/net.conf; fi
 @unexec if cmp -s %D/etc/sane.d/pie.conf %D/etc/sane.d/dist/pie.conf; then rm -f %D/etc/sane.d/pie.conf; fi
+@unexec if cmp -s %D/etc/sane.d/pixma.conf %D/etc/sane.d/dist/pixma.conf; then rm -f %D/etc/sane.d/pixma.conf; fi
 @unexec if cmp -s %D/etc/sane.d/plustek.conf %D/etc/sane.d/dist/plustek.conf; then rm -f %D/etc/sane.d/plustek.conf; fi
 @unexec if cmp -s %D/etc/sane.d/plustek_pp.conf %D/etc/sane.d/dist/plustek_pp.conf; then rm -f %D/etc/sane.d/plustek_pp.conf; fi
 @unexec if cmp -s %D/etc/sane.d/ricoh.conf %D/etc/sane.d/dist/ricoh.conf; then rm -f %D/etc/sane.d/ricoh.conf; fi
+@unexec if cmp -s %D/etc/sane.d/rts8891.conf %D/etc/sane.d/dist/rts8891.conf; then rm -f %D/etc/sane.d/rts8891.conf; fi
 @unexec if cmp -s %D/etc/sane.d/s9036.conf %D/etc/sane.d/dist/s9036.conf; then rm -f %D/etc/sane.d/s9036.conf; fi
 @unexec if cmp -s %D/etc/sane.d/saned.conf %D/etc/sane.d/dist/saned.conf; then rm -f %D/etc/sane.d/saned.conf; fi
 @unexec if cmp -s %D/etc/sane.d/sceptre.conf %D/etc/sane.d/dist/sceptre.conf; then rm -f %D/etc/sane.d/sceptre.conf; fi
@@ -65,6 +72,7 @@ bin/scanimage
 @unexec if cmp -s %D/etc/sane.d/umax.conf %D/etc/sane.d/dist/umax.conf; then rm -f %D/etc/sane.d/umax.conf; fi
 @unexec if cmp -s %D/etc/sane.d/umax1220u.conf %D/etc/sane.d/dist/umax1220u.conf; then rm -f %D/etc/sane.d/umax1220u.conf; fi
 @unexec if cmp -s %D/etc/sane.d/umax_pp.conf %D/etc/sane.d/dist/umax_pp.conf; then rm -f %D/etc/sane.d/umax_pp.conf; fi
+@unexec if cmp -s %D/etc/sane.d/xerox_mfp.conf %D/etc/sane.d/dist/xerox_mfp.conf; then rm -f %D/etc/sane.d/xerox_mfp.conf; fi
 etc/sane.d/dist/abaton.conf
 etc/sane.d/dist/agfafocus.conf
 etc/sane.d/dist/apple.conf
@@ -74,9 +82,12 @@ etc/sane.d/dist/avision.conf
 etc/sane.d/dist/bh.conf
 etc/sane.d/dist/canon.conf
 etc/sane.d/dist/canon630u.conf
+etc/sane.d/dist/canon_dr.conf
+%%IEEE1284%%etc/sane.d/dist/canon_pp.conf
 etc/sane.d/dist/cardscan.conf
 etc/sane.d/dist/coolscan.conf
 etc/sane.d/dist/coolscan2.conf
+etc/sane.d/dist/coolscan3.conf
 etc/sane.d/dist/dc210.conf
 etc/sane.d/dist/dc240.conf
 etc/sane.d/dist/dc25.conf
@@ -95,6 +106,7 @@ etc/sane.d/dist/hp.conf
 etc/sane.d/dist/hp3900.conf
 etc/sane.d/dist/hp4200.conf
 etc/sane.d/dist/hp5400.conf
+%%IEEE1284%%etc/sane.d/dist/hpsj5s.conf
 etc/sane.d/dist/hs2p.conf
 etc/sane.d/dist/ibm.conf
 etc/sane.d/dist/leo.conf
@@ -104,13 +116,16 @@ etc/sane.d/dist/matsushita.conf
 etc/sane.d/dist/microtek.conf
 etc/sane.d/dist/microtek2.conf
 etc/sane.d/dist/mustek.conf
+%%IEEE1284%%etc/sane.d/dist/mustek_pp.conf
 etc/sane.d/dist/mustek_usb.conf
 etc/sane.d/dist/nec.conf
 etc/sane.d/dist/net.conf
 etc/sane.d/dist/pie.conf
+etc/sane.d/dist/pixma.conf
 etc/sane.d/dist/plustek.conf
 etc/sane.d/dist/plustek_pp.conf
 etc/sane.d/dist/ricoh.conf
+etc/sane.d/dist/rts8891.conf
 etc/sane.d/dist/s9036.conf
 etc/sane.d/dist/saned.conf
 etc/sane.d/dist/sceptre.conf
@@ -129,6 +144,7 @@ etc/sane.d/dist/u12.conf
 etc/sane.d/dist/umax.conf
 etc/sane.d/dist/umax1220u.conf
 etc/sane.d/dist/umax_pp.conf
+etc/sane.d/dist/xerox_mfp.conf
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.la
@@ -164,6 +180,12 @@ lib/sane/libsane-canon.so.1
 lib/sane/libsane-canon630u.la
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
+lib/sane/libsane-canon_dr.la
+lib/sane/libsane-canon_dr.so
+lib/sane/libsane-canon_dr.so.1
+%%IEEE1284%%lib/sane/libsane-canon_pp.la
+%%IEEE1284%%lib/sane/libsane-canon_pp.so
+%%IEEE1284%%lib/sane/libsane-canon_pp.so.1
 lib/sane/libsane-cardscan.la
 lib/sane/libsane-cardscan.so
 lib/sane/libsane-cardscan.so.1
@@ -173,6 +195,9 @@ lib/sane/libsane-coolscan.so.1
 lib/sane/libsane-coolscan2.la
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
+lib/sane/libsane-coolscan3.la
+lib/sane/libsane-coolscan3.so
+lib/sane/libsane-coolscan3.so.1
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
@@ -233,6 +258,9 @@ lib/sane/libsane-hp5590.so.1
 lib/sane/libsane-hpljm1005.la
 lib/sane/libsane-hpljm1005.so
 lib/sane/libsane-hpljm1005.so.1
+%%IEEE1284%%lib/sane/libsane-hpsj5s.la
+%%IEEE1284%%lib/sane/libsane-hpsj5s.so
+%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
 lib/sane/libsane-hs2p.la
 lib/sane/libsane-hs2p.so
 lib/sane/libsane-hs2p.so.1
@@ -260,6 +288,9 @@ lib/sane/libsane-microtek2.so.1
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
+%%IEEE1284%%lib/sane/libsane-mustek_pp.la
+%%IEEE1284%%lib/sane/libsane-mustek_pp.so
+%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
 lib/sane/libsane-mustek_usb.la
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
@@ -290,6 +321,9 @@ lib/sane/libsane-plustek_pp.so.1
 lib/sane/libsane-ricoh.la
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
+lib/sane/libsane-rts8891.la
+lib/sane/libsane-rts8891.so
+lib/sane/libsane-rts8891.so.1
 lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
@@ -344,6 +378,9 @@ lib/sane/libsane-umax1220u.so.1
 lib/sane/libsane-umax_pp.la
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
+lib/sane/libsane-xerox_mfp.la
+lib/sane/libsane-xerox_mfp.so
+lib/sane/libsane-xerox_mfp.so.1
 sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -367,6 +404,7 @@ sbin/saned
 %%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
@@ -430,6 +468,7 @@ sbin/saned
 %%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/en_GB/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo
@@ -441,6 +480,7 @@ sbin/saned
 %%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo
+@exec mkdir %D/etc/sane.d/dll.d
 @exec mkdir %D/share/sane
 @exec mkdir %D/share/sane/artec_eplus48u
 @exec mkdir %D/share/sane/epjitsu
@@ -467,5 +507,6 @@ sbin/saned
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/sane
 @dirrm include/sane
+@dirrmtry etc/sane.d/dll.d
 @dirrm etc/sane.d/dist
 @dirrmtry etc/sane.d