ports/90294: [maintainer update] audio/audacity to 1.2.4

[Craig Boston]

>Number:         90294
>Category:       ports
>Synopsis:       [maintainer update] audio/audacity to 1.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 12 17:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Craig Boston
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
>Description:
	Update to Audacity 1.2.4

	Switch to wxGTK 2.6 -- it's not officially supported by the Audacity
	team, but neither is wxGTK2.4 + GTK2.  2.6 seemed to be more stable
	during testing.

	OPTIONSify

	Fix edge case of linking against libid3tag if installed without
	registering a dependency (reported by Laurent Debacker).
>How-To-Repeat:
>Fix:

--- audacity-1.2.4.patch begins here ---
diff -ruN audacity.orig/Makefile audacity/Makefile
--- audacity.orig/Makefile	Sun Dec 11 19:33:19 2005
+++ audacity/Makefile	Sun Dec 11 19:08:48 2005
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/audio/audacity/Makefile,v 1.25 2005/11/15 06:47:50 ade Exp $
 
 PORTNAME=	audacity
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTVERSION=	1.2.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +15,7 @@
 COMMENT=	Audacity is a GUI editor for digital audio waveforms
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
@@ -24,6 +23,10 @@
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 
+OPTIONS=	ID3TAG "ID3 tag support" off \
+		MAD "libmad MP3 support" on \
+		VORBIS "Ogg Vorbis support" on
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${OSVERSION} >= 501103
@@ -32,8 +35,7 @@
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
-CONFIGURE_ARGS+=	--with-id3=no
+		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.6-config
 
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
@@ -53,12 +55,11 @@
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_MAD)
-	@${ECHO_MSG} "You can disable support for libmad (MP3) by defining WITHOUT_MAD."
-.endif
-.if !defined(WITHOUT_VORBIS)
-	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
+.if defined(WITH_ID3TAG)
+CONFIGURE_ARGS+=	--with-id3tag=system
+LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag
+.else
+CONFIGURE_ARGS+=	--without-id3tag
 .endif
 
 MAN1=		audacity.1
diff -ruN audacity.orig/distinfo audacity/distinfo
--- audacity.orig/distinfo	Mon Dec  6 14:33:29 2004
+++ audacity/distinfo	Mon Dec 12 09:16:46 2005
@@ -1,2 +1,3 @@
-MD5 (audacity-src-1.2.3.tar.gz) = dbfc1b401420aa694753d35acb5a8a28
-SIZE (audacity-src-1.2.3.tar.gz) = 4175943
+MD5 (audacity-src-1.2.4.tar.gz) = b3e135cd1e34192f6cafa48cca0f77e7
+SHA256 (audacity-src-1.2.4.tar.gz) = 87621874a81453fec3b7f1b50890f0e31c7415135375dc8dd8fb71cb1fc30a6b
+SIZE (audacity-src-1.2.4.tar.gz) = 4497621
diff -ruN audacity.orig/pkg-plist audacity/pkg-plist
--- audacity.orig/pkg-plist	Mon Dec 12 09:49:36 2005
+++ audacity/pkg-plist	Mon Dec 12 10:00:38 2005
@@ -17,6 +17,7 @@
 share/audacity/nyquist/system.lsp
 share/audacity/nyquist/test.lsp
 share/audacity/nyquist/xlinit.lsp
+share/audacity/plug-ins/SilenceMarker.ny
 share/audacity/plug-ins/clicktrack.ny
 share/audacity/plug-ins/crossfadein.ny
 share/audacity/plug-ins/crossfadeout.ny
@@ -26,17 +27,22 @@
 share/audacity/plug-ins/pluck.ny
 share/audacity/plug-ins/tremolo.ny
 share/audacity/audacity-1.2-help.htb
+share/locale/ar/LC_MESSAGES/audacity.mo
 share/locale/bg/LC_MESSAGES/audacity.mo
 share/locale/ca/LC_MESSAGES/audacity.mo
 share/locale/cs/LC_MESSAGES/audacity.mo
 share/locale/da/LC_MESSAGES/audacity.mo
 share/locale/de/LC_MESSAGES/audacity.mo
+share/locale/el/LC_MESSAGES/audacity.mo
 share/locale/es/LC_MESSAGES/audacity.mo
+share/locale/eu/LC_MESSAGES/audacity.mo
 share/locale/fi/LC_MESSAGES/audacity.mo
 share/locale/fr/LC_MESSAGES/audacity.mo
+share/locale/ga/LC_MESSAGES/audacity.mo
 share/locale/hu/LC_MESSAGES/audacity.mo
 share/locale/it/LC_MESSAGES/audacity.mo
 share/locale/ja/LC_MESSAGES/audacity.mo
+share/locale/lt/LC_MESSAGES/audacity.mo
 share/locale/mk/LC_MESSAGES/audacity.mo
 share/locale/nb/LC_MESSAGES/audacity.mo
 share/locale/nl/LC_MESSAGES/audacity.mo
@@ -47,6 +53,7 @@
 share/locale/sv/LC_MESSAGES/audacity.mo
 share/locale/uk/LC_MESSAGES/audacity.mo
 share/locale/zh/LC_MESSAGES/audacity.mo
+share/locale/zh_TW/LC_MESSAGES/audacity.mo
 @dirrm share/audacity/plug-ins
 @dirrm share/audacity/nyquist
 @dirrm share/audacity
--- audacity-1.2.4.patch ends here ---


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