git: f33d3919ae20 - main - games/linux-quake4: Refactor

The branch main has been updated by bofh:

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

commit f33d3919ae20483e4e384b8d6deb6f6fa66ac9ec
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-12-27 08:13:13 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-12-27 10:37:16 +0000

    games/linux-quake4: Refactor
    
    - Remove GENTOO MASTER_SITES as it no longer provides flat layout
    - Convert to OPTIONSNG
    - Pet portclippy
    - Replace deprecated @exec/@unexec
---
 games/linux-quake4/Makefile  | 42 +++++++++++++++++++-----------------------
 games/linux-quake4/pkg-plist |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 519390d5e75b..c62815dbb1cd 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -3,8 +3,7 @@ PORTVERSION=	1.4.2
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	games linux
-MASTER_SITES=	IDSOFTWARE/quake4/linux/ \
-		GENTOO
+MASTER_SITES=	IDSOFTWARE/quake4/linux/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
@@ -21,25 +20,23 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 USES=		linux
 USE_LINUX=	sdl12
+
+SUB_FILES=	pkg-message pkg-deinstall
+SUB_LIST+=	Q4DIR="${Q4DIR}"
+
 NO_WRKSUBDIR=	yes
+
 Q4DIR=		lib/${PORTNAME}
 PLIST_SUB+=	Q4DIR="${Q4DIR}" \
 		LINUXBASE="${LINUXBASE}"
-SUB_LIST+=	Q4DIR="${Q4DIR}"
-SUB_FILES=	pkg-message pkg-deinstall
 
 OPTIONS_DEFINE=	THREADS GERMANY DOCS
-GERMANY_DESC=	Germany version
-
 OPTIONS_DEFAULT=	THREADS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
+GERMANY_DESC=	Germany version
 
-.if ${PORT_OPTIONS:MTHREADS}
-PLIST_SUB+=	THREADS=""
-.else
-PLIST_SUB+=	THREADS="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
 do-extract:
 	@cd ${WRKSRC} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
@@ -63,10 +60,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}${FILE}.sh ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${STAGEDIR}${PREFIX}/${Q4DIR}
 .endfor
-.if ${PORT_OPTIONS:MTHREADS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}quake4smp.sh ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}quake4smp
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${STAGEDIR}${PREFIX}/${Q4DIR}
-.endif
 
 	# Punkbuster
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${Q4DIR}/pb/htm
@@ -81,25 +74,28 @@ do-install:
 		${FIND} -E q4base -type f -iregex ".*\.(cfg|scriptcfg|pk4|off)" \
 			-exec ${INSTALL_DATA} {} "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
 
-	# All version (except germany) or only germany version
-.if ${PORT_OPTIONS:MGERMANY}
+# All version (except germany) or only germany version
+do-install-GERMANY-on:
 	@cd ${WRKSRC}/germany && \
 		${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
 			-exec ${INSTALL_DATA} {} "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
-.else
+
+do-install-GERMANY-off:
 	@cd ${WRKSRC}/us && \
 		${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
 			-exec ${INSTALL_DATA} {} "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
-.endif
 
-	# Documentation
-.if ${PORT_OPTIONS:MDOCS}
+# Documentation
+do-install-DOCS-on:
 	@cd ${WRKSRC}/Docs && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
 	${INSTALL_DATA} ${WRKSRC}/License.txt ${STAGEDIR}${DOCSDIR}/LICENSE && \
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README && \
 	${INSTALL_DATA} ${WRKSRC}/pb/PBEULA.txt ${STAGEDIR}${DOCSDIR}/PBEULA
-.endif
+
+do-install-THREADS-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}quake4smp.sh ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}quake4smp
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${STAGEDIR}${PREFIX}/${Q4DIR}
 
 .include <bsd.port.post.mk>
diff --git a/games/linux-quake4/pkg-plist b/games/linux-quake4/pkg-plist
index 55c1a23d1455..176b4cee2c5a 100644
--- a/games/linux-quake4/pkg-plist
+++ b/games/linux-quake4/pkg-plist
@@ -414,4 +414,4 @@ bin/linux-quake4
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/PBEULA
 %%PORTDOCS%%%%DOCSDIR%%/README
-@unexec rmdir %D/%%Q4DIR%% 2>/dev/null || echo "Note: %D/%%Q4DIR%% not empty -- not deleted!"
+@postunexec rmdir %D/%%Q4DIR%% 2>/dev/null || echo "Note: %D/%%Q4DIR%% not empty -- not deleted!"