From nobody Thu Feb 15 07:43:59 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tb6Wg5nDvz50v87; Thu, 15 Feb 2024 07:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tb6Wg5GyTz4V2C; Thu, 15 Feb 2024 07:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707983039; 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=aZtSAqi7vHBLmkz2ZRpGg+IwOVVu/Toq14UcSUHUxs0=; b=LEc3RfRL0byp0Rt3idWBYMwISGmHOFt9anNrro9a1tgTrnuvtmzUhJioDSkSaL9Qe0NhrI lfP8VOGOd3igZ0phLkCIwMkkfn4GfpO7q+9DoGTmkD/Fv+7NeyRluTz2XSTWnghjdr4sFq 8nb70ojBEIlZmUMcQttM/k3JWAr+4dEXSL7PHiEFyxLFntUzvMeizX+CCHXRXU58f4jzEJ GasmWODc+8G36+dShZgM7etDdZq+KyErBSlGE4cVLe0GOEXfan3DNrtcVpRGZV6B01qLXy NeAYqnKDlOUtQAWrhepgsH4dPYLut99+Ae5UGwBTExpaS1BCMpI2Z8A8h5F3lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707983039; a=rsa-sha256; cv=none; b=B7cfbbilyyOjuyJdbfzgGSgCGMbL+FobX1eE7NxOEPo6OYadptRhXPG9DIoVw12ekZOGRC E6vxo24p4oKpmU0452V4PBa34MHWotFYIdYMn5x/UUm8pmeZSvE12WKtBwklTFwcqZAIVf friWtM/+pCamyG1c2VBQdPI1RoQQw6Zkc7dZ/os08T5KZx7x7V4PHIo8TghalC/7BmAzBy zjSTPHpGASc5uSFjXWao6qdbzUZMU+xpeSPbR+6QxAZoF3N3Vu4baVNqUA+PRJ2g1pDZQs ZdPziCbUhdGgDxHwthRcRaQz8DvSmr7eyClNnQEpU7qKY0lTY3muQbVgS3FKJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707983039; 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=aZtSAqi7vHBLmkz2ZRpGg+IwOVVu/Toq14UcSUHUxs0=; b=a9HNFR2jG0iTE8z9tda6+jzHVmeYtI4NVtn8s0wfmIeBM3DiyYndWeN07wnPVYoRWmZ73C vgZe3ExOl5bVJanUBNCJUco5r/xkxKSaMb782BL2EWuYxfrd0T3l1kOAy6eTFbhZmadMzC J1z//XNWhE+YaRH5OU7NrIkRfIE8XZb1eIDD3yeFWE3drXf3Gh8b2VRnvycoaOntGBT0Ch mJjPrqzQ5OsKD3BmCMpZUccTBLRTkdKZMG990sYziaHovtVuMHp/KhilSSHYwgsCO4lTFn HHSahl2/jyS6SIhvdvDZE6saT2AyHmDGNhoQVku7zbokJ4uYnRfJzKTGX/RH0w== 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 4Tb6Wg4LsTzY6K; Thu, 15 Feb 2024 07:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41F7hxAb076760; Thu, 15 Feb 2024 07:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41F7hx8l076757; Thu, 15 Feb 2024 07:43:59 GMT (envelope-from git) Date: Thu, 15 Feb 2024 07:43:59 GMT Message-Id: <202402150743.41F7hx8l076757@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 9ba2b2fd7b50 - main - comms/{svxlink,qtel}: fix package conflicts List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ba2b2fd7b509af8d54ed105e5c3df098450c443 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ba2b2fd7b509af8d54ed105e5c3df098450c443 commit 9ba2b2fd7b509af8d54ed105e5c3df098450c443 Author: Charlie Li AuthorDate: 2024-02-15 07:39:58 +0000 Commit: Charlie Li CommitDate: 2024-02-15 07:39:58 +0000 comms/{svxlink,qtel}: fix package conflicts ${USE_RC_SUBR} files, UID/GID and /var/spool/svxlink only apply to comms/svxlink, but were included in both packages, which prevented both from coexisting in the same environment. While here, allow independent ${PORTREVISION}s between the ports --- comms/svxlink/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile index 7caea05c081a..60adc07c7d6b 100644 --- a/comms/svxlink/Makefile +++ b/comms/svxlink/Makefile @@ -1,6 +1,6 @@ PORTNAME?= svxlink PORTVERSION= 19.09.2 -PORTREVISION= 1 +PORTREVISION?= 2 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org @@ -30,10 +30,10 @@ CMAKE_ARGS+= -DLOCAL_STATE_DIR=/var \ -DLOCALBASE:STRING="${LOCALBASE}" \ -DMAN_INSTALL_DIR:FILEPATH=${PREFIX}/share/man +.if ${PORTNAME} == svxlink USERS= svxlink GROUPS= svxlink USE_RC_SUBR= remotetrx svxlink svxreflector -.if ${PORTNAME} == svxlink CMAKE_ARGS+= -DUSE_QT:BOOL=NO .endif USE_LDCONFIG= yes @@ -112,6 +112,7 @@ post-install: ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf.sample ${MV} ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf \ ${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf.sample + ${INSTALL} -d ${STAGEDIR}/var/spool/svxlink do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -123,5 +124,5 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/include/svxlink/common.h ${RM} ${STAGEDIR}${PREFIX}/lib/libsvxmisc.a .endif - ${INSTALL} -d ${STAGEDIR}/var/spool/svxlink + .include