git: 9ba2b2fd7b50 - main - comms/{svxlink,qtel}: fix package conflicts

The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9ba2b2fd7b509af8d54ed105e5c3df098450c443

commit 9ba2b2fd7b509af8d54ed105e5c3df098450c443
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2024-02-15 07:39:58 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
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 <bsd.port.mk>