Do not install a shell script over the real executable.

While here, clean up the Makefile.
Remove autoconf dependency (not used).
Remove alpha hack until someone reports it's still needed.
Bump PKGREVISION.

3 files changed, 36 insertions, 17 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index ac65cc0e0d5..6496dffcbd5 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.93 2015/06/30 09:57:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2015/09/18 08:46:20 wiz Exp $
 
 DISTNAME=		audacity-minsrc-2.1.0
 PKGNAME=		${DISTNAME:S/-minsrc//1}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}
 EXTRACT_SUFX=		.tar.xz
@@ -13,18 +13,26 @@ COMMENT=		Audio editor
 LICENSE=		gnu-gpl-v2 # AND cc-by-v3.0-license
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoconf gmake intltool msgfmt msgmerge pkg-config
+USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config
 USE_TOOLS+=		xgettext zip:run
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-expat=system --without-xaudio
-CONFIGURE_ARGS+=	--with-ffmpeg=system --with-libflac=system
-CONFIGURE_ARGS+=	--with-id3tag=system --with-libmad=system
-CONFIGURE_ARGS+=	--with-vorbis=system --with-sbsms=system
-CONFIGURE_ARGS+=	--with-libsamplerate=system --with-soundtouch=system
-CONFIGURE_ARGS+=	--with-twolame=system --with-lv2=system
-CONFIGURE_ARGS+=	--with-libsndfile=system --with-portaudio=local
-CONFIGURE_ARGS+=	--enable-nyquist=yes --with-midi=local
+CONFIGURE_ARGS+=	--enable-nyquist=yes
+CONFIGURE_ARGS+=	--with-expat=system
+CONFIGURE_ARGS+=	--with-ffmpeg=system
+CONFIGURE_ARGS+=	--with-id3tag=system
+CONFIGURE_ARGS+=	--with-libflac=system
+CONFIGURE_ARGS+=	--with-libmad=system
+CONFIGURE_ARGS+=	--with-libsamplerate=system
+CONFIGURE_ARGS+=	--with-libsndfile=system
+CONFIGURE_ARGS+=	--with-lv2=system
+CONFIGURE_ARGS+=	--with-midi=local
+CONFIGURE_ARGS+=	--with-portaudio=local
+CONFIGURE_ARGS+=	--with-sbsms=system
+CONFIGURE_ARGS+=	--with-soundtouch=system
+CONFIGURE_ARGS+=	--with-twolame=system
+CONFIGURE_ARGS+=	--with-vorbis=system
+CONFIGURE_ARGS+=	--without-xaudio
 
 CONFIG_GUESS_OVERRIDE=		\
 	config.guess */config.guess */*/config.guess */*/*/config.guess
@@ -62,8 +70,3 @@ BUILDLINK_API_DEPENDS.flac+=	flac>=1.3.0
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# XXX Internal compiler error with -O2
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-O
-.endif
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 7b0290aa1aa..c5d19aaa617 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.27 2015/04/27 23:50:38 joerg Exp $
+$NetBSD: distinfo,v 1.28 2015/09/18 08:46:20 wiz Exp $
 
 SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
 RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
 Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
+SHA1 (patch-Makefile.in) = 8a770c2ab0494359c22d7f8e1b548fb83c2c00ff
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
 SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
 SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
diff --git a/audio/audacity/patches/patch-Makefile.in b/audio/audacity/patches/patch-Makefile.in
new file mode 100644
index 00000000000..4be121de7ca
--- /dev/null
+++ b/audio/audacity/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2015/09/18 08:46:20 wiz Exp $
+
+Do not install a shell script over the real executable.
+
+--- Makefile.in.orig	2015-03-04 23:58:48.000000000 +0000
++++ Makefile.in
+@@ -414,7 +414,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = help images lib-src po src tests
+ ACLOCAL_AMFLAGS = -I m4
+-bin_SCRIPTS = audacity$(EXEEXT)
++bin_SCRIPTS = 
+ dist_doc_DATA = LICENSE.txt README.txt
+ dist_pkgdata_DATA = presets/EQDefaultCurves.xml
+ nobase_dist_pkgdata_DATA = \