Attachment #128139 for bug #172022




# Created by: gary@hotlava.com
# Date created:			Sat Jul 19 16:23:10 MET DST 1997
# Whom:				gary@hotlava.com
#
# $FreeBSD: ports/graphics/sane-backends/Makefile,v 1.106 2012/06/27 10:35:47 ale Exp $
#

PORTNAME=	sane-backends
PORTVERSION=	1.0.23
PORTREVISION=	2
CATEGORIES=	graphics
MASTER_SITES=	http://alioth.debian.org/frs/download.php/3752/:3752 \
		http://alioth.debian.org/frs/download.php/3753/:3753 \
		http://alioth.debian.org/frs/download.php/3754/:3754
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}.1:3752 \
		${DISTNAME}${EXTRACT_SUFX}.2:3753 \
		${DISTNAME}${EXTRACT_SUFX}.3:3754
EXTRACT_ONLY=	# need to concatenate before extraction

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

LICENSE=	GPLv2 # (or later)
LICENSE_COMB=	dual

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		tiff:${PORTSDIR}/graphics/tiff

OPTIONS_DEFINE=	USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 DOCS
OPTIONS_DEFAULT=	USB

OPTIONS_DEFINE=	USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 CUPS DOCS
OPTIONS_DEFAULT=USB
USB_DESC=	USB support
GPHOTO2_DESC=	gPhoto2 support
IEEE1284_DESC=	libieee1284 support

USE_GNOME=	gnomehack
USE_PKGCONFIG=	build
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-docdir=${WRKDIR}/tmproot \
		--disable-latex \
		--disable-locking \
		--enable-pthread
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

USE_RC_SUBR=	saned
SUB_FILES=	pkg-message

USERS=	saned
GROUPS=	saned

.include "Makefile.man"
.include <bsd.port.pre.mk>

.if empty(PORT_OPTIONS:MDOCS)
MAKE_ENV+=	NOPORTDOCS=1
.endif

.if ${PORT_OPTIONS:MUSB}
.if ${OSVERSION} < 800069
LIB_DEPENDS+=		usb-0.1:${PORTSDIR}/devel/libusb
.endif
.else
CONFIGURE_ARGS+=	--disable-libusb

.endif

.if ${PORT_OPTIONS:MGPHOTO2}
LIB_DEPENDS+=		gphoto2:${PORTSDIR}/graphics/libgphoto2
MAN5+=			sane-gphoto2.5
PLIST_SUB+=		GPHOTO2=""
.else

.endif

.if ${PORT_OPTIONS:MSNMP}
LIB_DEPENDS+=		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
.else
CONFIGURE_ARGS+=	--without-snmp
.endif

.if ${PORT_OPTIONS:MAVAHI}
LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
CONFIGURE_ARGS+=	--enable-avahi
.endif

.if ${PORT_OPTIONS:MIEEE1284}
LIB_DEPENDS+=		ieee1284:${PORTSDIR}/sysutils/libieee1284
PLIST_SUB+=		IEEE1284=""
MAN5+=			sane-canon_pp.5 sane-hpsj5s.5 sane-mustek_pp.5
.else
CONFIGURE_ENV+=		sane_cv_use_libieee1284=no
PLIST_SUB+=		IEEE1284="@comment "
.endif

.if ${PORT_OPTIONS:MCUPS}
LIB_DEPENDS+=		cups:${PORTSDIR}/print/cups-client
.else
CONFIGURE_ENV+=		ac_cv_header_cups_cups_h=no
.endif

