audio/polyphone: 1.9 -> 2.0.1.20190716

* Change to GitHub
* Patching in post-patch moved to a static patch under files/

Reported by:	repology

5 files changed, 74 insertions, 35 deletions

diff --git a/audio/polyphone/Makefile b/audio/polyphone/Makefile
index ada759975486..c5d078d86079 100644
--- a/audio/polyphone/Makefile
+++ b/audio/polyphone/Makefile
@@ -1,52 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	polyphone
-DISTVERSION=	1.9
+DISTVERSION=	2.0.1.20190716
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	http://polyphone-soundfonts.com/en/download/file/76-polyphone-1-8-src-zip/latest/download?ae95d968569b61bc77f7b8559a14db4d=1/
-
-PATCH_SITES=	https://github.com/davy7125/polyphone/commit/
-PATCHFILES=	7d3e26b46cb5.patch:-p2
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Graphical user interface for editing soundfont (sf2 and sfz) files
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libjack.so:audio/jack \
+LIB_DEPENDS=	libFLAC.so:audio/flac \
+		libjack.so:audio/jack \
 		libogg.so:audio/libogg \
 		libportaudio.so:audio/portaudio \
 		librtmidi.so:audio/rtmidi \
 		libstk.so:audio/stk \
 		libvorbisfile.so:audio/libvorbis
 
-USES=		compiler:c++11-lang desktop-file-utils pkgconfig qmake:outsource qt:5 shared-mime-info zip
+USES=		compiler:c++11-lang desktop-file-utils gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	davy7125
+GH_TAGNAME=	d7459fa
 USE_GL=		gl
 USE_QT=		core concurrent gui network printsupport svg widgets buildtools_build qmake_build
+USE_GNOME=	glib20
 USE_CXXSTD=	c++11
 QMAKE_ARGS=	DEFINES=USE_LOCAL_QCUSTOMPLOT
 CXXFLAGS+=	-D__UNIX_JACK__
 
-WRKSRC=		${WRKDIR}/trunk
+WRKSRC_SUBDIR=	sources
 
 PLIST_FILES=	bin/polyphone \
 		share/applications/polyphone.desktop \
 		share/mime/packages/polyphone.xml \
 		share/pixmaps/polyphone.png
 
-post-patch:
-	@${REINPLACE_CMD} -e ' \
-		s| -mfpmath=387||g; \
-		s|/usr/include|${LOCALBASE}/include|g; \
-		s| alsa||g; \
-		s|ExtraCompiler.commands = $$$${QMAKE_CXX} -fPIC|ExtraCompiler.commands = $$$${QMAKE_CXX} $$(CXXFLAGS) -fPIC|g' \
-		${WRKSRC}/polyphone.pro
-
 do-install:
-	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/RELEASE/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/ressources/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop  ${STAGEDIR}${PREFIX}/share/applications
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.xml  ${STAGEDIR}${PREFIX}/share/mime/packages
diff --git a/audio/polyphone/distinfo b/audio/polyphone/distinfo
index b402bf6ae4af..30346f7df470 100644
--- a/audio/polyphone/distinfo
+++ b/audio/polyphone/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1535706912
-SHA256 (polyphone-1.9-src.zip) = 2b0ba2887646208ae9953a336adfebe460133cd403e76f7fe795d3071827dfdd
-SIZE (polyphone-1.9-src.zip) = 3699516
-SHA256 (7d3e26b46cb5.patch) = 177737f0df2107eb4f7cf8b2e5e2519fa4f0b1500190d7d3a6ab6e479d43f520
-SIZE (7d3e26b46cb5.patch) = 1433
+TIMESTAMP = 1563729073
+SHA256 (davy7125-polyphone-2.0.1.20190716-src-d7459fa_GH0.tar.gz) = 4d1cdd0cc360962081ac88ce96a4f1a53aedbd3d95199d5acc5a7d547eedbfad
+SIZE (davy7125-polyphone-2.0.1.20190716-src-d7459fa_GH0.tar.gz) = 1964365
+SHA256 (7d3e26b46cb5.patch) = a53b6008960dc08112120c938f5442b3981474712a3741c9b62da4ab5760cd14
+SIZE (7d3e26b46cb5.patch) = 1435
diff --git a/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp b/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp
new file mode 100644
index 000000000000..bd0b88c456ce
--- /dev/null
+++ b/audio/polyphone/files/patch-core_input_sfark_sfarkextractor1.cpp
@@ -0,0 +1,13 @@
+--- core/input/sfark/sfarkextractor1.cpp.orig	2019-07-16 14:22:06 UTC
++++ core/input/sfark/sfarkextractor1.cpp
+@@ -30,8 +30,8 @@
+ #include "zlib.h"
+ #include "stdint.h"
+ 
+-#ifdef Q_OS_MAC
+-#include "unistd.h"
++#if defined(Q_OS_MAC) || defined(__FreeBSD__) || defined(__DragonFly__)
++#include <unistd.h>
+ #endif
+ 
+ static const char * SfArkId = ".sfArk";
diff --git a/audio/polyphone/files/patch-polyphone.pro b/audio/polyphone/files/patch-polyphone.pro
new file mode 100644
index 000000000000..3778ecf8bc54
--- /dev/null
+++ b/audio/polyphone/files/patch-polyphone.pro
@@ -0,0 +1,45 @@
+--- polyphone.pro.orig	2019-07-16 14:22:06 UTC
++++ polyphone.pro
+@@ -65,8 +65,9 @@ win32 {
+ unix:!macx {
+     DEFINES += __LINUX_ALSASEQ__
+     CONFIG += link_pkgconfig
+-    PKGCONFIG += alsa jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0 openssl
+-    INCLUDEPATH += /usr/include/jack \
++    PKGCONFIG += jack portaudio-2.0 zlib ogg flac vorbis vorbisfile vorbisenc glib-2.0
++    LIBS += -lssl -lcrypto # on FreeBSD /etc/make.conf defines which ssl library is used
++    INCLUDEPATH += $$PREFIX/include/jack \
+         lib/flac
+     isEmpty(PREFIX) {
+         PREFIX = /usr/local
+@@ -125,7 +126,7 @@ contains(DEFINES, USE_LOCAL_STK) {
+     INCLUDEPATH += lib/stk
+ } else {
+     LIBS += -lstk
+-    INCLUDEPATH += /usr/include/stk
++    INCLUDEPATH += $$PREFIX/include/stk
+ }
+ 
+ # Location of QCustomplot
+@@ -135,7 +136,7 @@ contains(DEFINES, USE_LOCAL_QCUSTOMPLOT) {
+     INCLUDEPATH += lib/qcustomplot
+ } else {
+     LIBS += -lqcustomplot
+-    INCLUDEPATH += /usr/include/qcustomplot
++    INCLUDEPATH += $$PREFIX/include/qcustomplot
+ }
+ 
+ INCLUDEPATH += mainwindow \
+@@ -862,10 +863,10 @@ win32 {
+     ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT}
+ }
+ macx {
+-    ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ }
+ unix:!macx {
+-    ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -fPIC -D__LITTLE_ENDIAN__ $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ }
+ QMAKE_EXTRA_COMPILERS += ExtraCompiler
+ 
diff --git a/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp b/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp
deleted file mode 100644
index aad888b51328..000000000000
--- a/audio/polyphone/files/patch-sfark_sfarkextractor1.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- sfark/sfarkextractor1.cpp.orig	2017-08-10 19:26:54 UTC
-+++ sfark/sfarkextractor1.cpp
-@@ -30,6 +30,8 @@
- #include "zlib.h"
- #include "stdint.h"
- 
-+#include <unistd.h>
-+
- static const char * SfArkId = ".sfArk";
- 
- SfArkExtractor1::SfArkExtractor1(const char * fileName) : AbstractExtractor(),