From tkato432@yahoo.com  Tue Sep 25 18:00:43 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6761E1065690
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:00:36 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169])
	by mx1.freebsd.org (Postfix) with ESMTP id C988B8FC18
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:00:35 +0000 (UTC)
Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63])
	by msa106lp.auone-net.jp (au one net msa) with ESMTP id 5B0C023C036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 26 Sep 2012 03:00:32 +0900 (JST)
Message-Id: <20120926022022.5ccc323de07252a93485730b@yahoo.com>
Date: Wed, 26 Sep 2012 02:20:22 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: audio/fluidsynth: Update to version 1.1.6

>Number:         171958
>Category:       ports
>Synopsis:       audio/fluidsynth: Update to version 1.1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:08 UTC 2012
>Closed-Date:    Mon Feb 04 09:35:05 UTC 2013
>Last-Modified:  Mon Feb  4 09:40:02 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.6

New file:
files/patch-src__drivers__fluid_oss.c

Remove file:
files/patch-src__CMakeLists.txt

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/fluidsynth/Makefile audio/fluidsynth/Makefile
--- /usr/ports/audio/fluidsynth/Makefile	2012-05-30 20:14:34.000000000 +0900
+++ audio/fluidsynth/Makefile	2012-09-25 03:16:03.000000000 +0900
@@ -1,52 +1,49 @@
-# ports collection makefile for:   fluidsynth
-# Date created:        27 Nov 2003
-# Whom:                Juha Nygard <juha.nygard1@netikka.fi>
-#
+# Created by: Juha Nygard <juha.nygard1@netikka.fi>
 # $FreeBSD: ports/audio/fluidsynth/Makefile,v 1.23 2012/05/30 11:14:34 bapt Exp $
-#
 
 PORTNAME=	fluidsynth
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications
 
-LICENSE=	GPLv2 # (or later)
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	LGPL20
 
 OPTIONS_DEFINE=	JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO SNDFILE
 OPTIONS_DEFAULT=	JACK
 
 USE_BZIP2=	yes
