- Update to 1.2.6

- Use github
- Remove DEPRECATED
- Switch to qt5

9 files changed, 25 insertions, 84 deletions

diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index e8038f471a74..e1e06c503205 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -2,28 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	fmit
-PORTVERSION=	0.99.5
-PORTREVISION=	4
+PORTVERSION=	1.2.6
+DISTVERSIONPREFIX=	v
 CATEGORIES=	audio
-MASTER_SITES=	http://download.gna.org/fmit/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Free Music Instrument Tuner
 
 LICENSE=	GPLv2
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
-USE_XORG=	xmu
-USE_QT=		corelib gui opengl \
-		linguist_build moc_build qmake_build rcc_build uic_build
-USE_GL=		glut
-USES=		cmake pkgconfig qt:4 tar:bzip2
-INSTALLS_ICONS=	yes
+USES=		gl gnome pkgconfig qmake qt:5 tar:bzip2
+
+USE_QT=		buildtools core gui opengl qmake_build multimedia network svg widgets
+USE_GL=		gl glut
+QMAKE_ARGS+=	PREFIXSHORTCUT=${PREFIX}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	gillesdegottex
 
 OPTIONS_DEFINE=	ALSA JACK OSS PORTAUDIO
 OPTIONS_DEFAULT=	JACK OSS
