diff options
| author | rillig <rillig@pkgsrc.org> | 2006-10-14 13:20:46 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-10-14 13:20:46 +0000 |
| commit | 82675e258b0e2ec2d09a49c0e5740b209c444c87 (patch) | |
| tree | 3e27a1148365ff3606089bd4c529fee45696f0f3 | |
| parent | a80d4c6ceecf25c10e2bb1c466c4c7ded958c14e (diff) | |
| download | pkgsrc-82675e258b0e2ec2d09a49c0e5740b209c444c87.tar.gz | |
Fixed PKGMANDIR and the path to the configuration file from the manual
page, which was mentioned in PR 34813.
| -rw-r--r-- | audio/abcde/Makefile | 14 | ||||
| -rw-r--r-- | audio/abcde/distinfo | 4 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ac | 13 |
3 files changed, 10 insertions, 21 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index 508a41c3caf..66660fa1c8a 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2006/04/30 21:14:46 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2006/10/14 13:20:46 rillig Exp $ DISTNAME= abcde_2.3.3.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= http://www.hispalinux.es/~data/files/ @@ -24,20 +24,20 @@ EGDIR= ${PREFIX}/share/examples/abcde MESSAGE_SUBST+= EGDIR=${EGDIR} MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -INSTALLATION_DIRS= bin man/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 SUBST_CLASSES+= abcde SUBST_STAGE.abcde= pre-configure SUBST_MESSAGE.abcde= Adjusting the directory for configuration files -SUBST_FILES.abcde= abcde -SUBST_SED.abcde= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR}," +SUBST_FILES.abcde= abcde abcde.1 +SUBST_SED.abcde= -e "s,/etc/,${PKG_SYSCONFDIR}/,g" do-install: ${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo index 079fcd8436a..0b7f5bd8171 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.29 2005/10/04 20:58:43 sketch Exp $ +$NetBSD: distinfo,v 1.30 2006/10/14 13:20:46 rillig Exp $ SHA1 (abcde_2.3.3.orig.tar.gz) = 76486a0bcb4ac85d052e0d244da3abbeab3c5db0 RMD160 (abcde_2.3.3.orig.tar.gz) = a96030891e263e765cd86151ec227b1d3babbcea Size (abcde_2.3.3.orig.tar.gz) = 73458 bytes SHA1 (patch-ab) = 9fe36ee69e628a4c460dd8ee30b4e9bca29d7081 -SHA1 (patch-ac) = bccc87311251c1c664440f36d05fbbcb3f1b7dba +SHA1 (patch-ac) = 7aa2adc9cc9eb34eff1e12a1093d25e81ec3fa31 diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index 90a06bf740c..cf736c10432 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.21 2005/10/04 20:58:43 sketch Exp $ +$NetBSD: patch-ac,v 1.22 2006/10/14 13:20:47 rillig Exp $ --- abcde.orig 2005-10-04 21:39:38.000000000 +0100 +++ abcde 2005-10-04 21:44:53.000000000 +0100 @@ -50,17 +50,6 @@ $NetBSD: patch-ac,v 1.21 2005/10/04 20:58:43 sketch Exp $ else HTTPGET=wget fi -@@ -2197,8 +2205,8 @@ - fi - - # Load system defaults --if [ -r /etc/abcde.conf ]; then -- . /etc/abcde.conf -+if [ -r @PKG_SYSCONFDIR@/abcde.conf ]; then -+ . @PKG_SYSCONFDIR@/abcde.conf - fi - # Load user preference defaults - if [ -r $HOME/.abcde.conf ]; then @@ -2231,6 +2239,9 @@ CDROM=/dev/acd0c elif [ -e /dev/disk1 ]; then |