Add autoreconf libtool to USES; install headers to include, not DATADIR

This changeset brings in the necessary fixes in audacity's build system
to use autoreconf and libtool in USES. (206914)
First use case of this is to have audacity install its headers in the
standard include path rather than DATADIR (207074).
Bump PORTREVISION.

PR:		206914, 207074
Submitted by:	tatsuki_makino@hotmail.com
Approved by:	xxjack12xx@gmail.com (maintainer)

15 files changed, 200 insertions, 51 deletions

diff --git a/audio/audacity/files/patch-Makefile.am b/audio/audacity/files/patch-Makefile.am
new file mode 100644
index 000000000000..1d553f2f247e
--- /dev/null
+++ b/audio/audacity/files/patch-Makefile.am
@@ -0,0 +1,23 @@
+--- Makefile.am.orig	2016-01-08 22:05:48 UTC
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = help images lib-src po src tests
++SUBDIRS = help images include lib-src po src tests
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+@@ -8,14 +8,6 @@ dist_doc_DATA = LICENSE.txt README.txt
+ dist_pkgdata_DATA = presets/EQDefaultCurves.xml
+ 
+ nobase_dist_pkgdata_DATA = \
+-   include/audacity/ConfigInterface.h \
+-   include/audacity/EffectAutomationParameters.h \
+-   include/audacity/EffectInterface.h \
+-   include/audacity/IdentInterface.h \
+-   include/audacity/ImporterInterface.h \
+-   include/audacity/ModuleInterface.h \
+-   include/audacity/PluginInterface.h \
+-   include/audacity/Types.h \
+    nyquist/dspprims.lsp \
+    nyquist/envelopes.lsp \
+    nyquist/equalizer.lsp \
diff --git a/audio/audacity/files/patch-configure.ac b/audio/audacity/files/patch-configure.ac
new file mode 100644
index 000000000000..5e6a139c605e
--- /dev/null
+++ b/audio/audacity/files/patch-configure.ac
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2016-01-08 22:05:48 UTC
++++ configure.ac
+@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4])
+ 
+ AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar])
+ AM_MAINTAINER_MODE([disable])
++AM_SILENT_RULES([yes])
+ 
+ AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+@@ -690,6 +690,7 @@ AC_CONFIG_FILES([
+    Makefile
+    help/Makefile
+    images/Makefile
++   include/Makefile
+    lib-src/Makefile
+    po/Makefile.in
+    src/audacity.desktop
diff --git a/audio/audacity/files/patch-include_Makefile.am b/audio/audacity/files/patch-include_Makefile.am
new file mode 100644
index 000000000000..c92306752c82
--- /dev/null
+++ b/audio/audacity/files/patch-include_Makefile.am
@@ -0,0 +1,24 @@
+--- include/Makefile.am.orig	1970-01-01 00:00:00 UTC
++++ include/Makefile.am
+@@ -0,0 +1,21 @@
++ACLOCAL_AMFLAGS=	-I m4
++
++pkginclude_HEADERS= \
++	audacity/ConfigInterface.h \
++	audacity/EffectAutomationParameters.h \
++	audacity/EffectInterface.h \
++	audacity/IdentInterface.h \
++	audacity/ImporterInterface.h \
++	audacity/ModuleInterface.h \
++	audacity/PluginInterface.h \
++	audacity/Types.h \
++	$(NULL)
++
++pkgdataincludedir=	$(pkgdatadir)/include
++
++install-data-local: install-data-include
++install-data-include:
++	$(MKDIR_P) "$(DESTDIR)$(pkgdataincludedir)"
++	$(LN_S) "$(pkgincludedir)" "$(DESTDIR)$(pkgdataincludedir)/"
++
++.PHONY: install-data-include
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
new file mode 100644
index 000000000000..8452d4495d89
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.am
@@ -0,0 +1,52 @@
+--- lib-src/FileDialog/Makefile.am.orig	2016-01-08 22:05:48 UTC
++++ lib-src/FileDialog/Makefile.am
+@@ -1,5 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
++SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
++DIST_SUBDIRS=	gtk mac win
+ lib_LTLIBRARIES = libFileDialog.la
+ 
+ libFileDialog_la_CPPFLAGS = $(WX_CXXFLAGS) -Wno-deprecated-declarations
+@@ -7,22 +9,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
+ libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
+ 
+ if GTK
+-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
+-libFileDialog_la_LIBADD += $(GTK_LIBS)
++GTK_SUBDIR=	gtk
++libFileDialog_la_LIBADD += \
++	gtk/libFileDialog.la \
++	$(NULL)
+ libFileDialog_la_SOURCES += \
+-	gtk/FileDialogPrivate.cpp \
+ 	gtk/FileDialogPrivate.h \
+ 	$(NULL)
+ endif
+ 
+ if MAC
+-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
+-									 mac/FileDialogPrivate.h \
+-									 $(NULL)
++MAC_SUBDIR=	mac
++libFileDialog_la_LIBADD+= \
++	mac/libFileDialog.la \
++	$(NULL)
++libFileDialog_la_SOURCES += \
++	mac/FileDialogPrivate.h \
++	$(NULL)
++#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
+ endif
+ 
+ if WINDOWS
+-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
+-									 win/FileDialogPrivate.h \
+-									 $(NULL)
++WINDOWS_SUBDIR=	win
++libFileDialog_la_LIBADD+= \
++	win/libFileDialog.la \
++	$(NULL)
++libFileDialog_la_SOURCES += \
++	win/FileDialogPrivate.h \
++	$(NULL)
+ endif
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.in b/audio/audacity/files/patch-lib-src_FileDialog_Makefile.in
deleted file mode 100644
index 72f3ae134d09..000000000000
--- a/audio/audacity/files/patch-lib-src_FileDialog_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/FileDialog/Makefile.in	2016-01-24 02:11:11.530847000 -0800
-+++ lib-src/FileDialog/Makefile.in	2016-01-24 02:03:53.243242000 -0800
-@@ -212,7 +212,7 @@
- am__v_OBJCXX_0 = @echo "  OBJCXX  " $@;
- am__v_OBJCXX_1 = 
- OBJCXXLD = $(OBJCXX)
--OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_configure.ac b/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
new file mode 100644
index 000000000000..36aa6958d573
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_FileDialog_configure.ac
@@ -0,0 +1,11 @@
+--- lib-src/FileDialog/configure.ac.orig	2016-01-08 22:05:48 UTC
++++ lib-src/FileDialog/configure.ac
+@@ -124,7 +124,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEME
+ 
+ echo "Implementation to use: $IMPLEMENTATION"
+ 
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile])
+ 
+ #
+ # Write it all out
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am
new file mode 100644
index 000000000000..54040c9fa7b6
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_FileDialog_gtk_Makefile.am
@@ -0,0 +1,15 @@
+--- lib-src/FileDialog/gtk/Makefile.am.orig	1970-01-01 00:00:00 UTC
++++ lib-src/FileDialog/gtk/Makefile.am
+@@ -0,0 +1,12 @@
++ACLOCAL_AMFLAGS=	-I m4
++noinst_LTLIBRARIES=	libFileDialog.la
++libFileDialog_la_CPPFLAGS= \
++	$(WX_CXXFLAGS) -Wno-deprecated-declarations \
++	$(GTK_CFLAGS)
++libFileDialog_la_LIBADD= \
++	$(WX_LIBS) \
++	$(GTK_LIBS)
++libFileDialog_la_SOURCES= \
++	FileDialogPrivate.cpp \
++	FileDialogPrivate.h \
++	$(NULL)
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am
new file mode 100644
index 000000000000..712c78c23a0b
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_FileDialog_mac_Makefile.am
@@ -0,0 +1,13 @@
+--- lib-src/FileDialog/mac/Makefile.am.orig	1970-01-01 00:00:00 UTC
++++ lib-src/FileDialog/mac/Makefile.am
+@@ -0,0 +1,10 @@
++ACLOCAL_AMFLAGS=	-I m4
++noinst_LTLIBRARIES=	libFileDialog.la
++libFileDialog_la_CPPFLAGS= \
++	$(WX_CXXFLAGS) -Wno-deprecated-declarations
++libFileDialog_la_LIBADD= \
++	$(WX_LIBS)
++libFileDialog_la_SOURCES= \
++	FileDialogPrivate.mm \
++	FileDialogPrivate.h \
++	$(NULL)
diff --git a/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am b/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am
new file mode 100644
index 000000000000..c9757b902435
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_FileDialog_win_Makefile.am
@@ -0,0 +1,13 @@
+--- lib-src/FileDialog/win/Makefile.am.orig	1970-01-01 00:00:00 UTC
++++ lib-src/FileDialog/win/Makefile.am
+@@ -0,0 +1,10 @@
++ACLOCAL_AMFLAGS=	-I m4
++noinst_LTLIBRARIES=	libFileDialog.la
++libFileDialog_la_CPPFLAGS= \
++	$(WX_CXXFLAGS) -Wno-deprecated-declarations
++libFileDialog_la_LIBADD= \
++	$(WX_LIBS)
++libFileDialog_la_SOURCES= \
++	FileDialogPrivate.cpp \
++	FileDialogPrivate.h \
++	$(NULL)
diff --git a/audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in b/audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in
deleted file mode 100644
index 1dbe35652c66..000000000000
--- a/audio/audacity/files/patch-lib-src__soundtouch__source__SoundTouch__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig	2015-07-11 10:02:22 UTC
-+++ lib-src/soundtouch/source/SoundTouch/Makefile.in
-@@ -346,7 +346,7 @@ lib_LTLIBRARIES = libSoundTouch.la
- libSoundTouch_la_SOURCES = AAFilter.cpp FIRFilter.cpp FIFOSampleBuffer.cpp RateTransposer.cpp SoundTouch.cpp TDStretch.cpp cpu_detect_x86.cpp BPMDetect.cpp PeakFinder.cpp
- 
- # Compiler flags
--AM_CXXFLAGS = -O3 -fcheck-new -I../../include
-+AM_CXXFLAGS = -O3 -I../../include
- 
- # Compile the files that need MMX and SSE individually.
- libSoundTouch_la_LIBADD = libSoundTouchMMX.la libSoundTouchSSE.la
diff --git a/audio/audacity/files/patch-lib-src__libmad__configure b/audio/audacity/files/patch-lib-src_libmad_configure.ac
index b04b7ed8c130..0a3f0df4f9e7 100644
--- a/audio/audacity/files/patch-lib-src__libmad__configure
+++ b/audio/audacity/files/patch-lib-src_libmad_configure.ac
@@ -1,20 +1,33 @@
---- lib-src/libmad/configure.orig	2015-07-11 10:02:22 UTC
-+++ lib-src/libmad/configure
-@@ -11983,17 +11983,12 @@ then
+--- lib-src/libmad/configure.ac.orig	2016-01-08 22:05:48 UTC
++++ lib-src/libmad/configure.ac
+@@ -141,22 +141,25 @@ then
+ 
+     case "$optimize" in
+ 	-O|"-O "*)
++dnl (using audio/libmad/files/patch-configure as reference)
++AC_PROG_GREP
++AS_IF([$CC -v 2>&1 | $GREP -q clang], [CLANG=yes], [CLANG=])
+ 	    optimize="-O"
+ 	    : #x optimize="$optimize -fforce-mem"
  	    : #x optimize="$optimize -fforce-addr"
  	    : #x optimize="$optimize -finline-functions"
  	    : #- optimize="$optimize -fstrength-reduce"
 -	    optimize="$optimize -fthread-jumps"
 -	    optimize="$optimize -fcse-follow-jumps"
 -	    optimize="$optimize -fcse-skip-blocks"
