From c5d7370a916e4314e252d50e1ff0668befde6186 Mon Sep 17 00:00:00 2001
From: pooka <pooka@pkgsrc.org>
Date: Thu, 21 Apr 2005 08:56:18 +0000
Subject: Our md5 tool is called "md5", not "md5sum".  And while in here, fix
 it for FreeBSD also.

---
 audio/abcde/distinfo         |  4 ++--
 audio/abcde/patches/patch-ac | 36 +++++++++++++++++++++++++++---------
 2 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'audio/abcde')

diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 095c2188e1c..2fe05d668bc 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2005/02/23 20:39:43 agc Exp $
+$NetBSD: distinfo,v 1.27 2005/04/21 08:56:18 pooka Exp $
 
 SHA1 (abcde_2.2.0.orig.tar.gz) = b94ebc7837f06b15f892bd083f7d91c2e0138c46
 RMD160 (abcde_2.2.0.orig.tar.gz) = 4bed4d3e10d4246a58ab23a246dcdab3baa2b3bf
 Size (abcde_2.2.0.orig.tar.gz) = 62550 bytes
 SHA1 (patch-ab) = d4f47d8bc01d58c477fbbe374bb6c2488e0def67
-SHA1 (patch-ac) = f32010778a13c580ff5ebac81a0a33e63f32f83a
+SHA1 (patch-ac) = 7db777b8ad33334373f0af3632c3f85a3429337a
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index a0cfc20ce1d..89bf4292250 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
+$NetBSD: patch-ac,v 1.19 2005/04/21 08:56:18 pooka Exp $
 
---- abcde.orig	2004-04-09 14:12:15.000000000 -0400
-+++ abcde	2004-04-25 23:19:43.000000000 -0400
-@@ -1129,7 +1129,11 @@
+--- abcde.orig	2004-11-08 16:40:30.000000000 +0200
++++ abcde	2005-04-21 11:55:39.000000000 +0300
+@@ -1215,7 +1215,11 @@
  do_cddbedit ()
  {
  	if checkstatus cddb-edit >/dev/null; then
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
  		VARIOUSARTISTS="$(checkstatus variousartists)"
  		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
  		return 0
-@@ -1373,7 +1377,7 @@
+@@ -1470,7 +1474,7 @@
  	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
  
  	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
@@ -23,7 +23,25 @@ $NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
  			# 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) 
-@@ -1703,8 +1707,8 @@
+@@ -1799,6 +1803,7 @@
+ 	HTTPGET=fetch
+ 	NEEDCDROMID=y
+ 	OSFLAVOUR=FBSD
++	MD5SUM=md5
+ elif [ X$(uname) = "XDarwin" ] ; then
+ 	HTTPGET=curl
+ 	OSFLAVOUR=OSX
+@@ -1807,6 +1812,9 @@
+ elif [ X$(uname) = "XOpenBSD" ] ; then
+ 	HTTPGET=wget
+ 	MD5SUM=md5
++elif [ X$(uname) = "XNetBSD" ] ; then
++	HTTPGET=wget
++	MD5SUM=md5
+ else
+ 	HTTPGET=wget
+ fi
+@@ -1825,8 +1833,8 @@
  fi
  
  # Load system defaults
@@ -34,7 +52,7 @@ $NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then
-@@ -1737,6 +1741,9 @@
+@@ -1859,6 +1867,9 @@
  		CDROM=/dev/acd0c
  	elif [ -e /dev/disk1 ]; then
  		CDROM=/dev/disk1
@@ -44,7 +62,7 @@ $NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
  	fi
  fi
  
-@@ -1837,7 +1844,7 @@
+@@ -1997,7 +2008,7 @@
  case "$CDROMREADERSYNTAX" in
  	cdparanoia|debug)
  		CDROMREADER="$CDPARANOIA"
@@ -53,7 +71,7 @@ $NetBSD: patch-ac,v 1.18 2004/05/02 07:37:19 kim Exp $
  		;;
  	cdda2wav)
  		CDROMREADER="$CDDA2WAV"
-@@ -1979,7 +1986,8 @@
+@@ -2148,7 +2159,8 @@
  do
  	# Cut off the command-line options we just added in
  	X=$(echo $X | cut -d' ' -f2)
-- 
cgit v1.2.3