This fixes an issue with finding required programs (found
when trying abcde -o mp3:-b192
I cannot find the missing "id3" program though (and
FLAVOR=lame make package gives me "/bin/sh: id3_0.12.orig.tar.gz:1: not found")
/Alexander
Index: patches/patch-abcde
===================================================================
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.5
diff -u -p -r1.5 patch-abcde
--- patches/patch-abcde 13 Apr 2004 21:07:48 -0000 1.5
+++ patches/patch-abcde 29 Jun 2008 01:22:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-abcde,v 1.5 2004/04/13 21:07:48 brad Exp $
---- abcde.orig Fri Apr 9 20:12:15 2004
-+++ abcde Sun Apr 11 16:58:13 2004
-@@ -1574,7 +1574,7 @@
+--- abcde.orig Sun Aug 14 21:51:53 2005
++++ abcde Sun Jun 29 02:48:19 2008
+@@ -2058,7 +2058,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
VAPLAYLISTDATAPREFIX=''
DOSPLAYLIST=n
COMMENT=''
@@ -10,16 +10,16 @@ $OpenBSD: patch-abcde,v 1.5 2004/04/13 2
ENCNICE=10
READNICE=10
DISTMP3NICE=10
-@@ -1683,7 +1683,7 @@
- # We should have disktool in OSX, but let's be sure...
+@@ -2170,7 +2170,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
NEEDDISKTOOL=y
+ CDROMREADERSYNTAX=cddafs
elif [ X$(uname) = "XOpenBSD" ] ; then
- HTTPGET=wget
+ HTTPGET=ftp
MD5SUM=md5
else
HTTPGET=wget
-@@ -1719,6 +1719,7 @@
+@@ -2207,6 +2207,7 @@ if [ "$HTTPGETOPTS" = "" ] ; then
wget) HTTPGETOPTS="-q -O -";;
curl) HTTPGETOPTS="-f -s";;
fetch)HTTPGETOPTS="-q -o -";;
@@ -27,3 +27,12 @@ $OpenBSD: patch-abcde,v 1.5 2004/04/13 2
*) echo "abcde warning: HTTPGET in non-standard and HTTPGETOPTS
are not defined." >&2 ;;
esac
fi
+@@ -2667,7 +2668,7 @@ for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER}
+ do
+ # Cut off the command-line options we just added in
+ X=$(echo $X | cut -d' ' -f2)
+- if [ "$(which $X)" = "" ]; then
++ if ! which $X >&-; then
+ echo "abcde error: $X is not in your path." >&2
+ exit 1
+ elif [ ! -x $(which $X) ]; then
