Index: head/audio/calf/Makefile =================================================================== --- head/audio/calf/Makefile (revision 425370) +++ head/audio/calf/Makefile (revision 425371) @@ -1,50 +1,50 @@ # Created by: # $FreeBSD$ PORTNAME= calf PORTVERSION= 0.0.60 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://calf-studio-gear.org/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Audio plug-in pack for LV2 and JACK environments LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth \ libjack.so:audio/jack \ libexpat.so:textproc/expat2 USES= autoreconf compiler:c++11-lang gmake libtool pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes INSTALL_TARGET= install-strip INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= DOCS LASH LV2 OPTIONS_DEFAULT= LASH LV2 OPTIONS_SUB= yes LASH_LIB_DEPENDS= liblash.so:audio/lash LASH_CONFIGURE_WITH= lash LV2_DESC= LV2 audio plugin -LV2_BUILD_DEPENDS= lv2>0:audio/lv2 -LV2_RUN_DEPENDS= lv2>0:audio/lv2 +LV2_BUILD_DEPENDS= lv2core>0:audio/lv2core +LV2_RUN_DEPENDS= lv2core>0:audio/lv2core LV2_CONFIGURE_WITH= lv2 .include .if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -finline-limit=80 -finline-functions -finline-functions-called-once .endif post-patch: @${REINPLACE_CMD} '//d' \ ${WRKSRC}/src/ctl_knob.cpp ${WRKSRC}/src/ctl_tube.cpp .include Index: head/audio/linuxsampler/Makefile =================================================================== --- head/audio/linuxsampler/Makefile (revision 425370) +++ head/audio/linuxsampler/Makefile (revision 425371) @@ -1,76 +1,77 @@ # Created by: trasz # $FreeBSD$ PORTNAME= linuxsampler PORTVERSION= 1.0.0 -PORTREVISION= 6 +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 LV2 +OPTIONS_DEFINE= JACK ALSA DSSI LV2CORE OPTIONS_DEFAULT= JACK DSSI_DESC= Enable DSSI support -LV2_DESC= Enable LV2 support +LV2CORE_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 .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:MLV2} -BUILD_DEPENDS+= lv2>=0:audio/lv2 -RUN_DEPENDS+= lv2>=0:audio/lv2 -PLIST_SUB+= LV2="" +.if ${PORT_OPTIONS:MLV2CORE} +BUILD_DEPENDS+= lv2core>=0:audio/lv2core +RUN_DEPENDS+= lv2core>=0:audio/lv2core +PLIST_SUB+= LV2CORE="" .else CONFIGURE_ENV+= ac_cv_header_lv2_h=no -PLIST_SUB+= LV2="@comment " +PLIST_SUB+= LV2CORE="@comment " .endif post-patch: - @${REINPLACE_CMD} -e '/CXX_CPU_SWITCH=/d' \ - ${WRKSRC}/configure + @${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 Index: head/audio/linuxsampler/pkg-plist =================================================================== --- head/audio/linuxsampler/pkg-plist (revision 425370) +++ head/audio/linuxsampler/pkg-plist (revision 425371) @@ -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 -%%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 +%%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 libdata/pkgconfig/linuxsampler.pc man/man1/linuxsampler.1.gz /var/lib/linuxsampler/instruments.db @dir /var/lib/linuxsampler @dir /var/lib Index: head/audio/lv2core/Makefile =================================================================== --- head/audio/lv2core/Makefile (revision 425370) +++ head/audio/lv2core/Makefile (revision 425371) @@ -1,34 +1,31 @@ # Created by: xaimus # $FreeBSD$ PORTNAME= lv2core PORTVERSION= 6.0 CATEGORIES= audio MASTER_SITES= http://lv2plug.in/spec/ MAINTAINER= ports@FreeBSD.org COMMENT= LV2 Core Package LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= lv2 -DEPRECATED= Superseded by audio/lv2 -EXPIRATION_DATE= 2016-11-30 - USES= pkgconfig python:build tar:bzip2 waf post-patch: @${REINPLACE_CMD} -e '/autowaf.build_pc/s|^|#|' ${WRKSRC}/wscript @(cd ${WRKSRC} && ${SED} -e \ 's|@PREFIX@|${PREFIX}| ; \ s|@EXEC_PREFIX@|${PREFIX}| ; \ s|@LIBDIR@|${PREFIX}/lib| ; \ s|@INCLUDEDIR@|${PREFIX}/include| ; \ s|@LV2CORE_VERSION@|${PORTVERSION}|' < lv2core.pc.in > lv2core.pc) post-install: ${INSTALL_DATA} ${WRKSRC}/lv2core.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: head/audio/slv2/Makefile =================================================================== --- head/audio/slv2/Makefile (revision 425370) +++ head/audio/slv2/Makefile (revision 425371) @@ -1,39 +1,39 @@ # Created by: xaimus # $FreeBSD$ PORTNAME= slv2 PORTVERSION= 0.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://download.drobilla.net/ MAINTAINER= ports@FreeBSD.org COMMENT= LV2 Application Support Library LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:audio/lv2 +BUILD_DEPENDS= ${LOCALBASE}/include/lv2.h:audio/lv2core LIB_DEPENDS= libjack.so:audio/jack \ librdf.so:textproc/redland USES= pkgconfig tar:bzip2 waf USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e \ '/pkgconfig/s|$${LIBDIRNAME}|libdata|' ${WRKSRC}/autowaf.py @${REINPLACE_CMD} -e \ '/autowaf.build_dox/s|^|#| ; \ /HTMLDIR/s|^|#| ; \ /MANDIR/s|^|#|' ${WRKSRC}/wscript @${REINPLACE_CMD} -e \ 's|^#define _XOPEN_SOURCE .*||' ${WRKSRC}/src/plugin.c post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libslv2.so .for file in lv2_inspect lv2_jack_host lv2_list lv2_simple_jack_host ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor .include