View | Details | Raw Unified | Return to bug 205648 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-49 / +19 lines)
Lines 2-70 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	ja2
4
PORTNAME=	ja2
5
PORTVERSION=	0.12.1
5
PORTVERSION=	0.14.01
6
PORTREVISION=	3
7
CATEGORIES=	games
6
CATEGORIES=	games
8
MASTER_SITES=	http://deponie.yamagi.org/freebsd/distfiles/ \
7
MASTER_SITES=	https://bitbucket.org/gennady/ja2-stracciatella/get/
9
		http://tron.homeunix.org/ja2/
8
DISTNAME=	v${PORTVERSION}
9
DIST_SUBDIR=	${PORTNAME}
10
10
11
MAINTAINER=	lme@FreeBSD.org
11
MAINTAINER=	lme@FreeBSD.org
12
COMMENT=	Port of "Jagged Alliance 2" using SDL
12
COMMENT=	Port of "Jagged Alliance 2" using SDL
13
13
14
BROKEN=		unfetchable
15
16
DISTVERSIONSUFFIX=	-source
17
18
# Ignore this if you feel adventurous
14
# Ignore this if you feel adventurous
19
ONLY_FOR_ARCHS=	amd64 arm i386 pc98
15
ONLY_FOR_ARCHS=	amd64 arm i386 pc98
20
ONLY_FOR_ARCHS_REASON=	Needs a little endian environment
16
ONLY_FOR_ARCHS_REASON=	Needs a little endian environment
17
18
NO_CDROM=	License only permits non-commerical use
19
21
USES=		gmake tar:bzip2
20
USES=		gmake tar:bzip2
21
HAS_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--prefix=${PREFIX}
22
USE_SDL=	sdl
23
USE_SDL=	sdl
23
NO_CDROM=	License only permits non-commerical use
24
MAKE_ENV=	Q=
24
NO_PACKAGE=	Language of the datafiles must be hardcoded in the game binary
25
25
26
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
26
WRKSRC=		${WRKDIR}/gennady-ja2-stracciatella-5585014471a7
27
SUB_FILES=	pkg-message
27
SUB_FILES=	pkg-message
28
28
29
OPTIONS_SINGLE=	LANGUAGE
29
post-patch:
30
OPTIONS_SINGLE_LANGUAGE=	DUTCH ENGLISH FRENCH GERMAN ITALIAN POLISH RUSSIAN RUSSIAN_GOLD
30
	@${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \
31
OPTIONS_DEFAULT=	ENGLISH
31
		${WRKSRC}/sgp/SGP.cc
32
32
33
DUTCH_DESC=		Compile for Dutch version
34
ENGLISH_DESC=		Compile for English version
35
FRENCH_DESC=		Compile for French version
36
GERMAN_DESC=		Compile for German version
37
ITALIAN_DESC=		Compile for Italian version
38
POLISH_DESC=		Compile for Polish version
39
RUSSIAN_DESC=		Compile for Russian version
40
RUSSIAN_GOLD_DESC=	Compile for Russian Gold version
41
42
.include <bsd.port.options.mk>
43
44
.for i in ${OPTIONS_SINGLE_LANGUAGE}
45
.  if ${PORT_OPTIONS:M${i}}
46
MAKE_ARGS+=	LNG=${i}
47
.  endif
48
.endfor
49
50
MAKE_ARGS+=	NO_DEPS=yes # For a single full build dependency calculation is unnecessary
51
52
MAKE_ARGS+=	SGPDATADIR=${STAGEDIR}${DATADIR}
53
54
MAKE_ARGS+=	${INSTALL_MACROS:S/BSD_//}
55
56
MAKE_ARGS+=	PREFIX=${STAGEDIR}${PREFIX} MANPREFIX=${STAGEDIR}${PREFIX}
57
58
post-install:
33
post-install:
59
	@${MKDIR} ${STAGEDIR}${DATADIR}/Data/TILECACHE
34
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2
35
	${INSTALL_DATA} ${WRKSRC}/_build/distr-files-linux/ja2-stracciatella.desktop \
36
		${STAGEDIR}${PREFIX}/share/applications
37
	${INSTALL_DATA} ${WRKSRC}/Build/Res/jagged3.ico \
38
		${STAGEDIR}${PREFIX}/share/pixmaps/jagged2.ico
60
39
61
lowercase:
62
	@for i in \
63
		${STAGEDIR}${DATADIR}/Data/*.[Ss][Ll][Ff] \
64
		${STAGEDIR}${DATADIR}/Data/TILECACHE/*.[Jj][Ss][Dd] \
65
		${STAGEDIR}${DATADIR}/Data/TILECACHE/*.[Ss][Tt][Ii]; \
66
	do \
67
		${MV} -n $$i `${DIRNAME} $$i`/`${BASENAME} $$i | ${TR} '[A-Z]' '[a-z]'`; \
68
	done
69
70
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (ja2-0.12.1-source.tar.bz2) = c29bef2b4ba3f28b808b18d3d4c4388be85f255e9c6d9c355b8080de33fc18d1
1
SHA256 (ja2/v0.14.01.tar.bz2) = 53ba2fa928eded7e1c1e574407fb814234a7040ebd3a28e4000f6d834b110350
2
SIZE (ja2-0.12.1-source.tar.bz2) = 2305303
2
SIZE (ja2/v0.14.01.tar.bz2) = 7752070
(-)files/patch-Makefile (+25 lines)
Line 0 Link Here
1
--- Makefile.orig	2014-05-09 20:51:45 UTC
2
+++ Makefile
3
@@ -607,14 +607,14 @@ clean distclean:
4
 	$(Q)rm -fr $(DEPS) $(OBJS) $(BINARY)
5
 
6
 install: $(BINARY)
7
-	test -z "$(INSTALLABLE)" || install -d $(BINARY_DIR)
8
-	test -z "$(INSTALLABLE)" || install -d $(MANPAGE_DIR)
9
-	test -z "$(INSTALLABLE)" || install -d $(FULL_PATH_EXTRA_DATA_DIR)
10
-	test -z "$(INSTALLABLE)" || install -m 555 $(BINARY) $(BINARY_DIR)
11
-	test -z "$(INSTALLABLE)" || cp -r externalized $(FULL_PATH_EXTRA_DATA_DIR)
12
-	test -z "$(INSTALLABLE)" || cp -r mods         $(FULL_PATH_EXTRA_DATA_DIR)
13
-	test -z "$(INSTALLABLE)" || cp -r _unittests   $(FULL_PATH_EXTRA_DATA_DIR)
14
-	test -z "$(INSTALLABLE)" || install -m 444 ja2_manpage $(MANPAGE_DIR)/ja2.6
15
+	test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(BINARY_DIR)
16
+	test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(MANPAGE_DIR)
17
+	test -z "$(INSTALLABLE)" || install -d ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR)
18
+	test -z "$(INSTALLABLE)" || install -m 555 $(BINARY) ${DESTDIR}$(BINARY_DIR)
19
+	test -z "$(INSTALLABLE)" || cp -r externalized ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR)
20
+	test -z "$(INSTALLABLE)" || cp -r mods         ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR)
21
+	test -z "$(INSTALLABLE)" || cp -r _unittests   ${DESTDIR}$(FULL_PATH_EXTRA_DATA_DIR)
22
+	test -z "$(INSTALLABLE)" || install -m 444 ja2_manpage ${DESTDIR}$(MANPAGE_DIR)/ja2.6
23
 
24
 	@test -n "$(INSTALLABLE)" || echo "------------------------------------------------------------------------------"
25
 	@test -n "$(INSTALLABLE)" || echo "This build doesn't support installation."
(-)files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.orig	2014-05-09 20:51:45 UTC
2
+++ configure
3
@@ -47,7 +47,7 @@ fi
4
 # writing Makefile.config
5
 echo "# configuration options"                                  >Makefile.config
6
 echo "BINARY_DIR               := $PREFIX/bin"                  >>Makefile.config
7
-echo "MANPAGE_DIR              := $PREFIX/share/man/man6"       >>Makefile.config
8
+echo "MANPAGE_DIR              := $PREFIX/man/man6"             >>Makefile.config
9
 echo "FULL_PATH_EXTRA_DATA_DIR := $PREFIX/share/ja2"            >>Makefile.config
10
 echo "INSTALLABLE              := yes"                          >>Makefile.config
11
 
(-)files/patch-sgp__MemMan.cc (-10 lines)
Lines 1-10 Link Here
1
--- ./sgp/MemMan.cc.orig	2013-09-28 16:08:40.756136684 +0200
2
+++ ./sgp/MemMan.cc	2013-09-28 16:09:05.355134574 +0200
3
@@ -5,6 +5,7 @@
4
 //		11sep96:HJH	- Creation
5
 //    29may97:ARM - Fix & improve MemDebugCounter handling, logging of
6
 //                    MemAlloc/MemFree, and reporting of any errors
7
+#include <new>
8
 #include <stdexcept>
9
 
10
 #include "Types.h"
(-)pkg-descr (-1 / +1 lines)
Lines 3-6 Link Here
3
3
4
You need an original game CD and installation to use this port.
4
You need an original game CD and installation to use this port.
5
5
6
WWW: http://tron.homeunix.org/ja2/
6
WWW: https://bitbucket.org/gennady/ja2-stracciatella
(-)pkg-plist (-1 / +69 lines)
Lines 1-5 Link Here
1
bin/ja2
1
bin/ja2
2
man/man6/ja2.6.gz
2
man/man6/ja2.6.gz
3
share/applications/ja2-stracciatella.desktop
3
share/applications/ja2-stracciatella.desktop
4
%%DATADIR%%/_unittests/datatypes/doubles.bin
5
%%DATADIR%%/_unittests/datatypes/floats.bin
6
%%DATADIR%%/_unittests/find-files/file-without-extension
7
%%DATADIR%%/_unittests/find-files/lowercase-ext.txt
8
%%DATADIR%%/_unittests/find-files/subfolder/file.txt
9
%%DATADIR%%/_unittests/find-files/uppercase-ext.TXT
10
%%DATADIR%%/_unittests/saves/strac-linux/SaveGame01.sav
11
%%DATADIR%%/_unittests/saves/strac-macos/SaveGame09.sav
12
%%DATADIR%%/_unittests/saves/strac-macos/imp.dat
13
%%DATADIR%%/_unittests/saves/strac-win/SaveGame09.sav
14
%%DATADIR%%/_unittests/saves/vanilla-russian/IMP.dat
15
%%DATADIR%%/_unittests/saves/vanilla-russian/SaveGame06.sav
16
%%DATADIR%%/externalized/ammo_types.json
17
%%DATADIR%%/externalized/army-gun-choice-extended.json
18
%%DATADIR%%/externalized/army-gun-choice-normal.json
19
%%DATADIR%%/externalized/bobby-ray-inventory-new.json
20
%%DATADIR%%/externalized/bobby-ray-inventory-used.json
21
%%DATADIR%%/externalized/calibres.json
22
%%DATADIR%%/externalized/dealer-inventory-alberto-santos.json
23
%%DATADIR%%/externalized/dealer-inventory-arnie.json
24
%%DATADIR%%/externalized/dealer-inventory-carlo-santos.json
25
%%DATADIR%%/externalized/dealer-inventory-devin.json
26
%%DATADIR%%/externalized/dealer-inventory-elgin.json
27
%%DATADIR%%/externalized/dealer-inventory-frank.json
28
%%DATADIR%%/externalized/dealer-inventory-franz.json
29
%%DATADIR%%/externalized/dealer-inventory-fredo.json
30
%%DATADIR%%/externalized/dealer-inventory-gabby.json
31
%%DATADIR%%/externalized/dealer-inventory-herve-santos.json
32
%%DATADIR%%/externalized/dealer-inventory-howard.json
33
%%DATADIR%%/externalized/dealer-inventory-jake.json
34
%%DATADIR%%/externalized/dealer-inventory-keith.json
35
%%DATADIR%%/externalized/dealer-inventory-manny.json
36
%%DATADIR%%/externalized/dealer-inventory-micky.json
37
%%DATADIR%%/externalized/dealer-inventory-perko.json
38
%%DATADIR%%/externalized/dealer-inventory-peter-santos.json
39
%%DATADIR%%/externalized/dealer-inventory-sam.json
40
%%DATADIR%%/externalized/dealer-inventory-tony.json
41
%%DATADIR%%/externalized/game.json
42
%%DATADIR%%/externalized/imp.json
43
%%DATADIR%%/externalized/magazines.json
44
%%DATADIR%%/externalized/readme.txt
45
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-dut.json
46
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-eng.json
47
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-fr.json
48
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-ger.json
49
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-it.json
50
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-pl.json
51
%%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-rus.json
52
%%DATADIR%%/externalized/strings/ammo-calibre-dut.json
53
%%DATADIR%%/externalized/strings/ammo-calibre-eng.json
54
%%DATADIR%%/externalized/strings/ammo-calibre-fr.json
55
%%DATADIR%%/externalized/strings/ammo-calibre-ger.json
56
%%DATADIR%%/externalized/strings/ammo-calibre-it.json
57
%%DATADIR%%/externalized/strings/ammo-calibre-pl.json
58
%%DATADIR%%/externalized/strings/ammo-calibre-rus.json
59
%%DATADIR%%/externalized/strings/new-strings-dut.json
60
%%DATADIR%%/externalized/strings/new-strings-eng.json
61
%%DATADIR%%/externalized/strings/new-strings-fr.json
62
%%DATADIR%%/externalized/strings/new-strings-ger.json
63
%%DATADIR%%/externalized/strings/new-strings-it.json
64
%%DATADIR%%/externalized/strings/new-strings-pl.json
65
%%DATADIR%%/externalized/strings/new-strings-rus.json
66
%%DATADIR%%/externalized/weapons.json
67
%%DATADIR%%/mods/from-russia-with-love/data/maps/A9.dat
68
%%DATADIR%%/mods/from-russia-with-love/license.txt
69
%%DATADIR%%/mods/from-russia-with-love/readme.txt
70
%%DATADIR%%/mods/readme.txt
71
%%DATADIR%%/mods/test-json-dialogs/data/mercedt/009.edt.json
72
%%DATADIR%%/mods/test-json-dialogs/readme.txt
4
share/pixmaps/jagged2.ico
73
share/pixmaps/jagged2.ico
5
@dir %%DATADIR%%/Data/TILECACHE

Return to bug 205648