Attachment #96073 for bug #134627

View | Details | Raw Unified | Return to bug 134627
Collapse All | Expand All




#

PORTNAME=	sane-backends
PORTVERSION=	1.0.20
PORTREVISION=	1
CATEGORIES=	graphics
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%/ \


OPTIONS=	USB "USB support" on \
		NLS "NLS support" on \
		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}


.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




MAN5+=	sane-bh.5
MAN5+=	sane-canon.5
MAN5+=	sane-canon630u.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

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

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

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

MAN5+=	sane-umax1220u.5
MAN5+=	sane-umax_pp.5
MAN5+=	sane-usb.5
MAN5+=	sane-xerox_mfp.5
MAN7+=	sane.7
MAN8+=	saned.8

Lines 1-3 Link Here

(-)graphics/sane-backends/distinfo (-3 / +3 lines)
1	MD5 (sane-backends-1.0.19.tar.gz) = 8c0936272dcfd4e98c51512699f1c06f	1	MD5 (sane-backends-1.0.20.tar.gz) = a0cfdfdebca2feb4f2ba5d3418b15a42
2	SHA256 (sane-backends-1.0.19.tar.gz) = 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e	2	SHA256 (sane-backends-1.0.20.tar.gz) = 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
3	SIZE (sane-backends-1.0.19.tar.gz) = 4293184	3	SIZE (sane-backends-1.0.20.tar.gz) = 4760873




--- 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