diff --git a/audio/fmit/distinfo b/audio/fmit/distinfo
index 6df51eb6e582..781b674480fc 100644
--- a/audio/fmit/distinfo
+++ b/audio/fmit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fmit-0.99.5-Source.tar.bz2) = 2191f0104133086d711c05c48d0efaba5eefbbb8c08309ab16b8ca23e22388e5
-SIZE (fmit-0.99.5-Source.tar.bz2) = 150037
+TIMESTAMP = 1545834886
+SHA256 (gillesdegottex-fmit-v1.2.6_GH0.tar.gz) = 73dd21b478498694fd10b2dac24160783c5956754e9db05d62611b041eec0f76
+SIZE (gillesdegottex-fmit-v1.2.6_GH0.tar.gz) = 289649
diff --git a/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt b/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt
deleted file mode 100644
index 9a1d66e4cbed..000000000000
--- a/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libs/CppAddons/CMakeLists.txt.orig	2012-06-23 20:03:59 UTC
-+++ libs/CppAddons/CMakeLists.txt
-@@ -8,6 +8,4 @@ INCLUDE_DIRECTORIES(
-     ${CMAKE_CURRENT_BINARY_DIR}
- )
- 
--set(CMAKE_CXX_FLAGS "-Wall -ansi -pedantic")
--
- add_library(CppAddons STATIC ${libCppAddons_SRCS})
diff --git a/audio/fmit/files/patch-libs_Music_CMakeLists.txt b/audio/fmit/files/patch-libs_Music_CMakeLists.txt
deleted file mode 100644
index b436d6e3fedf..000000000000
--- a/audio/fmit/files/patch-libs_Music_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- libs/Music/CMakeLists.txt.orig	2012-06-23 20:03:59 UTC
-+++ libs/Music/CMakeLists.txt
-@@ -18,8 +18,7 @@ SET(libMusic_SRCS
- INCLUDE_DIRECTORIES(
-     ../../libs
-     ${CMAKE_CURRENT_BINARY_DIR}
-+    ${FFTW3_INCLUDES}
- )
- 
--set(CMAKE_CXX_FLAGS "-Wall")
--
- add_library(Music STATIC ${libMusic_SRCS})
diff --git a/audio/fmit/files/patch-libs_Music_Music.h b/audio/fmit/files/patch-libs_Music_Music.h
deleted file mode 100644
index 350320764adc..000000000000
--- a/audio/fmit/files/patch-libs_Music_Music.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/Music/Music.h.orig	2014-05-30 11:38:46 UTC
-+++ libs/Music/Music.h
-@@ -285,7 +285,7 @@ namespace Music
-     // TODO cannot create a template so easily because the pow10 is not defined for all types
-     inline double invlp(double value)
-     {
--        return pow10(value/20.0);
-+        return pow(10.0,value/20.0);
- //         return pow(TYPE(10), value/TYPE(20));
-     }
- 
diff --git a/audio/fmit/files/patch-src_CMakeLists.txt b/audio/fmit/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 70e4e18e0d48..000000000000
--- a/audio/fmit/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/CMakeLists.txt.orig	2012-06-23 20:03:58 UTC
-+++ src/CMakeLists.txt
-@@ -35,10 +35,11 @@ SET (FILES_TO_TRANSLATE ${FILES_TO_TRANS
- INCLUDE_DIRECTORIES(
-     ../libs
-     ${CMAKE_CURRENT_BINARY_DIR}
-+    ${PORTAUDIO_INCLUDE_DIRS}
-     ${OSS_INCLUDE_DIR}
-     ${ALSA_INCLUDES}
--    ${PORTAUDIO_INCLUDE_DIRS}
-     ${JACK_INCLUDE_DIRS}
-+    ${GLUT_INCLUDE_DIR} ${FFTW3_INCLUDES}
- )
- 
- IF (UPDATE_TRANSLATIONS)
-@@ -53,6 +54,7 @@ ADD_EXECUTABLE(fmit ${fmit_UI_H} ${fmit_
- TARGET_LINK_LIBRARIES(fmit
-     CppAddons Music
-     fmit_modules
-+    ${PORTAUDIO2_LDFLAGS}
-     ${QT_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${FFTW3_LIBRARIES}
-     ${ALSA_LIBRARIES}
-     ${PORTAUDIO_LIBRARIES}
diff --git a/audio/fmit/files/patch-src_modules_CMakeLists.txt b/audio/fmit/files/patch-src_modules_CMakeLists.txt
deleted file mode 100644
index 5eef2d3f0b42..000000000000
--- a/audio/fmit/files/patch-src_modules_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/CMakeLists.txt.orig	2012-06-23 20:03:58 UTC
-+++ src/modules/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET (FILES_TO_TRANSLATE ${FILES_TO_TRANS
- INCLUDE_DIRECTORIES(
-     ../../libs
-     ${CMAKE_CURRENT_BINARY_DIR}
-+    ${GLUT_INCLUDE_DIR}
- )
- 
- ADD_LIBRARY(fmit_modules STATIC ${fmit_MODULE_SRCS_MOC} ${fmit_MODULE_SRCS})
diff --git a/audio/fmit/pkg-descr b/audio/fmit/pkg-descr
index ea7ca1e39dcc..b223355766a2 100644
--- a/audio/fmit/pkg-descr
+++ b/audio/fmit/pkg-descr
@@ -12,4 +12,4 @@ Current features:
  - JACK, OSS, ALSA, Portaudio support
  - Translations for: french
 
-WWW: http://home.gna.org/fmit/
+WWW: https://github.com/gillesdegottex/fmit
diff --git a/audio/fmit/pkg-plist b/audio/fmit/pkg-plist
index c7c33ce6d602..e9f62459681a 100644
--- a/audio/fmit/pkg-plist
+++ b/audio/fmit/pkg-plist
@@ -1,7 +1,15 @@
 bin/fmit
 share/appdata/fmit.appdata.xml
 share/applications/fmit.desktop
-%%DATADIR%%/tr/fmit_de.qm
-%%DATADIR%%/tr/fmit_fr.qm
-%%DATADIR%%/tr/fmit_pt.qm
+%%DATADIR%%/scales/15-edo.scl
+%%DATADIR%%/scales/16-edo.scl
+%%DATADIR%%/scales/17-edo.scl
+%%DATADIR%%/scales/19-edo.scl
+%%DATADIR%%/scales/22-edo.scl
+%%DATADIR%%/scales/Bernhard Stopper OnlyPure tuning.scl
+%%DATADIR%%/scales/Carlos Beta.scl
+%%DATADIR%%/scales/bohlen-p_et.scl
+%%DATADIR%%/scales/meanquar.scl
+share/icons/hicolor/128x128/apps/fmit.png
 share/icons/hicolor/scalable/apps/fmit.svg
+share/icons/hicolor/symbolic/apps/fmit-symbolic.svg