patch several Makefile.am's t use noinst_LTLIBRARIES instead of lib_,

so that we will only get static versions of them build.  now we don't
need to install the parts that shouldn't be and cause conflicts with
other patches.

now all we have to do is figure out all the things audacity 2.1.1
needs for the next update :-)


ok wiz@

7 files changed, 72 insertions, 23 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 5cf9bf8b251..752502afc7f 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2015/09/18 11:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2015/09/18 21:19:07 mrg Exp $
 
 DISTNAME=		audacity-minsrc-2.1.0
 PKGNAME=		${DISTNAME:S/-minsrc//1}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}
 EXTRACT_SUFX=		.tar.xz
@@ -13,6 +13,7 @@ COMMENT=		Audio editor
 LICENSE=		gnu-gpl-v2 # AND cc-by-v3.0-license
 
 USE_LIBTOOL=		yes
+USE_TOOLS+=		automake autoreconf
 USE_TOOLS+=		gmake intltool msgfmt msgmerge pkg-config
 USE_TOOLS+=		xgettext zip:run
 USE_LANGUAGES=		c c++
@@ -42,15 +43,12 @@ CONFIG_SUB_OVERRIDE=		\
 PTHREAD_AUTO_VARS=	yes
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
 
-# the configure script does not respect --disable-shared
-# so we need to install the convenience libraries so that the audacity
-# binary can use them
-# XXX: this causes a conflict with portaudio
-post-install:
-	cd ${WRKSRC}/lib-src/FileDialog && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
-	cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
-	cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
-	cd ${WRKSRC}/lib-src/lib-widget-extra && ${PKGSRC_SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_MAKE_FLAGS} install
+# regen Makefile.in to avoid being built as shared libraries
+pre-configure:
+	cd ${WRKSRC}/lib-src/FileDialog && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/portaudio-v19 && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/portmixer && ${PKGSRC_SETENV} autoreconf -fiv
+	cd ${WRKSRC}/lib-src/lib-widget-extra && autoreconf -fiv
 
 .include "options.mk"
 
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 0334981c5ce..cff3ab2e2bf 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,13 +1,5 @@
-@comment $NetBSD: PLIST,v 1.11 2015/09/18 09:32:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/09/18 21:19:07 mrg Exp $
 bin/audacity
-include/portaudio.h
-include/portmixer.h
-lib/libFileDialog.la
-lib/libportaudio.la
-lib/libportmixer.la
-lib/libwidgetextra.la
-lib/pkgconfig/libwidgetextra.pc
-lib/pkgconfig/portaudio-2.0.pc
 man/man1/audacity.1
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
@@ -81,8 +73,6 @@ share/audacity/plug-ins/vocalremover.ny
 share/audacity/plug-ins/vocoder.ny
 share/doc/audacity/LICENSE.txt
 share/doc/audacity/README.txt
-share/doc/portmixer/LICENSE.txt
-share/doc/portmixer/README.txt
 share/icons/hicolor/16x16/apps/audacity.png
 share/icons/hicolor/22x22/apps/audacity.png
 share/icons/hicolor/24x24/apps/audacity.png
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index c5d19aaa617..819fbd3e971 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2015/09/18 08:46:20 wiz Exp $
+$NetBSD: distinfo,v 1.29 2015/09/18 21:19:07 mrg Exp $
 
 SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
 RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
@@ -6,10 +6,14 @@ 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_FileDialog_Makefile.am) = 234c29402f157000dc3afb0b39e23f107c50eaf3
+SHA1 (patch-lib-src_lib-widget-extra_Makefile.am) = afa60d928f9d3de287815b4f7aadd4bbcc700a21
 SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
+SHA1 (patch-lib-src_portmixer_src-extra_Makefile.am) = 9a0d5be37753683a2cade42673edb3d08e01ab4d
+SHA1 (patch-lib-src_sbsms_src-extra_Makefile.am) = 2beca18a286de1b26f4f96976fb58e1665d0531c
 SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
 SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
diff --git a/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
new file mode 100644
index 00000000000..7cf92e7efdb
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_FileDialog_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_FileDialog_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/FileDialog/Makefile.am.orig	2015-03-01 17:07:12.000000000 -0800
++++ lib-src/FileDialog/Makefile.am	2015-09-18 11:28:47.000000000 -0700
+@@ -2,7 +2,7 @@
+ 
+ EXTRA_DIST = FileDialog.vcproj FileDialogPrivate.h.in
+ 
+-lib_LTLIBRARIES = libFileDialog.la
++noinst_LTLIBRARIES = libFileDialog.la
+ 
+ libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS)
+ libFileDialog_la_LIBADD = $(WX_LIBS)
diff --git a/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am b/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
new file mode 100644
index 00000000000..df8d1e4ba43
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_lib-widget-extra_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_lib-widget-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/lib-widget-extra/Makefile.am.orig	2015-03-01 17:07:17.000000000 -0800
++++ lib-src/lib-widget-extra/Makefile.am	2015-09-18 11:29:29.000000000 -0700
+@@ -5,7 +5,7 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libwidgetextra.pc
+ 
+-lib_LTLIBRARIES = libwidgetextra.la
++noinst_LTLIBRARIES = libwidgetextra.la
+ 
+ libwidgetextra_la_CPPFLAGS = $(WX_CXXFLAGS)
+ libwidgetextra_la_LIBADD = $(WX_LIBS)
diff --git a/audio/audacity/patches/patch-lib-src_portmixer_src-extra_Makefile.am b/audio/audacity/patches/patch-lib-src_portmixer_src-extra_Makefile.am
new file mode 100644
index 00000000000..7a432f6b1f1
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_portmixer_src-extra_Makefile.am
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib-src_portmixer_src-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/portmixer/src/Makefile.am.orig	2015-03-01 17:07:05.000000000 -0800
++++ lib-src/portmixer/src/Makefile.am	2015-09-18 11:29:08.000000000 -0700
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libportmixer.la
++noinst_LTLIBRARIES = libportmixer.la
+ 
+ libportmixer_la_CPPFLAGS = -I$(top_srcdir)/include $(PORTAUDIO_CFLAGS)
+ libportmixer_la_SOURCES = \
diff --git a/audio/audacity/patches/patch-lib-src_sbsms_src-extra_Makefile.am b/audio/audacity/patches/patch-lib-src_sbsms_src-extra_Makefile.am
new file mode 100644
index 00000000000..f4532b9da22
--- /dev/null
+++ b/audio/audacity/patches/patch-lib-src_sbsms_src-extra_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib-src_sbsms_src-extra_Makefile.am,v 1.1 2015/09/18 21:19:07 mrg Exp $
+
+don't build a shared library of this.
+
+--- lib-src/sbsms/src/Makefile.am.orig	2015-03-01 17:07:04.000000000 -0800
++++ lib-src/sbsms/src/Makefile.am	2015-09-18 11:29:19.000000000 -0700
+@@ -3,7 +3,7 @@
+ libsbsmsincludedir = $(includedir)
+ libsbsmsinclude_HEADERS = ../include/sbsms.h
+ 
+-lib_LTLIBRARIES = libsbsms.la
++noinst_LTLIBRARIES = libsbsms.la
+ libsbsms_la_SOURCES = \
+ 	sms.cpp \
+ 	track.cpp \