Index: head/audio/fmit/files/patch-src_modules_CMakeLists.txt =================================================================== --- head/audio/fmit/files/patch-src_modules_CMakeLists.txt (revision 488405) +++ head/audio/fmit/files/patch-src_modules_CMakeLists.txt (nonexistent) @@ -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}) Property changes on: head/audio/fmit/files/patch-src_modules_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/fmit/files/patch-libs_Music_CMakeLists.txt =================================================================== --- head/audio/fmit/files/patch-libs_Music_CMakeLists.txt (revision 488405) +++ head/audio/fmit/files/patch-libs_Music_CMakeLists.txt (nonexistent) @@ -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}) Property changes on: head/audio/fmit/files/patch-libs_Music_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt =================================================================== --- head/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt (revision 488405) +++ head/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt (nonexistent) @@ -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}) Property changes on: head/audio/fmit/files/patch-libs_CppAddons_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/fmit/files/patch-libs_Music_Music.h =================================================================== --- head/audio/fmit/files/patch-libs_Music_Music.h (revision 488405) +++ head/audio/fmit/files/patch-libs_Music_Music.h (nonexistent) @@ -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)); - } - Property changes on: head/audio/fmit/files/patch-libs_Music_Music.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/fmit/files/patch-src_CMakeLists.txt =================================================================== --- head/audio/fmit/files/patch-src_CMakeLists.txt (revision 488405) +++ head/audio/fmit/files/patch-src_CMakeLists.txt (nonexistent) @@ -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} Property changes on: head/audio/fmit/files/patch-src_CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/fmit/Makefile =================================================================== --- head/audio/fmit/Makefile (revision 488405) +++ head/audio/fmit/Makefile (revision 488406) @@ -1,48 +1,45 @@ # Created by: Edward Tomasz Napierala # $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 OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so.2:audio/alsa-lib ALSA_CMAKE_ON= -DSOUNDSYSTEM_USE_ALSA:BOOL=true ALSA_CMAKE_OFF= -DSOUNDSYSTEM_USE_ALSA:BOOL=false OSS_CMAKE_ON= -DSOUNDSYSTEM_USE_OSS:BOOL=true OSS_CMAKE_OFF= -DSOUNDSYSTEM_USE_OSS:BOOL=false JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_ON= -DSOUNDSYSTEM_USE_JACK:BOOL=true JACK_CMAKE_OFF= -DSOUNDSYSTEM_USE_JACK:BOOL=false PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_ON= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true PORTAUDIO_CMAKE_OFF= -DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false .include Index: head/audio/fmit/distinfo =================================================================== --- head/audio/fmit/distinfo (revision 488405) +++ head/audio/fmit/distinfo (revision 488406) @@ -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 Index: head/audio/fmit/pkg-descr =================================================================== --- head/audio/fmit/pkg-descr (revision 488405) +++ head/audio/fmit/pkg-descr (revision 488406) @@ -1,15 +1,15 @@ Free Music Instrument Tuner. Current features: - Error history - Volume history - Wave shape - Harmonic ratios - Statistics - Microtonal tuning (with Scala file support) - Discrete Fourier Transform view - JACK, OSS, ALSA, Portaudio support - Translations for: french -WWW: http://home.gna.org/fmit/ +WWW: https://github.com/gillesdegottex/fmit Index: head/audio/fmit/pkg-plist =================================================================== --- head/audio/fmit/pkg-plist (revision 488405) +++ head/audio/fmit/pkg-plist (revision 488406) @@ -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