4 files changed, 30 insertions, 30 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 4ec463ad65d..279131e36ad 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2005/08/05 07:23:43 sketch Exp $
+# $NetBSD: Makefile,v 1.36 2005/10/04 20:58:43 sketch Exp $
 
-DISTNAME=	abcde_2.2.6.orig
+DISTNAME=	abcde_2.3.3.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/a/abcde/}
+MASTER_SITES=	http://www.hispalinux.es/~data/files/
 
 MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://www.hispalinux.es/~data/abcde.php
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 62535532f06..079fcd8436a 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2005/05/15 00:36:28 snj Exp $
+$NetBSD: distinfo,v 1.29 2005/10/04 20:58:43 sketch Exp $
 
-SHA1 (abcde_2.2.6.orig.tar.gz) = dfb7433d8f2a783dab572cb27c9f54d04d8bde09
-RMD160 (abcde_2.2.6.orig.tar.gz) = 88795c8d964887dbfb2b83541ffb1b5af3e56bfd
-Size (abcde_2.2.6.orig.tar.gz) = 64213 bytes
-SHA1 (patch-ab) = 920c34f3c59c9c7da93ed62a7335566d9cb7d424
-SHA1 (patch-ac) = 8b56a86366938e2deea5b7e7cad2a400cf3eb024
+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
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index 40f90197a90..961ff80229a 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2005/05/15 00:36:28 snj Exp $
+$NetBSD: patch-ab,v 1.9 2005/10/04 20:58:43 sketch Exp $
 
---- abcde.conf.orig	2005-03-01 05:19:50.000000000 -0800
-+++ abcde.conf	2005-05-14 08:15:50.000000000 -0700
-@@ -174,7 +174,7 @@
+--- abcde.conf.orig	2005-10-04 21:45:58.000000000 +0100
++++ abcde.conf	2005-10-04 21:46:09.000000000 +0100
+@@ -184,7 +184,7 @@
  #ACTIONS=cddb,read,encode,tag,move,clean
  
  # CD device you want to read from
 -#CDROM=/dev/cdrom
 +#CDROM=/dev/rcd0d
- 
- # Optional CDROM device-ID for readers requiring the SCSI-syntax Bus,ID,Lun
- #CDROMID=0,3,0
+ # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
+ # If we are using the ide-scsi emulation layer, we need to define a "g"
+ #CDPARANOIACDROMBUS="d"
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 3fd5581fa49..90a06bf740c 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
+$NetBSD: patch-ac,v 1.21 2005/10/04 20:58:43 sketch Exp $
 
---- abcde.orig	2005-04-03 11:50:28.000000000 -0700
-+++ abcde	2005-05-14 09:21:24.000000000 -0700
-@@ -1227,7 +1227,11 @@ do_cddbread ()
+--- abcde.orig	2005-10-04 21:39:38.000000000 +0100
++++ abcde	2005-10-04 21:44:53.000000000 +0100
+@@ -1559,7 +1559,11 @@
  do_cddbedit ()
  {
  	if checkstatus cddb-edit >/dev/null; then
@@ -14,16 +14,16 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  		VARIOUSARTISTS="$(checkstatus variousartists)"
  		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
  		return 0
-@@ -1482,7 +1486,7 @@ do_cddbedit ()
+@@ -1824,7 +1828,7 @@
  	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
  
  	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
--		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d" " -f1) ]; then
+-		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; then
 +		if [ "$CDDBDATAMD5SUM" != "" ]  && [ "$CDDBDATAMD5SUM" != "$($MD5SUM '$CDDBDATA' | cut -d' ' -f1)" ]; then
  			# This works but does not have the necessary error checking
  			# yet. If you are familiar with the CDDB spec
  			# (see http://www.freedb.org/src/latest/DBFORMAT) 
-@@ -1764,7 +1768,7 @@ MD5SUM=md5sum
+@@ -2114,7 +2118,7 @@
  DISTMP3=distmp3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
@@ -31,8 +31,8 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
 +NORMALIZE=normalize
  CDSPEED=eject
  VORBISGAIN=vorbisgain
- 
-@@ -1811,6 +1815,7 @@ if [ X$(uname) = "XFreeBSD" ] ; then
+ MKCUE=mkcue
+@@ -2169,6 +2173,7 @@
  	HTTPGET=fetch
  	NEEDCDROMID=y
  	OSFLAVOUR=FBSD
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  elif [ X$(uname) = "XDarwin" ] ; then
  	HTTPGET=curl
  	OSFLAVOUR=OSX
-@@ -1819,6 +1824,9 @@ elif [ X$(uname) = "XDarwin" ] ; then
+@@ -2178,6 +2183,9 @@
  elif [ X$(uname) = "XOpenBSD" ] ; then
  	HTTPGET=wget
  	MD5SUM=md5
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  else
  	HTTPGET=wget
  fi
-@@ -1837,8 +1845,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then
+@@ -2197,8 +2205,8 @@
  fi
  
  # Load system defaults
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -1871,6 +1879,9 @@ if [ "$CDROM" = "" ] ; then
+@@ -2231,6 +2239,9 @@
  		CDROM=/dev/acd0c
  	elif [ -e /dev/disk1 ]; then
  		CDROM=/dev/disk1
@@ -71,7 +71,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  	fi
  fi
  
-@@ -2011,7 +2022,7 @@ fi
+@@ -2427,7 +2438,7 @@
  case "$CDROMREADERSYNTAX" in
  	cdparanoia|debug)
  		CDROMREADER="$CDPARANOIA"
@@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.20 2005/05/15 00:36:28 snj Exp $
  		;;
  	cdda2wav)
  		CDROMREADER="$CDDA2WAV"
-@@ -2185,7 +2196,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
+@@ -2681,7 +2692,8 @@
  do
  	# Cut off the command-line options we just added in
  	X=$(echo $X | cut -d' ' -f2)