2 files changed, 87 insertions, 36 deletions

diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile
index 72c79195c274..375de399104b 100644
--- a/audio/linuxsampler/Makefile
+++ b/audio/linuxsampler/Makefile
@@ -7,29 +7,34 @@
 
 PORTNAME=	linuxsampler
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://download.linuxsampler.org/packages/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular MIDI sampler
 
-LIB_DEPENDS=	jack.0:${PORTSDIR}/audio/jack \
-		gig.10:${PORTSDIR}/audio/libgig \
+LIB_DEPENDS=	gig.10:${PORTSDIR}/audio/libgig
 
 RESTRICTED=	no commercial use
-BROKEN=		unfetchable
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported"
 
+OPTIONS=	JACK "Enable JACK support" on \
+		ALSA "Enable ALSA support" off \
+		ARTS "Enable aRts support" off \
+		DSSI "Enable DSSI support" off \
+		LV2CORE "Enable LV2 support" off
+
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 USE_SQLITE=	3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	HAVE_UNIX98=1
-CONFIGURE_ARGS=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" HAVE_UNIX98=1
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		linuxsampler.1
 
@@ -38,12 +43,48 @@ LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-#.if ${OSVERSION} >= 900000
-#BROKEN=		Does not compile
-#.endif
+.if defined(WITHOUT_JACK)
+CONFIGURE_ARGS+=--disable-jack-driver	
+.else
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.endif
+
+.if defined(WITH_ALSA)
+LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+.else
+CONFIGURE_ARGS+=--disable-alsa-driver	
+.endif
+
+.if defined(WITH_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+.else
+CONFIGURE_ARGS+=--disable-arts-driver
+.endif
+
+.if defined(WITH_DSSI)
+BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
+RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
+PLIST_SUB+=	DSSI=""
+.else
+CONFIGURE_ENV+=	ac_cv_header_dssi_h=no	
+PLIST_SUB+=	DSSI="@comment "
+.endif
+
+.if defined(WITH_LV2CORE)
+BUILD_DEPENDS+=	lv2core>=0:${PORTSDIR}/audio/lv2core
+RUN_DEPENDS+=	lv2core>=0${PORTSDIR}/audio/lv2core
+PLIST_SUB+=	LV2CORE=""
+.else
+CONFIGURE_ENV+=	ac_cv_header_lv2_h=no
+PLIST_SUB+=	LV2CORE="@comment "
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g' ${WRKSRC}/configure
+		's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g ; \
+		 s|"lv2core"|"_lv2core_"|' ${WRKSRC}/configure
+
+post-install:
+	@${TOUCH} ${PREFIX}/lib/linuxsampler/plugins/.keep_me
 
 .include <bsd.port.post.mk>
diff --git a/audio/linuxsampler/pkg-plist b/audio/linuxsampler/pkg-plist
index 9951ecbcc0e7..3e3744c4ba47 100644
--- a/audio/linuxsampler/pkg-plist
+++ b/audio/linuxsampler/pkg-plist
@@ -1,43 +1,53 @@
 bin/linuxsampler
-include/linuxsampler/engines/Engine.h
-include/linuxsampler/engines/EngineChannel.h
-include/linuxsampler/engines/FxSend.h
-include/linuxsampler/engines/InstrumentManager.h
-include/linuxsampler/common/lsatomic.h
+include/linuxsampler/EventListeners.h
+include/linuxsampler/Sampler.h
+include/linuxsampler/common/Condition.h
 include/linuxsampler/common/Exception.h
+include/linuxsampler/common/Mutex.h
+include/linuxsampler/common/SynchronizedConfig.h
 include/linuxsampler/common/Thread.h
 include/linuxsampler/common/global.h
+include/linuxsampler/common/lsatomic.h
 include/linuxsampler/common/optional.h
-include/linuxsampler/common/Mutex.h
-include/linuxsampler/common/SynchronizedConfig.h
-include/linuxsampler/common/Condition.h
+include/linuxsampler/drivers/Device.h
+include/linuxsampler/drivers/DeviceParameter.h
 include/linuxsampler/drivers/audio/AudioChannel.h
 include/linuxsampler/drivers/audio/AudioOutputDevice.h
-include/linuxsampler/drivers/midi/midi.h
-include/linuxsampler/drivers/midi/MidiInputPort.h
 include/linuxsampler/drivers/midi/MidiInputDevice.h
+include/linuxsampler/drivers/midi/MidiInputPort.h
 include/linuxsampler/drivers/midi/MidiInstrumentMapper.h
 include/linuxsampler/drivers/midi/VirtualMidiDevice.h
-include/linuxsampler/drivers/Device.h
-include/linuxsampler/drivers/DeviceParameter.h
-include/linuxsampler/plugins/InstrumentEditor.h
-include/linuxsampler/plugins/InstrumentEditorFactory.h
+include/linuxsampler/drivers/midi/midi.h
 include/linuxsampler/effects/Effect.h
 include/linuxsampler/effects/EffectChain.h
-include/linuxsampler/Sampler.h
-include/linuxsampler/EventListeners.h
-@dirrm include/linuxsampler/engines
-@dirrm include/linuxsampler/common
-@dirrm include/linuxsampler/drivers/audio
-@dirrm include/linuxsampler/drivers/midi
-@dirrm include/linuxsampler/drivers
-@dirrm include/linuxsampler/plugins
-@dirrm include/linuxsampler/effects
-@dirrm include/linuxsampler
-lib/linuxsampler/liblinuxsampler.so.3
-lib/linuxsampler/liblinuxsampler.so
-lib/linuxsampler/liblinuxsampler.la
+include/linuxsampler/engines/Engine.h
+include/linuxsampler/engines/EngineChannel.h
+include/linuxsampler/engines/FxSend.h
+include/linuxsampler/engines/InstrumentManager.h
+include/linuxsampler/plugins/InstrumentEditor.h
+include/linuxsampler/plugins/InstrumentEditorFactory.h
+%%DSSI%%lib/dssi/linuxsampler.a
+%%DSSI%%lib/dssi/linuxsampler.la
+%%DSSI%%lib/dssi/linuxsampler.so
 lib/linuxsampler/liblinuxsampler.a
+lib/linuxsampler/liblinuxsampler.la
+lib/linuxsampler/liblinuxsampler.so
+lib/linuxsampler/liblinuxsampler.so.3
+lib/linuxsampler/plugins/.keep_me
+%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.a
+%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.la
+%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.so
+%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
+%%LV2CORE%%lib/lv2/linuxsampler.lv2/manifest.ttl
 libdata/pkgconfig/linuxsampler.pc
+%%LV2CORE%%@dirrm lib/lv2/linuxsampler.lv2
 @dirrm lib/linuxsampler/plugins
 @dirrm lib/linuxsampler
+@dirrm include/linuxsampler/plugins
+@dirrm include/linuxsampler/engines
+@dirrm include/linuxsampler/effects
+@dirrm include/linuxsampler/drivers/midi
+@dirrm include/linuxsampler/drivers/audio
+@dirrm include/linuxsampler/drivers
+@dirrm include/linuxsampler/common
+@dirrm include/linuxsampler