From nobody Fri Dec 27 10:37: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 4YKMQb5FFmz5jY7y; Fri, 27 Dec 2024 10:37: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKMQb1KGHz45SS; Fri, 27 Dec 2024 10:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735295879; 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=I4/pA2RB2DelEd9JQY0IoSEuMy1Rfy4Cm+gP/plKpl0=; b=fPU1hdfpjcyXPXeTQwODXRHnci7UQzWz1lowbfhH2mUe0OTBPJ64ngLnXdGQp1qccHbjuh ZzOiS0j2Rhxyghvarplr1v4UYsQXVkculMKDK8fFFDVJFRrLBIhj79pci94u7UJgkQhDAE ruybOBSr0p+P4ro8dqi2XRs7fSo9DLZsH2x3BAbUuPjCQ2yJp4xREjxUZZBIdbkeRHqw/7 wyRf1GGqxjVJ7FxuhzQM2FkGPKI0kivJbn5vM6VIAbD2bpd1amVDLJJk2NSGk1KuFHE9gP NotGWHEtDaCcr5zHgf9zjZ62ecp8vF2uWoeC+3iOJHIW/+OafWKfUgn7GpPLzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735295879; 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=I4/pA2RB2DelEd9JQY0IoSEuMy1Rfy4Cm+gP/plKpl0=; b=UqsHGZJ+Ni7o0Ksvw+AgzadiM5TJfO1k+OgS+r3bd9vXVYizykZxO+y6thLlOsgO4jvVZ8 5+zYp8DObVztd+l/7BLqg9S5Soaf32/5P5sQroBdKwa9Qg545ZvhG1CV4awzvZA6qGM0Hq mGakztgiKsRvFIoyYpOIjT/ABonYYMwq7u/2v6J4qC/qbV/ElDd24yRyW0Aiu4KD5IGLgk 7W8eguQ2EfNtHDOG2h7ArhUUyeIPFLHDUECUi2q1VWVqT8mQp1MmQ8SofMsbFEkEpxFUYH cdg5t6iWva8ox1mXSmIjN1lmpxZFQyG5qhbGJzSknNdhYqVm1LUwau9Q7NDlVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735295879; a=rsa-sha256; cv=none; b=VDQxTQBjOpxuXgzvc69lKjFtxd8AHIeZ//0lzf/MGFh6wVPMDAgF6mpgKJoM/SQgiennds UxcTzyJ0DAxQw7B0QkK5iUBK8ePlB098IkPDYyFsJOpR6Spo+nD7VpnVngpC3dScuFEGgp YGFvyV3vIsbVbvOgxgd3EkOejfunE7om0SwbxMRYLHhwRKPbk1u9jCgqCDgqaDlE66Yg0g LB3+VhaXBxcbO21z4kzz9qtTMBWZOnCwyDFxfnNkgWwgYt0T2AD/ntLVlPli1cF9vAZ835 4+C+SnnYm3wSzFYhbSXYCFLnHf5RMRVxf6chzll9xGgiOF8nG8Iaaz8kQZ8P5w== 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 4YKMQb0tZGzbsR; Fri, 27 Dec 2024 10:37:59 +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 4BRAbx9N006297; Fri, 27 Dec 2024 10:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRAbxUe006294; Fri, 27 Dec 2024 10:37:59 GMT (envelope-from git) Date: Fri, 27 Dec 2024 10:37:59 GMT Message-Id: <202412271037.4BRAbxUe006294@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: f33d3919ae20 - main - games/linux-quake4: Refactor 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f33d3919ae20483e4e384b8d6deb6f6fa66ac9ec Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f33d3919ae20483e4e384b8d6deb6f6fa66ac9ec commit f33d3919ae20483e4e384b8d6deb6f6fa66ac9ec Author: Muhammad Moinur Rahman AuthorDate: 2024-12-27 08:13:13 +0000 Commit: Muhammad Moinur Rahman 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 +GERMANY_DESC= Germany version -.if ${PORT_OPTIONS:MTHREADS} -PLIST_SUB+= THREADS="" -.else -PLIST_SUB+= THREADS="@comment " -.endif +.include 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 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!"