post-extract:
	@((cd ${DISTDIR} && ${CAT} ${DISTFILES:C/:[^:]+$//}) | (cd ${WRKDIR} \
		&& ${EXTRACT_CMD} ${EXTRACT_BEFOR_ARGS} ${EXTRACT_AFTER_ARGS}))

post-patch:
	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h|cups/cups.h| ; \
		 s|-e .*/cups.h|"$$ac_cv_header_cups_cups_h" = "yes"| ; \
		 s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|@libdir@|@prefix@/libdata|' \
		${WRKSRC}/tools/Makefile.in

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
.endif
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 38-45 Link Here

(-)graphics/sane-backends/Makefile.man (+2 lines)
38	MAN5+= sane-hs2p.5	38	MAN5+= sane-hs2p.5
39	MAN5+= sane-ibm.5	39	MAN5+= sane-ibm.5
40	MAN5+= sane-kodak.5	40	MAN5+= sane-kodak.5
		41	MAN5+= sane-kodakaio.5
41	MAN5+= sane-kvs1025.5	42	MAN5+= sane-kvs1025.5
42	MAN5+= sane-kvs20xx.5	43	MAN5+= sane-kvs20xx.5
		44	MAN5+= sane-kvs40xx.5
43	MAN5+= sane-leo.5	45	MAN5+= sane-leo.5
44	MAN5+= sane-lexmark.5	46	MAN5+= sane-lexmark.5
45	MAN5+= sane-ma1509.5	47	MAN5+= sane-ma1509.5

Lines 1-2 Link Here

(-)graphics/sane-backends/distinfo (-2 / +6 lines)
1	SHA256 (sane-backends-1.0.22.tar.gz) = 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54	1	SHA256 (sane-backends-1.0.23.tar.gz.1) = 551d7e0c89d18ca438bfce4f1c242b59485195c493c5f935a3b11e724ee39537
2	SIZE (sane-backends-1.0.22.tar.gz) = 5150661	2	SIZE (sane-backends-1.0.23.tar.gz.1) = 1792000
		3	SHA256 (sane-backends-1.0.23.tar.gz.2) = b487df0d8dc921803577ee34ceaa676a4a3b6715cd4d9a229b43d6a501a1baab
		4	SIZE (sane-backends-1.0.23.tar.gz.2) = 1792000
		5	SHA256 (sane-backends-1.0.23.tar.gz.3) = af91e84cb72dc2b1fa4c7eaba948ae6ab8e2ab353f79805a21de4ac52de5b81a
		6	SIZE (sane-backends-1.0.23.tar.gz.3) = 1758350




--- 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)"
 DATA = $(dist_doc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   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
-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 \
@@ -375,6 +374,7 @@
 distclean-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)'; 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)
@@ -710,9 +711,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




