aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorlme <lme@FreeBSD.org>2013-09-28 23:09:55 +0800
committerlme <lme@FreeBSD.org>2013-09-28 23:09:55 +0800
commit60bce63298e6c7bb19a73c6ae96e6e4a6e79a069 (patch)
treef0bb6fb554291059ed4de5c145a944bb1e1a3973 /games
parent18671a5ebf4a8e852d4d2a1c430ddc55ad7b2dee (diff)
downloadfreebsd-ports-gnome-60bce63298e6c7bb19a73c6ae96e6e4a6e79a069.tar.gz
freebsd-ports-gnome-60bce63298e6c7bb19a73c6ae96e6e4a6e79a069.tar.zst
freebsd-ports-gnome-60bce63298e6c7bb19a73c6ae96e6e4a6e79a069.zip
- Fix build with libc++ [1]
- stagify - USES gmake Submitted by: ed [1] Noticed by: pkg-fallout [1]
Diffstat (limited to 'games')
-rw-r--r--games/jaggedalliance2/Makefile15
-rw-r--r--games/jaggedalliance2/files/patch-sgp__MemMan.cc10
-rw-r--r--games/jaggedalliance2/pkg-plist7
3 files changed, 21 insertions, 11 deletions
diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile
index 7d6cdb3c15f8..3dc10189e62f 100644
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@@ -17,7 +17,7 @@ DISTVERSIONSUFFIX= -source
ONLY_FOR_ARCHS= amd64 arm i386 pc98
ONLY_FOR_ARCHS_REASON= Needs a little endian environment
USE_BZIP2= yes
-USE_GMAKE= yes
+USES= gmake
USE_SDL= sdl
NO_CDROM= License only permits non-commerical use
NO_PACKAGE= Language of the datafiles must be hardcoded in the game binary
@@ -38,7 +38,6 @@ POLISH_DESC= Compile for Polish version
RUSSIAN_DESC= Compile for Russian version
RUSSIAN_GOLD_DESC= Compile for Russian Gold version
-NO_STAGE= yes
.include <bsd.port.options.mk>
.for i in ${OPTIONS_SINGLE_LANGUAGE}
@@ -49,21 +48,21 @@ MAKE_ARGS+= LNG=${i}
MAKE_ARGS+= NO_DEPS=yes # For a single full build dependency calculation is unnecessary
-MAKE_ARGS+= SGPDATADIR=${DATADIR}
+MAKE_ARGS+= SGPDATADIR=${STAGEDIR}${DATADIR}
MAKE_ARGS+= ${INSTALL_MACROS:S/BSD_//}
-MAN6= ja2.6
+MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} MANPREFIX=${STAGEDIR}${PREFIX}
post-install:
- @${MKDIR} ${DATADIR}/Data/TILECACHE
+ @${MKDIR} ${STAGEDIR}${DATADIR}/Data/TILECACHE
@${CAT} ${PKGMESSAGE}
lowercase:
@for i in \
- ${DATADIR}/Data/*.[Ss][Ll][Ff] \
- ${DATADIR}/Data/TILECACHE/*.[Jj][Ss][Dd] \
- ${DATADIR}/Data/TILECACHE/*.[Ss][Tt][Ii]; \
+ ${STAGEDIR}${DATADIR}/Data/*.[Ss][Ll][Ff] \
+ ${STAGEDIR}${DATADIR}/Data/TILECACHE/*.[Jj][Ss][Dd] \
+ ${STAGEDIR}${DATADIR}/Data/TILECACHE/*.[Ss][Tt][Ii]; \
do \
${MV} -n $$i `${DIRNAME} $$i`/`${BASENAME} $$i | ${TR} '[A-Z]' '[a-z]'`; \
done
diff --git a/games/jaggedalliance2/files/patch-sgp__MemMan.cc b/games/jaggedalliance2/files/patch-sgp__MemMan.cc
new file mode 100644
index 000000000000..c46fba824763
--- /dev/null
+++ b/games/jaggedalliance2/files/patch-sgp__MemMan.cc
@@ -0,0 +1,10 @@
+--- ./sgp/MemMan.cc.orig 2013-09-28 16:08:40.756136684 +0200
++++ ./sgp/MemMan.cc 2013-09-28 16:09:05.355134574 +0200
+@@ -5,6 +5,7 @@
+ // 11sep96:HJH - Creation
+ // 29may97:ARM - Fix & improve MemDebugCounter handling, logging of
+ // MemAlloc/MemFree, and reporting of any errors
++#include <new>
+ #include <stdexcept>
+
+ #include "Types.h"
diff --git a/games/jaggedalliance2/pkg-plist b/games/jaggedalliance2/pkg-plist
index a2026ebe55c1..164d8d4d18e6 100644
--- a/games/jaggedalliance2/pkg-plist
+++ b/games/jaggedalliance2/pkg-plist
@@ -1,7 +1,8 @@
bin/ja2
+man/man6/ja2.6.gz
share/applications/ja2-stracciatella.desktop
share/pixmaps/jagged2.ico
-@dirrm %%DATADIR%%/Data/TILECACHE
-@dirrm %%DATADIR%%/Data
-@dirrmtry %D/%%DATADIR%% 2>/dev/null || echo "Warning: data files in %D/%%DATADIR%% have been left intact."
+@dirrmtry %%DATADIR%%/Data/TILECACHE
+@dirrmtry %%DATADIR%%/Data
+@dirrmtry %%DATADIR%%
@dirrmtry share/applications