3 files changed, 62 insertions, 9 deletions

diff --git a/audio/fmit/Makefile b/audio/fmit/Makefile
index ae45a19e1ea0..a1ea5b2d1d27 100644
--- a/audio/fmit/Makefile
+++ b/audio/fmit/Makefile
@@ -15,22 +15,52 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free Music Instrument Tuner
 
-LICENSE=	GPLv2 # (or later)
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3
 
-BROKEN=		does not configure
+OPTIONS=	OSS "Enable OSS support" on \
+		ALSA "Enable ALSA support" off \
+		PORTAUDIO "Enable PortAudio support" off \
+		JACK "Enable JACK support" on \
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui opengl \
-		linguist_build moc_build rcc_build uic_build
+		linguist_build moc_build qmake_build rcc_build uic_build
 USE_GL=		glut
 USE_CMAKE=	yes
-CMAKE_ARGS=	-DSOUNDSYSTEM_USE_ALSA:BOOL=false
-INSTALL_ICONS=	yes
+INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_OSS)
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_OSS:BOOL=false
+.else
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_OSS:BOOL=true
+.endif
+
+.if defined(WITH_ALSA)
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_ALSA:BOOL=true
+.else
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_ALSA:BOOL=false
+.endif
+
+.if defined(WITH_PORTAUDIO)
+BUILD_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
+RUN_DEPENDS+=	portaudio>=19:${PORTSDIR}/audio/portaudio2
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=true
+.else
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_PORTAUDIO:BOOL=false
+.endif
+
+.if defined(WITHOUT_JACK)
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_JACK:BOOL=false
+.else
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+CMAKE_ARGS+=	-DSOUNDSYSTEM_USE_JACK:BOOL=true
+.endif
+
 .include <bsd.port.mk>
diff --git a/audio/fmit/files/patch-src__CMakeLists.txt b/audio/fmit/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..74f15487a5b2
--- /dev/null
+++ b/audio/fmit/files/patch-src__CMakeLists.txt
@@ -0,0 +1,23 @@
+--- src/CMakeLists.txt.orig	2011-01-28 08:09:11.000000000 +0900
++++ src/CMakeLists.txt	2011-09-06 15:56:58.000000000 +0900
+@@ -35,10 +35,11 @@
+ 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 @@
+ 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
index 399f6db0d83f..5c70ea6c8dd0 100644
--- a/audio/fmit/files/patch-src__modules__CMakeLists.txt
+++ b/audio/fmit/files/patch-src__modules__CMakeLists.txt
@@ -4,7 +4,7 @@
  INCLUDE_DIRECTORIES(
      ../../libs
      ${CMAKE_CURRENT_BINARY_DIR}
-+    ${OPENGL_INCLUDE_DIR}
++    ${GLUT_INCLUDE_DIR}
  )
  
  ADD_LIBRARY(fmit_modules STATIC ${fmit_MODULE_SRCS_MOC} ${fmit_MODULE_SRCS})