summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorrillig <rillig>2006-07-02 09:53:00 +0000
committerrillig <rillig>2006-07-02 09:53:00 +0000
commite420807bdb4a9402a06a31d88848ecd5eb9b7055 (patch)
treebdccfa033762030e8f561978d32e324d7d4247b0 /audio
parentf5f422abbe6f609120d4faee69e0c45b9f4314e1 (diff)
downloadpkgsrc-e420807bdb4a9402a06a31d88848ecd5eb9b7055.tar.gz
Fixed the path to the configuration file. Bumped PKGREVISION.
Diffstat (limited to 'audio')
-rw-r--r--audio/ubs/Makefile10
-rw-r--r--audio/ubs/distinfo3
-rw-r--r--audio/ubs/patches/patch-ac17
3 files changed, 27 insertions, 3 deletions
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 76a9118ea15..4f0ba2d7a2a 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -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 @@ EGDIR= ${PREFIX}/share/examples/ubs
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 --git a/audio/ubs/distinfo b/audio/ubs/distinfo
index 3d05deb99fb..2abcc92de2e 100644
--- a/audio/ubs/distinfo
+++ b/audio/ubs/distinfo
@@ -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 --git a/audio/ubs/patches/patch-ac b/audio/ubs/patches/patch-ac
new file mode 100644
index 00000000000..fa1f21e51a7
--- /dev/null
+++ b/audio/ubs/patches/patch-ac
@@ -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;
+ }
+ }