From 1c179bdf40397ce301fd64cc63a60f7037cdad80 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 16 Jun 2014 14:13:29 +0000 Subject: [PATCH] - Switch to USES=libtool, drop .la files - Convert USE_BZIP2 to USES - Fix dssi handling (was not detected by configure) Approved by: portmgr blanket --- audio/linuxsampler/Makefile | 8 ++++---- audio/linuxsampler/pkg-plist | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/audio/linuxsampler/Makefile b/audio/linuxsampler/Makefile index 21049ae4861c..3e9f2bec0730 100644 --- a/audio/linuxsampler/Makefile +++ b/audio/linuxsampler/Makefile @@ -3,7 +3,7 @@ PORTNAME= linuxsampler PORTVERSION= 1.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://download.linuxsampler.org/packages/ @@ -22,10 +22,9 @@ OPTIONS_DEFAULT= JACK DSSI_DESC= Enable DSSI support LV2CORE_DESC= Enable LV2 support -USE_BZIP2= yes -USES= gmake pathfix pkgconfig +USES= tar:bzip2 libtool gmake pathfix pkgconfig +GNU_CONFIGURE= yes USE_SQLITE= 3 -USE_AUTOTOOLS= libtool CONFIGURE_ENV= HAVE_UNIX98=1 USE_LDCONFIG= yes @@ -52,6 +51,7 @@ CONFIGURE_ARGS+=--disable-alsa-driver BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi PLIST_SUB+= DSSI="" +CPPFLAGS:= -I${LOCALBASE}/include/dssi ${CPPFLAGS} .else CONFIGURE_ENV+= ac_cv_header_dssi_h=no PLIST_SUB+= DSSI="@comment " diff --git a/audio/linuxsampler/pkg-plist b/audio/linuxsampler/pkg-plist index e27b2a535872..d4c62ea87107 100644 --- a/audio/linuxsampler/pkg-plist +++ b/audio/linuxsampler/pkg-plist @@ -27,15 +27,13 @@ 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/liblinuxsampler.so.3.0.0 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