From 5ea227caeacd504b64eef301e83fa63e0a25b3f7 Mon Sep 17 00:00:00 2001
From: Alex Belkin <abc@telekom.ru>
Date: Tue, 8 Mar 2011 17:57:19 +0300
Subject: [PATCH] keep usb device by default (correct for bug introduced by tcp sub-backend

---
 backend/xerox_mfp.c |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
index e08b50f..d4672a7 100644
--- backend/xerox_mfp.c.orig
+++ backend/xerox_mfp.c
@@ -37,10 +37,10 @@
 static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
 static struct device *devices_head = NULL;	/* sane_get_devices list */
 
-transport available_transports[] = {
+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
+transport available_transports[TRANSPORTS_MAX] = {
     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
-    { 0 }
 };
 
 static int resolv_state(int state)
@@ -824,7 +824,13 @@ free_devices (void)
   devices_head = NULL;
 }
 
-/* SANE API ignores return code of this callback */
+static transport *tr_from_devname(SANE_String_Const devname)
+{
+  if (strncmp("tcp", devname, 3) == 0)
+    return &available_transports[TRANSPORT_TCP];
+  return &available_transports[TRANSPORT_USB];
+}
+
 static SANE_Status
 list_one_device (SANE_String_Const devname)
 {
@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
       return SANE_STATUS_GOOD;
   }
 
-  for (tr = available_transports; tr->ttype; tr++) {
-    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-      break;
-  }
-  if (!tr->ttype)
-    return SANE_STATUS_INVAL;
+  tr = tr_from_devname(devname);
 
   dev = calloc (1, sizeof (struct device));
   if (dev == NULL)
@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
 static SANE_Status
 list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
 {
-    transport *tr;
-
-    for (tr = available_transports; tr->ttype; tr++) {
-	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-	    return tr->configure_device(devname, list_one_device);
-    }
-    return	SANE_STATUS_INVAL;
+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
 }
 
 SANE_Status
-- 
1.7.2.5


Lines 1-10 Link Here

(-)graphics/sane-backends/files/patch-backend__epson2-commands.c (-10 lines)
1	--- backend/epson2-commands.c.orig 2010-04-05 22:18:04.000000000 +0900
2	+++ backend/epson2-commands.c 2010-05-10 22:24:33.000000000 +0900
3	@@ -21,6 +21,7 @@
4
5	#include <byteorder.h>
6	#include <math.h>
7	+#include <sys/types.h>
8
9	#include "epson2.h"
10	#include "epson2-io.h"

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-backend__epson2.c (-11 lines)
1	--- backend/epson2.c.orig 2010-04-05 22:18:04.000000000 +0900
2	+++ backend/epson2.c 2010-05-10 22:18:47.000000000 +0900
3	@@ -57,6 +57,8 @@
4	#include <unistd.h>
5	#include <errno.h>
6	#include <sys/time.h>
7	+#include <sys/types.h>
8	+#include <sys/socket.h>
9
10	#include "sane/saneopts.h"
11	#include "sane/sanei_scsi.h"




--- backend/kodakaio.c.orig	2012-08-10 09:33:29.000000000 +0900
+++ backend/kodakaio.c	2012-08-29 16:35:36.000000000 +0900
@@ -165,6 +165,10 @@
 #include <math.h>
 #include <poll.h>
 #include <time.h>
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 #if HAVE_CUPS
 /* used for auto detecting network printers  */




--- backend/kvs40xx.h.orig	2012-08-20 05:27:18.000000000 +0900
+++ backend/kvs40xx.h	2012-08-29 17:01:58.000000000 +0900
@@ -10,6 +10,7 @@
 
 #include "../include/sane/config.h"
 #include <semaphore.h>
+#include <pthread.h>
 
 #undef  BACKEND_NAME
 #define BACKEND_NAME kvs40xx
@@ -208,7 +209,7 @@
 SANE_Status kvs40xx_document_exist (struct scanner *s);
 SANE_Status get_buffer_status (struct scanner *s, unsigned *data_avalible);
 SANE_Status kvs40xx_scan (struct scanner *s);
-SANE_Status kvs40xx_sense_handler (int fd, u_char * sense_buffer, void *arg);
+SANE_Status kvs40xx_sense_handler (int fd, unsigned char * sense_buffer, void *arg);
 SANE_Status stop_adf (struct scanner *s);
 SANE_Status hopper_down (struct scanner *s);
 SANE_Status inquiry (struct scanner *s, char *id);

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__kvs40xx_opt.c (+10 lines)
	1	--- backend/kvs40xx_opt.c.orig 2012-08-10 09:33:29.000000000 +0900
	2	+++ backend/kvs40xx_opt.c 2012-08-29 16:57:47.000000000 +0900
	3	@@ -8,6 +8,7 @@
	4
	5	#include "../include/sane/config.h"
	6
	7	+#include <stdlib.h>
	8	#include <string.h>
	9	#define DEBUG_DECLARE_ONLY
	10	#define BACKEND_NAME kvs40xx

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-backend__magicolor.c (-11 lines)
1	--- backend/magicolor.c.orig 2011-01-31 03:49:46.000000000 +0900
2	+++ backend/magicolor.c 2011-08-02 02:38:15.000000000 +0900
3	@@ -50,6 +50,8 @@
4	#include <unistd.h>
5	#include <errno.h>
6	#include <sys/time.h>
7	+#include <sys/types.h>
8	+#include <sys/socket.h>
9	#include <math.h>
10	#include <poll.h>
11




--- backend/niash.c.orig	2006-02-04 12:34:28.000000000 +0100
+++ backend/niash.c	2007-02-21 15:38:12.000000000 +0100
@@ -89,7 +89,9 @@ typedef enum
   optLamp,
 
   optCalibrate,
-  optGamma                      /* analog gamma = single number */
+  optGamma,                     /* analog gamma = single number */
+/* have optEndOfList only to define arrays with sufficient size */
+  optEndOfList
 } EOptionIndex;
 
 
@@ -105,8 +107,8 @@ typedef union
 
 typedef struct
 {
-  SANE_Option_Descriptor aOptions[optLast];
-  TOptionValue aValues[optLast];
+  SANE_Option_Descriptor aOptions[optEndOfList];
+  TOptionValue aValues[optEndOfList];
 
   TScanParams ScanParams;
   THWParams HWParams;

Lines 1-11 Link Here

(-)graphics/sane-backends/files/patch-backend__xerox_mfp-tcp.c (-11 lines)
1	--- backend/xerox_mfp-tcp.c.orig 2010-12-02 08:49:58.000000000 +0900
2	+++ backend/xerox_mfp-tcp.c 2011-08-02 02:37:27.000000000 +0900
3	@@ -27,6 +27,8 @@
4	#include <unistd.h>
5	#include <errno.h>
6	#include <sys/time.h>
7	+#include <sys/types.h>
8	+#include <sys/socket.h>
9
10	#include "sane/saneopts.h"
11	#include "sane/sanei_scsi.h"




--- 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)" \
-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
+	"$(DESTDIR)$(man8dir)"
 man7dir = $(mandir)/man7
 man8dir = $(mandir)/man8
 NROFF = nroff
@@ -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)'; 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)
@@ -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)'; 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)
@@ -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)"
 	@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
 
 uninstall-nobase_dist_docDATA:
 	@$(NORMAL_UNINSTALL)

Lines 1-11 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

