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.

4 files changed, 30 insertions, 61 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 73f6fef5f9c..6907cae0f15 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -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
 MASTER_SITES=	http://www.hispalinux.es/~data/files/
-DISTFILES=	${DISTNAME:S/-/_/}.orig.tar.gz
 
 MAINTAINER=	lukem@NetBSD.org
 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
 
 NO_BUILD=	# defined
+WRKSRC=		${WRKDIR}/${PKGNAME}
 
 EGDIR=		${PREFIX}/share/examples/abcde
 
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 4b51f0610ff..51db71f1575 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -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
-Size (abcde_2.1.9.orig.tar.gz) = 45859 bytes
+SHA1 (abcde_2.1.15.orig.tar.gz) = 0a72c872fa8ff4609aca5fac83e556a7ca4773d0
+Size (abcde_2.1.15.orig.tar.gz) = 51427 bytes
 SHA1 (patch-ab) = 9b56c23dce4571301e9bbe38f3b30429a39efddb
-SHA1 (patch-ac) = 64eb6ec97e22ae6b1df6af659709c2dfb90cc9bb
-SHA1 (patch-ad) = 24ba8cbb1fd366a4c46cc0175d1cea0543bebcc2
+SHA1 (patch-ac) = 00bca932c7552d4b21f905196841b9d76f9ba6f7
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 06e2e0edb33..d39c1732a7a 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -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
-@@ -963,7 +963,12 @@ do_cddbedit ()
- 		echo "abcde: internal error: cddb-choice not recorded." >&2
- 		exit 1
- 	fi
-+
-+	# Strip out ^M
- 	CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
-+	CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
-+	tr -d '\r' < $CDDBDATA > $CDDBDATATMP
-+	mv $CDDBDATATMP $CDDBDATA
- 
- 	if [ "$INTERACTIVE" = "y" ]; then
- 		echo -n "Edit selected CDDB data? [y/n] (n): " >&2
-@@ -1281,8 +1286,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+--- abcde.orig	2004-02-15 16:19:36.000000000 -0800
++++ abcde	2004-02-23 10:50:21.000000000 -0800
+@@ -1026,7 +1026,11 @@ do_cddbread ()
+ do_cddbedit ()
+ {
+ 	if checkstatus cddb-edit >/dev/null; then
++		# Strip out ^M
+ 		CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
++		CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
++		tr -d '\r' < $CDDBDATA > $CDDBDATATMP
++		mv $CDDBDATATMP $CDDBDATA
+ 		VARIOUSARTISTS="$(checkstatus variousartists)"
+ 		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
+ 		return 0
+@@ -1494,8 +1498,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
  fi
  
  # Load system defaults
@@ -26,18 +25,17 @@ $NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -1308,8 +1313,8 @@ else
- 	elif [ -e /dev/acd0c ]; then
+@@ -1528,6 +1532,9 @@ if [ "$CDROM" = "" ] ; then
  		CDROM=/dev/acd0c
- 	else
--		echo "abcde error: CDROM device cannot be found." >&2
--		exit 1
+ 	elif [ -e /dev/disk1 ]; then
+ 		CDROM=/dev/disk1
++	else
 +		RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
 +		CDROM=/dev/rcd0$RAWPART
  	fi
  fi
  
-@@ -1356,7 +1361,7 @@ done
+@@ -1603,7 +1610,7 @@ fi
  case "$CDROMREADERSYNTAX" in
  	cdparanoia|debug)
  		CDROMREADER="$CDPARANOIA"
@@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.16 2003/11/27 17:38:29 abs Exp $
  		;;
  	cdda2wav)
  		CDROMREADER="$CDDA2WAV"
-@@ -1485,7 +1490,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
+@@ -1737,7 +1744,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
  do
  	# Cut off the command-line options we just added in
  	X=$(echo $X | cut -d' ' -f2)
diff --git a/audio/abcde/patches/patch-ad b/audio/abcde/patches/patch-ad
deleted file mode 100644
index 7e93fb3e79b..00000000000
--- a/audio/abcde/patches/patch-ad
+++ /dev/null
@@ -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