[pkgsrc/trunk]: pkgsrc/graphics/sane-airscan sane-airscan: Fix handling of co...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdf16566e064
branches:  trunk
changeset: 443538:fdf16566e064
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Dec 15 09:32:23 2020 +0000

description:
sane-airscan: Fix handling of config files.

- Use ${PKG_SYSCONFDIR} rather than ${PREFIX}/etc.
- Avoid unnecessary SUBST.

diffstat:

 graphics/sane-airscan/Makefile                  |  15 ++++++---------
 graphics/sane-airscan/PLIST                     |   6 +++---
 graphics/sane-airscan/distinfo                  |   4 ++--
 graphics/sane-airscan/patches/patch-meson.build |  10 ++++++----
 4 files changed, 17 insertions(+), 18 deletions(-)

diffs (88 lines):

diff -r acb893c11939 -r fdf16566e064 graphics/sane-airscan/Makefile
--- a/graphics/sane-airscan/Makefile    Tue Dec 15 09:18:14 2020 +0000
+++ b/graphics/sane-airscan/Makefile    Tue Dec 15 09:32:23 2020 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2020/12/14 09:11:02 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/12/15 09:32:23 nia Exp $
 
 GITHUB_PROJECT=        sane-airscan
 GITHUB_TAG=    0.99.21
 DISTNAME=      sane-airscan-0.99.21
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=alexpevzner/}
 
@@ -14,14 +15,10 @@
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
-SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    pre-configure
-SUBST_MESSAGE.prefix=  Fix config install path
-SUBST_FILES.prefix=    meson.build
-SUBST_VARS.prefix=     PREFIX
-
-EGDIR=                 ${PREFIX}/share/examples/
-CONF_FILES=            ${EGDIR}/airscan.conf ${PREFIX}/etc/sane.d/airscan.conf
+EGDIR=                 ${PREFIX}/share/examples/sane.d
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/sane.d/dll.d
+CONF_FILES=            ${EGDIR}/dll.d/airscan ${PKG_SYSCONFDIR}/sane.d/dll.d/airscan
+CONF_FILES+=           ${EGDIR}/airscan.conf ${PKG_SYSCONFDIR}/sane.d/airscan.conf
 
 PYTHON_FOR_BUILD_ONLY= tool
 
diff -r acb893c11939 -r fdf16566e064 graphics/sane-airscan/PLIST
--- a/graphics/sane-airscan/PLIST       Tue Dec 15 09:18:14 2020 +0000
+++ b/graphics/sane-airscan/PLIST       Tue Dec 15 09:32:23 2020 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2020/12/09 12:05:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/12/15 09:32:23 nia Exp $
 bin/airscan-discover
-etc/sane.d/dll.d/airscan
 lib/sane/libsane-airscan.so
 lib/sane/libsane-airscan.so.1
 man/man1/airscan-discover.1
 man/man5/sane-airscan.5
-share/examples/airscan.conf
+share/examples/sane.d/airscan.conf
+share/examples/sane.d/dll.d/airscan
diff -r acb893c11939 -r fdf16566e064 graphics/sane-airscan/distinfo
--- a/graphics/sane-airscan/distinfo    Tue Dec 15 09:18:14 2020 +0000
+++ b/graphics/sane-airscan/distinfo    Tue Dec 15 09:32:23 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2020/12/09 12:05:58 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2020/12/15 09:32:23 nia Exp $
 
 SHA1 (sane-airscan-0.99.21.tar.gz) = 679a0be46117b053c2479c57faaec358df2e742a
 RMD160 (sane-airscan-0.99.21.tar.gz) = cf2124e9bb4bc777ca56cd104ce621090d8a2fcc
@@ -6,4 +6,4 @@
 Size (sane-airscan-0.99.21.tar.gz) = 191255 bytes
 SHA1 (patch-airscan-netif.c) = 3b06cf883514c8804e2854a5e00ccd9fae957b7c
 SHA1 (patch-airscan-os.c) = 46e65e141d97356d2e6c7b16a4e78f53a83e9ec8
-SHA1 (patch-meson.build) = 0a8ff042c8baaa7be486d923d9ed67bd8edf4443
+SHA1 (patch-meson.build) = 3348d065567db299b2cd8e2139b382ddbc3f53db
diff -r acb893c11939 -r fdf16566e064 graphics/sane-airscan/patches/patch-meson.build
--- a/graphics/sane-airscan/patches/patch-meson.build   Tue Dec 15 09:18:14 2020 +0000
+++ b/graphics/sane-airscan/patches/patch-meson.build   Tue Dec 15 09:32:23 2020 +0000
@@ -1,15 +1,17 @@
-$NetBSD: patch-meson.build,v 1.1 2020/12/09 12:05:58 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.2 2020/12/15 09:32:23 nia Exp $
 
 * Install configuration file under share/examples for pkgsrc.
 
 --- meson.build.orig   2020-11-23 19:47:02.000000000 +0000
 +++ meson.build
-@@ -91,7 +91,7 @@ endforeach
+@@ -91,8 +91,8 @@ endforeach
  install_man('sane-airscan.5')
  install_man('airscan-discover.1')
  install_data('airscan.conf',
 -  install_dir: join_paths(get_option('sysconfdir'),  'sane.d')
-+  install_dir: '@PREFIX@/share/examples'
++  install_dir: join_paths(get_option('prefix'), 'share', 'examples', 'sane.d')
  )
  install_data(dll_file,
-   install_dir: join_paths(get_option('sysconfdir'),  'sane.d', 'dll.d')
+-  install_dir: join_paths(get_option('sysconfdir'),  'sane.d', 'dll.d')
++  install_dir: join_paths(get_option('prefix'), 'share', 'examples', 'sane.d', 'dll.d')
+ )