Fri Sep 18 09:32:48 2015 UTC ()
Install convenience libraries so that audacity binary can use them.

The configure script does not respect --disable-shared, no clue yet why,
which makes this necessary. However, it causes a conflict with portaudio,
which should, optimally, be fixed by building against the existing
library instead.

But, this should make the program usable again in the meantime.

Bump PKGREVISION.


(wiz)
diff -r1.95 -r1.96 pkgsrc/audio/audacity/Makefile
diff -r1.10 -r1.11 pkgsrc/audio/audacity/PLIST
cvs diff -r1.95 -r1.96 pkgsrc/audio/audacity/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/audacity/Makefile 2015/09/18 08:53:21 1.95
+++ pkgsrc/audio/audacity/Makefile 2015/09/18 09:32:48 1.96
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.95 2015/09/18 08:53:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.96 2015/09/18 09:32:48 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= 3 5PKGREVISION= 4
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://audacityteam.org/ 11HOMEPAGE= http://audacityteam.org/
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+= 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++
@@ -32,26 +32,36 @@ CONFIGURE_ARGS+= --with-sbsms=system @@ -32,26 +32,36 @@ CONFIGURE_ARGS+= --with-sbsms=system
32CONFIGURE_ARGS+= --with-soundtouch=system 32CONFIGURE_ARGS+= --with-soundtouch=system
33CONFIGURE_ARGS+= --with-twolame=system 33CONFIGURE_ARGS+= --with-twolame=system
34CONFIGURE_ARGS+= --with-vorbis=system 34CONFIGURE_ARGS+= --with-vorbis=system
35CONFIGURE_ARGS+= --without-xaudio 35CONFIGURE_ARGS+= --without-xaudio
36 36
37CONFIG_GUESS_OVERRIDE= \ 37CONFIG_GUESS_OVERRIDE= \
38 config.guess */config.guess */*/config.guess */*/*/config.guess 38 config.guess */config.guess */*/config.guess */*/*/config.guess
39CONFIG_SUB_OVERRIDE= \ 39CONFIG_SUB_OVERRIDE= \
40 config.sub */config.sub */*/config.sub */*/*/config.sub 40 config.sub */config.sub */*/config.sub */*/*/config.sub
41 41
42PTHREAD_AUTO_VARS= yes 42PTHREAD_AUTO_VARS= yes
43BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 43BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
44 44
 45# the configure script does not respect --disable-shared
 46# so we need to install the convenience libraries so that the audacity
 47# binary can use them
 48# XXX: this causes a conflict with portaudio
 49post-install:
 50 cd ${WRKSRC}/lib-src/FileDialog && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 51 cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 52 cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 53 cd ${WRKSRC}/lib-src/lib-widget-extra && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
 54
45.include "options.mk" 55.include "options.mk"
46 56
47.include "../../sysutils/desktop-file-utils/desktopdb.mk" 57.include "../../sysutils/desktop-file-utils/desktopdb.mk"
48.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 58.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
49.include "../../multimedia/libogg/buildlink3.mk" 59.include "../../multimedia/libogg/buildlink3.mk"
50.include "../../audio/lilv/buildlink3.mk" 60.include "../../audio/lilv/buildlink3.mk"
51.include "../../audio/lv2/buildlink3.mk" 61.include "../../audio/lv2/buildlink3.mk"
52.include "../../audio/soundtouch/buildlink3.mk" 62.include "../../audio/soundtouch/buildlink3.mk"
53BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9 63BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9
54.include "../../audio/twolame/buildlink3.mk" 64.include "../../audio/twolame/buildlink3.mk"
55.include "../../audio/lame/buildlink3.mk" 65.include "../../audio/lame/buildlink3.mk"
56.include "../../audio/libid3tag/buildlink3.mk" 66.include "../../audio/libid3tag/buildlink3.mk"
57.include "../../audio/libmad/buildlink3.mk" 67.include "../../audio/libmad/buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/audio/audacity/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/audacity/PLIST 2015/04/20 13:38:23 1.10
+++ pkgsrc/audio/audacity/PLIST 2015/09/18 09:32:48 1.11
@@ -1,15 +1,23 @@ @@ -1,15 +1,23 @@
1@comment $NetBSD: PLIST,v 1.10 2015/04/20 13:38:23 rodent Exp $ 1@comment $NetBSD: PLIST,v 1.11 2015/09/18 09:32:48 wiz Exp $
2bin/audacity 2bin/audacity
 3include/portaudio.h
 4include/portmixer.h
 5lib/libFileDialog.la
 6lib/libportaudio.la
 7lib/libportmixer.la
 8lib/libwidgetextra.la
 9lib/pkgconfig/libwidgetextra.pc
 10lib/pkgconfig/portaudio-2.0.pc
3man/man1/audacity.1 11man/man1/audacity.1
4share/appdata/audacity.appdata.xml 12share/appdata/audacity.appdata.xml
5share/applications/audacity.desktop 13share/applications/audacity.desktop
6share/audacity/EQDefaultCurves.xml 14share/audacity/EQDefaultCurves.xml
7share/audacity/include/audacity/ConfigInterface.h 15share/audacity/include/audacity/ConfigInterface.h
8share/audacity/include/audacity/EffectAutomationParameters.h 16share/audacity/include/audacity/EffectAutomationParameters.h
9share/audacity/include/audacity/EffectInterface.h 17share/audacity/include/audacity/EffectInterface.h
10share/audacity/include/audacity/IdentInterface.h 18share/audacity/include/audacity/IdentInterface.h
11share/audacity/include/audacity/ImporterInterface.h 19share/audacity/include/audacity/ImporterInterface.h
12share/audacity/include/audacity/ModuleInterface.h 20share/audacity/include/audacity/ModuleInterface.h
13share/audacity/include/audacity/PluginInterface.h 21share/audacity/include/audacity/PluginInterface.h
14share/audacity/include/audacity/Types.h 22share/audacity/include/audacity/Types.h
15share/audacity/nyquist/bug.lsp 23share/audacity/nyquist/bug.lsp
@@ -63,26 +71,28 @@ share/audacity/plug-ins/crossfadetracks. @@ -63,26 +71,28 @@ share/audacity/plug-ins/crossfadetracks.
63share/audacity/plug-ins/delay.ny 71share/audacity/plug-ins/delay.ny
64share/audacity/plug-ins/equalabel.ny 72share/audacity/plug-ins/equalabel.ny
65share/audacity/plug-ins/highpass.ny 73share/audacity/plug-ins/highpass.ny
66share/audacity/plug-ins/lowpass.ny 74share/audacity/plug-ins/lowpass.ny
67share/audacity/plug-ins/notch.ny 75share/audacity/plug-ins/notch.ny
68share/audacity/plug-ins/pluck.ny 76share/audacity/plug-ins/pluck.ny
69share/audacity/plug-ins/rissetdrum.ny 77share/audacity/plug-ins/rissetdrum.ny
70share/audacity/plug-ins/sample-data-export.ny 78share/audacity/plug-ins/sample-data-export.ny
71share/audacity/plug-ins/tremolo.ny 79share/audacity/plug-ins/tremolo.ny
72share/audacity/plug-ins/vocalremover.ny 80share/audacity/plug-ins/vocalremover.ny
73share/audacity/plug-ins/vocoder.ny 81share/audacity/plug-ins/vocoder.ny
74share/doc/audacity/LICENSE.txt 82share/doc/audacity/LICENSE.txt
75share/doc/audacity/README.txt 83share/doc/audacity/README.txt
 84share/doc/portmixer/LICENSE.txt
 85share/doc/portmixer/README.txt
76share/icons/hicolor/16x16/apps/audacity.png 86share/icons/hicolor/16x16/apps/audacity.png
77share/icons/hicolor/22x22/apps/audacity.png 87share/icons/hicolor/22x22/apps/audacity.png
78share/icons/hicolor/24x24/apps/audacity.png 88share/icons/hicolor/24x24/apps/audacity.png
79share/icons/hicolor/32x32/apps/audacity.png 89share/icons/hicolor/32x32/apps/audacity.png
80share/icons/hicolor/48x48/apps/audacity.png 90share/icons/hicolor/48x48/apps/audacity.png
81share/icons/hicolor/scalable/apps/audacity.svg 91share/icons/hicolor/scalable/apps/audacity.svg
82${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo 92${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo
83${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo 93${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo
84${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo 94${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo
85${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo 95${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo
86${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo 96${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo
87${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo 97${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo
88${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo 98${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo