[pkgsrc/trunk]: pkgsrc/sysutils/p5-Unburden-Home-Dir Just learned about SUBST...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c26b3683c952
branches:  trunk
changeset: 358312:c26b3683c952
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Thu Feb 09 10:37:12 2017 +0000

description:
Just learned about SUBST_VARS.foo.

diffstat:

 sysutils/p5-Unburden-Home-Dir/Makefile                                  |  6 ++----
 sysutils/p5-Unburden-Home-Dir/distinfo                                  |  8 ++++----
 sysutils/p5-Unburden-Home-Dir/files/unburden-home-dir.1                 |  4 ++--
 sysutils/p5-Unburden-Home-Dir/patches/patch-bin_unburden-home-dir       |  6 +++---
 sysutils/p5-Unburden-Home-Dir/patches/patch-docs_unburden-home-dir.1.md |  4 ++--
 sysutils/p5-Unburden-Home-Dir/patches/patch-share_common.sh             |  6 +++---
 6 files changed, 16 insertions(+), 18 deletions(-)

diffs (128 lines):

diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/Makefile
--- a/sysutils/p5-Unburden-Home-Dir/Makefile    Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/Makefile    Thu Feb 09 10:37:12 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/02/08 11:54:57 hauke Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/09 10:37:12 hauke Exp $
 
 VERSION_TAG=   0.4.0.1
 
@@ -17,7 +17,6 @@
 
 DEPENDS+=      p5-Config-File-[0-9]*:../../devel/p5-Config-File
 DEPENDS+=      p5-File-BaseDir-[0-9]*:../../devel/p5-File-BaseDir
-
 DEPENDS+=      p5-File-Rsync-[0-9]*:../../net/p5-File-Rsync
 DEPENDS+=      p5-File-Touch-[0-9]*:../../devel/p5-File-Touch
 DEPENDS+=      p5-File-Which-[0-9]*:../../devel/p5-File-Which
@@ -50,8 +49,7 @@
 SUBST_FILES.fix-paths+=                unburden-home-dir.1
 SUBST_FILES.fix-paths+=                Xsession.d/25unburden-home-dir-xdg
 SUBST_FILES.fix-paths+=                Xsession.d/95unburden-home-dir
-SUBST_SED.fix-paths+=          -e 's,@SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.fix-paths+=          -e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths+=         PKG_SYSCONFDIR PREFIX
 
 SUBST_CLASSES+=                        comment-cfg
 SUBST_STAGE.comment-cfg=       pre-install
diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/distinfo
--- a/sysutils/p5-Unburden-Home-Dir/distinfo    Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/distinfo    Thu Feb 09 10:37:12 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2017/02/08 11:54:57 hauke Exp $
+$NetBSD: distinfo,v 1.4 2017/02/09 10:37:12 hauke Exp $
 
 SHA1 (Unburden-Home-Dir-0.4.0.1.tar.gz) = 1692724d7790ccec30fa40b5df3158ea7b648bd0
 RMD160 (Unburden-Home-Dir-0.4.0.1.tar.gz) = 58b0d5c5805770c5f6d1a657f25bafad3a60b07e
@@ -6,6 +6,6 @@
 Size (Unburden-Home-Dir-0.4.0.1.tar.gz) = 50930 bytes
 SHA1 (patch-Xsession.d_25unburden-home-dir-xdg) = 17e35f199b082d96ead8402f53f0c1f3a5116d2e
 SHA1 (patch-Xsession.d_95unburden-home-dir) = 745ea2cb3a28c36bd8ab5ed7dd0622160d2916e1
-SHA1 (patch-bin_unburden-home-dir) = 7837d0cf7361a885fb24b0f55a0aa7a5b230f719
-SHA1 (patch-docs_unburden-home-dir.1.md) = baf3da5a8872013d92970bba5935b1c0b37e44bd
-SHA1 (patch-share_common.sh) = 4543d529a049adb448b4875ad883933025283bbf
+SHA1 (patch-bin_unburden-home-dir) = 0a043df8f029fe144eb735939ab9d3e2895fba4b
+SHA1 (patch-docs_unburden-home-dir.1.md) = 513a1aa840a645931d6c73de78c48213a2dc20e5
+SHA1 (patch-share_common.sh) = 9d7ed9273e9fa0b817051753d00a76bcd640f9f4
diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/files/unburden-home-dir.1
--- a/sysutils/p5-Unburden-Home-Dir/files/unburden-home-dir.1   Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/files/unburden-home-dir.1   Thu Feb 09 10:37:12 2017 +0000
@@ -68,7 +68,7 @@
 Example configuration files can be found at \fB@PREFIX@/share/examples/unburden\-home\-dir/\fR and in the \fBetc/\fR directory of the source tar ball\.
 .
 .SH "FILES"
-\fB@SYSCONFDIR@/unburden\-home\-dir\.conf\fR, \fB@SYSCONFDIR@/unburden\-home\-dir\.list\fR, \fB~/\.unburden\-home\-dir\.conf\fR, \fB~/\.unburden\-home\-dir\.list\fR, 
\fB~/\.config/unburden\-home\-dir/config\fR, \fB~/\.config/unburden\-home\-dir/list\fR
+\fB@PKG_SYSCONFDIR@/unburden\-home\-dir\.conf\fR, \fB@PKG_SYSCONFDIR@/unburden\-home\-dir\.list\fR, \fB~/\.unburden\-home\-dir\.conf\fR, \fB~/\.unburden\-home\-dir\.list\fR, 
\fB~/\.config/unburden\-home\-dir/config\fR, \fB~/\.config/unburden\-home\-dir/list\fR
 .
 .P
 Read the documentation at either \fB@PREFIX@/share/doc/unburden\-home\-dir/\fR, at https://unburden\-home\-dir\.readthedocs\.io/ online, or in the \fBdocs/\fR directory in the source tar ball for an 
