9 files changed, 14 insertions, 95 deletions

diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index 1f3a8d364d97..f1b10d1b0b89 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	1.3.0b
+PORTVERSION=	1.3.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,6 +25,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
+USE_GCC=	4.1
+
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		audacity.1
 MANCOMPRESSED=	yes
@@ -48,6 +51,7 @@ CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 MAKE_ENV=	DOC=yes
 .endif
 
+CONFIGURE_ARGS+=	--with-portaudio=v18
 .if !defined(WITHOUT_MAD)
 CONFIGURE_ARGS+=	--with-libmad=system
 LIB_DEPENDS+=		mad.2:${PORTSDIR}/audio/libmad
@@ -69,4 +73,8 @@ LIB_DEPENDS+=		id3tag.0:${PORTSDIR}/audio/libid3tag
 CONFIGURE_ARGS+=	--without-id3tag
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's,^sndfile.c : .*,,' \
+		${WRKSRC}/lib-src/libsndfile/src/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/audio/audacity-devel/distinfo b/audio/audacity-devel/distinfo
index c84307ef8126..d4877fa949dd 100644
--- a/audio/audacity-devel/distinfo
+++ b/audio/audacity-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacity-src-1.3.0b.tar.gz) = d1c5a3359ad95eab6ca8b375972c1a91
-SHA256 (audacity-src-1.3.0b.tar.gz) = cff02da856622acbca7b6ce9e0c05ad0cabc0c10fc5f79e349d2e586176e49f9
-SIZE (audacity-src-1.3.0b.tar.gz) = 4938302
+MD5 (audacity-src-1.3.2.tar.gz) = bf63673140254f1283dfd55b61ff2422
+SHA256 (audacity-src-1.3.2.tar.gz) = aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621
+SIZE (audacity-src-1.3.2.tar.gz) = 6683449
diff --git a/audio/audacity-devel/files/patch-gcc41 b/audio/audacity-devel/files/patch-gcc41
deleted file mode 100644
index ea482a83b6ad..000000000000
--- a/audio/audacity-devel/files/patch-gcc41
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/soundtouch/include/SoundTouch.h.orig        Sun Nov 27 08:47:29 2005
-+++ lib-src/soundtouch/include/SoundTouch.h     Sun Dec 17 22:52:47 2006
-@@ -146,7 +146,7 @@
-     static const char *getVersionString();
-
-     /// Get SoundTouch library version Id
--    static uint SoundTouch::getVersionId();
-+    static uint getVersionId();
-
-     /// Sets new rate control value. Normal rate = 1.0, smaller values
-     /// represent slower rate, larger faster rates.
diff --git a/audio/audacity-devel/files/patch-libnyquist-Makefile.in b/audio/audacity-devel/files/patch-libnyquist-Makefile.in
deleted file mode 100644
index 2f57bbaf95bb..000000000000
--- a/audio/audacity-devel/files/patch-libnyquist-Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- lib-src/libnyquist/Makefile.in.orig	Tue Dec  2 19:32:18 2003
-+++ lib-src/libnyquist/Makefile.in	Tue Dec  2 19:32:42 2003
-@@ -465,13 +465,13 @@
- 	cc -c cmt/userio.c -o cmt/userio.o $(CFLAGS)
- 
- misc/intgen: misc/intgen.c
--	cd misc; make intgen
-+	cd misc; $(MAKE) intgen
- 
- misc/unpacker: misc/unpacker.c misc/convert.c
--	cd misc; make unpacker
-+	cd misc; $(MAKE) unpacker
- 
- misc/packer: misc/packer.c misc/convert.c
--	cd misc; make packer
-+	cd misc; $(MAKE) packer
- 
- nyqsrc/sndfnintptrs.h: $(NYQHDRS) snd/snd.h misc/intgen
- 	$(INTGEN) nyqsrc/sndfnint $(NYQHDRS)
-@@ -481,14 +481,14 @@
- 
- clean:
- 	rm -f libnyquist.a
--	cd misc; make clean
-+	cd misc; $(MAKE) clean
- 	rm -f $(OBJECTS)
- # Note that these files are machine-generated:
- 	rm -f nyqsrc/sndfnintptrs.h nyqsrc/sndfnint.c nyqsrc/sndfnintdefs.h
- 	rm -f nyqsrc/seqfnintptrs.h nyqsrc/seqfnint.c nyqsrc/seqfnintdefs.h
- 
- cleaner: clean
--	cd misc; make cleaner
-+	cd misc; $(MAKE) cleaner
- 	rm -f *.backup */*.backup
- 	rm -f *~ */*.*~
- 	rm -f *.save */*.save
diff --git a/audio/audacity-devel/files/patch-libnyquist-switches.h b/audio/audacity-devel/files/patch-libnyquist-switches.h
deleted file mode 100644
index 4cd74add2be3..000000000000
--- a/audio/audacity-devel/files/patch-libnyquist-switches.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/libnyquist/sys/switches.h.orig	Tue Dec  2 19:14:40 2003
-+++ lib-src/libnyquist/sys/switches.h	Tue Dec  2 19:16:20 2003
-@@ -39,7 +39,7 @@
- */
- #define nyquist_printf printf
- 
--#if __APPLE__ && __GNUC__ /* Mac OS X */
-+#if (__FreeBSD__ || __APPLE__) && __GNUC__ /* Mac OS X */
- #define NEED_ULONG 1
- #else
- #include <sys/types.h>
diff --git a/audio/audacity-devel/files/patch-libnyquist-term.c b/audio/audacity-devel/files/patch-libnyquist-term.c
deleted file mode 100644
index 5e33f81c2f38..000000000000
--- a/audio/audacity-devel/files/patch-libnyquist-term.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/libnyquist/sys/term.c.orig	Tue Dec  2 19:17:30 2003
-+++ lib-src/libnyquist/sys/term.c	Tue Dec  2 19:17:51 2003
-@@ -40,7 +40,7 @@
- #else
- 
- #include <termios.h>
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <asm/ioctls.h>
- #endif
- #include <signal.h>
diff --git a/audio/audacity-devel/files/patch-portaudio-pa_unix_oss.c b/audio/audacity-devel/files/patch-portaudio-pa_unix_oss.c
deleted file mode 100644
index 43b2d587cca5..000000000000
--- a/audio/audacity-devel/files/patch-portaudio-pa_unix_oss.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/portaudio/pa_unix_oss/pa_unix_oss.c.orig	Tue Dec  2 19:57:13 2003
-+++ lib-src/portaudio/pa_unix_oss/pa_unix_oss.c	Tue Dec  2 19:57:47 2003
-@@ -42,6 +42,8 @@
- 
- #ifdef __linux__
- #include <linux/soundcard.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/soundcard.h>
- #else
- #include <machine/soundcard.h> /* JH20010905 */
- #endif
diff --git a/audio/audacity-devel/files/patch-portmixer-px_unix_oss.c b/audio/audacity-devel/files/patch-portmixer-px_unix_oss.c
deleted file mode 100644
index f55e651d1176..000000000000
--- a/audio/audacity-devel/files/patch-portmixer-px_unix_oss.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig	Tue Dec  2 20:06:55 2003
-+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c	Tue Dec  2 20:07:09 2003
-@@ -37,6 +37,8 @@
- 
- #ifdef __linux__
- #include <linux/soundcard.h>
-+#elif defined(__FreeBSD__)
-+#include <sys/soundcard.h>
- #else
- #include <machine/soundcard.h> /* JH20010905 */
- #endif
diff --git a/audio/audacity-devel/pkg-plist b/audio/audacity-devel/pkg-plist
index 3fc2d4029df6..2596889be688 100644
--- a/audio/audacity-devel/pkg-plist
+++ b/audio/audacity-devel/pkg-plist
@@ -27,6 +27,7 @@ bin/audacity
 %%DATADIR%%/plug-ins/pluck.ny
 %%DATADIR%%/plug-ins/tremolo.ny
 %%DATADIR%%/audacity-1.2-help.htb
+share/locale/af/LC_MESSAGES/audacity.mo
 share/locale/ar/LC_MESSAGES/audacity.mo
 share/locale/bg/LC_MESSAGES/audacity.mo
 share/locale/ca/LC_MESSAGES/audacity.mo
@@ -51,6 +52,7 @@ share/locale/pt/LC_MESSAGES/audacity.mo
 share/locale/ru/LC_MESSAGES/audacity.mo
 share/locale/sl/LC_MESSAGES/audacity.mo
 share/locale/sv/LC_MESSAGES/audacity.mo
+share/locale/tr/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