Index: head/audio/linuxsampler/Makefile
===================================================================
--- head/audio/linuxsampler/Makefile	(revision 425371)
+++ head/audio/linuxsampler/Makefile	(revision 425372)
@@ -1,77 +1,77 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
 
 PORTNAME=	linuxsampler
 PORTVERSION=	1.0.0
 PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://download.linuxsampler.org/packages/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular MIDI sampler
 
 LIB_DEPENDS=	libgig.so:audio/libgig
 
 RESTRICTED=	no commercial use
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported"
 
-OPTIONS_DEFINE=	JACK ALSA DSSI LV2CORE
+OPTIONS_DEFINE=	JACK ALSA DSSI LV2
 OPTIONS_DEFAULT=	JACK
 DSSI_DESC=	Enable DSSI support
-LV2CORE_DESC=	Enable LV2 support
+LV2_DESC=	Enable LV2 support
 
 USES=		tar:bzip2 libtool gmake pathfix pkgconfig sqlite:3
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	HAVE_UNIX98=1
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=--disable-arts-driver
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJACK}
 LIB_DEPENDS+=	libjack.so:audio/jack
 .else
 CONFIGURE_ARGS+=--disable-jack-driver
 .endif
 
 .if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS+=	libasound.so:audio/alsa-lib
 .else
 CONFIGURE_ARGS+=--disable-alsa-driver
 .endif
 
 .if ${PORT_OPTIONS:MDSSI}
 BUILD_DEPENDS+=	dssi>=0:audio/dssi
 RUN_DEPENDS+=	dssi>=0:audio/dssi
 PLIST_SUB+=	DSSI=""
 CPPFLAGS:=	-I${LOCALBASE}/include/dssi ${CPPFLAGS}
 .else
 CONFIGURE_ENV+=	ac_cv_header_dssi_h=no
 PLIST_SUB+=	DSSI="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MLV2CORE}
+.if ${PORT_OPTIONS:MLV2}
 BUILD_DEPENDS+=	lv2core>=0:audio/lv2core
 RUN_DEPENDS+=	lv2core>=0:audio/lv2core
-PLIST_SUB+=	LV2CORE=""
+PLIST_SUB+=	LV2=""
 .else
 CONFIGURE_ENV+=	ac_cv_header_lv2_h=no
-PLIST_SUB+=	LV2CORE="@comment "
+PLIST_SUB+=	LV2="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|CXX_CPU_SWITCH=.*|CXX_CPU_SWITCH=|g ; \
 		 s|"lv2core"|"_lv2core_"|' ${WRKSRC}/configure
 
 post-install:
 	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/linuxsampler/plugins/.keep_me
 
 .include <bsd.port.mk>
Index: head/audio/linuxsampler/pkg-plist
===================================================================
--- head/audio/linuxsampler/pkg-plist	(revision 425371)
+++ head/audio/linuxsampler/pkg-plist	(revision 425372)
@@ -1,44 +1,44 @@
 bin/linuxsampler
 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/drivers/Device.h
 include/linuxsampler/drivers/DeviceParameter.h
 include/linuxsampler/drivers/audio/AudioChannel.h
 include/linuxsampler/drivers/audio/AudioOutputDevice.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/midi/midi.h
 include/linuxsampler/effects/Effect.h
 include/linuxsampler/effects/EffectChain.h
 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.so
 lib/linuxsampler/liblinuxsampler.a
 lib/linuxsampler/liblinuxsampler.so
 lib/linuxsampler/liblinuxsampler.so.3
 lib/linuxsampler/liblinuxsampler.so.3.0.0
 lib/linuxsampler/plugins/.keep_me
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.a
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.so
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
-%%LV2CORE%%lib/lv2/linuxsampler.lv2/manifest.ttl
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.a
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.so
+%%LV2%%lib/lv2/linuxsampler.lv2/linuxsampler.ttl
+%%LV2%%lib/lv2/linuxsampler.lv2/manifest.ttl
 libdata/pkgconfig/linuxsampler.pc
 man/man1/linuxsampler.1.gz
 /var/lib/linuxsampler/instruments.db
 @dir /var/lib/linuxsampler
 @dir /var/lib