diff --git a/games/vanilla-conquer/Makefile b/games/vanilla-conquer/Makefile index 5460032a0f78..a3768c960f10 100644 --- a/games/vanilla-conquer/Makefile +++ b/games/vanilla-conquer/Makefile @@ -1,57 +1,46 @@ PORTNAME= ${GH_PROJECT:tl} -PORTVERSION= g20240528 +PORTVERSION= g20260716 CATEGORIES= games PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES= f1a415ebe08c01ccf317.patch:-p1 MAINTAINER= danfe@FreeBSD.org COMMENT= Portable version of the original C&C engine WWW= https://github.com/TheAssemblyArmada/Vanilla-Conquer LICENSE= GPLv3+ USE_GITHUB= yes GH_ACCOUNT= TheAssemblyArmada GH_PROJECT= Vanilla-Conquer -GH_TAGNAME= c2d93fe +GH_TAGNAME= ce83b59 USES= cmake openal sdl USE_SDL= sdl2 CMAKE_ON= BUILD_TOOLS -CONFIGURE_ENV= GIT_HEAD_SHA1=c2d93feafd3473b237cbefd193fafc2c68a577ee \ +CONFIGURE_ENV= GIT_HEAD_SHA1=ce83b59edd99cccac6cebaae054ca04962c744b7 \ GIT_HEAD_SHORT_SHA1=${GH_TAGNAME} \ GIT_COMMIT_DATE_ISO8601=${_GET_DATE:sh} \ GIT_AUTHOR_NAME=\ GIT_TAG=latest \ GIT_COMMIT_TSTAMP=${_GET_TSTAMP:sh} GIT_IS_DIRTY=true \ - GIT_RETRIEVED_STATE=true GIT_REV_LIST_COUNT=909 -LDFLAGS_i386= -fuse-ld=bfd + GIT_RETRIEVED_STATE=true GIT_REV_LIST_COUNT=973 +LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/vanillamix bin/vanillara bin/vanillatd \ share/icons/hicolor/scalable/apps/vanillara_icon.svg \ share/icons/hicolor/scalable/apps/vanillatd_icon.svg PORTSCOUT= skipv:latest -.include - -.if ${ARCH} == i386 -BUILD_DEPENDS+= ld.bfd:devel/binutils -.endif - -post-patch: - @${REINPLACE_CMD} -e '/Obfuscate/s,long,unsigned,' \ - ${WRKSRC}/tiberiandawn/function.h \ - ${WRKSRC}/tiberiandawn/init.cpp - do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/vanilla* \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/resources/*.svg \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps -.include +.include _GET_DATE= TZ= ${STAT} -f %Sm -t %FT%TZ ${WRKSRC}/.gitignore _GET_TSTAMP= TZ= ${STAT} -f %m ${WRKSRC}/.gitignore diff --git a/games/vanilla-conquer/distinfo b/games/vanilla-conquer/distinfo index dc240b26b974..dc159d59efac 100644 --- a/games/vanilla-conquer/distinfo +++ b/games/vanilla-conquer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1716898404 -SHA256 (TheAssemblyArmada-Vanilla-Conquer-g20240528-c2d93fe_GH0.tar.gz) = e2fcac67797f3ed21599ce7e8ea8635e42870e4401a20d78f2d0fb7836c104c7 -SIZE (TheAssemblyArmada-Vanilla-Conquer-g20240528-c2d93fe_GH0.tar.gz) = 3893218 +TIMESTAMP = 1784210236 +SHA256 (TheAssemblyArmada-Vanilla-Conquer-g20260716-ce83b59_GH0.tar.gz) = 410185a4dd277a3c192305bc2b2735879031679e86e31a525d295930994f015f +SIZE (TheAssemblyArmada-Vanilla-Conquer-g20260716-ce83b59_GH0.tar.gz) = 3891927 SHA256 (f1a415ebe08c01ccf317.patch) = f9063a3b558b6f04c253d0415efcdbbd7859155c5d096127f89db1711106d417 SIZE (f1a415ebe08c01ccf317.patch) = 19376 diff --git a/games/vanilla-conquer/files/patch-common_CMakeLists.txt b/games/vanilla-conquer/files/patch-common_CMakeLists.txt index 39b57004d2f0..e47c6807602b 100644 --- a/games/vanilla-conquer/files/patch-common_CMakeLists.txt +++ b/games/vanilla-conquer/files/patch-common_CMakeLists.txt @@ -1,15 +1,11 @@ ---- common/CMakeLists.txt.orig 2022-08-04 11:21:27 UTC +--- common/CMakeLists.txt.orig 2026-07-16 13:57:16 UTC +++ common/CMakeLists.txt -@@ -164,11 +164,9 @@ add_library(common STATIC ${COMMON_SRC} ${COMMON_HEADE - file(GLOB_RECURSE COMMON_HEADERS "*.h") - - add_library(common STATIC ${COMMON_SRC} ${COMMON_HEADERS}) --target_link_libraries(common PUBLIC ${COMMON_LIBS}) -+target_link_libraries(common PUBLIC ${COMMON_LIBS} compat) - target_include_directories(common PUBLIC .) +@@ -172,8 +172,6 @@ target_include_directories(common PUBLIC .) target_compile_definitions(common PRIVATE FIXIT_FAST_LOAD $<$:_DEBUG>) + target_compile_options(common PUBLIC ${VC_CXX_FLAGS}) + target_compile_features(common PUBLIC cxx_std_11) -# Make build check state of git to check for uncommitted changes. -add_dependencies(common check_git) - if(BUILD_REMASTERTD OR BUILD_REMASTERRA) - add_library(commonr STATIC ${COMMONR_SRC}) + if(WIN32) + if(WIN9X)