Received: by mail.netbsd.org (Postfix, from userid 605) id A0B6984DB6; Fri, 10 Jan 2020 19:38:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 29DA884DA2 for ; Fri, 10 Jan 2020 19:38:07 +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 pgcUSWPOxiF7 for ; Fri, 10 Jan 2020 19:38:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9390284D04 for ; Fri, 10 Jan 2020 19:38:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8D753FBF4; Fri, 10 Jan 2020 19:38:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15786850862340" MIME-Version: 1.0 Date: Fri, 10 Jan 2020 19:38:06 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/vvvvvv To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200110193806.8D753FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_15786850862340 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jan 10 19:38:06 UTC 2020 Modified Files: pkgsrc/games/vvvvvv: Makefile distinfo Added Files: pkgsrc/games/vvvvvv/patches: patch-CMakeLists.txt Removed Files: pkgsrc/games/vvvvvv/patches: patch-physfs_physfs__platform__unix.c Log Message: vvvvvv: Use physfs from pkgsrc. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/vvvvvv/Makefile \ pkgsrc/games/vvvvvv/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/vvvvvv/patches/patch-CMakeLists.txt cvs rdiff -u -r1.1 -r0 \ pkgsrc/games/vvvvvv/patches/patch-physfs_physfs__platform__unix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_15786850862340 Content-Disposition: inline Content-Length: 3266 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/vvvvvv/Makefile diff -u pkgsrc/games/vvvvvv/Makefile:1.1 pkgsrc/games/vvvvvv/Makefile:1.2 --- pkgsrc/games/vvvvvv/Makefile:1.1 Fri Jan 10 18:27:18 2020 +++ pkgsrc/games/vvvvvv/Makefile Fri Jan 10 19:38:06 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2020/01/10 18:27:18 nia Exp $ +# $NetBSD: Makefile,v 1.2 2020/01/10 19:38:06 nia Exp $ DISTNAME= VVVVVVV-0.0.0.20200110 PKGNAME= ${DISTNAME:tl} +PKGREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=TerryCavanagh/} GITHUB_PROJECT= VVVVVV @@ -24,4 +25,5 @@ do-install: .include "../../audio/SDL2_mixer/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/physfs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/vvvvvv/distinfo diff -u pkgsrc/games/vvvvvv/distinfo:1.1 pkgsrc/games/vvvvvv/distinfo:1.2 --- pkgsrc/games/vvvvvv/distinfo:1.1 Fri Jan 10 18:27:18 2020 +++ pkgsrc/games/vvvvvv/distinfo Fri Jan 10 19:38:06 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1 2020/01/10 18:27:18 nia Exp $ +$NetBSD: distinfo,v 1.2 2020/01/10 19:38:06 nia Exp $ SHA1 (VVVVVVV-0.0.0.20200110-9e5e9f3e670a0cc48475a20486b0630e83ae14b4.tar.gz) = 7efdc53b9c86bcdbcbbdaced32390cd64e9ee4a0 RMD160 (VVVVVVV-0.0.0.20200110-9e5e9f3e670a0cc48475a20486b0630e83ae14b4.tar.gz) = b12109fa84a6a87573210a2ffc99fb54cf62a605 SHA512 (VVVVVVV-0.0.0.20200110-9e5e9f3e670a0cc48475a20486b0630e83ae14b4.tar.gz) = 5e1ab96261afa091496bb79b6c2a5f5c5f304dbf03214cc87bfb01e722fe26fde14e9a659fff2ac9411be2247fd53bf0d6e400ea2ac2a78637bda0ddd8f87078 Size (VVVVVVV-0.0.0.20200110-9e5e9f3e670a0cc48475a20486b0630e83ae14b4.tar.gz) = 828498 bytes -SHA1 (patch-physfs_physfs__platform__unix.c) = 6c84e653c3058d614d08783925b35892e3f0950c +SHA1 (patch-CMakeLists.txt) = 6ba3b3fe1edcb42cae5d488ae90c150e88f87872 SHA1 (patch-src_FileSystemUtils.cpp) = 6ad10e2827e0453abdb50036fc156f7ec9504c28 SHA1 (patch-src_SteamNetwork.c) = 8e86050961b0a623e1794eeef03ce312c8fcefe9 Added files: Index: pkgsrc/games/vvvvvv/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/games/vvvvvv/patches/patch-CMakeLists.txt:1.1 --- /dev/null Fri Jan 10 19:38:06 2020 +++ pkgsrc/games/vvvvvv/patches/patch-CMakeLists.txt Fri Jan 10 19:38:06 2020 @@ -0,0 +1,32 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/01/10 19:38:06 nia Exp $ + +Use physfs from pkgsrc. + +--- CMakeLists.txt.orig 2020-01-10 16:45:29.000000000 +0000 ++++ CMakeLists.txt +@@ -27,7 +27,7 @@ ELSE() + ENDIF() + + # Include Directories +-INCLUDE_DIRECTORIES(src tinyxml physfs lodepng) ++INCLUDE_DIRECTORIES(src tinyxml lodepng) + + # Source Lists + SET(VVV_SRC +@@ -96,11 +96,14 @@ ENDIF() + + # Library information + ADD_LIBRARY(tinyxml-static STATIC ${XML_SRC}) +-ADD_LIBRARY(physfs-static STATIC ${PFS_SRC} ${PFSP_SRC}) + ADD_LIBRARY(lodepng-static STATIC ${PNG_SRC}) + ++find_package(PhysFS REQUIRED) ++TARGET_INCLUDE_DIRECTORIES(vvvvvv PUBLIC "${PHYSFS_INCLUDE_DIR}") ++TARGET_LINK_LIBRARIES(vvvvvv ${PHYSFS_LIBRARY}) ++ + # Static Dependencies +-TARGET_LINK_LIBRARIES(vvvvvv physfs-static tinyxml-static lodepng-static) ++TARGET_LINK_LIBRARIES(vvvvvv tinyxml-static lodepng-static) + + # SDL2 Dependency (Detection pulled from FAudio) + if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES) --_----------=_15786850862340--