- Update to version 1.2.0

PR:		ports/63673
Submitted by:	maintainer

6 files changed, 69 insertions, 63 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 3e7eea2ec677..089148b1da35 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -5,59 +5,58 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTVERSION=	1.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-2
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 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/wxgtk2 \
-		mad.2:${PORTSDIR}/audio/mad
-
-CONFLICTS=	audacity-1.2*
+LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-AUDACITY_HELP_DIR=	${PREFIX}/share/doc/audacity
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		CFLAGS="-DAUDACITY_HELP_DIR=${AUDACITY_HELP_DIR} ${PTHREAD_CFLAGS}" \
+USE_LIBTOOL=	yes
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
-CONFIGURE_ARGS+=	--with-id3=no --with-libmad=yes
+CONFIGURE_ARGS+=	--with-id3=no
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ARTS)
-LIB_DEPENDS+=	qtmcop.1:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--with-arts-soundserver=yes
+.if !defined(NOPORTDOCS)
+MAKE_ENV=	DOC=yes
+.endif
+
+.if !defined(WITHOUT_MAD)
+CONFIGURE_ARGS+=	--with-libmad=system
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+.else
+CONFIGURE_ARGS+=	--without-libmad
 .endif
 
 .if !defined(WITHOUT_VORBIS)
-CONFIGURE_ARGS+=	--with-vorbis
+CONFIGURE_ARGS+=	--with-vorbis=system
 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."
 .endif
-.if !defined(WITH_ARTS)
-	@${ECHO_MSG} "You can use artsd instead of OSS for output by defining WITH_ARTS."
-.endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/audacity ${PREFIX}/bin/audacity
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/audacity
-	${INSTALL_DATA} ${WRKSRC}/audacity-help.htb ${WRKSRC}/README.txt ${WRKSRC}/LICENSE.txt ${PREFIX}/share/doc/audacity/
-.endif
+MAN1=		audacity.1
+MANCOMPRESSED=	yes
 
 .include <bsd.port.post.mk>
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index c874c5f913b2..e24cd3e69071 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1 +1,2 @@
-MD5 (audacity-src-1.0.0-2.tgz) = 221573db91b48d521a55c7432189df80
+MD5 (audacity-src-1.2.0.tar.gz) = 2cc3dca5327954b876f47124ab6f3586
+SIZE (audacity-src-1.2.0.tar.gz) = 3341562
diff --git a/audio/audacity/files/patch-audioarts.c b/audio/audacity/files/patch-audioarts.c
deleted file mode 100644
index 4d59b2251ae8..000000000000
--- a/audio/audacity/files/patch-audioarts.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snd/audioarts.c.orig	Wed May 29 19:10:43 2002
-+++ snd/audioarts.c	Wed May 29 19:10:51 2002
-@@ -11,7 +11,7 @@
- 
- #include <sys/time.h>
- 
--#include <kde/artsc/artsc.h>
-+#include <artsc/artsc.h>
- 
- /* snd includes */
- 
diff --git a/audio/audacity/files/patch::Help.cpp b/audio/audacity/files/patch::Help.cpp
deleted file mode 100644
index 2c704e40a1e0..000000000000
--- a/audio/audacity/files/patch::Help.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Help.cpp.orig	Mon Sep 17 16:50:58 2001
-+++ Help.cpp	Mon Sep 17 16:53:11 2001
-@@ -61,7 +61,7 @@
- void InitHelp(wxWindow * parent)
- {
-    if (!gHelp) {
--      wxString defaultLoc = wxGetCwd() + wxFILE_SEP_PATH + "audacity-help.htb";
-+      wxString defaultLoc = AUDACITY_HELP_DIR + wxFILE_SEP_PATH + "audacity-help.htb";
- 
-       wxString helpFilePath =
-           gPrefs->Read("/Help/HelpFilePath", defaultLoc);
diff --git a/audio/audacity/files/patch::Help.h b/audio/audacity/files/patch::Help.h
deleted file mode 100644
index 85309d22eff2..000000000000
--- a/audio/audacity/files/patch::Help.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- Help.h.orig	Mon Sep 17 16:52:09 2001
-+++ Help.h	Mon Sep 17 16:52:53 2001
-@@ -11,6 +11,10 @@
- #ifndef __AUDACITY_HELP__
- #define __AUDACITY_HELP__
- 
-+#ifndef AUDACITY_HELP_DIR
-+#define AUDACITY_HELP_DIR /usr/X11R6/share/audacity
-+#endif
-+
- void InitHelp(wxWindow * parent);
- void ShowHelp(wxWindow * parent);
- void ShowHelp(wxWindow * parent, wxString topic);
diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist
index 994c949e6419..525fb6e1088f 100644
--- a/audio/audacity/pkg-plist
+++ b/audio/audacity/pkg-plist
@@ -1,5 +1,46 @@
 bin/audacity
-%%PORTDOCS%%%%DOCSDIR%%/audacity-help.htb
+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/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/es/LC_MESSAGES/audacity.mo
+share/locale/it/LC_MESSAGES/audacity.mo
+share/locale/mk/LC_MESSAGES/audacity.mo
+share/locale/nl/LC_MESSAGES/audacity.mo
+share/locale/pt/LC_MESSAGES/audacity.mo
+share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sv/LC_MESSAGES/audacity.mo
+@dirrm share/audacity/plug-ins
+@dirrm share/audacity/nyquist
+@dirrm share/audacity
+%%PORTDOCS%%%%DOCSDIR%%/audacity-1.2-help.htb
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%