Lines 1-10 Link Here

(-)graphics/sane-backends/files/patch-include_sane_sanei_tcp.h (-10 lines)
1	--- include/sane/sanei_tcp.h.orig 2006-11-30 14:23:19.000000000 -0900
2	+++ include/sane/sanei_tcp.h 2009-01-16 05:02:42.000000000 -0900
3	@@ -20,6 +20,7 @@
4
5	#include <sane/sane.h>
6
7	+#include <sys/types.h>
8	#include <netinet/in.h>
9	#include <netdb.h>
10




--- sanei/sanei_usb.c.orig	2009-07-26 21:29:33.000000000 +0200
+++ sanei/sanei_usb.c	2009-07-26 21:31:42.000000000 +0200
@@ -96,7 +96,8 @@
 }
 #endif /* HAVE_USBCALLS */
 
-#if defined (__FreeBSD__) 
+#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064))
+#include <sys/param.h>
 #include <dev/usb/usb.h>
 #endif /* __FreeBSD__ */
 #if defined (__DragonFly__)
@@ -273,7 +274,7 @@
     *vendorID = vendor;
     *productID = product;
   }
-#elif defined (__FreeBSD__) || defined (__DragonFly__)
+#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__)
   {
     int controller;
     int ctrl_fd;

Lines 38-43 Link Here

(-)graphics/sane-backends/pkg-plist (+9 lines)
38	@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	38	@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
39	@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	39	@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
40	@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	40	@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
		41	@unexec if cmp -s %D/etc/sane.d/kodakaio.conf %D/etc/sane.d/dist/kodakaio.conf; then rm -f %D/etc/sane.d/kodakaio.conf; fi
41	@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	42	@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
42	@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	43	@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
43	@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	44	@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
Lines 113-118 Link Here
113	etc/sane.d/dist/hs2p.conf	114	etc/sane.d/dist/hs2p.conf
114	etc/sane.d/dist/ibm.conf	115	etc/sane.d/dist/ibm.conf
115	etc/sane.d/dist/kodak.conf	116	etc/sane.d/dist/kodak.conf
		117	etc/sane.d/dist/kodakaio.conf
116	etc/sane.d/dist/leo.conf	118	etc/sane.d/dist/leo.conf
117	etc/sane.d/dist/lexmark.conf	119	etc/sane.d/dist/lexmark.conf
118	etc/sane.d/dist/ma1509.conf	120	etc/sane.d/dist/ma1509.conf
Lines 276-287 Link Here
276	lib/sane/libsane-kodak.la	278	lib/sane/libsane-kodak.la
277	lib/sane/libsane-kodak.so	279	lib/sane/libsane-kodak.so
278	lib/sane/libsane-kodak.so.1	280	lib/sane/libsane-kodak.so.1
		281	lib/sane/libsane-kodakaio.la
		282	lib/sane/libsane-kodakaio.so
		283	lib/sane/libsane-kodakaio.so.1
279	lib/sane/libsane-kvs1025.la	284	lib/sane/libsane-kvs1025.la
280	lib/sane/libsane-kvs1025.so	285	lib/sane/libsane-kvs1025.so
281	lib/sane/libsane-kvs1025.so.1	286	lib/sane/libsane-kvs1025.so.1
282	lib/sane/libsane-kvs20xx.la	287	lib/sane/libsane-kvs20xx.la
283	lib/sane/libsane-kvs20xx.so	288	lib/sane/libsane-kvs20xx.so
284	lib/sane/libsane-kvs20xx.so.1	289	lib/sane/libsane-kvs20xx.so.1
		290	lib/sane/libsane-kvs40xx.la
		291	lib/sane/libsane-kvs40xx.so
		292	lib/sane/libsane-kvs40xx.so.1
285	lib/sane/libsane-leo.la	293	lib/sane/libsane-leo.la
286	lib/sane/libsane-leo.so	294	lib/sane/libsane-leo.so
287	lib/sane/libsane-leo.so.1	295	lib/sane/libsane-leo.so.1
Lines 402-407 Link Here
402	lib/sane/libsane-xerox_mfp.la	410	lib/sane/libsane-xerox_mfp.la
403	lib/sane/libsane-xerox_mfp.so	411	lib/sane/libsane-xerox_mfp.so
404	lib/sane/libsane-xerox_mfp.so.1	412	lib/sane/libsane-xerox_mfp.so.1
		413	libdata/pkgconfig/sane-backends.pc
405	sbin/saned	414	sbin/saned
406	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	415	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
407	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog	416	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog

Return to bug 172022

Lines 1-45 Link Here

(-)graphics/sane-backends/Makefile (-31 / +46 lines)
1	# New ports collection makefile for: sane-backends	1	# Created by: gary@hotlava.com
2	# Date created: Sat Jul 19 16:23:10 MET DST 1997
3	# Whom: gary@hotlava.com
4	#
5	# $FreeBSD: ports/graphics/sane-backends/Makefile,v 1.106 2012/06/27 10:35:47 ale Exp $	2	# $FreeBSD: ports/graphics/sane-backends/Makefile,v 1.106 2012/06/27 10:35:47 ale Exp $
6	#
7		3
8	PORTNAME= sane-backends	4	PORTNAME= sane-backends
9	PORTVERSION= 1.0.22	5	PORTVERSION= 1.0.23
10	PORTREVISION= 2
11	CATEGORIES= graphics	6	CATEGORIES= graphics
12	MASTER_SITES= http://alioth.debian.org/frs/download.php/3503/ \	7	MASTER_SITES= http://alioth.debian.org/frs/download.php/3752/:3752 \
13	ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/	8	http://alioth.debian.org/frs/download.php/3753/:3753 \
14	MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION}	9	http://alioth.debian.org/frs/download.php/3754/:3754
		10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}.1:3752 \
		11	${DISTNAME}${EXTRACT_SUFX}.2:3753 \
		12	${DISTNAME}${EXTRACT_SUFX}.3:3754
		13	EXTRACT_ONLY= # need to concatenate before extraction
