6 files changed, 29 insertions, 48 deletions
diff --git a/graphics/sane-backends/files/patch-ab b/graphics/sane-backends/files/patch-ab
deleted file mode 100644
index 922cf11de150..000000000000
--- a/graphics/sane-backends/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- backend/artec.c.orig	Sun Mar  5 22:40:43 2000
-+++ backend/artec.c	Wed Apr 19 06:00:00 2000
-@@ -3238,7 +3238,11 @@
-   if (DBG_LEVEL == 101)
-     {
-       debug_fd = open ("artec.data.raw",
-+#ifdef __FreeBSD__
-+		       O_WRONLY | O_CREAT | O_TRUNC, 0666);
-+#else
- 		       O_WRONLY | O_CREAT | O_TRUNC | O_SYNC, 0666);
-+#endif
-       if (debug_fd > -1)
- 	DBG (101, "opened artec.data.raw output file\n");
-     }
diff --git a/graphics/sane-backends/files/patch-ac b/graphics/sane-backends/files/patch-ac
deleted file mode 100644
index f80c92526370..000000000000
--- a/graphics/sane-backends/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/Makefile.in.orig	Sun Mar  5 22:40:35 2000
-+++ backend/Makefile.in	Wed Apr 19 06:00:00 2000
-@@ -113,7 +113,7 @@
- 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
- 	  (cd ..; $(LN_S) sane/$$n $$nn); \
- 	done || exit 1
--	$(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-+	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
- 	@list="$(CONFIGS)"; for cfg in $$list; do \
- 	  if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
- 	  if test -f $(configdir)/$${cfg}; then \
diff --git a/graphics/sane-backends/files/patch-ae b/graphics/sane-backends/files/patch-ae
index c880e73f2c0c..8d7ef7a6640a 100644
--- a/graphics/sane-backends/files/patch-ae
+++ b/graphics/sane-backends/files/patch-ae
@@ -1,6 +1,6 @@
---- sanei/sanei_scsi.c.orig	Sat Aug 12 23:54:15 2000
-+++ sanei/sanei_scsi.c	Fri Sep  8 22:38:49 2000
-@@ -2424,6 +2424,169 @@
+--- sanei/sanei_scsi.c.orig	Fri Dec  1 05:02:30 2000
++++ sanei/sanei_scsi.c	Sat Dec 23 04:14:27 2000
+@@ -2425,6 +2425,169 @@
     cam_freeccb(ccb);
     return SANE_STATUS_GOOD;
  }
@@ -170,11 +170,3 @@
  #endif
  
  
-@@ -3722,6 +3885,7 @@
- 			 int findbus, int findchannel, int findid, int findlun,
- 			 SANE_Status (*attach) (const char *dev))
- {
-+  DBG_INIT();
-   DBG (1, "sanei_scsi_find_devices: not implemented for this platform\n");
- }
- 
diff --git a/graphics/sane-backends/files/patch-af b/graphics/sane-backends/files/patch-af
deleted file mode 100644
index 22046d4f0224..000000000000
--- a/graphics/sane-backends/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
---- frontend/xscanimage.c.orig	Sun Oct 15 08:12:12 2000
-+++ frontend/xscanimage.c	Sun Oct 15 08:12:39 2000
-@@ -57,6 +57,8 @@
- 
- #ifdef HAVE_LIBGIMP_GIMP_H
- 
-+#define GIMP_ENABLE_COMPAT_CRUFT
-+
- #include <libgimp/gimp.h>
- 
- static void query (void);
-
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
new file mode 100644
index 000000000000..299e402eeff1
--- /dev/null
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -0,0 +1,11 @@
+--- backend/Makefile.in.orig	Thu Mar 22 16:48:30 2001
++++ backend/Makefile.in	Thu Mar 22 16:50:53 2001
+@@ -69,7 +69,7 @@
+ LIBOBJS = $(addprefix ../lib/,$(addsuffix .lo,$(LIBLIB_FUNCS)))
+ 
+ libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
+-	@$(LIBTOOL) $(MLINK) $(CC) -export-dynamic -o $@ $($*_LIBS) \
++	@$(LIBTOOL) $(MLINK) $(CC) -avoid-version -module -o $@ $($*_LIBS) \
+ 	$(LDFLAGS) $(BACKENDLIBS) $^ -rpath $(libsanedir) \
+ 	-version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
+ 
diff --git a/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
new file mode 100644
index 000000000000..3c56a56b1a42
--- /dev/null
+++ b/graphics/sane-backends/files/patch-sanei_sanei_pa4s2.c
@@ -0,0 +1,15 @@
+--- 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
+ 
++#if defined(__FreeBSD__) && defined(__i386__)
++#define HAVE_IOPERM
++#define ioperm i386_set_ioperm
++#include <machine/sysarch.h>
++#endif
++
+ #include "sane/sane.h"
+ #include "sane/sanei.h"
+ #include "sane/sanei_pa4s2.h"