From d257fd9c86ab9f4bf75bd5c7918c6728844d3da3 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 25 Aug 2002 19:21:43 +0000
Subject: Merge changes in packages from the buildlink2 branch that have
 buildlink2.mk files back into the main trunk.

---
 graphics/sane-backends/Makefile.common  |  2 +-
 graphics/sane-backends/PLIST            |  2 +-
 graphics/sane-backends/buildlink2.mk    | 22 ++++++++++++++++++++++
 graphics/sane-backends/distinfo         |  2 +-
 graphics/sane-backends/patches/patch-aa |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 graphics/sane-backends/buildlink2.mk

(limited to 'graphics/sane-backends')

diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 4378c4c3ccf..298d4d00d86 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2002/08/19 19:17:03 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.3 2002/08/25 19:22:53 jlam Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 29ecfa3fb20..0736e318a5e 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/19 19:17:04 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:53 jlam Exp $
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
diff --git a/graphics/sane-backends/buildlink2.mk b/graphics/sane-backends/buildlink2.mk
new file mode 100644
index 00000000000..876390b35b2
--- /dev/null
+++ b/graphics/sane-backends/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:54 jlam Exp $
+
+.if !defined(SANE_BUILDLINK2_MK)
+SANE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		sane
+BUILDLINK_DEPENDS.sane?=	sane-backends>=1.0.3
+BUILDLINK_PKGSRCDIR.sane?=	../../graphics/sane-backends
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.sane=sane-backends
+BUILDLINK_PREFIX.sane_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.sane=		include/sane/*.h
+BUILDLINK_FILES.sane+=		lib/libsane.*
+
+.include "../../devel/libusb/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	sane-buildlink
+
+sane-buildlink: _BUILDLINK_USE
+
+.endif	# SANE_BUILDLINK2_MK
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index f86fa80337c..af47a12a3db 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/19 19:17:04 mycroft Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 19:22:54 jlam Exp $
 
 SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a
 Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 015b78b3531..a96762d63eb 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2002/08/19 19:17:05 mycroft Exp $
+$NetBSD: patch-aa,v 1.6 2002/08/25 19:22:54 jlam Exp $
 
 --- doc/Makefile.in.orig	Sun May  5 16:59:45 2002
 +++ doc/Makefile.in	Sat Jul 13 03:15:58 2002
-- 
cgit v1.2.3