summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorkim <kim>2002-11-29 02:37:21 +0000
committerkim <kim>2002-11-29 02:37:21 +0000
commit917795374d4fc9ac8f0042e14484d1c035eb50f4 (patch)
treefd5b6d192364880ed21b4265c20798beb555abab /audio
parentaf2ee7701853a74fc076ca3a74ef57131e4db21c (diff)
downloadpkgsrc-917795374d4fc9ac8f0042e14484d1c035eb50f4.tar.gz
Preserve pkgsrc and distribution defaults better:
- use ${PKG_SYSCONFBASE} instead of hardcoded /usr/pkg/etc - keep the ID3v2 default as distributed, and depend on audio/id3v2 - don't depend on vorbis-tools: just inform the user about the need to install at least one of the supported encoders - sample config only has commented out entries, so install it only in the examples directory
Diffstat (limited to 'audio')
-rw-r--r--audio/abcde/MESSAGE18
-rw-r--r--audio/abcde/Makefile22
-rw-r--r--audio/abcde/PLIST5
-rw-r--r--audio/abcde/distinfo6
-rw-r--r--audio/abcde/patches/patch-aa10
-rw-r--r--audio/abcde/patches/patch-ac19
6 files changed, 48 insertions, 32 deletions
diff --git a/audio/abcde/MESSAGE b/audio/abcde/MESSAGE
new file mode 100644
index 00000000000..ae564345888
--- /dev/null
+++ b/audio/abcde/MESSAGE
@@ -0,0 +1,18 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/11/29 02:37:21 kim Exp $
+
+You need to install at least one encoder to use with abcde. It has support
+for the following encoders in pkgsrc:
+
+ audio/bladeenc
+ audio/gogo
+ audio/lame
+ audio/vorbis-tools
+
+Preferences can be set in ~/.abcde.conf for each user, and for all users in
+${PKG_SYSCONFDIR}/abcde.conf system-wide.
+
+See the man page and ${EGDIR}/abcde.conf for
+configuration options.
+
+===========================================================================
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index fa8766d24f3..37b10ab3c0c 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2002/09/20 00:33:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2002/11/29 02:37:21 kim Exp $
-DISTNAME= abcde_2.0.3.orig
-PKGNAME= abcde-2.0.3
+DISTNAME= abcde-2.0.3
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://frantica.lly.org/~rcw/abcde/
+DISTFILES= ${DISTNAME:S/-/_/}.orig.tar.gz
MAINTAINER= lukem@netbsd.org
HOMEPAGE= http://frantica.lly.org/~rcw/abcde/page/
@@ -11,24 +12,29 @@ COMMENT= Command-line utility to rip and encode an audio CD
DEPENDS+= cd-discid>=0.7:../../audio/cd-discid
DEPENDS+= id3-[0-9]*:../../audio/id3
+DEPENDS+= id3v2-[0-9]*:../../audio/id3v2
DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia
-DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
DEPENDS+= wget>=1.7:../../net/wget
-WRKSRC= ${WRKDIR}/${PKGNAME}
-
NO_BUILD= # defined
+EGDIR= ${PREFIX}/share/examples/abcde
+
+MESSAGE_SUBST+= EGDIR=${EGDIR}
+MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
+
post-patch:
@cd ${WRKSRC} && for f in abcde abcde.1; do \
- ${SED} "s,@ETCDIR@,${PREFIX}/etc," $$f > $$f.tmp && \
+ ${SED} "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE}," \
+ $$f > $$f.tmp && \
${MV} $$f.tmp $$f; \
done
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/abcde.conf ${PREFIX}/etc
+ ${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
diff --git a/audio/abcde/PLIST b/audio/abcde/PLIST
index 03d40b03ef7..bb95597f55a 100644
--- a/audio/abcde/PLIST
+++ b/audio/abcde/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:15:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/29 02:37:21 kim Exp $
bin/abcde
bin/cddb-tool
-etc/abcde.conf
+share/examples/abcde/abcde.conf
+@dirrm share/examples/abcde
man/man1/abcde.1
man/man1/cddb-tool.1
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 7abd09c6138..44eb7177834 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2002/09/20 00:33:12 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2002/11/29 02:37:22 kim Exp $
SHA1 (abcde_2.0.3.orig.tar.gz) = 66a7620a835baee29296f4d5e9322bb1679baa49
Size (abcde_2.0.3.orig.tar.gz) = 35655 bytes
-SHA1 (patch-aa) = 68afebe66ba20dcaeddbfeed795f4049c3ff8f99
+SHA1 (patch-aa) = 9d371a43a5b67c7dbcd191e7197ed86734583a18
SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872
-SHA1 (patch-ac) = e1141bdbbbcbc7998574864081d71681afa1059e
+SHA1 (patch-ac) = 2ac23cf529045eceeca3e6d89c5b6cffcbf1c975
SHA1 (patch-ad) = 72550c6a7fa8231c9058a674e85781ec8d3adc18
diff --git a/audio/abcde/patches/patch-aa b/audio/abcde/patches/patch-aa
index 46b06daf327..d050ce14455 100644
--- a/audio/abcde/patches/patch-aa
+++ b/audio/abcde/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2002/09/20 00:33:12 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2002/11/29 02:37:22 kim Exp $
---- abcde.1.orig Tue Aug 21 03:22:33 2001
-+++ abcde.1
+--- abcde.1.orig Mon Aug 20 21:22:33 2001
++++ abcde.1 Thu Nov 28 20:57:01 2002
@@ -42,7 +42,7 @@
.TP
.B \-c [filename]
Specifies an additional configuration file to parse. Configuration options
-in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
-+in this file override those in /usr/pkg/etc/abcde.conf or $HOME/.abcde.conf.
++in this file override those in @PKG_SYSCONFBASE@/abcde.conf or $HOME/.abcde.conf.
.TP
.B \-C [discid]
Allows you to resume a session for
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2002/09/20 00:33:12 hubertf Exp $
variables in your abcde.conf.
.SH CONFIGURATION
-abcde sources two configuration files on startup - /etc/abcde.conf and
-+abcde sources two configuration files on startup - /usr/pkg/etc/abcde.conf and
++abcde sources two configuration files on startup - @PKG_SYSCONFBASE@/abcde.conf and
$HOME/.abcde.conf, in that order. Here is a list of options abcde recognizes:
.TP
.B CDDBURL
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index ed3a8ea01ee..711485918e5 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2002/09/20 00:33:13 hubertf Exp $
+$NetBSD: patch-ac,v 1.7 2002/11/29 02:37:22 kim Exp $
---- abcde.orig Mon Jan 28 06:44:02 2002
-+++ abcde
+--- abcde.orig Mon Jan 28 00:44:02 2002
++++ abcde Thu Nov 28 20:57:50 2002
@@ -206,6 +206,11 @@
TRACKARTIST="$(echo $DTITLEARTIST | cut -f1 -d~)"
TRACKNAME="$(echo $DTITLEARTIST | cut -f2 -d~)"
@@ -93,15 +93,6 @@ $NetBSD: patch-ac,v 1.6 2002/09/20 00:33:13 hubertf Exp $
VARIOUSARTISTS=n
;;
esac
-@@ -894,7 +906,7 @@
- PLAYLISTFORMAT='${ARTISTFILE}_-_${ALBUMFILE}.m3u'
- PLAYLISTDATAPREFIX=''
- COMMENT=''
--ID3TAGV=2
-+ID3TAGV=1
- ENCNICE=10
- READNICE=10
- VARIOUSARTISTS=n
@@ -931,7 +943,6 @@
OGGENCOPTS=
ID3OPTS=
@@ -137,8 +128,8 @@ $NetBSD: patch-ac,v 1.6 2002/09/20 00:33:13 hubertf Exp $
# Load system defaults
-if [ -r /etc/abcde.conf ]; then
- . /etc/abcde.conf
-+if [ -r /usr/pkg/etc/abcde.conf ]; then
-+ . /usr/pkg/etc/abcde.conf
++if [ -r @PKG_SYSCONFBASE@/abcde.conf ]; then
++ . @PKG_SYSCONFBASE@/abcde.conf
fi
# Load user preference defaults
if [ -r $HOME/.abcde.conf ]; then