From 6c3b434987bb62db6c32171d2a0d3dbcf3c064bf Mon Sep 17 00:00:00 2001
From: nia <nia@pkgsrc.org>
Date: Fri, 10 Jan 2020 19:38:06 +0000
Subject: vvvvvv: Use physfs from pkgsrc.

Bump PKGREVISION
---
 games/vvvvvv/Makefile                              |  4 ++-
 games/vvvvvv/distinfo                              |  4 +--
 games/vvvvvv/patches/patch-CMakeLists.txt          | 32 ++++++++++++++++++++++
 .../patches/patch-physfs_physfs__platform__unix.c  | 17 ------------
 4 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 games/vvvvvv/patches/patch-CMakeLists.txt
 delete mode 100644 games/vvvvvv/patches/patch-physfs_physfs__platform__unix.c

(limited to 'games')

diff --git a/games/vvvvvv/Makefile b/games/vvvvvv/Makefile
index 863193ecf19..8f1dd17087b 100644
--- a/games/vvvvvv/Makefile
+++ b/games/vvvvvv/Makefile
@@ -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"
diff --git a/games/vvvvvv/distinfo b/games/vvvvvv/distinfo
index ebff331426e..11071bf95be 100644
--- a/games/vvvvvv/distinfo
+++ b/games/vvvvvv/distinfo
@@ -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
diff --git a/games/vvvvvv/patches/patch-CMakeLists.txt b/games/vvvvvv/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..20271887ccb
--- /dev/null
+++ b/games/vvvvvv/patches/patch-CMakeLists.txt
@@ -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)
diff --git a/games/vvvvvv/patches/patch-physfs_physfs__platform__unix.c b/games/vvvvvv/patches/patch-physfs_physfs__platform__unix.c
deleted file mode 100644
index 5acba0f27fd..00000000000
--- a/games/vvvvvv/patches/patch-physfs_physfs__platform__unix.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-physfs_physfs__platform__unix.c,v 1.1 2020/01/10 18:27:18 nia Exp $
-
-Support NetBSD.
-
---- physfs/physfs_platform_unix.c.orig	2020-01-10 16:45:29.000000000 +0000
-+++ physfs/physfs_platform_unix.c
-@@ -57,6 +57,10 @@
- #include <sys/sysctl.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#include <sys/statvfs.h>
-+#define statfs statvfs
-+#endif
- 
- #include "physfs_internal.h"
- 
-- 
cgit v1.2.3