Update to 1.2.4

Switch to wxGTK 2.6
Use OPTIONS
Fix edge case of linking against libid3tag if installed without registering a dependency (reported by Laurent Debacker).
Add SHA256
portlint(1)

PR:		90294
Submitted by:	maintainer

3 files changed, 58 insertions, 48 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index da47c2827e7b..efd00845a8c5 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	1.2.3
-PORTREVISION=	2
+PORTVERSION=	1.2.4b
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +15,7 @@ MAINTAINER=	craig@yekse.gank.org
 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,16 +23,23 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 
+MAN1=		audacity.1
+MANCOMPRESSED=	yes
+
+OPTIONS=	ID3TAG	"ID3 tag support"		off \
+		MAD	"Mad MP3 audio decoder support"	on \
+		VORBIS	"OGG/Vorbis audio support"	on
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${OSVERSION} >= 501103
 SSE_CFLAGS=	-mno-sse -mno-sse2
 .endif
+
 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
@@ -41,27 +47,23 @@ MAKE_ENV=	DOC=yes
 
 .if !defined(WITHOUT_MAD)
 CONFIGURE_ARGS+=	--with-libmad=system
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=	--without-libmad
 .endif
 
 .if !defined(WITHOUT_VORBIS)
 CONFIGURE_ARGS+=	--with-vorbis=system
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.3:${PORTSDIR}/audio/libvorbis
 .else
 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
-MANCOMPRESSED=	yes
-
 .include <bsd.port.post.mk>
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index d7e71e102999..076dfd842480 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -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.4b.tar.gz) = 37df5b6119302f7ab77ca16d25311756
+SHA256 (audacity-src-1.2.4b.tar.gz) = 7c6f53ceffc10fbff96cc3fdf2a2b61072ed8b527d4f7313b3216390907de113
+SIZE (audacity-src-1.2.4b.tar.gz) = 4499894
diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist
index fdb473b161d6..ea90c2f86020 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -1,42 +1,48 @@
 bin/audacity
-share/audacity/nyquist/bug.lsp
-share/audacity/nyquist/dspprims.lsp
-share/audacity/nyquist/evalenv.lsp
-share/audacity/nyquist/follow.lsp
-share/audacity/nyquist/init.lsp
-share/audacity/nyquist/misc.lsp
-share/audacity/nyquist/nyinit.lsp
-share/audacity/nyquist/nyqmisc.lsp
-share/audacity/nyquist/nyquist.lsp
-share/audacity/nyquist/printrec.lsp
-share/audacity/nyquist/profile.lsp
-share/audacity/nyquist/seq.lsp
-share/audacity/nyquist/seqfnint.lsp
-share/audacity/nyquist/seqmidi.lsp
-share/audacity/nyquist/sndfnint.lsp
-share/audacity/nyquist/system.lsp
-share/audacity/nyquist/test.lsp
-share/audacity/nyquist/xlinit.lsp
-share/audacity/plug-ins/clicktrack.ny
-share/audacity/plug-ins/crossfadein.ny
-share/audacity/plug-ins/crossfadeout.ny
-share/audacity/plug-ins/delay.ny
-share/audacity/plug-ins/highpass.ny
-share/audacity/plug-ins/lowpass.ny
-share/audacity/plug-ins/pluck.ny
-share/audacity/plug-ins/tremolo.ny
-share/audacity/audacity-1.2-help.htb
+%%DATADIR%%/nyquist/bug.lsp
+%%DATADIR%%/nyquist/dspprims.lsp
+%%DATADIR%%/nyquist/evalenv.lsp
+%%DATADIR%%/nyquist/follow.lsp
+%%DATADIR%%/nyquist/init.lsp
+%%DATADIR%%/nyquist/misc.lsp
+%%DATADIR%%/nyquist/nyinit.lsp
+%%DATADIR%%/nyquist/nyqmisc.lsp
+%%DATADIR%%/nyquist/nyquist.lsp
+%%DATADIR%%/nyquist/printrec.lsp
+%%DATADIR%%/nyquist/profile.lsp
+%%DATADIR%%/nyquist/seq.lsp
+%%DATADIR%%/nyquist/seqfnint.lsp
+%%DATADIR%%/nyquist/seqmidi.lsp
+%%DATADIR%%/nyquist/sndfnint.lsp
+%%DATADIR%%/nyquist/system.lsp
+%%DATADIR%%/nyquist/test.lsp
+%%DATADIR%%/nyquist/xlinit.lsp
+%%DATADIR%%/plug-ins/SilenceMarker.ny
+%%DATADIR%%/plug-ins/clicktrack.ny
+%%DATADIR%%/plug-ins/crossfadein.ny
+%%DATADIR%%/plug-ins/crossfadeout.ny
+%%DATADIR%%/plug-ins/delay.ny
+%%DATADIR%%/plug-ins/highpass.ny
+%%DATADIR%%/plug-ins/lowpass.ny
+%%DATADIR%%/plug-ins/pluck.ny
+%%DATADIR%%/plug-ins/tremolo.ny
+%%DATADIR%%/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,9 +53,10 @@ share/locale/sl/LC_MESSAGES/audacity.mo
 share/locale/sv/LC_MESSAGES/audacity.mo
 share/locale/uk/LC_MESSAGES/audacity.mo
 share/locale/zh/LC_MESSAGES/audacity.mo
-@dirrm share/audacity/plug-ins
-@dirrm share/audacity/nyquist
-@dirrm share/audacity
+share/locale/zh_TW/LC_MESSAGES/audacity.mo
+@dirrm %%DATADIR%%/plug-ins
+@dirrm %%DATADIR%%/nyquist
+@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%