Update to abcde-2.1.15. Changes since 2.1.9:
* Portability fixes for OS X and OpenBSD * EDITOR can take a full path and arguments * The "-V" flag (extra verbosity) was added * Miscellaneous bugfixes Also, remove patch-ad, as it was buggy and unnecessary. This part closes PR pkg/24401.
This commit is contained in:
snj
parent
691ab4f1a2
commit
b474fe395f
4 changed files with 30 additions and 61 deletions
|
|
@ -1,9 +1,9 @@
|
||||||
# $NetBSD: Makefile,v 1.19 2003/11/27 17:38:29 abs Exp $
|
# $NetBSD: Makefile,v 1.20 2004/02/24 19:39:42 snj Exp $
|
||||||
|
|
||||||
DISTNAME= abcde-2.1.9
|
DISTNAME= abcde_2.1.15.orig
|
||||||
|
PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
|
||||||
CATEGORIES= audio
|
CATEGORIES= audio
|
||||||
MASTER_SITES= http://www.hispalinux.es/~data/files/
|
MASTER_SITES= http://www.hispalinux.es/~data/files/
|
||||||
DISTFILES= ${DISTNAME:S/-/_/}.orig.tar.gz
|
|
||||||
|
|
||||||
MAINTAINER= lukem@NetBSD.org
|
MAINTAINER= lukem@NetBSD.org
|
||||||
HOMEPAGE= http://www.hispalinux.es/~data/abcde.php
|
HOMEPAGE= http://www.hispalinux.es/~data/abcde.php
|
||||||
|
|
@ -16,6 +16,7 @@ DEPENDS+= cdparanoia>=3.0.9.7:../../audio/cdparanoia
|
||||||
DEPENDS+= wget>=1.7:../../net/wget
|
DEPENDS+= wget>=1.7:../../net/wget
|
||||||
|
|
||||||
NO_BUILD= # defined
|
NO_BUILD= # defined
|
||||||
|
WRKSRC= ${WRKDIR}/${PKGNAME}
|
||||||
|
|
||||||
EGDIR= ${PREFIX}/share/examples/abcde
|
EGDIR= ${PREFIX}/share/examples/abcde
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
$NetBSD: distinfo,v 1.21 2003/11/27 17:38:29 abs Exp $
|
$NetBSD: distinfo,v 1.22 2004/02/24 19:39:42 snj Exp $
|
||||||
|
|
||||||
SHA1 (abcde_2.1.9.orig.tar.gz) = c139a3f0eca5a1a84101c634775668575a343824
|
SHA1 (abcde_2.1.15.orig.tar.gz) = 0a72c872fa8ff4609aca5fac83e556a7ca4773d0
|
||||||
Size (abcde_2.1.9.orig.tar.gz) = 45859 bytes
|
Size (abcde_2.1.15.orig.tar.gz) = 51427 bytes
|
||||||
SHA1 (patch-ab) = 9b56c23dce4571301e9bbe38f3b30429a39efddb
|
SHA1 (patch-ab) = 9b56c23dce4571301e9bbe38f3b30429a39efddb
|
||||||
SHA1 (patch-ac) = 64eb6ec97e22ae6b1df6af659709c2dfb90cc9bb
|
SHA1 (patch-ac) = 00bca932c7552d4b21f905196841b9d76f9ba6f7
|
||||||
SHA1 (patch-ad) = 24ba8cbb1fd366a4c46cc0175d1cea0543bebcc2
|
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,20 @@
|
||||||
$NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
|
$NetBSD: patch-ac,v 1.17 2004/02/24 19:39:42 snj Exp $
|
||||||
|
|
||||||
--- abcde.orig 2003-11-05 16:08:37.000000000 +0000
|
--- abcde.orig 2004-02-15 16:19:36.000000000 -0800
|
||||||
+++ abcde
|
+++ abcde 2004-02-23 10:50:21.000000000 -0800
|
||||||
@@ -963,7 +963,12 @@ do_cddbedit ()
|
@@ -1026,7 +1026,11 @@ do_cddbread ()
|
||||||
echo "abcde: internal error: cddb-choice not recorded." >&2
|
do_cddbedit ()
|
||||||
exit 1
|
{
|
||||||
fi
|
if checkstatus cddb-edit >/dev/null; then
|
||||||
+
|
+ # Strip out ^M
|
||||||
+ # Strip out ^M
|
CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
|
||||||
CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
|
+ CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
|
||||||
+ CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
|
+ tr -d '\r' < $CDDBDATA > $CDDBDATATMP
|
||||||
+ tr -d '\r' < $CDDBDATA > $CDDBDATATMP
|
+ mv $CDDBDATATMP $CDDBDATA
|
||||||
+ mv $CDDBDATATMP $CDDBDATA
|
VARIOUSARTISTS="$(checkstatus variousartists)"
|
||||||
|
VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
|
||||||
if [ "$INTERACTIVE" = "y" ]; then
|
return 0
|
||||||
echo -n "Edit selected CDDB data? [y/n] (n): " >&2
|
@@ -1494,8 +1498,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
|
||||||
@@ -1281,8 +1286,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Load system defaults
|
# Load system defaults
|
||||||
|
|
@ -26,18 +25,17 @@ $NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
|
||||||
fi
|
fi
|
||||||
# Load user preference defaults
|
# Load user preference defaults
|
||||||
if [ -r $HOME/.abcde.conf ]; then
|
if [ -r $HOME/.abcde.conf ]; then
|
||||||
@@ -1308,8 +1313,8 @@ else
|
@@ -1528,6 +1532,9 @@ if [ "$CDROM" = "" ] ; then
|
||||||
elif [ -e /dev/acd0c ]; then
|
|
||||||
CDROM=/dev/acd0c
|
CDROM=/dev/acd0c
|
||||||
else
|
elif [ -e /dev/disk1 ]; then
|
||||||
- echo "abcde error: CDROM device cannot be found." >&2
|
CDROM=/dev/disk1
|
||||||
- exit 1
|
+ else
|
||||||
+ RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
|
+ RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
|
||||||
+ CDROM=/dev/rcd0$RAWPART
|
+ CDROM=/dev/rcd0$RAWPART
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -1356,7 +1361,7 @@ done
|
@@ -1603,7 +1610,7 @@ fi
|
||||||
case "$CDROMREADERSYNTAX" in
|
case "$CDROMREADERSYNTAX" in
|
||||||
cdparanoia|debug)
|
cdparanoia|debug)
|
||||||
CDROMREADER="$CDPARANOIA"
|
CDROMREADER="$CDPARANOIA"
|
||||||
|
|
@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
|
||||||
;;
|
;;
|
||||||
cdda2wav)
|
cdda2wav)
|
||||||
CDROMREADER="$CDDA2WAV"
|
CDROMREADER="$CDDA2WAV"
|
||||||
@@ -1485,7 +1490,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
|
@@ -1737,7 +1744,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
|
||||||
do
|
do
|
||||||
# Cut off the command-line options we just added in
|
# Cut off the command-line options we just added in
|
||||||
X=$(echo $X | cut -d' ' -f2)
|
X=$(echo $X | cut -d' ' -f2)
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
$NetBSD: patch-ad,v 1.7 2003/11/27 17:38:29 abs Exp $
|
|
||||||
|
|
||||||
--- cddb-tool.orig 2003-11-05 16:07:11.000000000 +0000
|
|
||||||
+++ cddb-tool
|
|
||||||
@@ -153,7 +153,7 @@ template)
|
|
||||||
echo '#'
|
|
||||||
echo '# Track frame offsets:'
|
|
||||||
NUMTRACKS=$2
|
|
||||||
- for x in $(f_seq 3 $(expr $NUMTRACKS + 2))
|
|
||||||
+ for x in $(jot $NUMTRACKS 3)
|
|
||||||
do
|
|
||||||
printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
|
|
||||||
done
|
|
||||||
@@ -171,13 +171,13 @@ template)
|
|
||||||
echo "DYEAR="
|
|
||||||
echo "DGENRE="
|
|
||||||
# TTITLE0 -- TTITLEn
|
|
||||||
- for x in $(f_seq 1 $NUMTRACKS)
|
|
||||||
+ for x in $(jot $NUMTRACKS 3)
|
|
||||||
do
|
|
||||||
echo "TTITLE$(expr $x - 1)=Track $x"
|
|
||||||
done
|
|
||||||
echo "EXTD="
|
|
||||||
# EXTT0 -- EXTTn
|
|
||||||
- for x in $(f_seq 1 $NUMTRACKS)
|
|
||||||
+ for x in $(jot $NUMTRACKS 3)
|
|
||||||
do
|
|
||||||
echo "EXTT$(expr $x - 1)="
|
|
||||||
done
|
|
||||||
Loading…
Reference in a new issue