summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso@pkgsrc.org>2009-08-20 03:53:20 +0000
committerhasso <hasso@pkgsrc.org>2009-08-20 03:53:20 +0000
commit20abfdb4e54fc96cad8b0c5554b9719e378111d1 (patch)
treef83ba22b32facc54171601cc2282fe1ece450f29
parentb270ed77d776dfe81869128310ac562683a1a8ab (diff)
downloadpkgsrc-20abfdb4e54fc96cad8b0c5554b9719e378111d1.tar.gz
* Make it link on DragonFly and maybe some others (sane_find_scanner needs
to be linked against libcam). * Fix PLIST for platforms not building sane-pint backend. * Bump PKGREVISION.
-rw-r--r--graphics/sane-backends/Makefile3
-rw-r--r--graphics/sane-backends/PLIST4
-rw-r--r--graphics/sane-backends/distinfo3
-rw-r--r--graphics/sane-backends/patches/patch-af13
4 files changed, 19 insertions, 4 deletions
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 55a70d9ef01..89710f504b3 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2009/08/15 17:53:11 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2009/08/20 03:53:20 hasso Exp $
PKG_DESTDIR_SUPPORT= user-destdir
@@ -7,6 +7,7 @@ COMMENT= API for access to scanners, digital cameras, frame grabbers etc.
DISTNAME= sane-backends-${SANE_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+PKGREVISION= 1
# lib/Makefile.in builds .o files and then .a, but rules for shlibs,
# while apparently independent, cause libtool to create .o again,
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 942a19042e7..37793b7efda 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/08/15 17:53:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2009/08/20 03:53:20 hasso Exp $
bin/gamma4scanimage
bin/sane-config
bin/sane-find-scanner
@@ -131,7 +131,7 @@ man/man5/sane-nec.5
man/man5/sane-net.5
man/man5/sane-niash.5
man/man5/sane-pie.5
-man/man5/sane-pint.5
+${PLIST.pint}man/man5/sane-pint.5
man/man5/sane-pixma.5
man/man5/sane-plustek.5
man/man5/sane-plustek_pp.5
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index d58fd97c62f..9216b85c72b 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2009/08/15 17:53:11 wiz Exp $
+$NetBSD: distinfo,v 1.25 2009/08/20 03:53:20 hasso Exp $
SHA1 (sane-backends-1.0.20.tar.gz) = 3b4d2ecde8be404bb44269771cf5dc6e4c10b086
RMD160 (sane-backends-1.0.20.tar.gz) = b80c0a15a75b3bce07060d65aecdcaf7860c323b
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 2fcf0110d53639ef0268a8a31d25e625b5264c11
SHA1 (patch-ac) = 7e4e710b0a570e677bdca6054ace3df07bbb909a
SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
+SHA1 (patch-af) = f2b74ea5f61591c426158ff11f07ba36a90c5acc
diff --git a/graphics/sane-backends/patches/patch-af b/graphics/sane-backends/patches/patch-af
new file mode 100644
index 00000000000..e08714f4595
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2009/08/20 03:53:20 hasso Exp $
+
+--- tools/Makefile.in.orig 2009-08-18 22:45:01 +0300
++++ tools/Makefile.in 2009-08-18 22:45:38 +0300
+@@ -270,7 +270,7 @@ sane_find_scanner_SOURCES = sane-find-sc
+ ../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@