[pkgsrc/trunk]: pkgsrc/audio/ubs Fixed the path to the configuration file. Bu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9f3911c32bb
branches:  trunk
changeset: 515383:f9f3911c32bb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 02 09:53:00 2006 +0000

description:
Fixed the path to the configuration file. Bumped PKGREVISION.

diffstat:

 audio/ubs/Makefile         |  10 ++++++++--
 audio/ubs/distinfo         |   3 ++-
 audio/ubs/patches/patch-ac |  17 +++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r a1c4aff62083 -r f9f3911c32bb audio/ubs/Makefile
--- a/audio/ubs/Makefile        Sun Jul 02 09:51:31 2006 +0000
+++ b/audio/ubs/Makefile        Sun Jul 02 09:53:00 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/05/19 16:18:53 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/02 09:53:00 rillig Exp $
 #
 
 DISTNAME=              ubs-0.17
-PKGREVISION=   2
+PKGREVISION=           3
 CATEGORIES=            audio
 MASTER_SITES=          http://aboleo.net/software/ubs/downloads/
 
@@ -38,6 +38,12 @@
 CONF_FILES=            ${EGDIR}/help.conf ${PKG_SYSCONFDIR}/help.conf
 CONF_FILES+=           ${EGDIR}/ubs.conf.default ${PKG_SYSCONFDIR}/ubs.conf
 
+SUBST_CLASSES+=                ubsconf
+SUBST_STAGE.ubsconf=   pre-configure
+SUBST_MESSAGE.ubsconf= Fixing path to ubs.conf.
+SUBST_FILES.ubsconf=   include/defaults.h
+SUBST_SED.ubsconf=     -e 's,"etc/ubs.conf","${PKG_SYSCONFDIR}/ubs.conf",'
+
 post-extract:
        ${MV} ${WRKSRC}/config/ubs.conf.default \
                ${WRKSRC}/config/ubs.conf.default.in
diff -r a1c4aff62083 -r f9f3911c32bb audio/ubs/distinfo
--- a/audio/ubs/distinfo        Sun Jul 02 09:51:31 2006 +0000
+++ b/audio/ubs/distinfo        Sun Jul 02 09:53:00 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/07/02 09:53:00 rillig Exp $
 
 SHA1 (ubs-0.17.tar.gz) = f0f67d437e4c5c7026b2f05d1aaff53688eb3253
 RMD160 (ubs-0.17.tar.gz) = 4e0e46bb8346f0c86989b0b33973000bbb86f1aa
 Size (ubs-0.17.tar.gz) = 372222 bytes
 SHA1 (patch-aa) = 4a5690fa3e7a8dc1dc50329bf844199575a09319
 SHA1 (patch-ab) = 88d06fca850e7bf2d38ad587021e4352c96cc89b
+SHA1 (patch-ac) = af22e0ca907b22eedb86e79ce2e81e4fb87283e9
diff -r a1c4aff62083 -r f9f3911c32bb audio/ubs/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/ubs/patches/patch-ac        Sun Jul 02 09:53:00 2006 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2006/07/02 09:53:00 rillig Exp $
+
+Fixed the way the pathname of the configuration file is built up.
+
+--- lib/read_config.c.orig     2003-10-26 04:36:51.000000000 +0100
++++ lib/read_config.c  2006-07-02 09:02:07.000000000 +0200
+@@ -52,8 +52,8 @@ int read_config(char *fname, char *secti
+  int bad = NO, line_ct = 0, res;
+ 
+  if(fname == NULL) {
+-  snprintf(buf, STRBUF, "%s/%s", ubs_table_data(&GLOBAL, "prefix"), DEF_CONFIG);
+-  if((config_fp = fopen(buf, "r")) == NULL) {
++  fname = DEF_CONFIG;
++  if((config_fp = fopen(fname, "r")) == NULL) {
+    return NO_FILE;
+   }
+  }