summaryrefslogtreecommitdiff
path: root/audio/abcde
diff options
context:
space:
mode:
Diffstat (limited to 'audio/abcde')
-rw-r--r--audio/abcde/MESSAGE5
-rw-r--r--audio/abcde/Makefile40
-rw-r--r--audio/abcde/PLIST3
-rw-r--r--audio/abcde/distinfo9
-rw-r--r--audio/abcde/patches/patch-ac136
5 files changed, 24 insertions, 169 deletions
diff --git a/audio/abcde/MESSAGE b/audio/abcde/MESSAGE
index 23084dfb640..e94e0f57c7d 100644
--- a/audio/abcde/MESSAGE
+++ b/audio/abcde/MESSAGE
@@ -1,13 +1,16 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/12/16 05:14:28 lukem Exp $
+$NetBSD: MESSAGE,v 1.3 2015/01/04 12:03:07 wiz 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/faac
audio/flac
audio/gogo
audio/lame
+ audio/musepack
+ audio/speex
audio/vorbis-tools
Preferences can be set in ~/.abcde.conf for each user, and for all users in
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index d1dd9051dbc..4929f7c7433 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,31 +1,30 @@
-# $NetBSD: Makefile,v 1.52 2012/09/23 05:36:22 obache Exp $
+# $NetBSD: Makefile,v 1.53 2015/01/04 12:03:07 wiz Exp $
-DISTNAME= abcde-2.3.99.7_p235
-PKGNAME= abcde-2.3.99.7
-PKGREVISION= 2
+DISTNAME= abcde-2.6
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES= http://abcde.einval.com/download/
MAINTAINER= sekiya@NetBSD.org
-HOMEPAGE= http://code.google.com/p/abcde/
+HOMEPAGE= http://abcde.einval.com/
COMMENT= Command-line utility to rip and encode an audio CD
-.include "../../mk/bsd.prefs.mk"
-
DEPENDS+= cd-discid>=0.7:../../audio/cd-discid
+DEPENDS+= eyeD3-[0-9]*:../../audio/eyeD3
DEPENDS+= id3-[0-9]*:../../audio/id3
-DEPENDS+= id3v2-[0-9]*:../../audio/id3v2
-.if ${OPSYS} != "SunOS"
DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia
-.endif
DEPENDS+= mkcue>=2.1:../../misc/mkcue
NO_BUILD= yes
-EXTRACT_SUFX= .tar.bz2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= bash:run gsed:run
+USE_TOOLS+= bash:run ftp:run gsed:run
REPLACE_BASH= abcde cddb-tool
+REPLACE_PERL+= abcde-musicbrainz-tool
+
+# even with all these installed, abcde-musicbrainz-tool does not work
+#USE_TOOLS= perl:run
+#DEPENDS+= p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID
+#DEPENDS+= p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz
EGDIR= ${PREFIX}/share/examples/abcde
@@ -44,11 +43,12 @@ SUBST_CLASSES+= gsed
SUBST_STAGE.gsed= pre-configure
SUBST_MESSAGE.gsed= Adjusting gsed path
SUBST_FILES.gsed= abcde
-SUBST_SED.gsed= -e "s,@TOOLS_GSED@,${TOOLS_PATH.gsed},g"
+SUBST_SED.gsed= -e "s, sed , ${TOOLS_PATH.gsed} ,g"
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
+# ${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
${INSTALL_MAN} ${WRKSRC}/abcde.1 \
@@ -56,16 +56,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.if ${OPSYS} == "SunOS"
-USE_TOOLS+= ftp:run
-
-SUBST_CLASSES+= abcde-cdparanoia
-SUBST_STAGE.abcde-cdparanoia= pre-configure
-SUBST_MESSAGE.abcde-cdparanoia= Adjusting cd-paranoia command name
-SUBST_FILES.abcde-cdparanoia= abcde abcde.conf
-SUBST_SED.abcde-cdparanoia= -e "/CDPARANOIA=cdparanoia/s/cdparanoia/cd-paranoia/"
-
-.include "../../misc/libcdio/buildlink3.mk"
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/abcde/PLIST b/audio/abcde/PLIST
index 9e99cf831e7..3d4c7564443 100644
--- a/audio/abcde/PLIST
+++ b/audio/abcde/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/01/04 12:03:07 wiz Exp $
bin/abcde
+@comment bin/abcde-musicbrainz-tool
bin/cddb-tool
man/man1/abcde.1
man/man1/cddb-tool.1
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 5a93c3fdb52..755f57b457d 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.36 2011/05/11 10:28:08 hans Exp $
+$NetBSD: distinfo,v 1.37 2015/01/04 12:03:07 wiz Exp $
-SHA1 (abcde-2.3.99.7_p235.tar.bz2) = 51db5e7da9b3eda0844904ad2b9138fa97eeb254
-RMD160 (abcde-2.3.99.7_p235.tar.bz2) = bbb7116a8a06ffae6e0027e5a7524e023bfd71cf
-Size (abcde-2.3.99.7_p235.tar.bz2) = 171342 bytes
+SHA1 (abcde-2.6.tar.gz) = a1545fb63673e247c8378e9925505e23ace806dc
+RMD160 (abcde-2.6.tar.gz) = 958f163b33efeda99b16f5ae6bfe35831e9eb652
+Size (abcde-2.6.tar.gz) = 105609 bytes
SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
-SHA1 (patch-ac) = c10192d56b3e73a0dc6fc7b1b192ff50cf0555ca
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
deleted file mode 100644
index 7ba26e75705..00000000000
--- a/audio/abcde/patches/patch-ac
+++ /dev/null
@@ -1,136 +0,0 @@
-$NetBSD: patch-ac,v 1.28 2011/05/11 10:28:08 hans Exp $
-
---- abcde.orig 2010-04-10 10:14:30.000000000 +0900
-+++ abcde 2010-04-10 18:40:03.000000000 +0900
-@@ -415,10 +415,10 @@
- {
- case $1 in
- TRACKNAME1)
-- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
-+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
- ;;
- TRACKNAME)
-- TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
-+ TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
- ;;
- esac
- }
-@@ -575,32 +575,32 @@
- if [ "$VARIOUSARTISTS" = "y" ] && [ ! "$ONETRACK" = "y" ]; then
- case "$VARIOUSARTISTSTYLE" in
- forward)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- ;;
- forward-dash)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- ;;
- reverse)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- ;;
- reverse-dash)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- ;;
- colon)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's-: -~-g')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's-: -~-g')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- ;;
- trailing-paren)
-- DTITLEARTIST="$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')"
-+ DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's,^\(.*\) (\(.*\)),\1~\2,')"
- TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- ;;
-@@ -1519,7 +1519,7 @@
- if [ "$DOSPLAYLIST" = "y" ]; then
- awk '{substr("\r",""); printf "%s\r\n", $0}' "$OUTPUTDIR/$PLAYLISTFILE" > "$ABCDETEMPDIR/PLAYLISTFILE.tmp"
- # mv -f "$ABCDETEMPDIR/PLAYLISTFILE.tmp" "$OUTPUTDIR/$PLAYLISTFILE"
-- cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | sed 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
-+ cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | ${SED} 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
- fi
- echo "playlistcomplete" >> "$ABCDETEMPDIR/status"
- done
-@@ -1703,7 +1703,7 @@
-
- #TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
- #TRACKS=0
-- OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
-+ OFFSETTIMES=( $(echo "$CUESHEET" | ${SED} -n -e's/\ *INDEX 01\ \+//p' ) )
- TRACKS=${#OFFSETTIMES[@]}
- unset OFFSETS
- #echo "processing offsetimes ${OFFSETTIMES[@]}"
-@@ -1737,7 +1737,7 @@
- # CDPARANOIAAUDIOTRACKS="$TRACKS"
- #
- # LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
--# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
-+# OFFSETS="$(echo "$CDPARANOIAOUTPUT" | ${SED} -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')"
- # makeids
- # ;;
- *)
-@@ -1831,7 +1831,7 @@
- TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
- # User-supplied track queue.
- # Weed out non-numbers, whitespace, then sort and weed out duplicates
-- TRACKQUEUE=$(echo $TRACKQUEUE | sed 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | sed 's- $--g')
-+ TRACKQUEUE=$(echo $TRACKQUEUE | ${SED} 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | ${SED} 's- $--g')
- # Once cleaned, obtain the highest value in the trackqueue for number padding
- for LASTTRACK in $TRACKQUEUE; do :; done
- if [ ! "$PADTRACKS" = "y" ] ; then
-@@ -2760,7 +2760,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on \(.*\) (.*/\1/')
-+ FILEPATH=$(mount | grep "$CDROM on" | ${SED} 's/^[^ ]* on \(.*\) (.*/\1/')
- FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
- # If the file exists, copy it
- if [ -e "$FILEPATH" ] ; then
-@@ -2841,8 +2841,8 @@
- # Custom filename munging:
- mungefilename ()
- {
-- #echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
-- echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
-+ #echo "$@" | ${SED} s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
-+ echo "$@" | ${SED} s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
- }
-
- # Custom genre munging:
-@@ -3037,6 +3037,9 @@
- DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:"
- DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:"
-
-+# We need GNU sed
-+SED=sed
-+
- # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
- # Linux/OpenBSD. ftp is user for NetBSD.
- # Let's use these checkings to determine the OS flavour, which will be used
-@@ -3060,10 +3063,12 @@
- HTTPGET=ftp
- MD5SUM=md5
- OSFLAVOUR=NBSD
-+ SED=@TOOLS_GSED@
- elif [ X$(uname) = "SunOS" ] ; then
-- HTTPGET=""
-+ HTTPGET=ftp
- MD5SUM=md5
- OSFLAVOUR=SunOS
-+ SED=@TOOLS_GSED@
- else
- HTTPGET=wget
- fi
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 03:25:54 +0000