Upgrade to 1.0, add cam support. (i hope it can work on 2.2.x)

3 files changed, 60 insertions, 30 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 72a9231aaea2..6e89b6e9daf4 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,30 +1,40 @@
 # New ports collection makefile for:	sane
-# Version required:     0.74
-# Date created:         Sat Jul 19 16:23:10 MET DST 1997
-# Whom:                 gary@hotlava.com
-#			obrien@FreeBSD.org
+# Version required:		1.00
+# Date created:			Sat Jul 19 16:23:10 MET DST 1997
+# Whom:				gary@hotlava.com
+#				obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.10 1998/10/05 03:04:00 steve Exp $
+# $Id: Makefile,v 1.11 1998/10/05 03:04:39 steve Exp $
 #
 
-DISTNAME=       sane-0.74
+DISTNAME=       sane-1.00
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 		ftp://ftp.lahn.de/pub/platforms/linux/libs/
 
 MAINTAINER=	gary@hotlava.com
 
-BROKEN_ELF=	build
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+VERSION!=	sysctl -n kern.osreldate
 
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+.if ${VERSION} < 300000
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+.else
+CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lcam"
+.endif
 
 MAN1=		scanimage.1 \
 		xscanimage.1 \
 		saned.1
-MAN5=		sane-apple.5 \
+MAN5=		sane-abaton.5 \
+		sane-agfafocus.5 \
+		sane-apple.5 \
 		sane-dc25.5 \
 		sane-dll.5 \
 		sane-dmc.5 \
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 0291f079d843..c59257f0a696 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-0.74.tar.gz) = 6837f35e51966121208c77349a9cdde8
+MD5 (sane-1.00.tar.gz) = 0723e78ab57c7340a0b8180a546c3871
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index cabfe485caf6..9582e68779e0 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -1,9 +1,12 @@
 bin/scanimage
 bin/xcam
 bin/xscanimage
+etc/sane.d/abaton.conf
+etc/sane.d/agfafocus.conf
 etc/sane.d/apple.conf
 etc/sane.d/artec.conf
 etc/sane.d/coolscan.conf
+etc/sane.d/dc210.conf
 etc/sane.d/dc25.conf
 etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
@@ -13,6 +16,7 @@ etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
 etc/sane.d/net.conf
+etc/sane.d/ricoh.conf
 etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
 etc/sane.d/snapscan.conf
@@ -31,79 +35,95 @@ include/sane/sanei_wire.h
 include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.so
-lib/libsane.so.0.74
+lib/libsane.so.1
+lib/sane/libsane-abaton.a
+lib/sane/libsane-abaton.la
+lib/sane/libsane-abaton.so
+lib/sane/libsane-abaton.so.1
+lib/sane/libsane-agfafocus.a
+lib/sane/libsane-agfafocus.la
+lib/sane/libsane-agfafocus.so
+lib/sane/libsane-agfafocus.so.1
 lib/sane/libsane-apple.a
 lib/sane/libsane-apple.la
 lib/sane/libsane-apple.so
-lib/sane/libsane-apple.so.0.74
+lib/sane/libsane-apple.so.1
 lib/sane/libsane-artec.a
 lib/sane/libsane-artec.la
 lib/sane/libsane-artec.so
-lib/sane/libsane-artec.so.0.74
+lib/sane/libsane-artec.so.1
 lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon.so
-lib/sane/libsane-canon.so.0.74
+lib/sane/libsane-canon.so.1
 lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.so.0.74
+lib/sane/libsane-coolscan.so.1
+lib/sane/libsane-dc210.a
+lib/sane/libsane-dc210.la
+lib/sane/libsane-dc210.so
+lib/sane/libsane-dc210.so.1
 lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so
-lib/sane/libsane-dc25.so.0.74
+lib/sane/libsane-dc25.so.1
 lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
 lib/sane/libsane-dll.so
-lib/sane/libsane-dll.so.0.74
+lib/sane/libsane-dll.so.1
 lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.la
 lib/sane/libsane-dmc.so
-lib/sane/libsane-dmc.so.0.74
+lib/sane/libsane-dmc.so.1
 lib/sane/libsane-epson.a
 lib/sane/libsane-epson.la
 lib/sane/libsane-epson.so
-lib/sane/libsane-epson.so.0.74
+lib/sane/libsane-epson.so.1
 lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so
-lib/sane/libsane-hp.so.0.74
+lib/sane/libsane-hp.so.1
 lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek.so
-lib/sane/libsane-microtek.so.0.74
+lib/sane/libsane-microtek.so.1
 lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.la
 lib/sane/libsane-microtek2.so
-lib/sane/libsane-microtek2.so.0.74
+lib/sane/libsane-microtek2.so.1
 lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so
-lib/sane/libsane-mustek.so.0.74
+lib/sane/libsane-mustek.so.1
 lib/sane/libsane-net.a
 lib/sane/libsane-net.la
 lib/sane/libsane-net.so
-lib/sane/libsane-net.so.0.74
+lib/sane/libsane-net.so.1
 lib/sane/libsane-pnm.a
 lib/sane/libsane-pnm.la
 lib/sane/libsane-pnm.so
-lib/sane/libsane-pnm.so.0.74
+lib/sane/libsane-pnm.so.1
+lib/sane/libsane-ricoh.a
+lib/sane/libsane-ricoh.la
+lib/sane/libsane-ricoh.so
+lib/sane/libsane-ricoh.so.1
 lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so
-lib/sane/libsane-s9036.so.0.74
+lib/sane/libsane-s9036.so.1
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so
-lib/sane/libsane-snapscan.so.0.74
+lib/sane/libsane-snapscan.so.1
 lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so
-lib/sane/libsane-tamarack.so.0.74
+lib/sane/libsane-tamarack.so.1
 lib/sane/libsane-umax.a
 lib/sane/libsane-umax.la
 lib/sane/libsane-umax.so
-lib/sane/libsane-umax.so.0.74
+lib/sane/libsane-umax.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 sbin/saned