15		14
16	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
17	COMMENT= API for access to scanners, digitals camera, frame grabbers etc	16	COMMENT= API for access to scanners, digitals camera, frame grabbers etc
18		17
19	LICENSE= GPLv2 GPLv3	18	LICENSE= GPLv2 # (or later)
20	LICENSE_COMB= dual
21		19
22	LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \	20	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
23	tiff.4:${PORTSDIR}/graphics/tiff	21	tiff:${PORTSDIR}/graphics/tiff
24
25	OPTIONS_DEFINE= USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 DOCS
26	OPTIONS_DEFAULT= USB
27		22
		23	OPTIONS_DEFINE= USB NLS GPHOTO2 SNMP AVAHI IEEE1284 IPV6 CUPS DOCS
		24	OPTIONS_DEFAULT=USB
28	USB_DESC= USB support	25	USB_DESC= USB support
29	GPHOTO2_DESC= gPhoto2 support	26	GPHOTO2_DESC= gPhoto2 support
30	IEEE1284_DESC= libieee1284 support	27	IEEE1284_DESC= libieee1284 support
31		28
		29	USE_GNOME= gnomehack
		30	USE_PKGCONFIG= build
32	USE_GMAKE= yes	31	USE_GMAKE= yes
33	GNU_CONFIGURE= yes	32	GNU_CONFIGURE= yes
34	CONFIGURE_ARGS= --with-docdir=${DOCSDIR} \	33	CONFIGURE_ARGS= --with-docdir=${WRKDIR}/tmproot \
35	--disable-latex \	34	--disable-latex \
36	--disable-locking \	35	--disable-locking \
37	--enable-pthread	36	--enable-pthread
38	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
39	MAKE_JOBS_UNSAFE= yes	38	MAKE_JOBS_SAFE= yes
40		39
41	USE_RC_SUBR= saned	40	USE_RC_SUBR= saned
42	SUB_FILES+= pkg-message	41	SUB_FILES= pkg-message
43		42
44	USERS= saned	43	USERS= saned
45	GROUPS= saned	44	GROUPS= saned
Lines 50-62 Link Here
50	.include "Makefile.man"	49	.include "Makefile.man"
51	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
52		51
53	.if empty(PORT_OPTIONS:MDOCS)
54	MAKE_ENV+= NOPORTDOCS=1
55	.endif
56
57	.if ${PORT_OPTIONS:MUSB}	52	.if ${PORT_OPTIONS:MUSB}
58	.if ${OSVERSION} < 800069	53	.if ${OSVERSION} < 800069
59	LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb	54	LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
60	.endif	55	.endif
61	.else	56	.else
62	CONFIGURE_ARGS+= --disable-libusb	57	CONFIGURE_ARGS+= --disable-libusb
Lines 75-81 Link Here
75	.endif	70	.endif
76		71
77	.if ${PORT_OPTIONS:MGPHOTO2}	72	.if ${PORT_OPTIONS:MGPHOTO2}
78	LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2	73	LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2
79	MAN5+= sane-gphoto2.5	74	MAN5+= sane-gphoto2.5
80	PLIST_SUB+= GPHOTO2=""	75	PLIST_SUB+= GPHOTO2=""
81	.else	76	.else
Lines 84-112 Link Here
84	.endif	79	.endif
85		80
86	.if ${PORT_OPTIONS:MSNMP}	81	.if ${PORT_OPTIONS:MSNMP}
87	LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp	82	LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
88	.else	83	.else
89	CONFIGURE_ARGS+= --without-snmp	84	CONFIGURE_ARGS+= --without-snmp
90	.endif	85	.endif
91		86
92	.if ${PORT_OPTIONS:MAVAHI}	87	.if ${PORT_OPTIONS:MAVAHI}
93	LIB_DEPENDS+= avahi-client.3:${PORTSDIR}/net/avahi-app	88	LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app
94	CONFIGURE_ARGS+= --enable-avahi	89	CONFIGURE_ARGS+= --enable-avahi
95	.endif	90	.endif
96		91
97	.if ${PORT_OPTIONS:MIEEE1284}	92	.if ${PORT_OPTIONS:MIEEE1284}
98	LIB_DEPENDS+= ieee1284.5:${PORTSDIR}/sysutils/libieee1284	93	LIB_DEPENDS+= ieee1284:${PORTSDIR}/sysutils/libieee1284
99	PLIST_SUB+= IEEE1284=""	94	PLIST_SUB+= IEEE1284=""
		95	MAN5+= sane-canon_pp.5 sane-hpsj5s.5 sane-mustek_pp.5
