From tkato432@yahoo.com  Fri Oct 14 18:46:16 2011
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65EB7106568C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 14 Oct 2011 18:44:07 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166])
	by mx1.freebsd.org (Postfix) with ESMTP id 13A9B8FC26
	for <FreeBSD-gnats-submit@FreeBSD.org>; Fri, 14 Oct 2011 18:44:06 +0000 (UTC)
Received: from msa103lp.auone-net.jp (MSA103lp [172.27.12.181])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id D92677D4136
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Oct 2011 03:30:37 +0900 (JST)
Received: from localhost.localdomain (ZT046175.ppp.dion.ne.jp [59.128.46.175])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id 1FE1747C036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Oct 2011 03:30:34 +0900 (JST)
Message-Id: <20111015025619.c9d98232.tkato432@yahoo.com>
Date: Sat, 15 Oct 2011 02:56:19 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: audio/fmit

>Number:         161624
>Category:       ports
>Synopsis:       Update port: audio/fmit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 14 18:50:20 UTC 2011
>Closed-Date:    Tue Oct 18 16:01:56 CEST 2011
>Last-Modified:  Tue Oct 18 14:10:09 UTC 2011
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build

New file:
files/patch-src__CMakeLists.txt

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/fmit/Makefile audio/fmit/Makefile
--- /usr/ports/audio/fmit/Makefile	2011-09-06 19:01:16.000000000 +0900
+++ audio/fmit/Makefile	2011-09-24 13:49:31.000000000 +0900
@@ -17,19 +17,50 @@
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		fftw3.5:${PORTSDIR}/math/fftw3
+LIB_DEPENDS=	fftw3.5:${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
 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 -urN /usr/ports/audio/fmit/files/patch-src__CMakeLists.txt audio/fmit/files/patch-src__CMakeLists.txt
--- /usr/ports/audio/fmit/files/patch-src__CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
+++ audio/fmit/files/patch-src__CMakeLists.txt	2011-09-06 19:26:22.000000000 +0900
@@ -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 -urN /usr/ports/audio/fmit/files/patch-src__modules__CMakeLists.txt audio/fmit/files/patch-src__modules__CMakeLists.txt
--- /usr/ports/audio/fmit/files/patch-src__modules__CMakeLists.txt	2011-08-26 12:33:52.000000000 +0900
+++ audio/fmit/files/patch-src__modules__CMakeLists.txt	2011-09-06 19:28:09.000000000 +0900
@@ -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})
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Mon Oct 17 20:17:41 CEST 2011 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161624 
State-Changed-From-To: open->closed 
State-Changed-By: ehaupt 
State-Changed-When: Tue Oct 18 16:01:53 CEST 2011 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161624 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161624: commit references a PR
Date: Tue, 18 Oct 2011 14:01:54 +0000 (UTC)

 ehaupt      2011-10-18 14:01:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/fmit           Makefile 
     audio/fmit/files     patch-src__modules__CMakeLists.txt 
   Added files:
     audio/fmit/files     patch-src__CMakeLists.txt 
   Log:
   Fix build
   
   PR:             161624
   Submitted by:   KATO Tsuguru <tkato432@yahoo.com>
   
   Revision  Changes    Path
   1.13      +38 -8     ports/audio/fmit/Makefile
   1.1       +23 -0     ports/audio/fmit/files/patch-src__CMakeLists.txt (new)
   1.2       +1 -1      ports/audio/fmit/files/patch-src__modules__CMakeLists.txt
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