++	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fthread-jumps" ; fi
++	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-follow-jumps" ; fi
++	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fcse-skip-blocks" ; fi
  	    : #x optimize="$optimize -frerun-cse-after-loop"
  	    : #x optimize="$optimize -frerun-loop-opt"
  	    : #x optimize="$optimize -fgcse"
  	    optimize="$optimize -fexpensive-optimizations"
 -	    optimize="$optimize -fregmove"
++	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fregmove" ; fi
  	    : #* optimize="$optimize -fdelayed-branch"
  	    : #x optimize="$optimize -fschedule-insns"
 -	    optimize="$optimize -fschedule-insns2"
++	    if @<:@ x$CLANG != xyes @:>@ ; then optimize="$optimize -fschedule-insns2" ; fi
  	    : #? optimize="$optimize -ffunction-sections"
  	    : #? optimize="$optimize -fcaller-saves"
  	    : #> optimize="$optimize -funroll-loops"
diff --git a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.in b/audio/audacity/files/patch-lib-src_libnyquist_Makefile.in
deleted file mode 100644
index 7b2842ae59c7..000000000000
--- a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/libnyquist/Makefile.in.orig	2016-01-08 22:05:48 UTC
-+++ lib-src/libnyquist/Makefile.in
-@@ -467,7 +467,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include
--SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src
-+SNDFILE_CFLAGS = -I%%LOCALBASE%%/include
- 
- # tell aclocal that extra macros can be found in autotools/m4/
- ACLOCAL_AMFLAGS = -I autotools/m4
diff --git a/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac b/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac
new file mode 100644
index 000000000000..3fedd24d94be
--- /dev/null
+++ b/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac
@@ -0,0 +1,11 @@
+--- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig	2016-01-08 22:05:48 UTC
++++ lib-src/portaudio-v19/bindings/cpp/configure.ac
+@@ -14,7 +14,7 @@ m4_define([lt_age], [0])
+ 
+ AC_INIT([PortAudioCpp], [12])
+ AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([subdir-objects])
+ AM_MAINTAINER_MODE
+ 
+ ###### Top-level directory of pacpp
diff --git a/audio/audacity/files/patch-lib-src_portmixer_configure b/audio/audacity/files/patch-lib-src_portmixer_configure
deleted file mode 100644
index a72020281858..000000000000
--- a/audio/audacity/files/patch-lib-src_portmixer_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib-src/portmixer/configure.orig	2016-01-08 22:05:48 UTC
-+++ lib-src/portmixer/configure
-@@ -12028,7 +12028,7 @@ fi
- #
- 
- cppflags_save="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $PORTAUDIO_CFLAGS"
-+CPPFLAGS="$PORTAUDIO_CFLAGS $CPPFLAGS"
- 
- have_oss=no
- for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
diff --git a/audio/audacity/files/patch-src__Makefile.in b/audio/audacity/files/patch-src_Makefile.am
index a2bf193086e3..d7c1c957124c 100644
--- a/audio/audacity/files/patch-src__Makefile.in
+++ b/audio/audacity/files/patch-src_Makefile.am
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2015-07-11 10:02:22 UTC
-+++ src/Makefile.in
-@@ -1118,8 +1118,7 @@ audacity_CPPFLAGS = -D__STDC_CONSTANT_MA
+--- src/Makefile.am.orig	2016-01-08 22:05:48 UTC
++++ src/Makefile.am
+@@ -75,8 +75,7 @@ audacity_CPPFLAGS = \
  #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
  #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
  #           ^
@@ -9,4 +9,4 @@
 +audacity_CXXFLAGS =
  
  audacity_LDFLAGS = -rdynamic
- audacity_LDADD = $(EXPAT_LIBS) $(FILEDIALOG_LIBS) $(PORTAUDIO_LIBS) \
+ audacity_LDADD = \