Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Aug 2003 03:17:24 -0400 (EDT)
From:      Munish Chopra <chopra@soulwax.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        osa@FreeBSD.org
Subject:   ports/55790: Maintainer update: audio/abcde
Message-ID:  <20030820071724.913F62B@opiate.soulwax.net>
Resent-Message-ID: <200308200944.h7K9iuNf091106@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         55790
>Category:       ports
>Synopsis:       Maintainer update: audio/abcde
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 20 02:44:56 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Munish Chopra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD opiate.soulwax.net 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Aug 11 17:23:48 EDT 2003 munish@opiate.soulwax.net:/usr/src/sys/i386/compile/OPIATE i386


	
>Description:
	* Update to 2.1.5
	* Make audio/normalize optional
	* Add Speex support
	* General cleanup of Makefile
	
>How-To-Repeat:
	N/A
	
>Fix:

	

--- abcde.diff begins here ---
diff -ruN /usr/ports/audio/abcde/Makefile abcde/Makefile
--- /usr/ports/audio/abcde/Makefile	Fri Aug  8 06:15:06 2003
+++ abcde/Makefile	Wed Aug 20 03:10:43 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	abcde
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hispalinux.es/~data/files/
 DISTNAME= 	abcde_${PORTVERSION}.orig
@@ -18,7 +18,6 @@
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
 		id3v2:${PORTSDIR}/audio/id3v2 \
 		lame:${PORTSDIR}/audio/lame \
-		normalize:${PORTSDIR}/audio/normalize \
 		oggenc:${PORTSDIR}/audio/vorbis-tools
 
 USE_REINPLACE=	yes
@@ -33,21 +32,33 @@
 .endif
 
 .if defined(WITH_DAGRAB)
-RUN_DEPENDS+=   dagrab:${PORTSDIR}/audio/dagrab
+RUN_DEPENDS+=	dagrab:${PORTSDIR}/audio/dagrab
 .else
-DAGRAB_MSG=     "Define WITH_DAGRAB to enable dagrab support."
+DAGRAB_MSG=	"Define WITH_DAGRAB to enable dagrab support."
 .endif
 
 .if defined(WITH_EJECT)
-RUN_DEPENDS+=   eject:${PORTSDIR}/sysutils/eject
+RUN_DEPENDS+=	eject:${PORTSDIR}/sysutils/eject
 .else
-EJECT_MSG=     "Define WITH_EJECT to enable auto-eject support."
+EJECT_MSG=	"Define WITH_EJECT to enable auto-eject support."
 .endif
 
 .if defined(WITH_FLAC)
 RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
 .else
-FLAC_MSG=     "Define WITH_FLAC to enable flac support."
+FLAC_MSG=	"Define WITH_FLAC to enable FLAC support."
+.endif
+
+.if defined(WITH_NORMALIZE)
+RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
+.else
+NORMALIZE_MSG=	"Define WITH_NORMALIZE to enable normalize support."
+.endif
+
+.if defined(WITH_SPEEX)
+RUN_DEPENDS+=	speexenc:${PORTSDIR}/audio/speex
+.else
+SPEEX_MSG=	"Define WITH_SPEEX to enable Speex support."
 .endif
 
 pre-fetch:
@@ -67,6 +78,14 @@
 	@${ECHO_MSG} ${FLAC_MSG}
 	@${ECHO_MSG} ""
 .endif
+.if defined(NORMALIZE_MSG)
+	@${ECHO_MSG} ${NORMALIZE_MSG}
+	@${ECHO_MSG} ""
+.endif
+.if defined(SPEEX_MSG)
+	@${ECHO_MSG} ${SPEEX_MSG}
+	@${ECHO_MSG} ""
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
@@ -85,11 +104,9 @@
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf to ~/.abcde.conf"
 	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
-	@${ECHO_MSG} "
-	@${ECHO_MSG} "NOTE: As of version 2.1.4, you will need to start with"
-	@${ECHO_MSG} "a fresh copy of the supplied abcde.conf file. Since all"
-	@${ECHO_MSG} "FreeBSD-specific patches have now entered the vendor"
-	@${ECHO_MSG} "code, little or no editing should be necessary."
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "NOTE: If you have been using ${PORTNAME}-2.1.4 or older,"
+	@${ECHO_MSG} "you must start with a fresh ~/.abcde.conf."
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/audio/abcde/distinfo abcde/distinfo
--- /usr/ports/audio/abcde/distinfo	Tue Jun 24 06:15:06 2003
+++ abcde/distinfo	Wed Aug 20 02:34:35 2003
@@ -1 +1 @@
-MD5 (abcde_2.1.4.orig.tar.gz) = bfc554c403d6cff332ffd4e9ce965404
+MD5 (abcde_2.1.5.orig.tar.gz) = cb052c02daab29f9e81bc5598579c80e
diff -ruN /usr/ports/audio/abcde/files/patch-aa abcde/files/patch-aa
--- /usr/ports/audio/abcde/files/patch-aa	Sun May 18 06:15:56 2003
+++ abcde/files/patch-aa	Wed Aug 20 03:03:05 2003
@@ -1,15 +1,15 @@
---- abcde.conf.orig	Sun May 11 12:58:34 2003
-+++ abcde.conf	Sun May 11 13:22:44 2003
-@@ -87,7 +87,7 @@
- #MP3ENCOPTS=
+--- abcde.conf.orig	Wed Aug 20 02:43:58 2003
++++ abcde.conf	Wed Aug 20 02:57:42 2003
+@@ -92,7 +92,7 @@
+ 
  # Ogg:
  #VORBIZEOPTS=
 -#OGGENCOPTS=
 +OGGENCOPTS="-q 5"
+ 
  # FLAC:
  #FLACOPTS=
- 
-@@ -145,10 +145,10 @@
+@@ -154,10 +154,10 @@
  # Since multiple-output was integrated we always append the file type
  # to the files. Remove it from your user defined string if you are getting
  # files like ".ogg.ogg".
--- abcde.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030820071724.913F62B>