From owner-svn-ports-head@freebsd.org Sat Nov 5 02:59:03 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FF4CC2EE31; Sat, 5 Nov 2016 02:59:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4EFA83; Sat, 5 Nov 2016 02:59:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA52x2A6062193; Sat, 5 Nov 2016 02:59:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA52x27R062188; Sat, 5 Nov 2016 02:59:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201611050259.uA52x27R062188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 5 Nov 2016 02:59:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425371 - in head/audio: calf linuxsampler lv2core slv2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2016 02:59:03 -0000 Author: jbeich Date: Sat Nov 5 02:59:01 2016 New Revision: 425371 URL: https://svnweb.freebsd.org/changeset/ports/425371 Log: audio/lv2core: backout r425367 to re-land cleanly Modified: head/audio/calf/Makefile (contents, props changed) head/audio/linuxsampler/Makefile (contents, props changed) head/audio/linuxsampler/pkg-plist (contents, props changed) head/audio/lv2core/Makefile (contents, props changed) head/audio/slv2/Makefile (contents, props changed) Modified: head/audio/calf/Makefile ============================================================================== --- head/audio/calf/Makefile Sat Nov 5 02:21:28 2016 (r425370) +++ head/audio/calf/Makefile Sat Nov 5 02:59:01 2016 (r425371) @@ -3,7 +3,7 @@ PORTNAME= calf PORTVERSION= 0.0.60 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://calf-studio-gear.org/files/ @@ -33,8 +33,8 @@ 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 Modified: head/audio/linuxsampler/Makefile ============================================================================== --- head/audio/linuxsampler/Makefile Sat Nov 5 02:21:28 2016 (r425370) +++ head/audio/linuxsampler/Makefile Sat Nov 5 02:59:01 2016 (r425371) @@ -3,7 +3,7 @@ PORTNAME= linuxsampler PORTVERSION= 1.0.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://download.linuxsampler.org/packages/ @@ -17,10 +17,10 @@ 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 @@ -57,18 +57,19 @@ 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 Modified: head/audio/linuxsampler/pkg-plist ============================================================================== --- head/audio/linuxsampler/pkg-plist Sat Nov 5 02:21:28 2016 (r425370) +++ head/audio/linuxsampler/pkg-plist Sat Nov 5 02:59:01 2016 (r425371) @@ -33,10 +33,10 @@ 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 Modified: head/audio/lv2core/Makefile ============================================================================== --- head/audio/lv2core/Makefile Sat Nov 5 02:21:28 2016 (r425370) +++ head/audio/lv2core/Makefile Sat Nov 5 02:59:01 2016 (r425371) @@ -14,9 +14,6 @@ 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: Modified: head/audio/slv2/Makefile ============================================================================== --- head/audio/slv2/Makefile Sat Nov 5 02:21:28 2016 (r425370) +++ head/audio/slv2/Makefile Sat Nov 5 02:59:01 2016 (r425371) @@ -3,7 +3,7 @@ PORTNAME= slv2 PORTVERSION= 0.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= http://download.drobilla.net/ @@ -13,7 +13,7 @@ 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