[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: UPDATE: audio/abcde

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: Re: UPDATE: audio/abcde
From: thuglife_(_at_)_bsd_(_dot_)_hu (Robert Nagy)
Date: Sun, 11 Apr 2004 16:48:12 +0200
Stardate [040411 16:30]. Okan Demirmen of Borg wrote:
> On Sun 2004.04.11 at 14:27 +0200, Robert Nagy wrote:
> > Hi. The attached diff updates the
> > abcde port to version 2.1.19. 
> > Please comment it.
> 
> Thanks. Works well, but one thing that has always bothered me was
> the requirement for wget. How about patching abcde to use ftp(1)
> instead, as in using this patch to patch-abcde, instead:
> 
It is ok for me. Let's see others' opinion.
> Index: patch-abcde
> ===================================================================
> RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
> retrieving revision 1.4
> diff -u -r1.4 patch-abcde
> --- patch-abcde	15 Feb 2004 16:25:14 -0000	1.4
> +++ patch-abcde	11 Apr 2004 13:52:08 -0000
> @@ -1,57 +1,29 @@
> -$OpenBSD: patch-abcde,v 1.4 2004/02/15 16:25:14 sturm Exp $
> ---- abcde.orig	2004-01-20 07:55:33.000000000 +0100
> -+++ abcde	2004-02-13 20:26:39.000000000 +0100
> -@@ -1098,7 +1098,7 @@ do_cddbedit ()
> - 		EDITCDDB=n
> - 	fi
> - 	if [ "$EDITCDDB" = "y" ]; then
> --		CDDBDATAMD5SUM=$(md5sum "$CDDBDATA" | cut -d " " -f 1);
> -+		CDDBDATAMD5SUM=$($MD5SUM "$CDDBDATA" | cut -d " " -f 1);
> - 		
> - 		# Use the debian sensible-editor wrapper to pick the editor that the
> - 		# user has requested via their $EDITOR environment variable
> -@@ -1214,7 +1214,7 @@ do_cddbedit ()
> - 	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
> - 
> - 	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
> --		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $(md5sum "$CDDBDATA" | cut -d " " -f 1) ]; then
> -+		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; 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) 
> -@@ -1338,7 +1338,7 @@ PLAYLISTDATAPREFIX=''
> - VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
> +$OpenBSD$
> +--- abcde.orig	2004-04-09 14:11:53.000000000 -0400
> ++++ abcde	2004-04-11 09:32:32.000000000 -0400
> +@@ -1574,7 +1574,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMF
>   VAPLAYLISTDATAPREFIX=''
> + DOSPLAYLIST=n
>   COMMENT=''
>  -ID3TAGV=2
>  +ID3TAGV=1
>   ENCNICE=10
>   READNICE=10
>   DISTMP3NICE=10
> -@@ -1380,6 +1380,7 @@ CDDAFS=cp
> - CDDISCID=cd-discid
> - CDDBTOOL=cddb-tool
> - EJECT=eject
> -+MD5SUM=md5sum
> - DISTMP3=distmp3
> - VORBISCOMMENT=vorbiscomment
> - METAFLAC=metaflac
> -@@ -1436,6 +1437,9 @@ elif [ X$(uname) = "XDarwin" ] ; then
> - 	OSFLAVOUR=OSX
> +@@ -1683,7 +1683,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
>   	# We should have disktool in OSX, but let's be sure...
>   	NEEDDISKTOOL=y
> -+elif [ X$(uname) = "XOpenBSD" ] ; then
> -+	HTTPGET=wget
> -+	MD5SUM=md5
> + elif [ X$(uname) = "XOpenBSD" ] ; then
> +-	HTTPGET=wget
> ++	HTTPGET=ftp
> + 	MD5SUM=md5
>   else
>   	HTTPGET=wget
> +@@ -1719,6 +1719,7 @@ if [ "$HTTPGETOPTS" = "" ] ; then
> + 		wget) HTTPGETOPTS="-q -O -";;
> + 		curl) HTTPGETOPTS="-f -s";;
> + 		fetch)HTTPGETOPTS="-q -o -";;
> ++		ftp)  HTTPGETOPTS="-V -o -";;
> + 		*) echo "abcde warning: HTTPGET in non-standard and HTTPGETOPTS are not defined." >&2 ;;
> + 	esac
>   fi
> -@@ -1709,7 +1713,7 @@ HTTPGET="$HTTPGET $HTTPGETOPTS"
> - 
> - # Export needed things so they can be read in this subshell
> - export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
> --export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET
> -+export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM
> - 
> - do_discid # Get ABCDETEMPDIR created and status file initialized
> - 
> 
> 
> > Regards
> > -- 
> > Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
> > http://thuglife.frontember.hu
> 
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/abcde/Makefile,v
> > retrieving revision 1.6
> > diff -u -r1.6 Makefile
> > --- Makefile	2004/02/15 16:25:14	1.6
> > +++ Makefile	2004/04/10 15:20:21
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=	"command-line utility to rip and encode audio cds"
> >  
> > -V=		2.1.14
> > +V=		2.1.19
> >  # cd-diskid version number
> >  V2=		0.9
> >  DISTNAME=	abcde_$V.orig
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/audio/abcde/distinfo,v
> > retrieving revision 1.2
> > diff -u -r1.2 distinfo
> > --- distinfo	2004/02/15 16:25:14	1.2
> > +++ distinfo	2004/04/10 15:20:21
> > @@ -1,9 +1,9 @@
> > -MD5 (abcde_2.1.14.orig.tar.gz) = c965218b4ca02d728c64396cc61f4d94
> > +MD5 (abcde_2.1.19.orig.tar.gz) = 6fab88a6f1080d36cd58d07a6664b2ad
> >  MD5 (cd-discid_0.9.orig.tar.gz) = 64677b8b63d1db0db015043f5455171a
> >  MD5 (id3_0.12.orig.tar.gz) = 5791f634b928f39ec9eaa59efb3f9315
> > -RMD160 (abcde_2.1.14.orig.tar.gz) = a09206afeed8f957e7f2a1dd4832922e36ddb200
> > +RMD160 (abcde_2.1.19.orig.tar.gz) = b94c0a723236ad0720b6a9fa6c19068aae9ce2c4
> >  RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa
> >  RMD160 (id3_0.12.orig.tar.gz) = 04bbb9077e606d4768e93a13b8f92cb9202a8f5c
> > -SHA1 (abcde_2.1.14.orig.tar.gz) = 37e5fa6feb19db0d1294d351631f646f0b42a68f
> > +SHA1 (abcde_2.1.19.orig.tar.gz) = c9ccceb0cc2d91f30cd32e5d24a7312ebf0d5a93
> >  SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4
> >  SHA1 (id3_0.12.orig.tar.gz) = 6e74313f56214a73ef8b54edabd698444e07080f
> > Index: patches/patch-abcde
> > ===================================================================
> > RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
> > retrieving revision 1.4
> > diff -u -r1.4 patch-abcde
> > --- patches/patch-abcde	2004/02/15 16:25:14	1.4
> > +++ patches/patch-abcde	2004/04/10 15:20:21
> > @@ -1,57 +1,12 @@
> > -$OpenBSD: patch-abcde,v 1.4 2004/02/15 16:25:14 sturm Exp $
> > ---- abcde.orig	2004-01-20 07:55:33.000000000 +0100
> > -+++ abcde	2004-02-13 20:26:39.000000000 +0100
> > -@@ -1098,7 +1098,7 @@ do_cddbedit ()
> > - 		EDITCDDB=n
> > - 	fi
> > - 	if [ "$EDITCDDB" = "y" ]; then
> > --		CDDBDATAMD5SUM=$(md5sum "$CDDBDATA" | cut -d " " -f 1);
> > -+		CDDBDATAMD5SUM=$($MD5SUM "$CDDBDATA" | cut -d " " -f 1);
> > - 		
> > - 		# Use the debian sensible-editor wrapper to pick the editor that the
> > - 		# user has requested via their $EDITOR environment variable
> > -@@ -1214,7 +1214,7 @@ do_cddbedit ()
> > - 	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
> > - 
> > - 	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
> > --		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $(md5sum "$CDDBDATA" | cut -d " " -f 1) ]; then
> > -+		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; 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) 
> > -@@ -1338,7 +1338,7 @@ PLAYLISTDATAPREFIX=''
> > - VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
> > +$OpenBSD$
> > +--- abcde.orig	Sat Apr 10 17:24:04 2004
> > ++++ abcde	Sat Apr 10 17:24:06 2004
> > +@@ -1574,7 +1574,7 @@
> >   VAPLAYLISTDATAPREFIX=''
> > + DOSPLAYLIST=n
> >   COMMENT=''
> >  -ID3TAGV=2
> >  +ID3TAGV=1
> >   ENCNICE=10
> >   READNICE=10
> >   DISTMP3NICE=10
> > -@@ -1380,6 +1380,7 @@ CDDAFS=cp
> > - CDDISCID=cd-discid
> > - CDDBTOOL=cddb-tool
> > - EJECT=eject
> > -+MD5SUM=md5sum
> > - DISTMP3=distmp3
> > - VORBISCOMMENT=vorbiscomment
> > - METAFLAC=metaflac
> > -@@ -1436,6 +1437,9 @@ elif [ X$(uname) = "XDarwin" ] ; then
> > - 	OSFLAVOUR=OSX
> > - 	# We should have disktool in OSX, but let's be sure...
> > - 	NEEDDISKTOOL=y
> > -+elif [ X$(uname) = "XOpenBSD" ] ; then
> > -+	HTTPGET=wget
> > -+	MD5SUM=md5
> > - else
> > - 	HTTPGET=wget
> > - fi
> > -@@ -1709,7 +1713,7 @@ HTTPGET="$HTTPGET $HTTPGETOPTS"
> > - 
> > - # Export needed things so they can be read in this subshell
> > - export CDDBTOOL ABCDETEMPDIR TRACKQUEUE LOWDISK EJECTCD EJECT EJECTOPTS
> > --export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET
> > -+export CDROM CDDBDATA REMOTEHOSTS MAXPROCS HTTPGET MD5SUM
> > - 
> > - do_discid # Get ABCDETEMPDIR created and status file initialized
> > - 
> 
> 
> -- 
> Okan Demirmen <okan_(_at_)_demirmen_(_dot_)_com>
> PGP-Key: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xB3670934
> PGP-Fingerprint: 226D B4AE 78A9 7F4E CD2B 1B44 C281 AF18 B367 0934

-- 
Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
http://thuglife.frontember.hu
Follow-Ups:
- Re: UPDATE: audio/abcde
  - From: Keith Matthews
References:
- UPDATE: audio/abcde
  - From: Robert Nagy
Prev by Date: Re: NEW: memoir (a LaTeX class)
Next by Date: Re: UPDATE: audio/abcde
Previous by thread: UPDATE: audio/abcde
Next by thread: Re: UPDATE: audio/abcde
Index(es):
- Date
- Thread
Visit your host, monkey.org