100	.else	96	.else
101	CONFIGURE_ENV+= sane_cv_use_libieee1284=no	97	CONFIGURE_ENV+= sane_cv_use_libieee1284=no
102	PLIST_SUB+= IEEE1284="@comment "	98	PLIST_SUB+= IEEE1284="@comment "
103	.endif	99	.endif
104		100
		101	.if ${PORT_OPTIONS:MCUPS}
		102	LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client
		103	.else
		104	CONFIGURE_ENV+= ac_cv_header_cups_cups_h=no
		105	.endif
		106
		107	post-extract:
		108	@((cd ${DISTDIR} && ${CAT} ${DISTFILES:C/:[^:]+$//}) \| (cd ${WRKDIR} \
		109	&& ${EXTRACT_CMD} ${EXTRACT_BEFOR_ARGS} ${EXTRACT_AFTER_ARGS}))
		110
105	post-patch:	111	post-patch:
106	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|\|g ; \	112	@${REINPLACE_CMD} -e '/^for ac_header in/s\|libc.h\|cups/cups.h\| ; \
107	s\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure	113	s\|-e .*/cups.h\|"$$ac_cv_header_cups_cups_h" = "yes"\| ; \
		114	s\|-pthread\|${PTHREAD_LIBS}\|' ${WRKSRC}/configure
		115	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s\|COPYING\|\|' \
		116	${WRKSRC}/Makefile.in
		117	@${REINPLACE_CMD} -e '/^pkgconfigdir/s\|@libdir@\|@prefix@/libdata\|' \
		118	${WRKSRC}/tools/Makefile.in
108		119
109	post-install:	120	post-install:
		121	.if ${PORT_OPTIONS:MDOCS}
		122	@${MKDIR} ${DOCSDIR}
		123	@(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
		124	.endif
110	@${CAT} ${PKGMESSAGE}	125	@${CAT} ${PKGMESSAGE}
111		126
112	.include <bsd.port.post.mk>	127	.include <bsd.port.post.mk>

Lines 1-45 Link Here

(-)graphics/sane-backends/files/patch-Makefile.in (-45 lines)
1	--- Makefile.in.orig 2010-04-14 09:52:59.000000000 +0900
2	+++ Makefile.in 2010-05-10 21:48:54.000000000 +0900
3	@@ -82,7 +82,6 @@
4	am__base_list = \
5	sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
6	sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
7	-am__installdirs = "$(DESTDIR)$(docdir)"
8	DATA = $(dist_doc_DATA)
9	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
10	distclean-recursive maintainer-clean-recursive
11	@@ -292,7 +291,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	@@ -375,6 +374,7 @@
21	distclean-libtool:
22	-rm -f libtool config.lt
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)'; test -n "$(docdir)" \|\| list=; \
28	@@ -386,6 +386,7 @@
29	echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
30	$(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" \|\| exit $$?; \
31	done
32	+endif
33
34	uninstall-dist_docDATA:
35	@$(NORMAL_UNINSTALL)
36	@@ -710,9 +711,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-73 Link Here

(-)graphics/sane-backends/files/patch-backend-xerox_mfp.c (-73 lines)
1	From 5ea227caeacd504b64eef301e83fa63e0a25b3f7 Mon Sep 17 00:00:00 2001
2	From: Alex Belkin <abc@telekom.ru>
3	Date: Tue, 8 Mar 2011 17:57:19 +0300
4	Subject: [PATCH] keep usb device by default (correct for bug introduced by tcp sub-backend
5
6	---
7	backend/xerox_mfp.c \| 27 +++++++++++----------------
8	1 files changed, 11 insertions(+), 16 deletions(-)
9
10	diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
11	index e08b50f..d4672a7 100644
12	--- backend/xerox_mfp.c.orig
13	+++ backend/xerox_mfp.c
14	@@ -37,10 +37,10 @@
15	static const SANE_Device *devlist = NULL; / sane_get_devices array */
16	static struct device devices_head = NULL; / sane_get_devices list */
17
18	-transport available_transports[] = {
19	+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
20	+transport available_transports[TRANSPORTS_MAX] = {
21	{ "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
22	{ "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
23	- { 0 }
24	};
25
26	static int resolv_state(int state)
27	@@ -824,7 +824,13 @@ free_devices (void)
28	devices_head = NULL;
29	}
30
31	-/* SANE API ignores return code of this callback */
32	+static transport *tr_from_devname(SANE_String_Const devname)
33	+{
34	+ if (strncmp("tcp", devname, 3) == 0)
35	+ return &available_transports[TRANSPORT_TCP];
36	+ return &available_transports[TRANSPORT_USB];
37	+}
38	+
39	static SANE_Status
40	list_one_device (SANE_String_Const devname)
41	{
42	@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
43	return SANE_STATUS_GOOD;
44	}
45
46	- for (tr = available_transports; tr->ttype; tr++) {
47	- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
48	- break;
49	- }
50	- if (!tr->ttype)
51	- return SANE_STATUS_INVAL;
52	+ tr = tr_from_devname(devname);
53
54	dev = calloc (1, sizeof (struct device));
55	if (dev == NULL)
56	@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
57	static SANE_Status
58	list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
59	{
60	- transport *tr;
61	-
62	- for (tr = available_transports; tr->ttype; tr++) {
63	- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
64	- return tr->configure_device(devname, list_one_device);
65	- }
66	- return SANE_STATUS_INVAL;
67	+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
68	}
69
70	SANE_Status
71	--
72	1.7.2.5
73

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__kodakaio.c (+13 lines)
	1	--- backend/kodakaio.c.orig 2012-08-10 09:33:29.000000000 +0900
	2	+++ backend/kodakaio.c 2012-08-29 16:35:36.000000000 +0900
	3	@@ -165,6 +165,10 @@
	4	#include <math.h>
	5	#include <poll.h>
	6	#include <time.h>
	7	+#include <sys/types.h>
	8	+#ifdef HAVE_SYS_SOCKET_H
	9	+#include <sys/socket.h>
	10	+#endif
	11
	12	#if HAVE_CUPS
	13	/* used for auto detecting network printers */

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__kvs40xx.h (+19 lines)
	1	--- backend/kvs40xx.h.orig 2012-08-20 05:27:18.000000000 +0900
	2	+++ backend/kvs40xx.h 2012-08-29 17:01:58.000000000 +0900
	3	@@ -10,6 +10,7 @@
	4
	5	#include "../include/sane/config.h"
	6	#include <semaphore.h>
	7	+#include <pthread.h>
	8
	9	#undef BACKEND_NAME
	10	#define BACKEND_NAME kvs40xx
	11	@@ -208,7 +209,7 @@
	12	SANE_Status kvs40xx_document_exist (struct scanner *s);
	13	SANE_Status get_buffer_status (struct scanner s, unsigned data_avalible);
	14	SANE_Status kvs40xx_scan (struct scanner *s);
	15	-SANE_Status kvs40xx_sense_handler (int fd, u_char * sense_buffer, void *arg);
	16	+SANE_Status kvs40xx_sense_handler (int fd, unsigned char * sense_buffer, void *arg);
	17	SANE_Status stop_adf (struct scanner *s);
	18	SANE_Status hopper_down (struct scanner *s);
	19	SANE_Status inquiry (struct scanner s, char id);

Line 0 Link Here

(-)graphics/sane-backends/files/patch-backend__niash.c (+24 lines)
	1	--- backend/niash.c.orig 2006-02-04 12:34:28.000000000 +0100
	2	+++ backend/niash.c 2007-02-21 15:38:12.000000000 +0100
	3	@@ -89,7 +89,9 @@ typedef enum
	4	optLamp,
	5
	6	optCalibrate,
	7	- optGamma /* analog gamma = single number */
	8	+ optGamma, /* analog gamma = single number */
	9	+/* have optEndOfList only to define arrays with sufficient size */
	10	+ optEndOfList
	11	} EOptionIndex;
	12
	13
	14	@@ -105,8 +107,8 @@ typedef union
	15
	16	typedef struct
	17	{
	18	- SANE_Option_Descriptor aOptions[optLast];
	19	- TOptionValue aValues[optLast];
	20	+ SANE_Option_Descriptor aOptions[optEndOfList];
	21	+ TOptionValue aValues[optEndOfList];
	22
	23	TScanParams ScanParams;
	24	THWParams HWParams;

Lines 1-60 Link Here

(-)graphics/sane-backends/files/patch-doc_Makefile.in (-60 lines)
1	--- doc/Makefile.in.orig 2010-04-14 09:52:59.000000000 +0900
2	+++ doc/Makefile.in 2010-05-10 22:02:46.000000000 +0900
3	@@ -73,8 +73,7 @@
4	sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
5	man1dir = $(mandir)/man1
6	am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" \
7	- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(docdir)" \
8	- "$(DESTDIR)$(docdir)" "$(DESTDIR)$(docdir)"
9	+ "$(DESTDIR)$(man8dir)"
10	man7dir = $(mandir)/man7
11	man8dir = $(mandir)/man8
12	NROFF = nroff
13	@@ -559,6 +558,7 @@
14	echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
15	cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
16	install-dist_docDATA: $(dist_doc_DATA)
17	+ifndef NOPORTDOCS
18	@$(NORMAL_INSTALL)
19	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
20	@list='$(dist_doc_DATA)'; test -n "$(docdir)" \|\| list=; \
21	@@ -570,6 +570,7 @@
22	echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
23	$(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" \|\| exit $$?; \
24	done
25	+endif
26
27	uninstall-dist_docDATA:
28	@$(NORMAL_UNINSTALL)
29	@@ -579,6 +580,7 @@
30	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
31	cd "$(DESTDIR)$(docdir)" && rm -f $$files
32	install-docDATA: $(doc_DATA)
33	+ifndef NOPORTDOCS
34	@$(NORMAL_INSTALL)
35	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
36	@list='$(doc_DATA)'; test -n "$(docdir)" \|\| list=; \
37	@@ -590,6 +592,7 @@
38	echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
39	$(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" \|\| exit $$?; \
40	done
41	+endif
42
43	uninstall-docDATA:
44	@$(NORMAL_UNINSTALL)
45	@@ -599,6 +602,7 @@
46	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
47	cd "$(DESTDIR)$(docdir)" && rm -f $$files
48	install-nobase_dist_docDATA: $(nobase_dist_doc_DATA)
49	+ifndef NOPORTDOCS
50	@$(NORMAL_INSTALL)
51	test -z "$(docdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(docdir)"
52	@list='$(nobase_dist_doc_DATA)'; test -n "$(docdir)" \|\| list=; \
53	@@ -613,6 +617,7 @@
54	echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(docdir)/$$dir'"; \
55	$(INSTALL_DATA) $$xfiles "$(DESTDIR)$(docdir)/$$dir" \|\| exit $$?; }; \
56	done
57	+endif
58
59	uninstall-nobase_dist_docDATA:
60	@$(NORMAL_UNINSTALL)

Lines 1-21 Link Here

(-)graphics/sane-backends/files/patch-sanei_sanei_usb.c (-21 lines)
1	--- sanei/sanei_usb.c.orig 2009-07-26 21:29:33.000000000 +0200
2	+++ sanei/sanei_usb.c 2009-07-26 21:31:42.000000000 +0200
3	@@ -96,7 +96,8 @@
4	}
5	#endif /* HAVE_USBCALLS */
6
7	-#if defined (__FreeBSD__)
8	+#if (defined (__FreeBSD__) && (__FreeBSD_version < 800064))
9	+#include <sys/param.h>
10	#include <dev/usb/usb.h>
11	#endif /* __FreeBSD__ */
12	#if defined (__DragonFly__)
13	@@ -273,7 +274,7 @@
14	*vendorID = vendor;
15	*productID = product;
16	}
17	-#elif defined (__FreeBSD__) \|\| defined (__DragonFly__)
18	+#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) \|\| defined (__DragonFly__)
19	{
20	int controller;
21	int ctrl_fd;