Received: by mail.netbsd.org (Postfix, from userid 605) id B4C7384E61; Wed, 17 May 2023 03:50:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E3AA684E5A for ; Wed, 17 May 2023 03:50:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id iIXpfc5tw8ZG for ; Wed, 17 May 2023 03:50:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C40C384D50 for ; Wed, 17 May 2023 03:50:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B86C1FA87; Wed, 17 May 2023 03:50:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16842954548380" MIME-Version: 1.0 Date: Wed, 17 May 2023 03:50:54 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/games/warzone2100 To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20230517035054.B86C1FA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16842954548380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Wed May 17 03:50:54 UTC 2023 Modified Files: pkgsrc/games/warzone2100: Makefile PLIST distinfo Log Message: warzone2100: Update to 4.3.5 pkgsrc changes: --------------- * Fix build on Darwin but install to ${LOCALBASE}/Warzone 2100.app. The installation script should be patched for Darwin to install in common directories. upstream changes: ----------------- * https://github.com/Warzone2100/warzone2100/blob/4.3.5/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.4/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.3/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.2/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.1/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.0/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.0-beta3/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.0-beta2/ChangeLog * https://github.com/Warzone2100/warzone2100/blob/4.3.0-beta1/ChangeLog To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/games/warzone2100/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/warzone2100/PLIST cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/warzone2100/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16842954548380 Content-Disposition: inline Content-Length: 9618 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/warzone2100/Makefile diff -u pkgsrc/games/warzone2100/Makefile:1.70 pkgsrc/games/warzone2100/Makefile:1.71 --- pkgsrc/games/warzone2100/Makefile:1.70 Sat May 6 19:09:30 2023 +++ pkgsrc/games/warzone2100/Makefile Wed May 17 03:50:54 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.70 2023/05/06 19:09:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.71 2023/05/17 03:50:54 triaxx Exp $ DISTNAME= warzone2100_src -PKGNAME= warzone2100-4.2.7 -PKGREVISION= 9 +PKGNAME= warzone2100-4.3.5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=Warzone2100/} GITHUB_RELEASE= ${PKGVERSION_NOREV} @@ -16,7 +15,7 @@ LICENSE= gnu-gpl-v2 USE_CMAKE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= pkg-config zip +USE_TOOLS+= gmake pkg-config zip USE_TOOLS+= msgfmt msgmerge xgettext TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc @@ -38,8 +37,10 @@ CONFIGURE_DIRS= build CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DCMAKE_MAKE_PROGRAM=${MAKE_PROGRAM} -DWZ_DISTRIBUTOR=pkgsrc +CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1 CFLAGS.NetBSD+= -D_NETBSD_SOURCE +CFLAGS.Darwin+= -fobjc-arc LDFLAGS.DragonFly+= -lX11 -lintl BUILDLINK_TRANSFORM+= rm:-Werror @@ -47,6 +48,22 @@ BUILDLINK_TRANSFORM+= rm:-Werror # Needs gnu standard variant to get alloca builtin. BUILDLINK_TRANSFORM+= opt:-std=c++11:-std=gnu++11 +SUBST_CLASSES+= rpath +SUBST_MESSAGE.rpath= Fixing linker arguments. +SUBST_STAGE.rpath= pre-configure +SUBST_FILES.rpath= 3rdparty/basis_universal/CMakeLists.txt +SUBST_SED.rpath= -e 's|-Wl,-rpath |${COMPILER_RPATH_FLAG},|' + +# TODO: Patch installation to comply with the common Unix directories and +# eventually add a variable INSTALL_MACOS_BUNDLE somewhere in mk/ +# to let the possibility to install the bundle in +# ${LOCALBASE}/Applications/Warzone 2100.app. +# XXX: It installs out of the box but it does not comply with the pkgsrc +# directory hierarchy. +.if ${OPSYS} == "Darwin" +PLIST_SRC= PLIST.bundle +.endif + pre-configure: ${RUN}${MKDIR} ${WRKSRC}/build @@ -54,13 +71,11 @@ pre-configure: .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -BUILDLINK_API_DEPENDS.gettext+= gettext>=0.18 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/harfbuzz/buildlink3.mk" -BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.10.2 .include "../../graphics/freetype2/buildlink3.mk" BUILDLINK_API_DEPENDS.glew+= glew>=1.5.2 .include "../../graphics/glew/buildlink3.mk" @@ -72,6 +87,7 @@ BUILDLINK_API_DEPENDS.glew+= glew>=1.5. .include "../../net/miniupnpc/buildlink3.mk" BUILDLINK_API_DEPENDS.libsodium+= libsodium>=1.0.13 .include "../../security/libsodium/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" Index: pkgsrc/games/warzone2100/PLIST diff -u pkgsrc/games/warzone2100/PLIST:1.8 pkgsrc/games/warzone2100/PLIST:1.9 --- pkgsrc/games/warzone2100/PLIST:1.8 Wed Jan 5 08:50:28 2022 +++ pkgsrc/games/warzone2100/PLIST Wed May 17 03:50:54 2023 @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.8 2022/01/05 08:50:28 triaxx Exp $ -bin/.portable +@comment $NetBSD: PLIST,v 1.9 2023/05/17 03:50:54 triaxx Exp $ bin/warzone2100 man/man6/warzone2100.6 -share/applications/warzone2100.desktop +share/applications/net.wz2100.warzone2100.desktop share/doc/warzone2100/AUTHORS share/doc/warzone2100/COPYING share/doc/warzone2100/COPYING.NONGPL @@ -65,7 +64,7 @@ share/doc/warzone2100/js-globals.md share/doc/warzone2100/js-objects.md share/doc/warzone2100/quickstartguide.html share/doc/warzone2100/warzone2100.6.html -share/icons/warzone2100.png +share/icons/net.wz2100.warzone2100.png share/locale/af_ZA/LC_MESSAGES/warzone2100.mo share/locale/ar_SA/LC_MESSAGES/warzone2100.mo share/locale/bg_BG/LC_MESSAGES/warzone2100.mo @@ -89,6 +88,7 @@ share/locale/hu/LC_MESSAGES/warzone2100. share/locale/id/LC_MESSAGES/warzone2100.mo share/locale/id_ID/LC_MESSAGES/warzone2100.mo share/locale/it/LC_MESSAGES/warzone2100.mo +share/locale/ja_JP/LC_MESSAGES/warzone2100.mo share/locale/ko/LC_MESSAGES/warzone2100.mo share/locale/la/LC_MESSAGES/warzone2100.mo share/locale/lt/LC_MESSAGES/warzone2100.mo @@ -107,31 +107,49 @@ share/locale/tt_RU/LC_MESSAGES/warzone21 share/locale/uk_UA/LC_MESSAGES/warzone2100.mo share/locale/zh_CN/LC_MESSAGES/warzone2100.mo share/locale/zh_TW/LC_MESSAGES/warzone2100.mo -share/metainfo/warzone2100.appdata.xml +share/metainfo/net.wz2100.warzone2100.appdata.xml share/warzone2100/base.wz share/warzone2100/fonts/DejaVu.LICENSE.txt share/warzone2100/fonts/DejaVuSans-Bold.ttf share/warzone2100/fonts/DejaVuSans.ttf +share/warzone2100/fonts/Noto.LICENSE.txt +share/warzone2100/fonts/NotoSansCJK-VF.otf.ttc share/warzone2100/mp.wz +share/warzone2100/music/albums/aftermath_soundtrack/album.json +share/warzone2100/music/albums/aftermath_soundtrack/albumcover.png +share/warzone2100/music/albums/aftermath_soundtrack/license.txt +share/warzone2100/music/albums/aftermath_soundtrack/menu_enhanced.opus +share/warzone2100/music/albums/aftermath_soundtrack/track17.opus +share/warzone2100/music/albums/aftermath_soundtrack/track18.opus +share/warzone2100/music/albums/aftermath_soundtrack/track19.opus +share/warzone2100/music/albums/aftermath_soundtrack/track20.opus +share/warzone2100/music/albums/aftermath_soundtrack/track21.opus +share/warzone2100/music/albums/aftermath_soundtrack/track22.opus +share/warzone2100/music/albums/aftermath_soundtrack/track23.opus +share/warzone2100/music/albums/aftermath_soundtrack/track24.opus +share/warzone2100/music/albums/aftermath_soundtrack/track25.opus +share/warzone2100/music/albums/aftermath_soundtrack/track26.opus +share/warzone2100/music/albums/aftermath_soundtrack/track27.opus +share/warzone2100/music/albums/aftermath_soundtrack/track3_enhanced.opus share/warzone2100/music/albums/legacy_soundtrack/album.json share/warzone2100/music/albums/legacy_soundtrack/albumcover.png share/warzone2100/music/albums/legacy_soundtrack/license.txt -share/warzone2100/music/albums/legacy_soundtrack/track10.ogg -share/warzone2100/music/albums/legacy_soundtrack/track11.ogg -share/warzone2100/music/albums/legacy_soundtrack/track12.ogg -share/warzone2100/music/albums/legacy_soundtrack/track13.ogg -share/warzone2100/music/albums/legacy_soundtrack/track14.ogg -share/warzone2100/music/albums/legacy_soundtrack/track15.ogg -share/warzone2100/music/albums/legacy_soundtrack/track16.ogg -share/warzone2100/music/albums/legacy_soundtrack/track4.ogg -share/warzone2100/music/albums/legacy_soundtrack/track5.ogg -share/warzone2100/music/albums/legacy_soundtrack/track6.ogg -share/warzone2100/music/albums/legacy_soundtrack/track7.ogg -share/warzone2100/music/albums/legacy_soundtrack/track8.ogg -share/warzone2100/music/albums/legacy_soundtrack/track9.ogg +share/warzone2100/music/albums/legacy_soundtrack/track10.opus +share/warzone2100/music/albums/legacy_soundtrack/track11.opus +share/warzone2100/music/albums/legacy_soundtrack/track12.opus +share/warzone2100/music/albums/legacy_soundtrack/track13.opus +share/warzone2100/music/albums/legacy_soundtrack/track14.opus +share/warzone2100/music/albums/legacy_soundtrack/track15.opus +share/warzone2100/music/albums/legacy_soundtrack/track16.opus +share/warzone2100/music/albums/legacy_soundtrack/track4.opus +share/warzone2100/music/albums/legacy_soundtrack/track5.opus +share/warzone2100/music/albums/legacy_soundtrack/track6.opus +share/warzone2100/music/albums/legacy_soundtrack/track7.opus +share/warzone2100/music/albums/legacy_soundtrack/track8.opus +share/warzone2100/music/albums/legacy_soundtrack/track9.opus share/warzone2100/music/albums/original_soundtrack/album.json share/warzone2100/music/albums/original_soundtrack/albumcover.png -share/warzone2100/music/albums/original_soundtrack/track1.ogg -share/warzone2100/music/albums/original_soundtrack/track2.ogg -share/warzone2100/music/albums/original_soundtrack/track3.ogg -share/warzone2100/music/menu.ogg +share/warzone2100/music/albums/original_soundtrack/track1.opus +share/warzone2100/music/albums/original_soundtrack/track2.opus +share/warzone2100/music/albums/original_soundtrack/track3.opus +share/warzone2100/music/menu.opus Index: pkgsrc/games/warzone2100/distinfo diff -u pkgsrc/games/warzone2100/distinfo:1.19 pkgsrc/games/warzone2100/distinfo:1.20 --- pkgsrc/games/warzone2100/distinfo:1.19 Mon May 9 04:55:44 2022 +++ pkgsrc/games/warzone2100/distinfo Wed May 17 03:50:54 2023 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.19 2022/05/09 04:55:44 triaxx Exp $ +$NetBSD: distinfo,v 1.20 2023/05/17 03:50:54 triaxx Exp $ -BLAKE2s (wz2100_4.2.7/warzone2100_src.tar.xz) = c6bd453917e44f576a2e1977f357c8006fa9db11ee1c3f28574d569df563b283 -SHA512 (wz2100_4.2.7/warzone2100_src.tar.xz) = af538f3bdf6ec543e5f919377c95c35c730fa6efa5c3ea8d140347595dd9f8056677d4b494677ea20c98da305e0fb588cdb00a3da1c497f96edc58ca8772e45b -Size (wz2100_4.2.7/warzone2100_src.tar.xz) = 338687576 bytes +BLAKE2s (wz2100_4.3.5/warzone2100_src.tar.xz) = a66e59fe1934f87f9fa00b4a392346f6ca000c518e4dec75b244239f1c7a1e69 +SHA512 (wz2100_4.3.5/warzone2100_src.tar.xz) = ec65f22a0aad9fe482c4ea916cb321d171b10f0a9b181fea7db2eb17bf54e32b3828c8259082fff266713e2cab4e32dcc455d0d5b923a5ca221fc77b11137062 +Size (wz2100_4.3.5/warzone2100_src.tar.xz) = 320369492 bytes --_----------=_16842954548380--