pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Updated the package to compile on NetBSD 9 Removed ja2-launcher build routine



Module Name:	pkgsrc-wip
Committed By:	Astr0 <astr0b4by%gmail.com@localhost>
Pushed By:	astr0b4by
Date:		Mon Oct 19 17:40:07 2020 +0200
Changeset:	8bccdab4c9eaa943d19557b84d03cb6dce3e3b6a

Modified Files:
	stracciatella/DESCR
	stracciatella/Makefile
	stracciatella/distinfo
Added Files:
	stracciatella/patches/patch-CMakeLists.txt
Removed Files:
	stracciatella/HOWTO

Log Message:
Updated the package to compile on NetBSD 9
Removed ja2-launcher build routine

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8bccdab4c9eaa943d19557b84d03cb6dce3e3b6a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 stracciatella/DESCR                        |  7 ++-----
 stracciatella/HOWTO                        |  2 --
 stracciatella/Makefile                     |  2 ++
 stracciatella/distinfo                     |  1 +
 stracciatella/patches/patch-CMakeLists.txt | 13 +++++++++++++
 5 files changed, 18 insertions(+), 7 deletions(-)

diffs:
diff --git a/stracciatella/DESCR b/stracciatella/DESCR
index f64a11eeab..236bb30e77 100644
--- a/stracciatella/DESCR
+++ b/stracciatella/DESCR
@@ -1,6 +1,3 @@
 Opensource re-implementation of Jagged Alliance 2
-
--Note: on NetBSD 8.2 adm64 following was  observed
-
-For RUSTC/CARGO to work set a symlink from /usr/pkg/etc/openssl/certs to
-/etc/openssl/certs
+You will need the original datafiles to play the
+game. Run ja2 -help for more info
diff --git a/stracciatella/HOWTO b/stracciatella/HOWTO
deleted file mode 100644
index e0dc20827b..0000000000
--- a/stracciatella/HOWTO
+++ /dev/null
@@ -1,2 +0,0 @@
-For RUSTC/CARGO to work set a symlink from /usr/pkg/etc/openssl/certs to 
-/etc/openssl/certs
diff --git a/stracciatella/Makefile b/stracciatella/Makefile
index 90f20488e8..a281352877 100644
--- a/stracciatella/Makefile
+++ b/stracciatella/Makefile
@@ -43,6 +43,8 @@ do-install:
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../lang/rust/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
diff --git a/stracciatella/distinfo b/stracciatella/distinfo
index 56a9c393e7..4765c88e21 100644
--- a/stracciatella/distinfo
+++ b/stracciatella/distinfo
@@ -4,3 +4,4 @@ SHA1 (ja2-stracciatella/ja2-0.16.1.tar.gz) = e7ff04d609fd4f6e4d580abdc1f5cb85de7
 RMD160 (ja2-stracciatella/ja2-0.16.1.tar.gz) = 1333c76ff5141275f9cbd685176d1c729d902b96
 SHA512 (ja2-stracciatella/ja2-0.16.1.tar.gz) = 481d58fc852c6c22fc90d33e8d1f7abd81c43fefc23fe236abb6a2830d87816e06fc260e1acca1b8d2e811ff4245cf5a9ab75b288b201ad3a6dd75de667a5fb0
 Size (ja2-stracciatella/ja2-0.16.1.tar.gz) = 25971172 bytes
+SHA1 (patch-CMakeLists.txt) = 34497d985b64b9341b5d8869c9fd728b1724bd4a
diff --git a/stracciatella/patches/patch-CMakeLists.txt b/stracciatella/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..8f00580afe
--- /dev/null
+++ b/stracciatella/patches/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2018-01-30 11:03:21.000000000 +0000
++++ CMakeLists.txt
+@@ -47,7 +47,7 @@ option(LOCAL_GTEST_LIB "Build with local
+ option(WITH_UNITTESTS "Build with unittests" ON)
+ option(WITH_FIXMES "Build with fixme messages" OFF)
+ option(WITH_MAEMO "Build with right click mapped to F4 (menu button)" OFF)
+-option(BUILD_LAUNCHER "Build the ja2 launcher application" ON)
++option(BUILD_LAUNCHER "Build the ja2 launcher application" OFF)
+ 
+ ## Build
+ 


Home | Main Index | Thread Index | Old Index