Fri Sep 18 08:46:20 2015 UTC ()
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.


(wiz)
diff -r1.93 -r1.94 pkgsrc/audio/audacity/Makefile
diff -r1.27 -r1.28 pkgsrc/audio/audacity/distinfo
diff -r0 -r1.1 pkgsrc/audio/audacity/patches/patch-Makefile.in
cvs diff -r1.93 -r1.94 pkgsrc/audio/audacity/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/audacity/Makefile 2015/06/30 09:57:34 1.93
+++ pkgsrc/audio/audacity/Makefile 2015/09/18 08:46:20 1.94
@@ -1,40 +1,48 @@ @@ -1,40 +1,48 @@
1# $NetBSD: Makefile,v 1.93 2015/06/30 09:57:34 ryoon Exp $ 1# $NetBSD: Makefile,v 1.94 2015/09/18 08:46:20 wiz Exp $
2 2
3DISTNAME= audacity-minsrc-2.1.0 3DISTNAME= audacity-minsrc-2.1.0
4PKGNAME= ${DISTNAME:S/-minsrc//1} 4PKGNAME= ${DISTNAME:S/-minsrc//1}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://audacity.sourceforge.net/ 11HOMEPAGE= http://audacity.sourceforge.net/
12COMMENT= Audio editor 12COMMENT= Audio editor
13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license 13LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
14 14
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= autoconf gmake intltool msgfmt msgmerge pkg-config 16USE_TOOLS+= gmake intltool msgfmt msgmerge pkg-config
17USE_TOOLS+= xgettext zip:run 17USE_TOOLS+= xgettext zip:run
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ARGS+= --with-expat=system --without-xaudio 20CONFIGURE_ARGS+= --enable-nyquist=yes
21CONFIGURE_ARGS+= --with-ffmpeg=system --with-libflac=system 21CONFIGURE_ARGS+= --with-expat=system
22CONFIGURE_ARGS+= --with-id3tag=system --with-libmad=system 22CONFIGURE_ARGS+= --with-ffmpeg=system
23CONFIGURE_ARGS+= --with-vorbis=system --with-sbsms=system 23CONFIGURE_ARGS+= --with-id3tag=system
24CONFIGURE_ARGS+= --with-libsamplerate=system --with-soundtouch=system 24CONFIGURE_ARGS+= --with-libflac=system
25CONFIGURE_ARGS+= --with-twolame=system --with-lv2=system 25CONFIGURE_ARGS+= --with-libmad=system
26CONFIGURE_ARGS+= --with-libsndfile=system --with-portaudio=local 26CONFIGURE_ARGS+= --with-libsamplerate=system
27CONFIGURE_ARGS+= --enable-nyquist=yes --with-midi=local 27CONFIGURE_ARGS+= --with-libsndfile=system
 28CONFIGURE_ARGS+= --with-lv2=system
 29CONFIGURE_ARGS+= --with-midi=local
 30CONFIGURE_ARGS+= --with-portaudio=local
 31CONFIGURE_ARGS+= --with-sbsms=system
 32CONFIGURE_ARGS+= --with-soundtouch=system
 33CONFIGURE_ARGS+= --with-twolame=system
 34CONFIGURE_ARGS+= --with-vorbis=system
 35CONFIGURE_ARGS+= --without-xaudio
28 36
29CONFIG_GUESS_OVERRIDE= \ 37CONFIG_GUESS_OVERRIDE= \
30 config.guess */config.guess */*/config.guess */*/*/config.guess 38 config.guess */config.guess */*/config.guess */*/*/config.guess
31CONFIG_SUB_OVERRIDE= \ 39CONFIG_SUB_OVERRIDE= \
32 config.sub */config.sub */*/config.sub */*/*/config.sub 40 config.sub */config.sub */*/config.sub */*/*/config.sub
33 41
34PTHREAD_AUTO_VARS= yes 42PTHREAD_AUTO_VARS= yes
35BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 43BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
36 44
37.include "options.mk" 45.include "options.mk"
38 46
39.include "../../sysutils/desktop-file-utils/desktopdb.mk" 47.include "../../sysutils/desktop-file-utils/desktopdb.mk"
40.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 48.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -52,18 +60,13 @@ BUILDLINK_API_DEPENDS.twolame+= twolame> @@ -52,18 +60,13 @@ BUILDLINK_API_DEPENDS.twolame+= twolame>
52.include "../../audio/libsndfile/buildlink3.mk" 60.include "../../audio/libsndfile/buildlink3.mk"
53.include "../../audio/libvorbis/buildlink3.mk" 61.include "../../audio/libvorbis/buildlink3.mk"
54#.include "../../audio/portaudio-devel/buildlink3.mk" # Needs Pa_GetStreamHostApiType 62#.include "../../audio/portaudio-devel/buildlink3.mk" # Needs Pa_GetStreamHostApiType
55.include "../../devel/zlib/buildlink3.mk" 63.include "../../devel/zlib/buildlink3.mk"
56BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0 64BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
57.include "../../audio/flac/buildlink3.mk" 65.include "../../audio/flac/buildlink3.mk"
58.include "../../multimedia/ffmpeg1/buildlink3.mk" 66.include "../../multimedia/ffmpeg1/buildlink3.mk"
59.include "../../textproc/expat/buildlink3.mk" 67.include "../../textproc/expat/buildlink3.mk"
60.include "../../x11/wxGTK28/buildlink3.mk" 68.include "../../x11/wxGTK28/buildlink3.mk"
61.include "../../mk/dlopen.buildlink3.mk" 69.include "../../mk/dlopen.buildlink3.mk"
62.include "../../mk/oss.buildlink3.mk" 70.include "../../mk/oss.buildlink3.mk"
63.include "../../mk/pthread.buildlink3.mk" 71.include "../../mk/pthread.buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
65 
66# XXX Internal compiler error with -O2 
67.if ${MACHINE_ARCH} == "alpha" 
68CFLAGS+= -O 
69.endif 
cvs diff -r1.27 -r1.28 pkgsrc/audio/audacity/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/audacity/distinfo 2015/04/27 23:50:38 1.27
+++ pkgsrc/audio/audacity/distinfo 2015/09/18 08:46:20 1.28
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.27 2015/04/27 23:50:38 joerg Exp $ 1$NetBSD: distinfo,v 1.28 2015/09/18 08:46:20 wiz Exp $
2 2
3SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3 3SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
4RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f 4RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
5Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes 5Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
 6SHA1 (patch-Makefile.in) = 8a770c2ab0494359c22d7f8e1b548fb83c2c00ff
6SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994 7SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
7SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96 8SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
8SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3 9SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
9SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2 10SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
10SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee 11SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
11SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09 12SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
12SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3 13SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
13SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2 14SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
14SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb 15SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
File Added: pkgsrc/audio/audacity/patches/patch-Makefile.in
$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 = \