ient CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brtFv3frrz3cSt; Tue, 29 Jul 2025 11:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753788083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlavtFGqSxTZ9CewqjuvtNTjUu+RIFbAqjtbc7d1uGY=; b=SilU6u8lQUso8SFwP+q41PIiscWsBJblE4vYdrS0/sFJY1nAzl/yJOVI3C9YGstAv3J3J7 YF8WQD+0rDKTz90l3/zCi4Bh3tsSGqU8wKike4cTHZ86L6BBy2qOvWSbsLhEYfc3jAShza 4S+9jLFVUH/Qh//kjJ9llOUTdfRVk1wvXFnGCpZ54AqkYcB/OVudppjlYDfDJPtlecgeQV QCgFAe6Ux0vHs6jMwe75mvl+VBh8itN7gnVEKvGnDnXQeIIp9uXfxm0Lr8TTpxGPbn+OAF 0YaFmVSvLqD1DL9nT4O5FSfsI1QcdxiBFPF9bGa/YvKSdwmcF4umtvR2f+65BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753788083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlavtFGqSxTZ9CewqjuvtNTjUu+RIFbAqjtbc7d1uGY=; b=gc1jr/cWEpyzdLM3bribXsLvfKK34Nm2VBL9+B1hOCw85mGGziujtyO6o3TtVZhFrRyL3P mmlBeiIXjzOSx6FfnVmprVlEHQQv7Byn+R87uPosPrvJMSlmJzMcRH37YnkNlKGUVzuqCy aCNfXdPXFY0XAPUnIuxXwDFR86kkL3ZjCdzFXxvvyURbcLqE9IMfwfEEa0DtMLbLFPSVJx wFcXRTru7rUA2N2Dwr9pPymglfulbzKFYytaaHpHT+wgcaP9Rgh+9Aq1Y15Hw3f2DtO0zg btcBV6kOokH34f0sb5aCgd4oSj0q3o9+ATSyES375ZM8G3ysxnlP1Pyyzm01Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753788083; a=rsa-sha256; cv=none; b=UbM+rd/DHJJq2PQGRz9U1ylpyNjE/yFdgUHGxd48T2vhtssaQ7rmh2eUlbWqoo8PNwEfZ4 uTnjwcHO33N0vftkHBPlaY1F1OHKxVWGmocYL8PfQd886CScFg+mHGcuMxy4h6L1JxkF2d ii1YSzuUjqFgExwdsDfdekR1qa1ehjSinvMR488PsvyfRwLD0TR6E0DxDXAup/tZXCPh5i vYoInC7dtYbgVbZXghLRUcDLzDYeMmWZjUlyiQ61fNm9lc3MMWfYLhy5/uAqhsNZNyiXoj KP7CKDFfOKT4+AMhh0M+JpdstBAFK/pATu52mgmzTXOQdMU241ZC4KORrXUcjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brtFv3GMhzDNm; Tue, 29 Jul 2025 11:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56TBLN7M077753; Tue, 29 Jul 2025 11:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TBLNMm077750; Tue, 29 Jul 2025 11:21:23 GMT (envelope-from git) Date: Tue, 29 Jul 2025 11:21:23 GMT Message-Id: <202507291121.56TBLNMm077750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 3206915a57e9 - main - audio/libcanberra*: prepare for splitting audio plugins List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3206915a57e9a1eb208a05aabb46768ad3574d0e Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=3206915a57e9a1eb208a05aabb46768ad3574d0e commit 3206915a57e9a1eb208a05aabb46768ad3574d0e Author: Max Brazhnikov AuthorDate: 2025-07-29 11:18:08 +0000 Commit: Max Brazhnikov CommitDate: 2025-07-29 11:18:08 +0000 audio/libcanberra*: prepare for splitting audio plugins - Respect PORTREVISION - Sort USES - Deduplicate LIB_DEPENDS --- audio/libcanberra-gtk2/Makefile | 4 ++-- audio/libcanberra-gtk3/Makefile | 4 ++-- audio/libcanberra/Makefile | 22 ++++++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/audio/libcanberra-gtk2/Makefile b/audio/libcanberra-gtk2/Makefile index feda323ad049..afdf85817fe9 100644 --- a/audio/libcanberra-gtk2/Makefile +++ b/audio/libcanberra-gtk2/Makefile @@ -1,6 +1,6 @@ MASTERDIR= ${.CURDIR:H}/libcanberra -PORTREVISION= 1 -SLAVEPORT= gtk2 +PORTREVISION= 11 +CANBERRA= gtk2 post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk2 diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile index 65bce8f80b07..928810429f44 100644 --- a/audio/libcanberra-gtk3/Makefile +++ b/audio/libcanberra-gtk3/Makefile @@ -1,6 +1,6 @@ MASTERDIR= ${.CURDIR:H}/libcanberra -PORTREVISION= 1 -SLAVEPORT= gtk3 +PORTREVISION= 11 +CANBERRA= gtk3 post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/include/canberra-gtk3 diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 343b4aa68374..442baf563b8f 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,6 +1,6 @@ PORTNAME= libcanberra PORTVERSION= 0.30 -PORTREVISION= 11 +PORTREVISION?= 11 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ \ http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-0.30.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/ @@ -15,30 +15,32 @@ LICENSE_FILE= ${WRKSRC}/LGPL LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libltdl.so:devel/libltdl -USES= gmake gnome localbase libtool pkgconfig tar:xz +USES= gmake gnome libtool localbase pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-lynx --disable-tdb --disable-alsa --disable-udev +CONFIGURE_ARGS= --disable-alsa \ + --disable-lynx \ + --disable-tdb \ + --disable-udev INSTALL_TARGET= install-strip -SLAVEPORT?= +CANBERRA?= PLIST_SUB= VERSION=${PORTVERSION} -.if ${SLAVEPORT} != "" -PKGNAMESUFFIX= -${SLAVEPORT} +.if ${CANBERRA} != "" +PKGNAMESUFFIX= -${CANBERRA} +LIB_DEPENDS+= libcanberra.so:audio/libcanberra .endif -.if ${SLAVEPORT:U} == gtk3 +.if ${CANBERRA:U} == gtk3 USE_GNOME+= gtk30 -LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk3 \ --disable-gtk \ --disable-gstreamer \ --disable-pulse PLIST_SUB+= BASE="@comment " GTK3="" GTK2="@comment " -.elif ${SLAVEPORT:U} == gtk2 +.elif ${CANBERRA:U} == gtk2 USE_GNOME+= gnomeprefix gtk20 -LIB_DEPENDS+= libcanberra.so:audio/libcanberra CONFIGURE_ARGS+= --enable-gtk \ --disable-gtk3 \ --disable-gstreamer \