pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/sane-backends Change the PLIST_SUBST called "...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/864d6225211a
branches:  trunk
changeset: 493799:864d6225211a
user:      reed <reed%pkgsrc.org@localhost>
date:      Sun May 15 03:13:10 2005 +0000

description:
Change the PLIST_SUBST called "NOT_SUNOS" into two different
definitions for libsane-pint and libsane-sm3600. Because
under Linux, libsane-pint is also not installed (like on Solaris)
but libsane-sm3600 is installed (like NetBSD).

Also add PLIST.Linux to add libsane-qcam, libsane-v4l la files and
config files. (The man pages were already installed.)

Sorry, I did not test on Solaris, but did test on NetBSD 1.6.2_STABLE
and Linux.

TODO: make this package honor PKG_SYSCONFDIR instead of
hard-coded ${PREFIX}/etc and use CONF_FILES too.

diffstat:

 graphics/sane-backends/Makefile    |  11 ++++++++---
 graphics/sane-backends/PLIST       |   6 +++---
 graphics/sane-backends/PLIST.Linux |   5 +++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r bd2314554a4e -r 864d6225211a graphics/sane-backends/Makefile
--- a/graphics/sane-backends/Makefile   Sun May 15 03:09:52 2005 +0000
+++ b/graphics/sane-backends/Makefile   Sun May 15 03:13:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/11/08 10:28:15 adam Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/15 03:13:10 reed Exp $
 
 .include "Makefile.common"
 COMMENT=       API for access to scanners, digitals camera, frame grabbers etc.
@@ -11,9 +11,14 @@
 CONFIGURE_ARGS+=       --with-gphoto2=no
 
 .if (${OPSYS} == "SunOS")
-PLIST_SUBST+=   NOT_SUNOS="@comment "
+PLIST_SUBST+=  SANE_PINT="@comment "
+PLIST_SUBST+=  SANE_SM3600="@comment "
+.elif (${OPSYS} == "Linux")
+PLIST_SUBST+=  SANE_PINT="@comment "
+PLIST_SUBST+=   SANE_SM3600=""
 .else
-PLIST_SUBST+=   NOT_SUNOS=""
+PLIST_SUBST+=  SANE_PINT=""
+PLIST_SUBST+=  SANE_SM3600=""
 .endif
 
 .if (${OPSYS} != "SunOS")
diff -r bd2314554a4e -r 864d6225211a graphics/sane-backends/PLIST
--- a/graphics/sane-backends/PLIST      Sun May 15 03:09:52 2005 +0000
+++ b/graphics/sane-backends/PLIST      Sun May 15 03:13:10 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/11/08 10:28:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/05/15 03:13:10 reed Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -91,14 +91,14 @@
 lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
 lib/sane/libsane-pie.la
-${NOT_SUNOS}lib/sane/libsane-pint.la
+${SANE_PINT}lib/sane/libsane-pint.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-ricoh.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
-${NOT_SUNOS}lib/sane/libsane-sm3600.la
+${SANE_SM3600}lib/sane/libsane-sm3600.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-st400.la
diff -r bd2314554a4e -r 864d6225211a graphics/sane-backends/PLIST.Linux
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/sane-backends/PLIST.Linux        Sun May 15 03:13:10 2005 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2005/05/15 03:13:10 reed Exp $
+etc/sane.d/qcam.conf
+etc/sane.d/v4l.conf
+lib/sane/libsane-qcam.la
+lib/sane/libsane-v4l.la



Home | Main Index | Thread Index | Old Index