--- 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; \
+	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg}; \
 	  done
 
 install-firmware-path:
 	   $(MKDIR) $(DESTDIR)$(datadir)/sane/$${dir} ; \

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__epson2.c (+17 lines)
	1	--- backend/epson2.c.orig 2009-04-30 22:15:19.000000000 +0900
	2	+++ backend/epson2.c 2009-05-05 02:16:46.000000000 +0900
	3	@@ -3446,12 +3446,14 @@
	4	*/
	5	DBG(1, "max req size: %d\n", sanei_scsi_max_request_size);
	6
	7	+#if 0
	8	if (s->lcount < 3 && e2_model(s, "GT-X800")) {
	9	s->lcount = 21;
	10	DBG(17,
	11	"%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
	12	__func__, s->lcount);
	13	}
	14	+#endif
	15
	16	if (s->lcount >= 255) {
	17	s->lcount = 255;




--- 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
 
 uninstall-docDATA:
 	@$(NORMAL_UNINSTALL)
@@ -607,6 +610,7 @@
 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
 	done
 install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
+ifndef NOPORTDOCS
 	@$(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-nobase_dist_docDATA:
 	@$(NORMAL_UNINSTALL)

Line 0 Link Here

(-)graphics/sane-backends/files/patch-frontend__Makefile.in (+11 lines)
	1	--- frontend/Makefile.in.orig 2009-04-30 22:41:19.000000000 +0900
	2	+++ frontend/Makefile.in 2009-05-13 15:21:53.000000000 +0900
	3	@@ -254,7 +254,7 @@
	4	scanimage_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la
	5	saned_SOURCES = saned.c
	6	saned_LDADD = ../sanei/libsanei.la ../lib/liblib.la ../lib/libfelib.la \
	7	- ../backend/libsane.la @SYSLOG_LIBS@
	8	+ ../backend/libsane.la @SYSLOG_LIBS@ @AVAHI_LIBS@
	9
	10	test_SOURCES = test.c
	11	test_LDADD = ../lib/liblib.la ../lib/libfelib.la ../backend/libsane.la




--- 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");

Line 0 Link Here

(-)graphics/sane-backends/files/patch-include__sane__sane.h (+10 lines)
	1	--- include/sane/sane.h.orig 2009-04-24 04:59:23.000000000 +0900
	2	+++ include/sane/sane.h 2009-05-13 15:15:50.000000000 +0900
	3	@@ -115,6 +115,7 @@
	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)

Line 0 Link Here

(-)graphics/sane-backends/files/patch-tools__Makefile.in (+11 lines)
	1	--- tools/Makefile.in.orig 2009-04-30 22:41:19.000000000 +0900
	2	+++ tools/Makefile.in 2009-05-15 17:37:48.000000000 +0900
	3	@@ -270,7 +270,7 @@
	4	../backend/sane_strstatus.c
	5
	6	sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
	7	- @USB_LIBS@ @IEEE1284_LIBS@
	8	+ @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
	9
	10	gamma4scanimage_SOURCES = gamma4scanimage.c
	11	gamma4scanimage_LDADD = @MATH_LIB@




@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/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

@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

@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

@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

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

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

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

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

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

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

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

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

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

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

%%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

%%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

%%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

%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/sane
@dirrm include/sane
@dirrmtry etc/sane.d/dll.d
@dirrm etc/sane.d/dist
@dirrmtry etc/sane.d

Return to bug 134627

Lines 6-15 Link Here

(-)graphics/sane-backends/Makefile (-7 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= sane-backends	8	PORTNAME= sane-backends
9	PORTVERSION= 1.0.19	9	PORTVERSION= 1.0.20
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= http://alioth.debian.org/frs/download.php/2318/ \	11	MASTER_SITES= http://alioth.debian.org/frs/download.php/3026/ \
13	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \	12	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
14	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \	13	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
15	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \	14	ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
Lines 25-38 Link Here
25		24
26	OPTIONS= USB "USB support" on \	25	OPTIONS= USB "USB support" on \
27	NLS "NLS support" on \	26	NLS "NLS support" on \
28	GPHOTO2 "gPhoto2 support" off	27	GPHOTO2 "gPhoto2 support" off \
		28	AVAHI "Avahi support" off \
		29	IEEE1284 "libieee1284 support" off
29		30
30	USE_GNOME= gnometarget
31	USE_GMAKE= yes	31	USE_GMAKE= yes
32	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	33	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
34	LDFLAGS="-L${LOCALBASE}/lib"	34	LDFLAGS="-L${LOCALBASE}/lib"
35	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \	35	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \
		36	--disable-latex \
36	--disable-locking	37	--disable-locking
37		38
38	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}	39	MAKE_ENV= NOPORTDOCS=${NOPORTDOCS}
Lines 59-73 Link Here
59		60
60	.if defined(WITH_GPHOTO2)	61	.if defined(WITH_GPHOTO2)
61	LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2	62	LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
		63	MAN5+= sane-gphoto2.5
62	PLIST_SUB+= GPHOTO2=""	64	PLIST_SUB+= GPHOTO2=""
63	.else	65	.else
64	CONFIGURE_ARGS+= --with-gphoto2=no	66	CONFIGURE_ARGS+= --with-gphoto2=no
65	PLIST_SUB+= GPHOTO2="@comment "	67	PLIST_SUB+= GPHOTO2="@comment "
66	.endif	68	.endif
67		69
		70	.if defined(WITH_AVAHI)
		71	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app
		72	CONFIGURE_ARGS+= --enable-avahi
		73	.endif
		74
		75	.if defined(WITH_IEEE1284)
		76	LIB_DEPENDS+= ieee1284.5:${PORTSDIR}/sysutils/libieee1284
		77	PLIST_SUB+= IEEE1284=""
		78	.else
		79	CONFIGURE_ENV+= sane_cv_use_libieee1284=no
		80	PLIST_SUB+= IEEE1284="@comment "
		81	.endif
		82
68	post-patch:	83	post-patch:
69	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
70	's\|= \.\./libtool\|= @LIBTOOL@\|g'
71	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|\|g ; \	84	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|\|g ; \
72	s\|} -D_REENT\|} ${PTHREAD_CFLAGS} -D_REENT\|g ; \	85	s\|} -D_REENT\|} ${PTHREAD_CFLAGS} -D_REENT\|g ; \
73	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure	86	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure

Lines 12-21 Link Here

(-)graphics/sane-backends/Makefile.man (-8 / +5 lines)
12	MAN5+= sane-bh.5	12	MAN5+= sane-bh.5
13	MAN5+= sane-canon.5	13	MAN5+= sane-canon.5
14	MAN5+= sane-canon630u.5	14	MAN5+= sane-canon630u.5
15	MAN5+= sane-canon_pp.5	15	MAN5+= sane-canon_dr.5
16	MAN5+= sane-cardscan.5	16	MAN5+= sane-cardscan.5
17	MAN5+= sane-coolscan.5	17	MAN5+= sane-coolscan.5
18	MAN5+= sane-coolscan2.5	18	MAN5+= sane-coolscan2.5
		19	MAN5+= sane-coolscan3.5
