Attachment 106120 Details for Bug 146674 – file.diff

[patch] file.diff

file.diff (text/plain), 20.49 KB, created by tkato432 on 2010-05-17 21:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-05-17 21:20:05 UTC

Size: 20.49 KB

patch

obsolete

>diff -urN /usr/ports/graphics/sane-backends/Makefile graphics/sane-backends/Makefile
>--- /usr/ports/graphics/sane-backends/Makefile	2010-02-08 16:47:24.000000000 +0900
>+++ graphics/sane-backends/Makefile	2010-05-18 01:52:15.000000000 +0900
>@@ -6,10 +6,9 @@
> #
> 
> PORTNAME=	sane-backends
>-PORTVERSION=	1.0.20
>-PORTREVISION=	6
>+PORTVERSION=	1.0.21
> CATEGORIES=	graphics
>-MASTER_SITES=	http://alioth.debian.org/frs/download.php/3026/ \
>+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3258/ \
> 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
> 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
> 		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
>@@ -23,8 +22,6 @@
> LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
> 		tiff.4:${PORTSDIR}/graphics/tiff
> 
>-MAKE_JOBS_UNSAFE=	yes
>-
> OPTIONS=	USB "USB support" on \
> 		NLS "NLS support" on \
> 		GPHOTO2 "gPhoto2 support" off \
>@@ -39,8 +36,8 @@
> CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
> 		--disable-latex \
> 		--disable-locking
>-
>-MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
>+MAKE_ENV=	NOPORTDOCS="${NOPORTDOCS}"
>+MAKE_JOBS_UNSAFE=	yes
> USE_LDCONFIG=	yes
> 
> USE_RC_SUBR=	saned
>@@ -95,6 +92,7 @@
> 	@${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
>+	@(cd ${WRKSRC}/po; ${BASENAME} -s .po `${LS} *.po` > LINGUAS)
> 
> # Pass BATCH to pkg-install for Evil Things(tm)
> pre-install:
>diff -urN /usr/ports/graphics/sane-backends/Makefile.man graphics/sane-backends/Makefile.man
>--- /usr/ports/graphics/sane-backends/Makefile.man	2009-05-24 00:20:26.000000000 +0900
>+++ graphics/sane-backends/Makefile.man	2010-05-18 01:57:39.000000000 +0900
>@@ -37,6 +37,8 @@
> MAN5+=	sane-hpljm1005.5
> MAN5+=	sane-hs2p.5
> MAN5+=	sane-ibm.5
>+MAN5+=	sane-kodak.5
>+MAN5+=	sane-kvs1025.5
> MAN5+=	sane-leo.5
> MAN5+=	sane-lexmark.5
> MAN5+=	sane-ma1509.5
>@@ -45,10 +47,10 @@
> MAN5+=	sane-microtek2.5
> MAN5+=	sane-mustek.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-p5.5
> MAN5+=	sane-pie.5
> MAN5+=	sane-pixma.5
> MAN5+=	sane-plustek.5
>diff -urN /usr/ports/graphics/sane-backends/distinfo graphics/sane-backends/distinfo
>--- /usr/ports/graphics/sane-backends/distinfo	2009-05-24 00:20:26.000000000 +0900
>+++ graphics/sane-backends/distinfo	2010-04-26 16:36:28.000000000 +0900
>@@ -1,3 +1,3 @@
>-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
>+MD5 (sane-backends-1.0.21.tar.gz) = be586a23633949cf2ecf0c9c6d769130
>+SHA256 (sane-backends-1.0.21.tar.gz) = e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
>+SIZE (sane-backends-1.0.21.tar.gz) = 5050344
>diff -urN /usr/ports/graphics/sane-backends/files/patch-Makefile.in graphics/sane-backends/files/patch-Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-Makefile.in	2009-05-23 23:24:05.000000000 +0900
>+++ graphics/sane-backends/files/patch-Makefile.in	2010-05-10 21:49:21.000000000 +0900
>@@ -1,14 +1,14 @@
>---- 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|^.*/||'`;
>+--- Makefile.in.orig	2010-04-14 09:52:59.000000000 +0900
>++++ Makefile.in	2010-05-10 21:48:54.000000000 +0900
>+@@ -82,7 +82,6 @@
>+ am__base_list = \
>+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
>+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
> -am__installdirs = "$(DESTDIR)$(docdir)"
>- dist_docDATA_INSTALL = $(INSTALL_DATA)
>  DATA = $(dist_doc_DATA)
>  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
>-@@ -246,7 +245,7 @@
>+   distclean-recursive maintainer-clean-recursive
>+@@ -292,7 +291,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
>@@ -17,23 +17,23 @@
>   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 @@
>+@@ -375,6 +374,7 @@
>  distclean-libtool:
>- 	-rm -f libtool
>+ 	-rm -f libtool config.lt
>  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"; \
>+ 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
>+@@ -386,6 +386,7 @@
>+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
>+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
>  	done
> +endif
>  
>  uninstall-dist_docDATA:
>  	@$(NORMAL_UNINSTALL)
>-@@ -627,9 +628,6 @@
>+@@ -710,9 +711,6 @@
>  all-am: Makefile $(DATA)
>  installdirs: installdirs-recursive
>  installdirs-am:
>diff -urN /usr/ports/graphics/sane-backends/files/patch-backend-Makefile.in graphics/sane-backends/files/patch-backend-Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-backend-Makefile.in	2009-05-28 18:48:00.000000000 +0900
>+++ graphics/sane-backends/files/patch-backend-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>-
>---- backend/Makefile.in.orig 2009-04-30 17:41:18.000000000 +0400
>-+++ backend/Makefile.in   2009-05-24 12:02:03.000000000 +0400
>-@@ -1138,7 +1138,7 @@
>- libxerox_mfp_la_LIBADD =
>- am_libxerox_mfp_la_OBJECTS = libxerox_mfp_la-xerox_mfp.lo
>- libxerox_mfp_la_OBJECTS = $(am_libxerox_mfp_la_OBJECTS)
>--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
>- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
>-
>-
>diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__Makefile.in graphics/sane-backends/files/patch-backend__Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-backend__Makefile.in	2009-05-24 00:20:26.000000000 +0900
>+++ graphics/sane-backends/files/patch-backend__Makefile.in	2010-05-10 21:52:20.000000000 +0900
>@@ -1,6 +1,15 @@
>---- 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 @@
>+--- backend/Makefile.in.orig	2010-04-14 09:52:59.000000000 +0900
>++++ backend/Makefile.in	2010-05-10 21:51:54.000000000 +0900
>+@@ -1244,7 +1244,7 @@
>+ libxerox_mfp_la_LIBADD =
>+ am_libxerox_mfp_la_OBJECTS = libxerox_mfp_la-xerox_mfp.lo
>+ libxerox_mfp_la_OBJECTS = $(am_libxerox_mfp_la_OBJECTS)
>+-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
>+@@ -4701,7 +4701,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.*
>@@ -9,7 +18,7 @@
>  	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 @@
>+@@ -4712,6 +4712,7 @@
>  	  $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \
>  	  || exit 1; \
>  	  fi; \
>diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__epson2-commands.c graphics/sane-backends/files/patch-backend__epson2-commands.c
>--- /usr/ports/graphics/sane-backends/files/patch-backend__epson2-commands.c	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/sane-backends/files/patch-backend__epson2-commands.c	2010-05-10 22:25:49.000000000 +0900
>@@ -0,0 +1,10 @@
>+--- backend/epson2-commands.c.orig	2010-04-05 22:18:04.000000000 +0900
>++++ backend/epson2-commands.c	2010-05-10 22:24:33.000000000 +0900
>+@@ -21,6 +21,7 @@
>+ 
>+ #include <byteorder.h>
>+ #include <math.h>
>++#include <sys/types.h>
>+ 
>+ #include "epson2.h"
>+ #include "epson2-io.h"
>diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__epson2-ops.c graphics/sane-backends/files/patch-backend__epson2-ops.c
>--- /usr/ports/graphics/sane-backends/files/patch-backend__epson2-ops.c	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/sane-backends/files/patch-backend__epson2-ops.c	2010-05-10 21:59:29.000000000 +0900
>@@ -0,0 +1,18 @@
>+--- backend/epson2-ops.c.orig	2010-04-14 09:52:59.000000000 +0900
>++++ backend/epson2-ops.c	2010-05-10 21:59:04.000000000 +0900
>+@@ -1219,6 +1219,7 @@
>+ 
>+ 	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")) {
>+ 		s->lcount = 21;
>+@@ -1226,6 +1227,7 @@
>+ 		    "%s: set lcount = %i bigger than sanei_scsi_max_request_size\n",
>+ 		    __func__, s->lcount);
>+ 	}
>++#endif
>+ 
>+ 	if (s->lcount >= 255)
>+ 		s->lcount = 255;
>diff -urN /usr/ports/graphics/sane-backends/files/patch-backend__epson2.c graphics/sane-backends/files/patch-backend__epson2.c
>--- /usr/ports/graphics/sane-backends/files/patch-backend__epson2.c	2009-05-23 23:24:05.000000000 +0900
>+++ graphics/sane-backends/files/patch-backend__epson2.c	2010-05-10 22:19:21.000000000 +0900
>@@ -1,17 +1,11 @@
>---- 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);
>+--- backend/epson2.c.orig	2010-04-05 22:18:04.000000000 +0900
>++++ backend/epson2.c	2010-05-10 22:18:47.000000000 +0900
>+@@ -57,6 +57,8 @@
>+ #include <unistd.h>
>+ #include <errno.h>
>+ #include <sys/time.h>
>++#include <sys/types.h>
>++#include <sys/socket.h>
>  
>-+#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;
>+ #include "sane/saneopts.h"
>+ #include "sane/sanei_scsi.h"
>diff -urN /usr/ports/graphics/sane-backends/files/patch-doc_Makefile.in graphics/sane-backends/files/patch-doc_Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-doc_Makefile.in	2009-05-24 00:20:26.000000000 +0900
>+++ graphics/sane-backends/files/patch-doc_Makefile.in	2010-05-10 22:03:21.000000000 +0900
>@@ -1,7 +1,7 @@
>---- 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 =
>+--- doc/Makefile.in.orig	2010-04-14 09:52:59.000000000 +0900
>++++ doc/Makefile.in	2010-05-10 22:02:46.000000000 +0900
>+@@ -73,8 +73,7 @@
>+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
>  man1dir = $(mandir)/man1
>  am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
> -	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \
>@@ -10,49 +10,49 @@
>  man7dir = $(mandir)/man7
>  man8dir = $(mandir)/man8
>  NROFF = nroff
>-@@ -573,6 +572,7 @@
>- 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
>- 	done
>+@@ -559,6 +558,7 @@
>+ 	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
>+ 	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
>  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"; \
>+ 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
>+@@ -570,6 +570,7 @@
>+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
>+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
>  	done
> +endif
>  
>  uninstall-dist_docDATA:
>  	@$(NORMAL_UNINSTALL)
>-@@ -590,6 +591,7 @@
>- 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
>- 	done
>+@@ -579,6 +580,7 @@
>+ 	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
>+ 	cd "$(DESTDIR)$(docdir)" && rm -f $$files
>  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"; \
>+ 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
>+@@ -590,6 +592,7 @@
>+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
>+ 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
>  	done
> +endif
>  
>  uninstall-docDATA:
>  	@$(NORMAL_UNINSTALL)
>-@@ -607,6 +610,7 @@
>- 	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
>- 	done
>+@@ -599,6 +602,7 @@
>+ 	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
>+ 	cd "$(DESTDIR)$(docdir)" && rm -f $$files
>  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"; \
>+ 	@list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" || list=; \
>+@@ -613,6 +617,7 @@
>+ 	    echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(docdir)/$$dir'"; \
>+ 	    $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(docdir)/$$dir" || exit $$?; }; \
>  	done
> +endif
>  
>diff -urN /usr/ports/graphics/sane-backends/files/patch-frontend__saned.c graphics/sane-backends/files/patch-frontend__saned.c
>--- /usr/ports/graphics/sane-backends/files/patch-frontend__saned.c	2009-05-23 23:24:05.000000000 +0900
>+++ graphics/sane-backends/files/patch-frontend__saned.c	1970-01-01 09:00:00.000000000 +0900
>@@ -1,44 +0,0 @@
>---- 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 -urN /usr/ports/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
>--- /usr/ports/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c	2001-03-22 18:13:27.000000000 +0900
>+++ graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c	2010-05-10 22:08:26.000000000 +0900
>@@ -1,8 +1,8 @@
>---- sanei/sanei_pa4s2.c.orig	Sun Oct  8 22:58:42 2000
>-+++ sanei/sanei_pa4s2.c	Wed Feb  7 00:28:27 2001
>-@@ -89,6 +89,12 @@
>- #define IO_SUPPORT_MISSING
>- #endif
>+--- sanei/sanei_pa4s2.c.orig	2010-04-05 22:18:06.000000000 +0900
>++++ sanei/sanei_pa4s2.c	2010-05-10 22:07:48.000000000 +0900
>+@@ -109,6 +109,12 @@
>+ 
>+ #endif /* HAVE_LIBIEEE1284 */
>  
> +#if defined(__FreeBSD__) && defined(__i386__)
> +#define HAVE_IOPERM
>@@ -10,6 +10,6 @@
> +#include <machine/sysarch.h>
> +#endif
> +
>- #include "sane/sane.h"
>- #include "sane/sanei.h"
>- #include "sane/sanei_pa4s2.h"
>+ #include "../include/sane/sane.h"
>+ #include "../include/sane/sanei.h"
>+ #include "../include/sane/sanei_pa4s2.h"
>diff -urN /usr/ports/graphics/sane-backends/files/patch-tools__Makefile.in graphics/sane-backends/files/patch-tools__Makefile.in
>--- /usr/ports/graphics/sane-backends/files/patch-tools__Makefile.in	2009-05-23 23:24:05.000000000 +0900
>+++ graphics/sane-backends/files/patch-tools__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- 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 -urN /usr/ports/graphics/sane-backends/pkg-plist graphics/sane-backends/pkg-plist
>--- /usr/ports/graphics/sane-backends/pkg-plist	2009-05-24 00:20:26.000000000 +0900
>+++ graphics/sane-backends/pkg-plist	2010-05-18 01:52:44.000000000 +0900
>@@ -37,6 +37,7 @@
> %%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/kodak.conf %D/etc/sane.d/dist/kodak.conf; then rm -f %D/etc/sane.d/kodak.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/lexmark.conf %D/etc/sane.d/dist/lexmark.conf; then rm -f %D/etc/sane.d/lexmark.conf; fi
> @unexec if cmp -s %D/etc/sane.d/ma1509.conf %D/etc/sane.d/dist/ma1509.conf; then rm -f %D/etc/sane.d/ma1509.conf; fi
>@@ -48,6 +49,7 @@
> @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/p5.conf %D/etc/sane.d/dist/p5.conf; then rm -f %D/etc/sane.d/p5.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
>@@ -109,6 +111,7 @@
> %%IEEE1284%%etc/sane.d/dist/hpsj5s.conf
> etc/sane.d/dist/hs2p.conf
> etc/sane.d/dist/ibm.conf
>+etc/sane.d/dist/kodak.conf
> etc/sane.d/dist/leo.conf
> etc/sane.d/dist/lexmark.conf
> etc/sane.d/dist/ma1509.conf
>@@ -120,6 +123,7 @@
> etc/sane.d/dist/mustek_usb.conf
> etc/sane.d/dist/nec.conf
> etc/sane.d/dist/net.conf
>+etc/sane.d/dist/p5.conf
> etc/sane.d/dist/pie.conf
> etc/sane.d/dist/pixma.conf
> etc/sane.d/dist/plustek.conf
>@@ -267,6 +271,12 @@
> lib/sane/libsane-ibm.la
> lib/sane/libsane-ibm.so
> lib/sane/libsane-ibm.so.1
>+lib/sane/libsane-kodak.la
>+lib/sane/libsane-kodak.so
>+lib/sane/libsane-kodak.so.1
>+lib/sane/libsane-kvs1025.la
>+lib/sane/libsane-kvs1025.so
>+lib/sane/libsane-kvs1025.so.1
> lib/sane/libsane-leo.la
> lib/sane/libsane-leo.so
> lib/sane/libsane-leo.so.1
>@@ -294,9 +304,6 @@
> lib/sane/libsane-mustek_usb.la
> lib/sane/libsane-mustek_usb.so
> lib/sane/libsane-mustek_usb.so.1
>-lib/sane/libsane-mustek_usb2.la
>-lib/sane/libsane-mustek_usb2.so
>-lib/sane/libsane-mustek_usb2.so.1
> lib/sane/libsane-nec.la
> lib/sane/libsane-nec.so
> lib/sane/libsane-nec.so.1
>@@ -306,6 +313,9 @@
> lib/sane/libsane-niash.la
> lib/sane/libsane-niash.so
> lib/sane/libsane-niash.so.1
>+lib/sane/libsane-p5.la
>+lib/sane/libsane-p5.so
>+lib/sane/libsane-p5.so.1
> lib/sane/libsane-pie.la
> lib/sane/libsane-pie.so
> lib/sane/libsane-pie.so.1
>@@ -473,13 +483,16 @@
> %%NLS%%share/locale/es/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/it/LC_MESSAGES/sane-backends.mo
>+%%NLS%%share/locale/ja/LC_MESSAGES/sane-backends.mo
> %%NLS%%share/locale/nb/LC_MESSAGES/sane-backends.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
> %%NLS%%share/locale/pl/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
>+%%NLS%%share/locale/uk/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

Actions: View | Diff

Attachments on bug 146674: 106120