ardour: Update to 4.7

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jun 18 15:29:14 2016 +0200
Changeset:	7b69d0191e9d7403e0232519bf92f071fc884259

Modified Files:
	ardour/Makefile
	ardour/distinfo
Added Files:
	ardour/patches/patch-libs_pbd_fpu.cc

Log Message:
ardour: Update to 4.7

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7b69d0191e9d7403e0232519bf92f071fc884259

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ardour/Makefile                      | 28 +++++++---------------------
 ardour/distinfo                      | 11 +++++------
 ardour/patches/patch-libs_pbd_fpu.cc | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 27 deletions(-)

diffs:
diff --git a/ardour/Makefile b/ardour/Makefile
index f6879cf..f8f45ff 100644
--- a/ardour/Makefile
+++ b/ardour/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	ardour-4.4
+DISTNAME=	ardour-4.7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Ardour/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
@@ -70,6 +70,7 @@ REPLACE_PYTHON+=	tools/autowaf.py
 REPLACE_PYTHON+=	tools/gccabicheck/wscript
 REPLACE_PYTHON+=	tools/sanity_check/wscript
 REPLACE_PYTHON+=	wscript
+REPLACE_PYTHON+=	waf
 
 REPLACE_PERL+=		tools/fmt-bindings
 REPLACE_PERL+=		tools/resample_session.pl
@@ -127,31 +128,16 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 35 # as of 4.4
 BUILDLINK_TRANSFORM+=   rm:-ldl
 .endif
 
-post-extract:
+pre-configure:
 	${SED} -e 's!REVISION!${PKGVERSION_NOREV}!' \
 		${FILESDIR}/revision.cc > ${WRKSRC}/libs/ardour/revision.cc
 
-#./waf configure --strict --prefix=/usr --configdir=/etc --libjack=weak --ptformat --with-backends=jack,alsa,dummy
-do-configure:
-	${RUN} cd ${WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
-			--prefix=${PREFIX} \
-			--configdir=${PKG_SYSCONFDIR} \
-			--destdir=${DESTDIR} \
-			--mandir=${PKGMANDIR} \
-			--with-backends=dummy \
-			--cxx11
-
-# ./waf
-# ./waf i18n
-do-build:
-	${RUN} cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
+WAF_ARGS+=	--prefix=/usr --configdir=/etc --libjack=weak --ptformat --with-backends=dummy --cxx11
+WAF_REPLACE_EXECUTABLE=	no
 
-do-install:
-	${RUN} cd ${WRKSRC} && \
-		${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
+# ./waf i18n
 
+.include "../../devel/waf/waf.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../audio/lilv/buildlink3.mk"
 .include "../../converters/sratom/buildlink3.mk"
diff --git a/ardour/distinfo b/ardour/distinfo
index 4bc85c4..96c2c47 100644
--- a/ardour/distinfo
+++ b/ardour/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (ardour-4.4.tar.gz) = 12e053e2b409e30771b99358ff0b926e68120507
-RMD160 (ardour-4.4.tar.gz) = 87564e05b8d1d7c1c7abc7e267144e392c6f6c63
-SHA512 (ardour-4.4.tar.gz) = 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0
-Size (ardour-4.4.tar.gz) = 9511090 bytes
-SHA1 (patch-libs_midi++2_run-tests.sh) = 8d9ac9f1c918a89e69f722b78aab42a0b78587ea
-SHA1 (patch-libs_pbd_wscript) = 5660f358a689e51785c24c22f4f518194ccb33f4
+SHA1 (ardour-4.7.tar.gz) = 95047ccb3fc599ce11c473a0fd7f1eb012c3e440
+RMD160 (ardour-4.7.tar.gz) = 366f7057fab9878ac425dd70a751899984abc030
+SHA512 (ardour-4.7.tar.gz) = 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
+Size (ardour-4.7.tar.gz) = 9863149 bytes
+SHA1 (patch-libs_pbd_fpu.cc) = bec4f67f8b52482b5b1cf582a4631c335efec8c7
diff --git a/ardour/patches/patch-libs_pbd_fpu.cc b/ardour/patches/patch-libs_pbd_fpu.cc
new file mode 100644
index 0000000..c6af5ab
--- /dev/null
+++ b/ardour/patches/patch-libs_pbd_fpu.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- libs/pbd/fpu.cc.orig	2016-02-19 01:28:56.000000000 +0000
++++ libs/pbd/fpu.cc
+@@ -19,7 +19,9 @@
+ 
+ #include "libpbd-config.h"
+ 
++#ifndef __NetBSD__
+ #define _XOPEN_SOURCE 600
++#endif
+ #include <cstring> // for memset
+ #include <cstdlib>
+ #include <stdint.h>