19	MAN5+= sane-dc210.5	20	MAN5+= sane-dc210.5
20	MAN5+= sane-dc240.5	21	MAN5+= sane-dc240.5
21	MAN5+= sane-dc25.5	22	MAN5+= sane-dc25.5
Lines 23-31 Link Here
23	MAN5+= sane-dmc.5	24	MAN5+= sane-dmc.5
24	MAN5+= sane-epjitsu.5	25	MAN5+= sane-epjitsu.5
25	MAN5+= sane-epson.5	26	MAN5+= sane-epson.5
		27	MAN5+= sane-epson2.5
26	MAN5+= sane-fujitsu.5	28	MAN5+= sane-fujitsu.5
27	MAN5+= sane-genesys.5	29	MAN5+= sane-genesys.5
28	MAN5+= sane-gphoto2.5
29	MAN5+= sane-gt68xx.5	30	MAN5+= sane-gt68xx.5
30	MAN5+= sane-hp.5	31	MAN5+= sane-hp.5
31	MAN5+= sane-hp3500.5	32	MAN5+= sane-hp3500.5
Lines 34-40 Link Here
34	MAN5+= sane-hp5400.5	35	MAN5+= sane-hp5400.5
35	MAN5+= sane-hp5590.5	36	MAN5+= sane-hp5590.5
36	MAN5+= sane-hpljm1005.5	37	MAN5+= sane-hpljm1005.5
37	MAN5+= sane-hpsj5s.5
38	MAN5+= sane-hs2p.5	38	MAN5+= sane-hs2p.5
39	MAN5+= sane-ibm.5	39	MAN5+= sane-ibm.5
40	MAN5+= sane-leo.5	40	MAN5+= sane-leo.5
Lines 44-63 Link Here
44	MAN5+= sane-microtek.5	44	MAN5+= sane-microtek.5
45	MAN5+= sane-microtek2.5	45	MAN5+= sane-microtek2.5
46	MAN5+= sane-mustek.5	46	MAN5+= sane-mustek.5
47	MAN5+= sane-mustek_pp.5
48	MAN5+= sane-mustek_usb.5	47	MAN5+= sane-mustek_usb.5
49	MAN5+= sane-mustek_usb2.5	48	MAN5+= sane-mustek_usb2.5
50	MAN5+= sane-nec.5	49	MAN5+= sane-nec.5
51	MAN5+= sane-net.5	50	MAN5+= sane-net.5
52	MAN5+= sane-niash.5	51	MAN5+= sane-niash.5
53	MAN5+= sane-pie.5	52	MAN5+= sane-pie.5
54	MAN5+= sane-pint.5
55	MAN5+= sane-pixma.5	53	MAN5+= sane-pixma.5
56	MAN5+= sane-plustek.5	54	MAN5+= sane-plustek.5
57	MAN5+= sane-plustek_pp.5	55	MAN5+= sane-plustek_pp.5
58	MAN5+= sane-pnm.5
59	MAN5+= sane-qcam.5
60	MAN5+= sane-ricoh.5	56	MAN5+= sane-ricoh.5
		57	MAN5+= sane-rts8891.5
61	MAN5+= sane-s9036.5	58	MAN5+= sane-s9036.5
62	MAN5+= sane-sceptre.5	59	MAN5+= sane-sceptre.5
63	MAN5+= sane-scsi.5	60	MAN5+= sane-scsi.5
Lines 78-83 Link Here
78	MAN5+= sane-umax1220u.5	75	MAN5+= sane-umax1220u.5
79	MAN5+= sane-umax_pp.5	76	MAN5+= sane-umax_pp.5
80	MAN5+= sane-usb.5	77	MAN5+= sane-usb.5
81	MAN5+= sane-v4l.5	78	MAN5+= sane-xerox_mfp.5
82	MAN7+= sane.7	79	MAN7+= sane.7
83	MAN8+= saned.8	80	MAN8+= saned.8

Line 0 Link Here

