[pkgsrc/trunk]: pkgsrc/graphics/sane-backends Solaris fixes:

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/59e6d01bbf5d
branches:  trunk
changeset: 471179:59e6d01bbf5d
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Sat Mar 20 21:18:41 2004 +0000

description:
Solaris fixes:
- this package uses msgfmt
- locale files are always installed in share/locale
- don't depend on libusb on solaris
- libsane-pint and libsane-sm3600 are not installed on solaris

diffstat:

 graphics/sane-backends/Makefile      |  14 +++++++++++-
 graphics/sane-backends/PLIST         |  38 ++++++++++++++++++------------------
 graphics/sane-backends/buildlink2.mk |   6 +++-
 3 files changed, 35 insertions(+), 23 deletions(-)

diffs (113 lines):

diff -r 4ab6ade6c231 -r 59e6d01bbf5d graphics/sane-backends/Makefile
--- a/graphics/sane-backends/Makefile   Sat Mar 20 20:21:22 2004 +0000
+++ b/graphics/sane-backends/Makefile   Sat Mar 20 21:18:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/12/10 17:15:04 jdolecek Exp $
+# $NetBSD: Makefile,v 1.16 2004/03/20 21:18:41 bouyer Exp $
 
 .include "Makefile.common"
 COMMENT=       API for access to scanners, digitals camera, frame grabbers etc.
@@ -8,6 +8,16 @@
 
 SANE_MICRO=    12
 
-.include "../../devel/libusb/buildlink2.mk"
+BUILD_USES_MSGFMT=     YES
+
+.if (${OPSYS} == "SunOS")
+PLIST_SUBST+=   NOT_SUNOS="@comment "
+.else
+PLIST_SUBST+=   NOT_SUNOS=""
+.endif
+
+.if (${OPSYS} != "SunOS")
+. include "../../devel/libusb/buildlink2.mk"
+.endif
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4ab6ade6c231 -r 59e6d01bbf5d graphics/sane-backends/PLIST
--- a/graphics/sane-backends/PLIST      Sat Mar 20 20:21:22 2004 +0000
+++ b/graphics/sane-backends/PLIST      Sat Mar 20 21:18:41 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/06/29 10:16:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/03/20 21:18:41 bouyer Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -230,11 +230,11 @@
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.${SANE_MAJOR}
 lib/sane/libsane-pie.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-pint.a
-lib/sane/libsane-pint.la
-lib/sane/libsane-pint.so
-lib/sane/libsane-pint.so.${SANE_MAJOR}
-lib/sane/libsane-pint.so.${SANE_MAJOR}.${SANE_MICRO}
+${NOT_SUNOS}lib/sane/libsane-pint.a
+${NOT_SUNOS}lib/sane/libsane-pint.la
+${NOT_SUNOS}lib/sane/libsane-pint.so
+${NOT_SUNOS}lib/sane/libsane-pint.so.${SANE_MAJOR}
+${NOT_SUNOS}lib/sane/libsane-pint.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-plustek.a
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.so
@@ -260,11 +260,11 @@
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.${SANE_MAJOR}
 lib/sane/libsane-sharp.so.${SANE_MAJOR}.${SANE_MICRO}
-lib/sane/libsane-sm3600.a
-lib/sane/libsane-sm3600.la
-lib/sane/libsane-sm3600.so
-lib/sane/libsane-sm3600.so.${SANE_MAJOR}
-lib/sane/libsane-sm3600.so.${SANE_MAJOR}.${SANE_MICRO}
+${NOT_SUNOS}lib/sane/libsane-sm3600.a
+${NOT_SUNOS}lib/sane/libsane-sm3600.la
+${NOT_SUNOS}lib/sane/libsane-sm3600.so
+${NOT_SUNOS}lib/sane/libsane-sm3600.so.${SANE_MAJOR}
+${NOT_SUNOS}lib/sane/libsane-sm3600.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so
@@ -467,14 +467,14 @@
 share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES
 share/doc/sane-${SANE_VERSION}/umax/umax.FAQ
 share/doc/sane-${SANE_VERSION}/umax/umax.TODO
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sane-backends.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo
+share/locale/de/LC_MESSAGES/sane-backends.mo
+share/locale/es/LC_MESSAGES/sane-backends.mo
+share/locale/fr/LC_MESSAGES/sane-backends.mo
+share/locale/nl/LC_MESSAGES/sane-backends.mo
+share/locale/no/LC_MESSAGES/sane-backends.mo
+share/locale/pt/LC_MESSAGES/sane-backends.mo
+share/locale/ru/LC_MESSAGES/sane-backends.mo
+share/locale/sv/LC_MESSAGES/sane-backends.mo
 @dirrm share/doc/sane-${SANE_VERSION}/umax
 @dirrm share/doc/sane-${SANE_VERSION}/teco
 @dirrm share/doc/sane-${SANE_VERSION}/sceptre
diff -r 4ab6ade6c231 -r 59e6d01bbf5d graphics/sane-backends/buildlink2.mk
--- a/graphics/sane-backends/buildlink2.mk      Sat Mar 20 20:21:22 2004 +0000
+++ b/graphics/sane-backends/buildlink2.mk      Sat Mar 20 21:18:41 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:54 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/20 21:18:41 bouyer Exp $
 
 .if !defined(SANE_BUILDLINK2_MK)
 SANE_BUILDLINK2_MK=    # defined
@@ -12,7 +12,9 @@
 BUILDLINK_FILES.sane=          include/sane/*.h
 BUILDLINK_FILES.sane+=         lib/libsane.*
 
-.include "../../devel/libusb/buildlink2.mk"
+.if (${OPSYS} != "SunOS")
+. include "../../devel/libusb/buildlink2.mk"
+.endif
 .include "../../graphics/jpeg/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    sane-buildlink