Date: Sat, 28 Sep 2013 15:09:56 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328576 - in head/games/jaggedalliance2: . files Message-ID: <201309281509.r8SF9uR0035663@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Sat Sep 28 15:09:55 2013 New Revision: 328576 URL: http://svnweb.freebsd.org/changeset/ports/328576 Log: - Fix build with libc++ [1] - stagify - USES gmake Submitted by: ed [1] Noticed by: pkg-fallout [1] Added: head/games/jaggedalliance2/files/patch-sgp__MemMan.cc (contents, props changed) Modified: head/games/jaggedalliance2/Makefile head/games/jaggedalliance2/pkg-plist (contents, props changed) Modified: head/games/jaggedalliance2/Makefile ============================================================================== --- head/games/jaggedalliance2/Makefile Sat Sep 28 15:02:14 2013 (r328575) +++ head/games/jaggedalliance2/Makefile Sat Sep 28 15:09:55 2013 (r328576) @@ -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 Added: head/games/jaggedalliance2/files/patch-sgp__MemMan.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/jaggedalliance2/files/patch-sgp__MemMan.cc Sat Sep 28 15:09:55 2013 (r328576) @@ -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" Modified: head/games/jaggedalliance2/pkg-plist ============================================================================== --- head/games/jaggedalliance2/pkg-plist Sat Sep 28 15:02:14 2013 (r328575) +++ head/games/jaggedalliance2/pkg-plist Sat Sep 28 15:09:55 2013 (r328576) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309281509.r8SF9uR0035663>