-USE_GNOME=	glib20 pkgconfig
+USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 USE_CMAKE=	yes
 CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
 		-Denable-midishare:BOOL=FALSE
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	${PA_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	${PA_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 MAN1=		fluidsynth.1
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 .else
 CMAKE_ARGS+=	-Denable-jack:BOOL=FALSE
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 .else
 CMAKE_ARGS+=	-Denable-alsa:BOOL=FALSE
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
 .else
 CMAKE_ARGS+=	-Denable-dbus:BOOL=FALSE
 .endif
@@ -67,16 +64,18 @@
 BUILD_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
 RUN_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
 CMAKE_ARGS+=	-Denable-portaudio:BOOL=TRUE
+PA_CFLAGS=	-I${LOCALBASE}/include/portaudio2
+PA_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
 .endif
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 .else
 CMAKE_ARGS+=	-Denable-pulseaudio:BOOL=FALSE
 .endif
 
 .if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 .else
 CMAKE_ARGS+=	-Denable-libsndfile:BOOL=FALSE
 .endif
diff -urN /usr/ports/audio/fluidsynth/distinfo audio/fluidsynth/distinfo
--- /usr/ports/audio/fluidsynth/distinfo	2011-11-19 05:07:19.000000000 +0900
+++ audio/fluidsynth/distinfo	2012-08-16 21:43:38.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (fluidsynth-1.1.5.tar.bz2) = 44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4
-SIZE (fluidsynth-1.1.5.tar.bz2) = 800195
+SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601
+SIZE (fluidsynth-1.1.6.tar.bz2) = 823783
diff -urN /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt audio/fluidsynth/files/patch-src__CMakeLists.txt
--- /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt	2011-11-19 05:08:25.000000000 +0900
+++ audio/fluidsynth/files/patch-src__CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
@@ -1,59 +0,0 @@
---- src/CMakeLists.txt.orig	2011-09-04 16:38:58.000000000 +0900
-+++ src/CMakeLists.txt	2011-09-05 16:30:18.000000000 +0900
-@@ -42,6 +42,11 @@
-   include_directories ( ${READLINE_INCLUDE_DIR} )
- endif ( READLINE_SUPPORT )
- 
-+if ( PORTAUDIO_SUPPORT )
-+  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
-+  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
-+endif ( PORTAUDIO_SUPPORT )
-+
- if ( PULSE_SUPPORT )
-   set ( fluid_pulse_SOURCES drivers/fluid_pulse.c )
-   include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} )
-@@ -70,11 +75,6 @@
-   include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} )
- endif ( JACK_SUPPORT )
- 
--if ( PORTAUDIO_SUPPORT )
--  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
--  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
--endif ( PORTAUDIO_SUPPORT )
--
- if ( WINDOWS_SUPPORT )
-   set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c )
- endif ( WINDOWS_SUPPORT )
-@@ -207,6 +207,8 @@
- )
- 
- link_directories (
-+    ${PORTAUDIO_LIBDIR}
-+    ${PORTAUDIO_LIBRARY_DIRS}
-     ${GLIB_LIBDIR}
-     ${GLIB_LIBRARY_DIRS}
-     ${LASH_LIBDIR}
-@@ -219,8 +221,6 @@
-     ${ALSA_LIBRARY_DIRS}
-     ${PULSE_LIBDIR}
-     ${PULSE_LIBRARY_DIRS}
--    ${PORTAUDIO_LIBDIR}
--    ${PORTAUDIO_LIBRARY_DIRS}
-     ${LIBSNDFILE_LIBDIR}
-     ${LIBSNDFILE_LIBRARY_DIRS}
-     ${DBUS_LIBDIR}
-@@ -280,13 +280,13 @@
- endif ( LIBFLUID_CPPFLAGS )
- 
- target_link_libraries ( libfluidsynth
-+    ${PORTAUDIO_LIBRARIES}
-     ${GLIB_LIBRARIES}
-     ${LASH_LIBRARIES}
-     ${LADCCA_LIBRARIES}
-     ${JACK_LIBRARIES}
-     ${ALSA_LIBRARIES}
-     ${PULSE_LIBRARIES}
--    ${PORTAUDIO_LIBRARIES}
-     ${LIBSNDFILE_LIBRARIES}
-     ${DBUS_LIBRARIES}
-     ${READLINE_LIBS}
diff -urN /usr/ports/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c audio/fluidsynth/files/patch-src__drivers__fluid_oss.c
--- /usr/ports/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c	1970-01-01 09:00:00.000000000 +0900
+++ audio/fluidsynth/files/patch-src__drivers__fluid_oss.c	2012-08-18 04:16:22.000000000 +0900
@@ -0,0 +1,15 @@
+--- src/drivers/fluid_oss.c.orig	2012-08-16 13:01:13.000000000 +0900
++++ src/drivers/fluid_oss.c	2012-08-18 04:12:09.000000000 +0900
+@@ -45,9 +45,9 @@
+ #define BUFFER_LENGTH 512
+ 
+ // Build issue on some systems (OSS 4.0)?
+-#ifdef SNDCTL_DSP_CHANNELS
+-  #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
+-#endif
++// #ifdef SNDCTL_DSP_CHANNELS
++//   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
++// #endif
+ 
+ /** fluid_oss_audio_driver_t
+  *
diff -urN /usr/ports/audio/fluidsynth/pkg-plist audio/fluidsynth/pkg-plist
--- /usr/ports/audio/fluidsynth/pkg-plist	2011-11-19 05:07:19.000000000 +0900
+++ audio/fluidsynth/pkg-plist	2012-08-18 04:28:33.000000000 +0900
@@ -19,6 +19,6 @@
 include/fluidsynth/voice.h
 lib/libfluidsynth.so
 lib/libfluidsynth.so.1
-lib/libfluidsynth.so.1.5.1
+lib/libfluidsynth.so.1.5.2
 libdata/pkgconfig/fluidsynth.pc
 @dirrm include/fluidsynth
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Sep 25 18:10:48 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171958: audio/fluidsynth: Update to version 1.1.6
Date: Mon, 8 Oct 2012 02:56:12 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Mon__8_Oct_2012_02_56_12_+0900_XYWgrheQQsQJ85iU
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Mon__8_Oct_2012_02_56_12_+0900_XYWgrheQQsQJ85iU
 Content-Type: text/x-diff;
  name="audio_fluidsynth.diff"
 Content-Disposition: attachment;
  filename="audio_fluidsynth.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/audio/fluidsynth/Makefile audio/fluidsynth/Makefile
 --- /usr/ports/audio/fluidsynth/Makefile	2012-10-06 19:42:36.000000000 +0900
 +++ audio/fluidsynth/Makefile	2012-10-06 22:08:05.000000000 +0900
 @@ -2,15 +2,14 @@
  # $FreeBSD: ports/audio/fluidsynth/Makefile,v 1.24 2012/10/06 10:42:36 bapt Exp $
  
  PORTNAME=	fluidsynth
 -PORTVERSION=	1.1.5
 +PORTVERSION=	1.1.6
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	multimedia@FreeBSD.org
  COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications
  
 -LICENSE=	GPLv2 # (or later)
 -LICENSE_FILE=	${WRKSRC}/COPYING
 +LICENSE=	LGPL20
  
  OPTIONS_DEFINE=	JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO SNDFILE
  OPTIONS_DEFAULT=	JACK
 @@ -22,28 +21,29 @@
  CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
  		-Denable-midishare:BOOL=FALSE
  USE_LDCONFIG=	yes
 +MAKE_JOBS_SAFE=	yes
  
 -CFLAGS+=	${PTHREAD_CFLAGS}
 -LDFLAGS+=	${PTHREAD_LIBS}
 +CFLAGS+=	${PA_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 +LDFLAGS+=	${PA_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
  
  MAN1=		fluidsynth.1
  
  .include <bsd.port.pre.mk>
  
  .if ${PORT_OPTIONS:MJACK}
 -LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 +LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
  .else
  CMAKE_ARGS+=	-Denable-jack:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MALSA}
 -LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 +LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
  .else
  CMAKE_ARGS+=	-Denable-alsa:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MDBUS}
 -LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 +LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
  .else
  CMAKE_ARGS+=	-Denable-dbus:BOOL=FALSE
  .endif
 @@ -64,16 +64,18 @@
  BUILD_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
  RUN_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
  CMAKE_ARGS+=	-Denable-portaudio:BOOL=TRUE
 +PA_CFLAGS=	-I${LOCALBASE}/include/portaudio2
 +PA_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
  .endif
  
  .if ${PORT_OPTIONS:MPULSEAUDIO}
 -LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 +LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
  .else
  CMAKE_ARGS+=	-Denable-pulseaudio:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MSNDFILE}
 -LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
 +LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
  .else
  CMAKE_ARGS+=	-Denable-libsndfile:BOOL=FALSE
  .endif
 diff -urN /usr/ports/audio/fluidsynth/distinfo audio/fluidsynth/distinfo
 --- /usr/ports/audio/fluidsynth/distinfo	2011-11-19 05:07:19.000000000 +0900
 +++ audio/fluidsynth/distinfo	2012-08-16 21:43:38.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (fluidsynth-1.1.5.tar.bz2) = 44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4
 -SIZE (fluidsynth-1.1.5.tar.bz2) = 800195
 +SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601
 +SIZE (fluidsynth-1.1.6.tar.bz2) = 823783
 diff -urN /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt audio/fluidsynth/files/patch-src__CMakeLists.txt
 --- /usr/ports/audio/fluidsynth/files/patch-src__CMakeLists.txt	2011-11-19 05:08:25.000000000 +0900
 +++ audio/fluidsynth/files/patch-src__CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
 @@ -1,59 +0,0 @@
 ---- src/CMakeLists.txt.orig	2011-09-04 16:38:58.000000000 +0900
 -+++ src/CMakeLists.txt	2011-09-05 16:30:18.000000000 +0900
 -@@ -42,6 +42,11 @@
 -   include_directories ( ${READLINE_INCLUDE_DIR} )
 - endif ( READLINE_SUPPORT )
 - 
 -+if ( PORTAUDIO_SUPPORT )
 -+  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
 -+  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
 -+endif ( PORTAUDIO_SUPPORT )
 -+
 - if ( PULSE_SUPPORT )
 -   set ( fluid_pulse_SOURCES drivers/fluid_pulse.c )
 -   include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} )
 -@@ -70,11 +75,6 @@
 -   include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} )
 - endif ( JACK_SUPPORT )
 - 
 --if ( PORTAUDIO_SUPPORT )
 --  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
 --  include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
 --endif ( PORTAUDIO_SUPPORT )
 --
 - if ( WINDOWS_SUPPORT )
 -   set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c )
 - endif ( WINDOWS_SUPPORT )
 -@@ -207,6 +207,8 @@
 - )
 - 
 - link_directories (
 -+    ${PORTAUDIO_LIBDIR}
 -+    ${PORTAUDIO_LIBRARY_DIRS}
 -     ${GLIB_LIBDIR}
 -     ${GLIB_LIBRARY_DIRS}
 -     ${LASH_LIBDIR}
 -@@ -219,8 +221,6 @@
 -     ${ALSA_LIBRARY_DIRS}
 -     ${PULSE_LIBDIR}
 -     ${PULSE_LIBRARY_DIRS}
 --    ${PORTAUDIO_LIBDIR}
 --    ${PORTAUDIO_LIBRARY_DIRS}
 -     ${LIBSNDFILE_LIBDIR}
 -     ${LIBSNDFILE_LIBRARY_DIRS}
 -     ${DBUS_LIBDIR}
 -@@ -280,13 +280,13 @@
 - endif ( LIBFLUID_CPPFLAGS )
 - 
 - target_link_libraries ( libfluidsynth
 -+    ${PORTAUDIO_LIBRARIES}
 -     ${GLIB_LIBRARIES}
 -     ${LASH_LIBRARIES}
 -     ${LADCCA_LIBRARIES}
 -     ${JACK_LIBRARIES}
 -     ${ALSA_LIBRARIES}
 -     ${PULSE_LIBRARIES}
 --    ${PORTAUDIO_LIBRARIES}
 -     ${LIBSNDFILE_LIBRARIES}
 -     ${DBUS_LIBRARIES}
 -     ${READLINE_LIBS}
 diff -urN /usr/ports/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c audio/fluidsynth/files/patch-src__drivers__fluid_oss.c
 --- /usr/ports/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c	1970-01-01 09:00:00.000000000 +0900
 +++ audio/fluidsynth/files/patch-src__drivers__fluid_oss.c	2012-08-18 04:16:22.000000000 +0900
 @@ -0,0 +1,15 @@
 +--- src/drivers/fluid_oss.c.orig	2012-08-16 13:01:13.000000000 +0900
 ++++ src/drivers/fluid_oss.c	2012-08-18 04:12:09.000000000 +0900
 +@@ -45,9 +45,9 @@
 + #define BUFFER_LENGTH 512
 + 
 + // Build issue on some systems (OSS 4.0)?
 +-#ifdef SNDCTL_DSP_CHANNELS
 +-  #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
 +-#endif
 ++// #ifdef SNDCTL_DSP_CHANNELS
 ++//   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
 ++// #endif
 + 
 + /** fluid_oss_audio_driver_t
 +  *
 diff -urN /usr/ports/audio/fluidsynth/pkg-plist audio/fluidsynth/pkg-plist
 --- /usr/ports/audio/fluidsynth/pkg-plist	2011-11-19 05:07:19.000000000 +0900
 +++ audio/fluidsynth/pkg-plist	2012-08-18 04:28:33.000000000 +0900
 @@ -19,6 +19,6 @@
  include/fluidsynth/voice.h
  lib/libfluidsynth.so
  lib/libfluidsynth.so.1
 -lib/libfluidsynth.so.1.5.1
 +lib/libfluidsynth.so.1.5.2
  libdata/pkgconfig/fluidsynth.pc
  @dirrm include/fluidsynth
 
 --Multipart=_Mon__8_Oct_2012_02_56_12_+0900_XYWgrheQQsQJ85iU--
Responsible-Changed-From-To: freebsd-multimedia->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Feb 4 09:34:55 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171958 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Feb 4 09:35:04 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171958: commit references a PR
Date: Mon,  4 Feb 2013 09:34:17 +0000 (UTC)

 Author: miwi
 Date: Mon Feb  4 09:34:00 2013
 New Revision: 311590
 URL: http://svnweb.freebsd.org/changeset/ports/311590
 
 Log:
   - Update to 1.1.6
   
   PR:		171958
   Submitted by:	ports fury
 
 Added:
   head/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c   (contents, props changed)
 Deleted:
   head/audio/fluidsynth/files/patch-src__CMakeLists.txt
 Modified:
   head/audio/fluidsynth/Makefile   (contents, props changed)
   head/audio/fluidsynth/distinfo   (contents, props changed)
   head/audio/fluidsynth/pkg-plist   (contents, props changed)
 
 Modified: head/audio/fluidsynth/Makefile
 ==============================================================================
 --- head/audio/fluidsynth/Makefile	Mon Feb  4 09:21:10 2013	(r311589)
 +++ head/audio/fluidsynth/Makefile	Mon Feb  4 09:34:00 2013	(r311590)
 @@ -2,15 +2,14 @@
  # $FreeBSD$
  
  PORTNAME=	fluidsynth
 -PORTVERSION=	1.1.5
 +PORTVERSION=	1.1.6
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  
  MAINTAINER=	multimedia@FreeBSD.org
  COMMENT=	Real-time software synthesizer based on the SoundFont 2 specifications
  
 -LICENSE=	GPLv2 # (or later)
 -LICENSE_FILE=	${WRKSRC}/COPYING
 +LICENSE=	LGPL20
  
  OPTIONS_DEFINE=	JACK ALSA DBUS LADSPA LASH PORTAUDIO PULSEAUDIO SNDFILE
  OPTIONS_DEFAULT=	JACK
 @@ -22,28 +21,29 @@ USE_CMAKE=	yes
  CMAKE_ARGS=	-Denable-ladcca:BOOL=FALSE \
  		-Denable-midishare:BOOL=FALSE
  USE_LDCONFIG=	yes
 +MAKE_JOBS_SAFE=	yes
  
 -CFLAGS+=	${PTHREAD_CFLAGS}
 -LDFLAGS+=	${PTHREAD_LIBS}
 +CFLAGS+=	${PA_CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 +LDFLAGS+=	${PA_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}
  
  MAN1=		fluidsynth.1
  
  .include <bsd.port.pre.mk>
  
  .if ${PORT_OPTIONS:MJACK}
 -LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
 +LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
  .else
  CMAKE_ARGS+=	-Denable-jack:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MALSA}
 -LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
 +LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
  .else
  CMAKE_ARGS+=	-Denable-alsa:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MDBUS}
 -LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 +LIB_DEPENDS+=	dbus-1:${PORTSDIR}/devel/dbus
  .else
  CMAKE_ARGS+=	-Denable-dbus:BOOL=FALSE
  .endif
 @@ -64,16 +64,18 @@ CMAKE_ARGS+=	-Denable-lash:BOOL=FALSE
  BUILD_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
  RUN_DEPENDS+=	${LOCALBASE}/include/portaudio2/portaudio.h:${PORTSDIR}/audio/portaudio2
  CMAKE_ARGS+=	-Denable-portaudio:BOOL=TRUE
 +PA_CFLAGS=	-I${LOCALBASE}/include/portaudio2
 +PA_LDFLAGS=	-L${LOCALBASE}/lib/portaudio2
  .endif
  
  .if ${PORT_OPTIONS:MPULSEAUDIO}
 -LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 +LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
  .else
  CMAKE_ARGS+=	-Denable-pulseaudio:BOOL=FALSE
  .endif
  
  .if ${PORT_OPTIONS:MSNDFILE}
 -LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
 +LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
  .else
  CMAKE_ARGS+=	-Denable-libsndfile:BOOL=FALSE
  .endif
 
 Modified: head/audio/fluidsynth/distinfo
 ==============================================================================
 --- head/audio/fluidsynth/distinfo	Mon Feb  4 09:21:10 2013	(r311589)
 +++ head/audio/fluidsynth/distinfo	Mon Feb  4 09:34:00 2013	(r311590)
 @@ -1,2 +1,2 @@
 -SHA256 (fluidsynth-1.1.5.tar.bz2) = 44b40ee28f0ed1718c924d8a175e30381431edfb9320026480d56daf7351e3f4
 -SIZE (fluidsynth-1.1.5.tar.bz2) = 800195
 +SHA256 (fluidsynth-1.1.6.tar.bz2) = d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601
 +SIZE (fluidsynth-1.1.6.tar.bz2) = 823783
 
 Added: head/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c	Mon Feb  4 09:34:00 2013	(r311590)
 @@ -0,0 +1,15 @@
 +--- src/drivers/fluid_oss.c.orig	2012-08-16 13:01:13.000000000 +0900
 ++++ src/drivers/fluid_oss.c	2012-08-18 04:12:09.000000000 +0900
 +@@ -45,9 +45,9 @@
 + #define BUFFER_LENGTH 512
 + 
 + // Build issue on some systems (OSS 4.0)?
 +-#ifdef SNDCTL_DSP_CHANNELS
 +-  #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
 +-#endif
 ++// #ifdef SNDCTL_DSP_CHANNELS
 ++//   #define SOUND_PCM_WRITE_CHANNELS        SNDCTL_DSP_CHANNELS
 ++// #endif
 + 
 + /** fluid_oss_audio_driver_t
 +  *
 
 Modified: head/audio/fluidsynth/pkg-plist
 ==============================================================================
 --- head/audio/fluidsynth/pkg-plist	Mon Feb  4 09:21:10 2013	(r311589)
 +++ head/audio/fluidsynth/pkg-plist	Mon Feb  4 09:34:00 2013	(r311590)
 @@ -19,6 +19,6 @@ include/fluidsynth/version.h
  include/fluidsynth/voice.h
  lib/libfluidsynth.so
  lib/libfluidsynth.so.1
 -lib/libfluidsynth.so.1.5.1
 +lib/libfluidsynth.so.1.5.2
  libdata/pkgconfig/fluidsynth.pc
  @dirrm include/fluidsynth
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
