diff --git a/games/alienarena-data/Makefile b/games/alienarena-data/Makefile index c3322ee766fb..2be1c7fcf166 100644 --- a/games/alienarena-data/Makefile +++ b/games/alienarena-data/Makefile @@ -1,45 +1,45 @@ PORTNAME= alienarena -DISTVERSION= 7.71.6 +DISTVERSION= 7.72.1 PORTEPOCH= 1 CATEGORIES= games PKGNAMESUFFIX= -data MAINTAINER= acm@FreeBSD.org COMMENT= Alien Arena (data) WWW= https://alienarena.org/ LICENSE= AlienArena-Data LICENSE_NAME= Freely redistributable as a whole LICENSE_FILE= ${WRKSRC}/docs/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept # See also http://red.planetarena.org/forum/showthread.php?tid=716 where fedora asked for clarification USE_GITHUB= yes NO_BUILD= yes PLIST= ${WRKDIR}/pkg-plist OPTIONS_DEFINE= DOCS post-extract: @${RM} ${WRKSRC}/data1/Makefile* ${WRKSRC}/data1/configure* ${WRKSRC}/data1/aclocal* pre-install: @${RM} -f ${PLIST} . for DIRE in arena data1 @cd ${WRKSRC} && \ ${FIND} ${DIRE} -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} ${DIRE} -type d | ${SORT} -r | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} . endfor @cd ${WRKSRC}/docs && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%PORTDOCS%%%%DOCSDIR%%/|' >> ${PLIST} && \ ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|%%PORTDOCS%%@dir %%DOCSDIR%%/|' >> ${PLIST} do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "arena data1" ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR} .include diff --git a/games/alienarena-data/distinfo b/games/alienarena-data/distinfo index e995e1bc0055..9e6d9b4596d7 100644 --- a/games/alienarena-data/distinfo +++ b/games/alienarena-data/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699845348 -SHA256 (alienarena-alienarena-7.71.6_GH0.tar.gz) = c9d6082fa287114ce70851acebdcabee907d93ca637a5b921abb329442501b14 -SIZE (alienarena-alienarena-7.71.6_GH0.tar.gz) = 1201296013 +TIMESTAMP = 1787857921 +SHA256 (alienarena-alienarena-7.72.1_GH0.tar.gz) = d76bb624c2331b681cad29eb7d1bf4a1df67f5525ebf7eacfaf7e1770645542c +SIZE (alienarena-alienarena-7.72.1_GH0.tar.gz) = 1206830446 diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 659748f11f8f..c6942afebdea 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -1,95 +1,94 @@ PORTNAME= alienarena -DISTVERSION= 7.71.6 -PORTREVISION= 2 +DISTVERSION= 7.72.1 PORTEPOCH= 1 CATEGORIES= games MAINTAINER= acm@FreeBSD.org COMMENT= Alien Arena (native version) WWW= https://alienarena.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../docs/license.txt RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/arena/default.cfg:games/alienarena-data USES= compiler:c++11-lib desktop-file-utils dos2unix gmake localbase pkgconfig USE_CXXSTD= c++11 USE_GITHUB= yes GNU_CONFIGURE= yes 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 -Wno-error=int-conversion EXTRACT_AFTER_ARGS= --exclude "data1" SUB_FILES= pkg-message CONFIGURE_WRKSRC=${WRKDIR}/${PORTNAME}-${DISTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}/source 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 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@double CLIENT_USES= gl jpeg openal:soft,alut minizip xorg CLIENT_USE= GL=glu XORG=x11,xxf86dga,xxf86vm LIBDIR= ${PREFIX}/lib/${PORTNAME} .include .if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED} CONFIGURE_ARGS+=--disable-client .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 @${REINPLACE_CMD} -e "s|.codered|.config/alienarena|g" ${WRKSRC}/qcommon/qcommon.h @${REINPLACE_CMD} -e "s|/usr/games/alien-arena|${PORTNAME}|g" ${WRKSRC}/../unix_dist/alien-arena.desktop # Resolve name collision with jpeg-8 ${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \ ${WRKSRC}/ref_gl/r_image.c ${REINPLACE_CMD} -e 's|inline void IQM_DrawVBO|void IQM_DrawVBO|' \ ${WRKSRC}/ref_gl/r_iqm.c do-install: ${MKDIR} ${STAGEDIR}${LIBDIR}/arena ${STAGEDIR}${LIBDIR}/data1 ${LN} -sf ${DATADIR}/arena/* ${STAGEDIR}${LIBDIR}/arena ${LN} -sf ${DATADIR}/data1/* ${STAGEDIR}${LIBDIR}/data1 do-install-CLIENT-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/ ${INSTALL_DATA} ${WRKSRC}/../unix_dist/alien-arena.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}.desktop ${INSTALL_DATA} ${WRKSRC}/../unix_dist/alien-arena.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/ do-install-DEDICATED-on: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-ded \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-ded .include diff --git a/games/alienarena/distinfo b/games/alienarena/distinfo index 19751bac3285..ea91f66f65b4 100644 --- a/games/alienarena/distinfo +++ b/games/alienarena/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699837592 -SHA256 (alienarena-alienarena-7.71.6_GH0.tar.gz) = c9d6082fa287114ce70851acebdcabee907d93ca637a5b921abb329442501b14 -SIZE (alienarena-alienarena-7.71.6_GH0.tar.gz) = 1201296013 +TIMESTAMP = 1787857898 +SHA256 (alienarena-alienarena-7.72.1_GH0.tar.gz) = d76bb624c2331b681cad29eb7d1bf4a1df67f5525ebf7eacfaf7e1770645542c +SIZE (alienarena-alienarena-7.72.1_GH0.tar.gz) = 1206830446 diff --git a/games/alienarena/files/patch-client_cl_updates.c b/games/alienarena/files/patch-client_cl_updates.c deleted file mode 100644 index e9d4495f78de..000000000000 --- a/games/alienarena/files/patch-client_cl_updates.c +++ /dev/null @@ -1,21 +0,0 @@ ---- client/cl_updates.c 2023-11-12 22:09:46.989672000 -0500 -+++ client/cl_updates.c 2023-11-12 22:10:10.652785000 -0500 -@@ -250,14 +250,14 @@ - easyhandle = curl_easy_init(); - - // Set Http version to 1.1, somehow this seems to be needed for the multi-download -- if (curl_easy_setopt(easyhandle, CURLOPT_HTTP_VERSION, (long) CURL_HTTP_VERSION_1_1) != CURLE_OK) return false; -+ if (curl_easy_setopt(easyhandle, CURLOPT_HTTP_VERSION, (long) CURL_HTTP_VERSION_1_1) != CURLE_OK) return; - - // Follow redirects to https - but this doesn't seem to be working -- if (curl_easy_setopt(easyhandle, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK) return false; -- if (curl_easy_setopt(easyhandle, CURLOPT_MAXREDIRS, 3L) != CURLE_OK) return false; -+ if (curl_easy_setopt(easyhandle, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK) return; -+ if (curl_easy_setopt(easyhandle, CURLOPT_MAXREDIRS, 3L) != CURLE_OK) return; - - // Don't verify that the host matches the certificate -- if (curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYHOST, 0L) != CURLE_OK) return false; -+ if (curl_easy_setopt(easyhandle, CURLOPT_SSL_VERIFYHOST, 0L) != CURLE_OK) return; - - Com_sprintf(url, sizeof(url), "%s", cl_latest_game_version_url->string); - diff --git a/games/alienarena/files/patch-ref__gl_r__main.c b/games/alienarena/files/patch-ref__gl_r__main.c new file mode 100644 index 000000000000..63a962209c98 --- /dev/null +++ b/games/alienarena/files/patch-ref__gl_r__main.c @@ -0,0 +1,47 @@ +--- ref_gl/r_main.c.orig 2026-08-27 21:47:04 UTC ++++ ref_gl/r_main.c +@@ -1671,7 +1671,11 @@ int R_Init( void *hinstance, void *hWnd ) + int cores; + size_t szrslt; + int irslt; ++#if defined(__FreeBSD__) ++ fp = popen("/sbin/sysctl -n hw.ncpu","r"); ++#else + fp = popen("/bin/cat /proc/cpuinfo | grep -c '^processor'","r"); ++#endif + if ( fp == NULL ) + goto cpuinfo_error; + szrslt = fread(res, 1, sizeof(res)-1, fp); +@@ -1680,7 +1684,11 @@ int R_Init( void *hinstance, void *hWnd ) + if ( !szrslt ) + goto cpuinfo_error; + cores = atoi( &res[0] ); ++#if defined(__FreeBSD__) ++ fp = popen("/sbin/sysctl -n dev.cpu.0.freq_levels | cut -d / -f1","r"); ++#else + fp = popen("/bin/cat /proc/cpuinfo | grep '^cpu MHz'","r"); ++#endif + if ( fp == NULL ) + goto cpuinfo_error; + szrslt = fread(res, 1, sizeof(res)-1, fp); // about 20 bytes/cpu +@@ -1688,14 +1696,18 @@ int R_Init( void *hinstance, void *hWnd ) + pclose(fp); + if ( !szrslt ) + goto cpuinfo_error; ++#if defined(__FreeBSD__) ++ irslt = sscanf( res, "%lf", &CPUTotalSpeed ); ++#else + irslt = sscanf( res, "cpu MHz : %lf", &CPUTotalSpeed ); ++#endif + if ( !irslt ) + goto cpuinfo_error; + Com_Printf("...CPU: %4.2f Cores: %d\n", CPUTotalSpeed, cores); +- CPUTotalSpeed *= cores; ++ + goto cpuinfo_exit; + cpuinfo_error: +- Com_Printf("...Reading /proc/cpuinfo failed.\n"); ++ Com_Printf("...Reading cpu info failed.\n"); + cpuinfo_exit: + #endif + diff --git a/games/alienarena/files/pkg-message.in b/games/alienarena/files/pkg-message.in index e437f8a8b9c8..34d6a62cdd4b 100644 --- a/games/alienarena/files/pkg-message.in +++ b/games/alienarena/files/pkg-message.in @@ -1,19 +1,21 @@ [ { type: install message: < Where could be 22050 and 44100 for example (the default that has the delay is 11025, and the SDL version uses 22050). The value of "sndspeed" will be saved in the configuration file for future runs. -2) Enjoy it :) +2) Use +set in_dgamouse 0 if it is crashing when a new game is loading + +3) Enjoy it :) EOM } ]