Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Jun 2021 22:55:14 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7620e258ef9d - main - audio/carla: Fix build of audio/lmms by re-adding USE_LDCONFIG.
Message-ID:  <202106042255.154MtEkr005713@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7620e258ef9d255c73beb70a085366eef1915a62

commit 7620e258ef9d255c73beb70a085366eef1915a62
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-06-04 22:48:58 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-06-04 22:55:12 +0000

    audio/carla: Fix build of audio/lmms by re-adding USE_LDCONFIG.
    
    Last update removed USE_LDCONFIG based on a bad recommendation from portlint.
    
    Also move CONFLICTS_BUILD to the right place.
    
    PR:             256420
    Reported by:    rodrigo
---
 audio/carla/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index 82c00bc4145a..fcb198f5a849 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	Carla
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,8 +14,6 @@ LIB_DEPENDS=	liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 
-CONFLICTS_BUILD=	rtaudio-* rtmidi-*
-
 USES=		compiler:c++11-lib desktop-file-utils gl gmake gnome localbase \
 		pkgconfig pyqt:5 python:3.4+ qt:5 shared-mime-info shebangfix \
 		tar:bz2 xorg
@@ -24,6 +22,9 @@ USE_GNOME=	gtk20 gtk30
 USE_QT=		core gui widgets buildtools_build
 USE_GL=		gl
 USE_XORG=	x11
+USE_LDCONFIG=	${PREFIX}/lib/carla
+
+CONFLICTS_BUILD=	rtaudio rtmidi
 
 SHEBANG_FILES=	data/carla-single data/carla-bridge-lv2-modgui source/native-plugins/resources/* source/frontend/*
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106042255.154MtEkr005713>