games/supertux: fix datadir

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

games/supertux: fix datadir

Thomas Frohwein-2
Hi,

games/supertux fails to start with an error of not finding the datadir. It
turns out it looks in ./share/supertux2, so running it in /usr/local works
(thanks to Leonid Bobrov for the hint). The diff below fixes this by selecting
the correct datadir.

Also a few other small fixes/updates:

* The old homepage just forwards to https://www.supertux.org/. Since the old
  one is http and not https, just switch to https://www.supertux.org/.
* update WANTLIB from png to png16 as it came out of make port-lib-depends-check
* make update-plist removed entries for intermediary directories to
  share/icons/hicolor/scalable/apps/supertux2.svg. Please let me know if
  there's a reason to keep them anyway.

CC'd maintainer.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/supertux/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 4 Feb 2019 10:02:07 -0000 1.18
+++ Makefile 18 Feb 2019 19:37:40 -0000
@@ -5,10 +5,11 @@ COMMENT = jump 'n' run game
 V = 0.6.0
 DISTNAME = SuperTux-v${V}-Source
 PKGNAME = supertux-$V
+REVISION = 0
 
 CATEGORIES = games
 
-HOMEPAGE = http://supertux.lethargik.org/
+HOMEPAGE = https://www.supertux.org/
 
 MAINTAINER = Pascal Stumpf <[hidden email]>
 
@@ -17,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU SDL2 SDL2_image boost_date_time-mt
 WANTLIB += boost_filesystem-mt boost_locale-mt boost_system-mt
-WANTLIB += c curl freetype m ogg openal png vorbis vorbisfile
+WANTLIB += c curl freetype m ogg openal png16 vorbis vorbisfile
 WANTLIB += z
 
 MASTER_SITES = https://github.com/SuperTux/supertux/releases/download/v${V}/
Index: patches/patch-src_supertux_main_cpp
===================================================================
RCS file: patches/patch-src_supertux_main_cpp
diff -N patches/patch-src_supertux_main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_supertux_main_cpp 18 Feb 2019 19:37:40 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+fix datadir on OpenBSD
+
+Index: src/supertux/main.cpp
+--- src/supertux/main.cpp.orig
++++ src/supertux/main.cpp
+@@ -204,10 +204,7 @@ class PhysfsSubsystem final (public)
+       }
+       else
+       {
+-        // if the game is not run from the source directory, try to find
+-        // the global install location
+-        datadir = basepath.substr(0, basepath.rfind(INSTALL_SUBDIR_BIN));
+-        datadir = FileSystem::join(datadir, INSTALL_SUBDIR_SHARE);
++        datadir = "${PREFIX}/share/supertux2";
+       }
+     }
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/supertux/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 4 Feb 2019 10:02:07 -0000 1.5
+++ pkg/PLIST 18 Feb 2019 19:37:40 -0000
@@ -6,10 +6,6 @@ share/doc/supertux2/INSTALL.md
 share/doc/supertux2/LICENSE.txt
 share/doc/supertux2/NEWS.md
 share/doc/supertux2/README.md
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/supertux2.svg
 share/metainfo/
 share/metainfo/supertux2.appdata.xml