explanation of these files\.
@@ -80,7 +80,7 @@
 Of, course, du(1) can help you to find potential files or directories to handle by unburden\-home\-dir, but there are quite some du(1)\-like tools out there which are way more comfortable, e\.g\. 
ncdu(1) (text\-mode), baobab(1) (GNOME), filelight(1) (KDE), xdiskusage(1) (X tool calling du(1) itself), or xdu(1) (X tool reading du(1) output from STDIN)\.
 .
 .SH "AUTHOR"
-Unburden Home Dir is written and maintained by Axel Beckert \fIabe@deuxchevaux\.org\fR\.
+Unburden Home Dir is written and maintained by Axel Beckert \fIbeckert@phys\.ethz\.ch\fR\.
 .
 .SH "LICENSE"
 Unburden Home Dir is available under the terms of the GNU General Public License (GPL) version 2 or any later version at your option\.
diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/patches/patch-bin_unburden-home-dir
--- a/sysutils/p5-Unburden-Home-Dir/patches/patch-bin_unburden-home-dir Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/patches/patch-bin_unburden-home-dir Thu Feb 09 10:37:12 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bin_unburden-home-dir,v 1.2 2017/02/08 11:05:29 hauke Exp $
+$NetBSD: patch-bin_unburden-home-dir,v 1.3 2017/02/09 10:37:12 hauke Exp $
 
 We depend on sysutils/lsof, so we do not need to hunt for it
 Rename the config file, sticking to conventions
@@ -20,11 +20,11 @@
  # By default check for a system wide and a user configuration and list file
 -my @CONFFILES = ("/etc/$BASENAME",
 -                 "$ENV{HOME}/.$BASENAME",
-+my @CONFFILES = ("@SYSCONFDIR@/$BASENAME.conf",
++my @CONFFILES = ("@PKG_SYSCONFDIR@/$BASENAME.conf",
 +                 "$ENV{HOME}/.$BASENAME.conf",
                   config_home($BASENAME).'/config');
 -my @LISTFILES = ("/etc/$BASENAME.$LISTSUFFIX",
-+my @LISTFILES = ("@SYSCONFDIR@/$BASENAME.$LISTSUFFIX",
++my @LISTFILES = ("@PKG_SYSCONFDIR@/$BASENAME.$LISTSUFFIX",
                   "$ENV{HOME}/.$BASENAME.$LISTSUFFIX",
                   config_home($BASENAME)."/$LISTSUFFIX");
  
diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/patches/patch-docs_unburden-home-dir.1.md
--- a/sysutils/p5-Unburden-Home-Dir/patches/patch-docs_unburden-home-dir.1.md   Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/patches/patch-docs_unburden-home-dir.1.md   Thu Feb 09 10:37:12 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-docs_unburden-home-dir.1.md,v 1.1 2017/02/07 14:34:36 hauke Exp $
+$NetBSD: patch-docs_unburden-home-dir.1.md,v 1.2 2017/02/09 10:37:12 hauke Exp $
 
 Fix absolute paths, and normalize config file name
 
@@ -17,7 +17,7 @@
  
 -`/etc/unburden-home-dir`, `/etc/unburden-home-dir.list`,
 -`~/.unburden-home-dir`, `~/.unburden-home-dir.list`,
-+`@SYSCONFDIR@/unburden-home-dir.conf`, `@SYSCONFDIR@/unburden-home-dir.list`,
++`@PKG_SYSCONFDIR@/unburden-home-dir.conf`, `@PKG_SYSCONFDIR@/unburden-home-dir.list`,
 +`~/.unburden-home-dir.conf`, `~/.unburden-home-dir.list`,
  `~/.config/unburden-home-dir/config`,
 -`~/.config/unburden-home-dir/list`, `/etc/default/unburden-home-dir`,
diff -r 782604b10559 -r c26b3683c952 sysutils/p5-Unburden-Home-Dir/patches/patch-share_common.sh
--- a/sysutils/p5-Unburden-Home-Dir/patches/patch-share_common.sh       Thu Feb 09 10:16:21 2017 +0000
+++ b/sysutils/p5-Unburden-Home-Dir/patches/patch-share_common.sh       Thu Feb 09 10:37:12 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-share_common.sh,v 1.1 2017/02/07 14:34:36 hauke Exp $
+$NetBSD: patch-share_common.sh,v 1.2 2017/02/09 10:37:12 hauke Exp $
 
 Fix absolute paths.
 Normalize prefs filename.
@@ -11,8 +11,8 @@
  
 -if [ -e /etc/default/"${UNBURDEN_BASENAME}" ]; then
 -    . /etc/default/"${UNBURDEN_BASENAME}"
-+if [ -e @SYSCONFDIR@/"${UNBURDEN_BASENAME}".conf ]; then
-+    . @SYSCONFDIR@/"${UNBURDEN_BASENAME}".conf
++if [ -e @PKG_SYSCONFDIR@/"${UNBURDEN_BASENAME}".conf ]; then
++    . @PKG_SYSCONFDIR@/"${UNBURDEN_BASENAME}".conf
  fi
  
 -if [ -e /etc/"${UNBURDEN_BASENAME}" ]; then