- Update to 0.99.2

PR:		160076
Submitted by:	Ports Fury

7 files changed, 67 insertions, 16 deletions

diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index 4903195ae0e5..83f88cb6a12f 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -6,22 +6,28 @@
 #
 
 PORTNAME=	fmit
-PORTVERSION=	0.97.7
-PORTREVISION=	6
+PORTVERSION=	0.99.2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.gna.org/fmit/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free Music Instrument Tuner
 
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
 		fftw3.5:${PORTSDIR}/math/fftw3
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-alsa bnv_cv_qt_test_result=yes
-CONFIGURE_ENV+=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-USE_GMAKE=	yes
-USE_QT_VER=	3
-USE_GL=		glut glu gl
+USE_BZIP2=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui opengl \
+		linguist_build moc_build rcc_build uic_build
+USE_GL=		glut
+USE_CMAKE=	yes
+CMAKE_ARGS=	-DSOUNDSYSTEM_USE_ALSA:BOOL=false
+INSTALL_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/fmit/distinfo b/audio/fmit/distinfo
index f51a0a849e5d..6b54b5e7e904 100644
--- a/audio/fmit/distinfo
+++ b/audio/fmit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fmit-0.97.7.tar.gz) = 0817d6c537cc76fbc1b824b9043446833f470242cd5be86380b3af14f984a905
-SIZE (fmit-0.97.7.tar.gz) = 274622
+SHA256 (fmit-0.99.2-Source.tar.bz2) = 234f927b09833b86a6889376983c431fd42b831b7b68d749b1234143b6f32383
+SIZE (fmit-0.99.2-Source.tar.bz2) = 156875
diff --git a/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt b/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt
new file mode 100644
index 000000000000..65df2b6ee085
--- /dev/null
+++ b/audio/fmit/files/patch-libs__CppAddons__CMakeLists.txt
@@ -0,0 +1,9 @@
+--- libs/CppAddons/CMakeLists.txt.orig	2011-01-28 08:09:11.000000000 +0900
++++ libs/CppAddons/CMakeLists.txt	2011-08-21 21:54:31.000000000 +0900
+@@ -8,6 +8,4 @@
+     ${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
new file mode 100644
index 000000000000..012a67bb2c8e
--- /dev/null
+++ b/audio/fmit/files/patch-libs__Music__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- libs/Music/CMakeLists.txt.orig	2011-01-28 08:09:11.000000000 +0900
++++ libs/Music/CMakeLists.txt	2011-08-21 21:55:31.000000000 +0900
+@@ -18,8 +18,7 @@
+ 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
new file mode 100644
index 000000000000..0d69bd61f1d7
--- /dev/null
+++ b/audio/fmit/files/patch-libs__Music__Music.h
@@ -0,0 +1,11 @@
+--- libs/Music/Music.h.orig	2011-01-28 08:09:11.000000000 +0900
++++ libs/Music/Music.h	2011-08-21 21:51:54.000000000 +0900
+@@ -285,7 +285,7 @@
+     // 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__modules__CMakeLists.txt b/audio/fmit/files/patch-src__modules__CMakeLists.txt
new file mode 100644
index 000000000000..399f6db0d83f
--- /dev/null
+++ b/audio/fmit/files/patch-src__modules__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/modules/CMakeLists.txt.orig	2011-01-28 08:09:11.000000000 +0900
++++ src/modules/CMakeLists.txt	2011-08-21 21:56:20.000000000 +0900
+@@ -29,6 +29,7 @@
+ INCLUDE_DIRECTORIES(
+     ../../libs
+     ${CMAKE_CURRENT_BINARY_DIR}
++    ${OPENGL_INCLUDE_DIR}
+ )
+ 
+ ADD_LIBRARY(fmit_modules STATIC ${fmit_MODULE_SRCS_MOC} ${fmit_MODULE_SRCS})
diff --git a/audio/fmit/pkg-plist b/audio/fmit/pkg-plist
index 940418032848..8b7bd8c92aeb 100644
--- a/audio/fmit/pkg-plist
+++ b/audio/fmit/pkg-plist
@@ -1,9 +1,12 @@
 bin/fmit
-lib/libCppAddons.a
-lib/libMusic.a
-lib/libmodules.a
-share/fmit/tr/fmit_fr.qm
-@dirrm share/fmit/tr
-@dirrm share/fmit
 share/applications/fmit.desktop
+%%DATADIR%%/tr/fmit_de.qm
+%%DATADIR%%/tr/fmit_fr.qm
+share/icons/hicolor/scalable/apps/fmit.svg
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm %%DATADIR%%/tr
+@dirrm %%DATADIR%%
 @dirrmtry share/applications