(-)graphics/sane-backends/files/patch-Makefile.in (+45 lines)
	1	--- Makefile.in.orig 2009-04-30 22:41:20.000000000 +0900
	2	+++ Makefile.in 2009-05-05 01:23:45.000000000 +0900
	3	@@ -64,7 +64,6 @@
	4	*) f=$$p;; \
	5	esac;
	6	am__strip_dir = `echo $$p \| sed -e 's\|^.*/\|\|'`;
	7	-am__installdirs = "$(DESTDIR)$(docdir)"
	8	dist_docDATA_INSTALL = $(INSTALL_DATA)
	9	DATA = $(dist_doc_DATA)
	10	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
	11	@@ -246,7 +245,7 @@
	12	top_srcdir = @top_srcdir@
	13	SUBDIRS = include lib sanei backend frontend tools doc po
	14	DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
	15	-dist_doc_DATA = AUTHORS ChangeLog COPYING LICENSE NEWS PROBLEMS PROJECTS \
	16	+dist_doc_DATA = AUTHORS ChangeLog LICENSE NEWS PROBLEMS PROJECTS \
	17	README README.aix README.beos README.darwin README.djpeg README.freebsd \
	18	README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
	19	README.solaris README.unixware2 README.unixware7 README.windows \
	20	@@ -327,6 +326,7 @@
	21	distclean-libtool:
	22	-rm -f libtool
	23	install-dist_docDATA: $(dist_doc_DATA)
	24	+ifndef NOPORTDOCS
	25	@$(NORMAL_INSTALL)
	26	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
	27	@list='$(dist_doc_DATA)'; for p in $$list; do \
	28	@@ -335,6 +335,7 @@
	29	echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
	30	$(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
	31	done
	32	+endif
	33
	34	uninstall-dist_docDATA:
	35	@$(NORMAL_UNINSTALL)
	36	@@ -627,9 +628,6 @@
	37	all-am: Makefile $(DATA)
	38	installdirs: installdirs-recursive
	39	installdirs-am:
	40	- for dir in "$(DESTDIR)$(docdir)"; do \
	41	- test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
	42	- done
	43	install: install-recursive
	44	install-exec: install-exec-recursive
	45	install-data: install-data-recursive

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-backend__Makefile.in (-10 / +18 lines)
1	--- ./backend/Makefile.in.orig Sun Feb 19 18:30:27 2006	1	--- backend/Makefile.in.orig 2009-04-30 22:41:18.000000000 +0900
2	+++ ./backend/Makefile.in Sun Feb 19 18:32:47 2006	2	+++ backend/Makefile.in 2009-05-13 15:25:25.000000000 +0900
3	@@ -244,6 +244,8 @@	3	@@ -4432,7 +4433,7 @@
4	$(INSTALL_DATA) $(srcdir)/$${cfg} $(DESTDIR)$(configdir)/$${cfg} \	4	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
5	\|\| exit 1; \	5	@# Having two libsane's can cause issues so get rid of it.
		6	-rm -f $(DESTDIR)$(sanelibdir)/libsane.*
		7	- test -z "$(configdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)"
		8	+ test -z "$(configdir)/dist" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dist"
		9	test -z "$(configdir)/dll.d" \|\| $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
		10	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
		11	if test ! -r $${cfg}; then continue; fi; \
		12	@@ -4443,6 +4444,7 @@
		13	$(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
		14	\|\| exit 1; \
6	fi; \	15	fi; \
7	+ if test ! -d $(DESTDIR)$(configdir)/dist; then $(MKDIR) $(DESTDIR)$(configdir)/dist; fi; \	16	+ $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg}; \
8	+ $(INSTALL_DATA) $(srcdir)/$${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} ; \	17	done
9	done	18
10	for dir in $(FIRMWARE_DIRS) ; do \	19	install-firmware-path:
11	$(MKDIR) $(DESTDIR)$(datadir)/sane/$${dir} ; \

Lines 1-41 Link Here

(-)graphics/sane-backends/files/patch-doc_Makefile.in (-36 / +55 lines)
1	--- doc/Makefile.in.orig Sat Jul 16 06:19:07 2005	1	--- doc/Makefile.in.orig 2009-04-30 22:41:18.000000000 +0900
2	+++ doc/Makefile.in Mon Aug 8 03:19:18 2005	2	+++ doc/Makefile.in 2009-05-05 01:22:08.000000000 +0900
3	@@ -56,7 +56,7 @@	3	@@ -49,8 +49,7 @@
4	SECT7 = sane.7	4	DIST_SOURCES =
5	SECT8 = saned.8	5	man1dir = $(mandir)/man1
6	MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8)	6	am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
7	-READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \	7	- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \
8	+READMES = README AUTHORS ChangeLog LICENSE NEWS PROBLEMS \	8	- "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
9	PROJECTS README README.aix README.beos README.darwin README.freebsd \	9	+ "$(DESTDIR)$(man8dir)"
10	README.djpeg \	10	man7dir = $(mandir)/man7
11	README.hp-ux README.linux README.netbsd README.openbsd README.os2 \	11	man8dir = $(mandir)/man8
12	@@ -78,7 +78,7 @@	12	NROFF = nroff
13	ifeq (@USE_LATEX@,no)	13	@@ -573,6 +572,7 @@
14	STANDARD =	14	rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
15	else	15	done
16	-STANDARD = sane.ps	16	install-dist_docDATA: $(dist_doc_DATA)
17	+STANDARD =	17	+ifndef NOPORTDOCS
18	endif	18	@$(NORMAL_INSTALL)
		19	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
		20	@list='$(dist_doc_DATA)'; for p in $$list; do \
		21	@@ -581,6 +581,7 @@
		22	echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
		23	$(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
		24	done
		25	+endif
		26
		27	uninstall-dist_docDATA:
		28	@$(NORMAL_UNINSTALL)
		29	@@ -590,6 +591,7 @@
		30	rm -f "$(DESTDIR)$(docdir)/$$f"; \
		31	done
		32	install-docDATA: $(doc_DATA)
		33	+ifndef NOPORTDOCS
		34	@$(NORMAL_INSTALL)
		35	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
		36	@list='$(doc_DATA)'; for p in $$list; do \
		37	@@ -598,6 +600,7 @@
		38	echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
		39	$(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
		40	done
		41	+endif
19		42
20	SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external	43	uninstall-docDATA:
21	@@ -139,6 +139,7 @@	44	@$(NORMAL_UNINSTALL)
22	echo installing $${page} in $(mandir)/man8/$${page}...; \	45	@@ -607,6 +610,7 @@
23	$(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man8/$${page} \|\| exit 1; \	46	rm -f "$(DESTDIR)$(docdir)/$$f"; \
24	done	47	done
		48	install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
25	+ifndef NOPORTDOCS	49	+ifndef NOPORTDOCS
26	$(MKDIR) $(DESTDIR)$(docdir)	50	@$(NORMAL_INSTALL)
27	@for readme in $(READMES); do \	51	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
28	echo installing $${readme} in $(docdir)/$${readme}...; \	52	@$(am__vpath_adj_setup) \
29	@@ -155,10 +156,11 @@	53	@@ -616,6 +620,7 @@
30	fi \	54	echo " $(nobase_dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
31	done \	55	$(nobase_dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
32	done	56	done
33	- @-for doc in $(DOCS) $(HTML_PAGES); do \
34	+ @-for doc in $(HTML_PAGES); do \
35	echo installing $${doc} in $(docdir)/$${doc}...; \
36	$(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
37	done
38	+endif	57	+endif
39		58
40	uninstall:	59	uninstall-nobase_dist_docDATA:
41	@for page in $(SECT1); do \	60	@$(NORMAL_UNINSTALL)

Line 0 Link Here

(-)graphics/sane-backends/files/patch-frontend__saned.c (+44 lines)
	1	--- frontend/saned.c.orig 2009-03-15 02:35:54.000000000 +0900
	2	+++ frontend/saned.c 2009-05-13 15:18:09.000000000 +0900
	3	@@ -2338,7 +2338,7 @@
	4
	5	#ifdef WITH_AVAHI
	6	static void
	7	-saned_avahi (void);
	8	+saned_avahi (struct pollfd *fds, int nfds);
	9
	10	static void
	11	saned_create_avahi_services (AvahiClient *c);
	12	@@ -2351,8 +2351,9 @@
	13
	14
	15	static void
	16	-saned_avahi (void)
	17	+saned_avahi (struct pollfd *fds, int nfds)
	18	{
	19	+ struct pollfd *fdp = NULL;
	20	int error;
	21
	22	avahi_pid = fork ();
	23	@@ -2371,6 +2372,12 @@
	24	signal (SIGINT, NULL);
	25	signal (SIGTERM, NULL);
	26
	27	+ /* Close network fds */
	28	+ for (fdp = fds; nfds > 0; nfds--, fdp++)
	29	+ close (fdp->fd);
	30	+
	31	+ free(fds);
	32	+
	33	avahi_svc_name = avahi_strdup(SANED_NAME);
	34
	35	avahi_poll = avahi_simple_poll_new ();
	36	@@ -3055,7 +3062,7 @@
	37
	38	#ifdef WITH_AVAHI
	39	DBG (DBG_INFO, "run_standalone: spawning Avahi process\n");
	40	- saned_avahi ();
	41	+ saned_avahi (fds, nfds);
	42	#endif /* WITH_AVAHI */
	43
	44	DBG (DBG_MSG, "run_standalone: waiting for control connection\n");

Lines 11-19 Link Here

(-)graphics/sane-backends/pkg-plist (+40 lines)
11	@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	11	@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
12	@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	12	@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
13	@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	13	@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
		14	%%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
14	@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	15	@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
15	@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	16	@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
16	@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	17	@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
		18	@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
17	@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	19	@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
18	@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	20	@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
19	@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	21	@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
Lines 31-36 Link Here
31	@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	33	@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
32	@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	34	@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
33	@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	35	@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
		36	%%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
34	@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	37	@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
35	@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	38	@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
36	@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	39	@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
Lines 40-52 Link Here
40	@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	43	@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
41	@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	44	@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
42	@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	45	@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
		46	%%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
43	@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	47	@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
44	@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	48	@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
45	@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	49	@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
46	@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	50	@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
		51	@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
47	@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	52	@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
48	@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	53	@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
49	@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	54	@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
		55	@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
50	@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	56	@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
51	@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	57	@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
52	@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	58	@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
Lines 65-70 Link Here
65	@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	71	@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
66	@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	72	@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
67	@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	73	@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
		74	@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
68	etc/sane.d/dist/abaton.conf	75	etc/sane.d/dist/abaton.conf
69	etc/sane.d/dist/agfafocus.conf	76	etc/sane.d/dist/agfafocus.conf
70	etc/sane.d/dist/apple.conf	77	etc/sane.d/dist/apple.conf
Lines 74-82 Link Here
74	etc/sane.d/dist/bh.conf	81	etc/sane.d/dist/bh.conf
75	etc/sane.d/dist/canon.conf	82	etc/sane.d/dist/canon.conf
76	etc/sane.d/dist/canon630u.conf	83	etc/sane.d/dist/canon630u.conf
		84	etc/sane.d/dist/canon_dr.conf
		85	%%IEEE1284%%etc/sane.d/dist/canon_pp.conf
77	etc/sane.d/dist/cardscan.conf	86	etc/sane.d/dist/cardscan.conf
78	etc/sane.d/dist/coolscan.conf	87	etc/sane.d/dist/coolscan.conf
79	etc/sane.d/dist/coolscan2.conf	88	etc/sane.d/dist/coolscan2.conf
		89	etc/sane.d/dist/coolscan3.conf
80	etc/sane.d/dist/dc210.conf	90	etc/sane.d/dist/dc210.conf
81	etc/sane.d/dist/dc240.conf	91	etc/sane.d/dist/dc240.conf
82	etc/sane.d/dist/dc25.conf	92	etc/sane.d/dist/dc25.conf
Lines 95-100 Link Here
95	etc/sane.d/dist/hp3900.conf	105	etc/sane.d/dist/hp3900.conf
96	etc/sane.d/dist/hp4200.conf	106	etc/sane.d/dist/hp4200.conf
97	etc/sane.d/dist/hp5400.conf	107	etc/sane.d/dist/hp5400.conf
		108	%%IEEE1284%%etc/sane.d/dist/hpsj5s.conf
98	etc/sane.d/dist/hs2p.conf	109	etc/sane.d/dist/hs2p.conf
99	etc/sane.d/dist/ibm.conf	110	etc/sane.d/dist/ibm.conf
100	etc/sane.d/dist/leo.conf	111	etc/sane.d/dist/leo.conf
Lines 104-116 Link Here
104	etc/sane.d/dist/microtek.conf	115	etc/sane.d/dist/microtek.conf
105	etc/sane.d/dist/microtek2.conf	116	etc/sane.d/dist/microtek2.conf
106	etc/sane.d/dist/mustek.conf	117	etc/sane.d/dist/mustek.conf
		118	%%IEEE1284%%etc/sane.d/dist/mustek_pp.conf
107	etc/sane.d/dist/mustek_usb.conf	119	etc/sane.d/dist/mustek_usb.conf
108	etc/sane.d/dist/nec.conf	120	etc/sane.d/dist/nec.conf
109	etc/sane.d/dist/net.conf	121	etc/sane.d/dist/net.conf
110	etc/sane.d/dist/pie.conf	122	etc/sane.d/dist/pie.conf
		123	etc/sane.d/dist/pixma.conf
111	etc/sane.d/dist/plustek.conf	124	etc/sane.d/dist/plustek.conf
112	etc/sane.d/dist/plustek_pp.conf	125	etc/sane.d/dist/plustek_pp.conf
113	etc/sane.d/dist/ricoh.conf	126	etc/sane.d/dist/ricoh.conf
		127	etc/sane.d/dist/rts8891.conf
114	etc/sane.d/dist/s9036.conf	128	etc/sane.d/dist/s9036.conf
115	etc/sane.d/dist/saned.conf	129	etc/sane.d/dist/saned.conf
116	etc/sane.d/dist/sceptre.conf	130	etc/sane.d/dist/sceptre.conf
Lines 129-134 Link Here
129	etc/sane.d/dist/umax.conf	143	etc/sane.d/dist/umax.conf
130	etc/sane.d/dist/umax1220u.conf	144	etc/sane.d/dist/umax1220u.conf
131	etc/sane.d/dist/umax_pp.conf	145	etc/sane.d/dist/umax_pp.conf
		146	etc/sane.d/dist/xerox_mfp.conf
132	include/sane/sane.h	147	include/sane/sane.h
133	include/sane/saneopts.h	148	include/sane/saneopts.h
134	lib/libsane.la	149	lib/libsane.la
Lines 164-169 Link Here
164	lib/sane/libsane-canon630u.la	179	lib/sane/libsane-canon630u.la
165	lib/sane/libsane-canon630u.so	180	lib/sane/libsane-canon630u.so
166	lib/sane/libsane-canon630u.so.1	181	lib/sane/libsane-canon630u.so.1
		182	lib/sane/libsane-canon_dr.la
		183	lib/sane/libsane-canon_dr.so
		184	lib/sane/libsane-canon_dr.so.1
		185	%%IEEE1284%%lib/sane/libsane-canon_pp.la
		186	%%IEEE1284%%lib/sane/libsane-canon_pp.so
		187	%%IEEE1284%%lib/sane/libsane-canon_pp.so.1
167	lib/sane/libsane-cardscan.la	188	lib/sane/libsane-cardscan.la
168	lib/sane/libsane-cardscan.so	189	lib/sane/libsane-cardscan.so
169	lib/sane/libsane-cardscan.so.1	190	lib/sane/libsane-cardscan.so.1
Lines 173-178 Link Here
173	lib/sane/libsane-coolscan2.la	194	lib/sane/libsane-coolscan2.la
174	lib/sane/libsane-coolscan2.so	195	lib/sane/libsane-coolscan2.so
175	lib/sane/libsane-coolscan2.so.1	196	lib/sane/libsane-coolscan2.so.1
		197	lib/sane/libsane-coolscan3.la
		198	lib/sane/libsane-coolscan3.so
		199	lib/sane/libsane-coolscan3.so.1
176	lib/sane/libsane-dc210.la	200	lib/sane/libsane-dc210.la
177	lib/sane/libsane-dc210.so	201	lib/sane/libsane-dc210.so
178	lib/sane/libsane-dc210.so.1	202	lib/sane/libsane-dc210.so.1
Lines 233-238 Link Here
233	lib/sane/libsane-hpljm1005.la	257	lib/sane/libsane-hpljm1005.la
234	lib/sane/libsane-hpljm1005.so	258	lib/sane/libsane-hpljm1005.so
235	lib/sane/libsane-hpljm1005.so.1	259	lib/sane/libsane-hpljm1005.so.1
		260	%%IEEE1284%%lib/sane/libsane-hpsj5s.la
		261	%%IEEE1284%%lib/sane/libsane-hpsj5s.so
		262	%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
236	lib/sane/libsane-hs2p.la	263	lib/sane/libsane-hs2p.la
237	lib/sane/libsane-hs2p.so	264	lib/sane/libsane-hs2p.so
238	lib/sane/libsane-hs2p.so.1	265	lib/sane/libsane-hs2p.so.1
Lines 260-265 Link Here
260	lib/sane/libsane-mustek.la	287	lib/sane/libsane-mustek.la
261	lib/sane/libsane-mustek.so	288	lib/sane/libsane-mustek.so
262	lib/sane/libsane-mustek.so.1	289	lib/sane/libsane-mustek.so.1
		290	%%IEEE1284%%lib/sane/libsane-mustek_pp.la
		291	%%IEEE1284%%lib/sane/libsane-mustek_pp.so
		292	%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
263	lib/sane/libsane-mustek_usb.la	293	lib/sane/libsane-mustek_usb.la
264	lib/sane/libsane-mustek_usb.so	294	lib/sane/libsane-mustek_usb.so
265	lib/sane/libsane-mustek_usb.so.1	295	lib/sane/libsane-mustek_usb.so.1
Lines 290-295 Link Here
290	lib/sane/libsane-ricoh.la	320	lib/sane/libsane-ricoh.la
291	lib/sane/libsane-ricoh.so	321	lib/sane/libsane-ricoh.so
292	lib/sane/libsane-ricoh.so.1	322	lib/sane/libsane-ricoh.so.1
		323	lib/sane/libsane-rts8891.la
		324	lib/sane/libsane-rts8891.so
		325	lib/sane/libsane-rts8891.so.1
293	lib/sane/libsane-s9036.la	326	lib/sane/libsane-s9036.la
294	lib/sane/libsane-s9036.so	327	lib/sane/libsane-s9036.so
295	lib/sane/libsane-s9036.so.1	328	lib/sane/libsane-s9036.so.1
Lines 344-349 Link Here
344	lib/sane/libsane-umax_pp.la	377	lib/sane/libsane-umax_pp.la
345	lib/sane/libsane-umax_pp.so	378	lib/sane/libsane-umax_pp.so
346	lib/sane/libsane-umax_pp.so.1	379	lib/sane/libsane-umax_pp.so.1
		380	lib/sane/libsane-xerox_mfp.la
		381	lib/sane/libsane-xerox_mfp.so
		382	lib/sane/libsane-xerox_mfp.so.1
347	sbin/saned	383	sbin/saned
348	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	384	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
349	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	385	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
Lines 367-372 Link Here
367	%%PORTDOCS%%%%DOCSDIR%%/README.unixware7	403	%%PORTDOCS%%%%DOCSDIR%%/README.unixware7
368	%%PORTDOCS%%%%DOCSDIR%%/README.windows	404	%%PORTDOCS%%%%DOCSDIR%%/README.windows
369	%%PORTDOCS%%%%DOCSDIR%%/README.zeta	405	%%PORTDOCS%%%%DOCSDIR%%/README.zeta
		406	%%PORTDOCS%%%%DOCSDIR%%/backend-writing.txt
370	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes	407	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes
371	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt	408	%%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt
372	%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES	409	%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES
Lines 430-435 Link Here
430	%%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo	467	%%NLS%%share/locale/cs/LC_MESSAGES/sane-backends.mo
431	%%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo	468	%%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo
432	%%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo	469	%%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo
		470	%%NLS%%share/locale/en_GB/LC_MESSAGES/sane-backends.mo
433	%%NLS%%share/locale/eo/LC_MESSAGES/sane-backends.mo	471	%%NLS%%share/locale/eo/LC_MESSAGES/sane-backends.mo
434	%%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo	472	%%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo
435	%%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo	473	%%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo
Lines 441-446 Link Here
441	%%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo	479	%%NLS%%share/locale/pt/LC_MESSAGES/sane-backends.mo
442	%%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo	480	%%NLS%%share/locale/ru/LC_MESSAGES/sane-backends.mo
443	%%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo	481	%%NLS%%share/locale/sv/LC_MESSAGES/sane-backends.mo
		482	@exec mkdir %D/etc/sane.d/dll.d
444	@exec mkdir %D/share/sane	483	@exec mkdir %D/share/sane
445	@exec mkdir %D/share/sane/artec_eplus48u	484	@exec mkdir %D/share/sane/artec_eplus48u
446	@exec mkdir %D/share/sane/epjitsu	485	@exec mkdir %D/share/sane/epjitsu
Lines 467-471 Link Here
467	%%PORTDOCS%%@dirrm %%DOCSDIR%%	506	%%PORTDOCS%%@dirrm %%DOCSDIR%%
468	@dirrm lib/sane	507	@dirrm lib/sane
469	@dirrm include/sane	508	@dirrm include/sane
		509	@dirrmtry etc/sane.d/dll.d
470	@dirrm etc/sane.d/dist	510	@dirrm etc/sane.d/dist
471	@dirrmtry etc/sane.d	511	@dirrmtry etc/sane.d