5 files changed, 30 insertions, 72 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 493d0b03a5bb..fa0a46ed47ba 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -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
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index c1edb1e7e8a1..54588ac43729 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -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 --git a/audio/fluidsynth/files/patch-src__CMakeLists.txt b/audio/fluidsynth/files/patch-src__CMakeLists.txt
deleted file mode 100644
index 9798836a1da0..000000000000
--- a/audio/fluidsynth/files/patch-src__CMakeLists.txt
+++ /dev/null
@@ -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 --git a/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c b/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c
new file mode 100644
index 000000000000..dea1fe2b54a9
--- /dev/null
+++ b/audio/fluidsynth/files/patch-src__drivers__fluid_oss.c
@@ -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 --git a/audio/fluidsynth/pkg-plist b/audio/fluidsynth/pkg-plist
index 53037850bdd7..c27f7d326196 100644
--- a/audio/fluidsynth/pkg-plist
+++ b/audio/fluidsynth/pkg-plist
@@ -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