Update to upstream version 0.4.0

PR:		203796
Submitted by:	tkato432@yahoo.com

5 files changed, 22 insertions, 20 deletions

diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 36b6d2f0f30e..fcb43c69a3f5 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qsynth
-PORTVERSION=	0.3.9
+PORTVERSION=	0.4.0
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -10,15 +10,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt fluidsynth front-end application
 
 LICENSE=	GPLv2 # (or later)
+#LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 
 USES=		gmake
 QT_NONSTANDARD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_path_ac_moc=${MOC} \
+CONFIGURE_ENV=	ac_cv_path_ac_cv_qmake=${QMAKE} \
+		ac_cv_path_ac_moc=${MOC} \
 		ac_cv_path_ac_uic=${UIC} \
-		ac_cv_path_ac_qmake=${QMAKE} \
 		ac_cv_path_ac_lupdate=${LUPDATE} \
 		ac_cv_path_ac_lrelease=${LRELEASE}
 CONFIGURE_ARGS=	--localedir=${DATADIR} \
@@ -36,7 +37,7 @@ QT4_USE=		qt4=corelib,gui \
 			qt4=linguisttools_build \
 			qt4=moc_build,qmake_build,rcc_build,uic_build
 QT4_CONFIGURE_ENABLE=	qt4
-QT5_USE=		qt5=core,gui,widgets \
+QT5_USE=		qt5=core,gui,widgets,x11extras \
 			qt5=buildtools_build,linguisttools_build,qmake_build
 QT5_CXXFLAGS=		-fPIC
 QT5_CONFIGURE_ENABLE=	qt5
diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo
index c6520f7b52a1..e9d89f1f8237 100644
--- a/audio/qsynth/distinfo
+++ b/audio/qsynth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qsynth-0.3.9.tar.gz) = eb2050d0f7a8011b9ac20f82fec88faf2237a2475dfefc424cb4944399b17e22
-SIZE (qsynth-0.3.9.tar.gz) = 255130
+SHA256 (qsynth-0.4.0.tar.gz) = 9dc8413ddc6847a2dd0bfb3b44e0246273531ea253fd9dc91c5c329876420cb2
+SIZE (qsynth-0.4.0.tar.gz) = 251230
diff --git a/audio/qsynth/files/patch-Makefile.in b/audio/qsynth/files/patch-Makefile.in
index 16dfadab3c13..a90d428f3c6c 100644
--- a/audio/qsynth/files/patch-Makefile.in
+++ b/audio/qsynth/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2013-02-20 01:37:32.082725000 +0900
-+++ Makefile.in	2013-04-19 19:57:44.000000000 +0900
-@@ -60,6 +60,7 @@
+--- Makefile.in.orig	2015-09-07 14:59:23 UTC
++++ Makefile.in
+@@ -57,6 +57,7 @@ forms = \
  	src/qsynthSetupForm.ui
  
  translations_sources = \
@@ -8,11 +8,11 @@
  	src/translations/qsynth_de.ts \
  	src/translations/qsynth_es.ts \
  	src/translations/qsynth_fr.ts \
-@@ -68,6 +69,7 @@
+@@ -66,6 +67,7 @@ translations_sources = \
  translations_targets = \
  	src/translations/qsynth_cs.qm \
  	src/translations/qsynth_de.qm \
 +	src/translations/qsynth_es.qm \
  	src/translations/qsynth_fr.qm \
- 	src/translations/qsynth_ru.qm
- 
+ 	src/translations/qsynth_ru.qm \
+ 	src/translations/qsynth_sr.qm
diff --git a/audio/qsynth/files/patch-src-qsynthOptions.cpp b/audio/qsynth/files/patch-src-qsynthOptions.cpp
index da0299341304..542de6de424b 100644
--- a/audio/qsynth/files/patch-src-qsynthOptions.cpp
+++ b/audio/qsynth/files/patch-src-qsynthOptions.cpp
@@ -1,6 +1,6 @@
---- src/qsynthOptions.cpp.orig	2011-03-30 20:53:04.000000000 +0900
-+++ src/qsynthOptions.cpp	2012-09-25 21:29:15.000000000 +0900
-@@ -172,11 +172,11 @@
+--- src/qsynthOptions.cpp.orig	2015-09-07 14:59:23 UTC
++++ src/qsynthOptions.cpp
+@@ -174,11 +174,11 @@ void qsynthOptions::print_usage ( const 
  	out << "  -n, --no-midi-in" + sEot +
  		QObject::tr("Don't create a midi driver to read MIDI input events [default = yes]") + sEol;
  	out << "  -m, --midi-driver=[label]" + sEot +
@@ -14,7 +14,7 @@
  	out << "  -j, --connect-jack-outputs" + sEot +
  		QObject::tr("Attempt to connect the jack outputs to the physical ports") + sEol;
  	out << "  -L, --audio-channels=[num]" + sEot +
-@@ -477,7 +477,7 @@
+@@ -481,7 +481,7 @@ void qsynthOptions::loadSetup ( qsynthSe
  	pSetup->iAudioBufSize    = m_settings.value("/AudioBufSize", 512).toInt();
  	pSetup->iAudioBufCount   = m_settings.value("/AudioBufCount", 8).toInt();
  #else
diff --git a/audio/qsynth/pkg-descr b/audio/qsynth/pkg-descr
index 7279fba26579..8036fb3210aa 100644
--- a/audio/qsynth/pkg-descr
+++ b/audio/qsynth/pkg-descr
@@ -1,6 +1,7 @@
-Qsynth is a fluidsynth GUI front-end application written in C++ around the Qt4
-toolkit using Qt Designer. Eventually it may evolve into a softsynth management
-application allowing the user to control and manage a variety of command line
-softsynth but for the moment it wraps the excellent FluidSynth.
+Qsynth is a fluidsynth GUI front-end application written in C++ around
+the Qt toolkit using Qt Designer. Eventually it may evolve into a
+softsynth management application allowing the user to control and manage
+a variety of command line softsynth but for the moment it wraps the
+excellent FluidSynth.
 
 WWW: http://qsynth.sourceforge.net/