From nobody Sun Jul 23 17:54:36 2023 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 4R89sm6rmQz4ndJp; Sun, 23 Jul 2023 17:54:36 +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 4R89sm4x32z3DYf; Sun, 23 Jul 2023 17:54:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690134876; 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=KGom9wxp9l8mJPOFTgzWrd/aXEEMJS3r3RuQ5EO1TtA=; b=gzsePMP5gPMO93NLtRbjpvjd9mWtVd0WgNbMc5BcNS+i6mY/L9/OaDtX34p4XaWhtEFFoJ iI9TbW3J8xRZh3o8oCbJ+ZYalzWwV3QlaIo7OKYFClioiLkudBV+n6VErxp0Y0an49NHRK EhydhoOZUNQAq5Rm1SvxQqYg2RfLDbe5rerw0TZNB/TZfHZU/ttU9HxMDBFdUrTCg6LZZT Nplg6Az9r+DbsENjYPx04OQnYIVsByscGvY232cHPJKKrPGlyC+YHCJHCD6IQfZ89kCchb Gcx5egc4AKYIxXkhIMIoIT3tFhtIPgEyRSPokIZAqZPZjeqvN13MiKoFKpsvzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690134876; 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=KGom9wxp9l8mJPOFTgzWrd/aXEEMJS3r3RuQ5EO1TtA=; b=nQGCrpNXf0YT6AuCNEJBssVzcj97qmPd+6ysOMI8+gXKWW1IJXbg3pWV+JNnIdj9qL2llb O8wiVoYOvhfC7xdgTKHWLtV7Afh2BfWpTIxVUbUIWAa0Bdypuj1q7EHabi56aEnMxViQoD zRXCZXfxZv4XshuUkkCGQoVH/NQdeI+MJuwVItioxMyYXHO6KLSGhMoBJD08v3MYVFylkn 3VfeXN/3miU5ZaQWuOkXHPAXXM+UQoZaOr7tH4QpAgrPFmTt5PipysMOdAHFP9xSvjofkv EA+2/u/NoDQFp8dmSReV/B/t4JkF8owGhxbnv2Oa3qRwSNC7CpZHMuQeBBTo/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690134876; a=rsa-sha256; cv=none; b=Ia5KgGFIy1DFEVhz5g9wyoKrP3Jn0GWuXDq++wZOLCuogFREX5808u4Q8NCkQknzxDN6jZ B2qkex5Pdgdq8i8q+9R+mqp0T8+GLHRMjxVESRvumAEXgGm5bPml6oOZZZu0k1PyVT8ux8 oXQKk5YiOQw/qrFj7FzsxGx6eTRCzwwF87tubO77AFT5sBO70BiGr7HobcTSNV4uywXR+g NiKPREFcRT5dwYaG1JGFW2u8MefH4oyerFSFQPp6QKSZG3Miq6rjQADgGj92APYryhOlh6 lCO37GVUBmfGEhaIzrvNuWlcAI0bTv5D29Otu936OID1Pa9XF27bjK+XqPf/TA== 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 4R89sm3tSQzmBx; Sun, 23 Jul 2023 17:54:36 +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 36NHsaAn007433; Sun, 23 Jul 2023 17:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NHsa60007432; Sun, 23 Jul 2023 17:54:36 GMT (envelope-from git) Date: Sun, 23 Jul 2023 17:54:36 GMT Message-Id: <202307231754.36NHsa60007432@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: c0aa7aa1720c - main - games/alienarena: Fix build with llvm16 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0aa7aa1720cd527b30432efc9ffdc51aaf0e397 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0aa7aa1720cd527b30432efc9ffdc51aaf0e397 commit c0aa7aa1720cd527b30432efc9ffdc51aaf0e397 Author: Muhammad Moinur Rahman AuthorDate: 2023-07-23 17:50:07 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-07-23 17:54:18 +0000 games/alienarena: Fix build with llvm16 - Add LICENSE GPLv2 - Utilize USES=localbase - Utilize OPTIONSNG - Remove unnecessary post-install target - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- games/alienarena/Makefile | 71 +++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 4cb224365bb0..5446bb523df7 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -2,8 +2,7 @@ PORTNAME= alienarena PORTVERSION= 2013.766 PORTREVISION= 12 CATEGORIES= games -MASTER_SITES= SF/alienarena.mirror/Alien%20Arena%207.66/ \ - http://icculus.org/alienarena/Files/ \ +MASTER_SITES= http://icculus.org/alienarena/Files/ \ http://red.planetarena.org/files/ \ GENTOO DISTNAME= ${PORTNAME}-7.66-linux20130827 @@ -12,69 +11,62 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Alien Arena (native version) WWW= http://red.planetarena.org/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/../COPYING + RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/data1/default.cfg:games/alienarena-data -USES= compiler:c++11-lib dos2unix gmake +USES= compiler:c++11-lib dos2unix gmake localbase USE_CXXSTD= c++11 + GNU_CONFIGURE= yes -CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/ -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--with-xf86vm \ --with-xf86dga \ --with-system-libode +MAKE_ENV= WITH_DATADIR=yes WITH_LIBDIR=yes \ + DATADIR="${DATADIR}" LIBDIR="${LIBDIR}" + # Fix build with clang11 CFLAGS+= -fcommon EXTRACT_AFTER_ARGS= --exclude "data1" +SUB_FILES= pkg-message -MAKE_ENV= WITH_DATADIR=yes WITH_LIBDIR=yes \ - DATADIR="${DATADIR}" LIBDIR="${LIBDIR}" +CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-7.66/ WRKSRC= ${WRKDIR}/${PORTNAME}-7.66/source -SUB_FILES= pkg-message +PLIST_SUB+= LIBDIR=${LIBDIR:S|^${PREFIX}/||} +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED +OPTIONS_SUB= yes + CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server -OPTIONS_DEFAULT= CLIENT DEDICATED - -PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} +CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl \ + libfreetype.so:print/freetype2 \ + libogg.so:audio/libogg \ + libpng.so:graphics/png \ + libvorbis.so:audio/libvorbis \ + libode.so:devel/ode +CLIENT_USES= gl jpeg openal:soft,alut pkgconfig xorg +CLIENT_USE= GL=glu XORG=x11,xxf86dga,xxf86vm LIBDIR= ${PREFIX}/lib/${PORTNAME} .include -.if ${PORT_OPTIONS:MCLIENT} -USES+= gl jpeg openal:soft,alut pkgconfig xorg -LIB_DEPENDS+= libcurl.so:ftp/curl \ - libfreetype.so:print/freetype2 \ - libpng.so:graphics/png \ - libvorbis.so:audio/libvorbis \ - libode.so:devel/ode -USE_GL= yes -USE_XORG= xxf86dga xxf86vm +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED} CONFIGURE_ARGS+=--disable-client .endif -.if ${PORT_OPTIONS:MCLIENT} -PLIST_SUB+= CLIENT="" -.else -PLIST_SUB+= CLIENT="@comment " -.endif - -.if ${PORT_OPTIONS:MDEDICATED} -PLIST_SUB+= DEDICATED="" -.else -PLIST_SUB+= DEDICATED="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e "s|(CCLD)|(CXX)|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/client/snd_openal.c @@ -90,18 +82,13 @@ do-install: ${LN} -s ${DATADIR}/arena/* ${STAGEDIR}${LIBDIR}/arena ${LN} -s ${DATADIR}/botinfo ${STAGEDIR}${LIBDIR} ${LN} -s ${DATADIR}/data1/* ${STAGEDIR}${LIBDIR}/data1 -.if ${PORT_OPTIONS:MCLIENT} + +do-install-CLIENT-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.endif -.if ${PORT_OPTIONS:MDEDICATED} + +do-install-DEDICATED-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-ded \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded -.endif - -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} .include