ports/141170: Add more configuration options to audacity-devel and clean up patches

[Jack Low]

>Number:         141170
>Category:       ports
>Synopsis:       Add more configuration options to audacity-devel and clean up patches
>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:   Fri Dec 04 16:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jack Low
>Release:        8.0
>Organization:
PRDHost
>Environment:
FreeBSD upstairs.jack.com 8.0-STABLE FreeBSD 8.0-STABLE #0 r199898: Sun Nov 29 03:43:47 PST 2009     jack at upstairs.jack.com:/usr/obj/usr/src/sys/UPSTAIRS  amd64

>Description:
- Add new configuration options for audacity
- Alphabetize option listing
- Fix unicode support
- Cleanup "trailing garbage" and typos in patches
- Add debug option
>How-To-Repeat:
Apply attached patch
>Fix:
Apply attached patch

Patch attached with submission follows:

diff -ur audacity-devel/Makefile audacity-new/Makefile
--- audacity-devel/Makefile	2009-12-04 02:00:11.000000000 -0800
+++ audacity-new/Makefile	2009-12-04 08:17:18.000000000 -0800
@@ -29,23 +29,29 @@
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_WX=		2.8
-MAKE_JOBS_SAFE=	yes
 WX_COMPS=	wx
+MAKE_JOBS_SAFE=	yes
 PORTDOCS=	README.txt LICENSE.txt
-
 MAN1=		audacity.1
 MANCOMPRESSED=	yes
 
-OPTIONS=	VORBIS		"Use libvorbis for Ogg Vorbis support"	on \
-		MAD		"Use libmad for mp2/3 decoding support"	on \
+OPTIONS=	DEBUG		"enable debug support" off \
+		FFMPEG		"Use ffmpeg for import and export support" on \
 		FLAC		"Use libFLAC for FLAC support" on \
 		ID3TAG		"Use libid3tag for mp3 id3 tag support" on \
+		LADSPA		"enable LADSPA plug-in support" on \
+		MAD		"Use libmad for mp2/3 decoding support"	on \
+		MIDI		"Use portSMF for Midi support" on \
+		NYQUIST		"enable Nyquist plug-in support" on \
+		PORTMIXER	"compile with PortMixer" on \
 		SAMPLERATE	"Use libresample for sample rate conversion" on \
 		SBSMS		"Use libsbsms for pitch and tempo changing" on \
 		SOUNDTOUCH 	"Use libSoundTouch for pitch and tempo changing" on\
+		TAGLIB		"use TagLib for metadata support" on \
 		TWOLAME		"Use libtwolame for MP2 export support" on \
-		FFMPEG		"Use ffmpeg for import and export support" on \
-		MIDI		"Use portSMF for Midi support" on
+		UNICODE		"enable unicode support" on \
+		VORBIS		"Use libvorbis for Ogg Vorbis support"	on \
+		VAMP		"use libvamp for Vamp plug-in support" on
 
 .include <bsd.port.pre.mk>
 
@@ -63,14 +69,12 @@
 MAKE_ENV=	DOC=yes
 .endif
 
-CONFIGURE_ARGS+=	--enable-unicode=no
-
-.if defined(WITH_VORBIS)
-CONFIGURE_ARGS+=	--with-libvorbis
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--with-debug
 .endif
 
-.if defined(WITH_MAD)
-CONFIGURE_ARGS+=	--with-libmad
+.if defined(WITH_FFMPEG)
+CONFIGURE_ARGS+=	--with-ffmpeg
 .endif
 
 .if defined(WITH_FLAC)
@@ -81,6 +85,26 @@
 CONFIGURE_ARGS+=	--with-libid3tag
 .endif
 
+.if defined(WITH_LADSPA)
+CONFIGURE_ARGS+=	--with-ladspa
+.endif
+
+.if defined(WITH_MAD)
+CONFIGURE_ARGS+=	--with-libmad
+.endif
+
+.if defined(WITH_MIDI)
+CONFIGURE_ARGS+=	--with-midi
+.endif
+
+.if defined(WITH_NYQUIST)
+CONFIGURE_ARGS+=	--with-nyquist
+.endif
+
+.if defined(WITH_PORTMIXER)
+CONFIGURE_ARGS+=	--with-portmixer
+.endif
+
 .if defined(WITH_SAMPLERATE)
 CONFIGURE_ARGS+=	--with-libresample
 .endif
@@ -97,12 +121,21 @@
 CONFIGURE_ARGS+=	--with-libtwolame
 .endif
 
-.if defined(WITH_FFMPEG)
-CONFIGURE_ARGS+=	--with-ffmpeg
+.if defined(WITH_TAGLIB)
+CONFIGURE_ARGS+=	--with-taglib
 .endif
 
-.if defined(WITH_MIDI)
-CONFIGURE_ARGS+=	--with-midi
+.if defined(WITH_UNICODE)
+WX_UNICODE=	yes
+CONFIGURE_ARGS+=	--enable-unicode
+.endif
+
+.if defined(WITH_VAMP)
+CONFIGURE_ARGS+=	--with-libvamp
+.endif
+
+.if defined(WITH_VORBIS)
+CONFIGURE_ARGS+=	--with-libvorbis
 .endif
 
 .include <bsd.port.post.mk>
diff -ur audacity-devel/files/patch-cext.h audacity-new/files/patch-cext.h
--- audacity-devel/files/patch-cext.h	2009-10-16 05:11:24.000000000 -0700
+++ audacity-new/files/patch-cext.h	2009-12-04 07:20:02.000000000 -0800
@@ -1,5 +1,5 @@
 --- lib-src/libnyquist/nyquist/cmt/cext.h       2009-07-15 20:27:36.000000000 -0700
-+++ lib-src/libnyquist/nyquist/cmt/cext.hcext.h 2009-07-19 00:37:45.000000000 -0700
++++ lib-src/libnyquist/nyquist/cmt/cext.h       2009-07-19 00:37:45.000000000 -0700
 
 @@ -58,7 +58,7 @@
  #include <malloc.h>
diff -ur audacity-devel/files/patch-xlisp.h audacity-new/files/patch-xlisp.h
--- audacity-devel/files/patch-xlisp.h	2009-10-16 05:11:24.000000000 -0700
+++ audacity-new/files/patch-xlisp.h	2009-12-04 08:23:52.000000000 -0800
@@ -16,4 +16,3 @@
  /* Apple CC */
  #ifdef __APPLE__
  #define NNODES 2000
-


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