Date: Sun, 23 Jul 2023 17:54:36 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c0aa7aa1720c - main - games/alienarena: Fix build with llvm16 Message-ID: <202307231754.36NHsa60007432@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0aa7aa1720cd527b30432efc9ffdc51aaf0e397 commit c0aa7aa1720cd527b30432efc9ffdc51aaf0e397 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-07-23 17:50:07 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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 <bsd.port.options.mk> -.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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307231754.36NHsa60007432>