Attachment #168167 for bug #207988

View | Details | Raw Unified | Return to bug 207988
Collapse All | Expand All




# $FreeBSD: head/games/cataclysm-dda/Makefile 408120 2016-02-05 00:04:44Z marino $

PORTNAME=	cataclysm-dda
PORTVERSION=	0.C
PORTEPOCH=	1
CATEGORIES=	games
MASTER_SITES=	http://polehammer.com/azmodean/:soundset
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Fork/variant of Cataclysm Roguelike by Whales

LICENSE_FILE=	${WRKSRC}/LICENSE.txt
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		alias compiler:c++11-lib execinfo gmake shebangfix ncurses
SHEBANG_FILES=	lang/*.sh
bash_CMD=	/bin/sh

USE_GITHUB=	yes
GH_ACCOUNT=	CleverRaven
GH_PROJECT=	Cataclysm-DDA
MAKE_ARGS+=	PREFIX=${PREFIX} RELEASE=1 USE_HOME_DIR=1
CXXFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-Wl,-rpath=${_GCC_RUNTIME} -L${LOCALBASE}/lib -lexecinfo

USES=		compiler:c++11-lib alias compiler execinfo gmake shebangfix
SHEBANG_FILES=	lang/*.sh
bash_CMD=	${SH}
MAKE_ARGS=	CXX="${CXX}" LD="${CXX}" RELEASE=1

CPPFLAGS+=	${EXECINFO_CPPFLAGS}
LDFLAGS+=	${EXECINFO_LDFLAGS} -lexecinfo

OPTIONS_DEFINE=		DOCS LUA NLS SOUND
OPTIONS_SINGLE=		UI
OPTIONS_SINGLE=	UI
OPTIONS_SINGLE_UI=	NCURSES SDL
OPTIONS_DEFAULT=	NCURSES
OPTIONS_SUB=		yes

LUA_USES=		lua pkgconfig
LUA_MAKE_ARGS=		LUA=1 LUA_BINARY="${LUA_CMD}"
NCURSES_USES=		ncurses
NLS_USES=		gettext
NLS_MAKE_ARGS_OFF=	LOCALIZE=0
NLS_CPPFLAGS=		-I${LOCALBASE}/include
NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
SDL_RUN_DEPENDS=	terminus-font>0:${PORTSDIR}/x11-fonts/terminus-font
SDL_USES=		pkgconfig
SDL_USE=		SDL=image2,ttf2
SDL_MAKE_ARGS=		TILES=1 TILESTARGET=cataclysm
SDL_CPPFLAGS=		$$(sdl2-config --cflags)
SDL_LDFLAGS=		$$(sdl2-config --libs)
SDL_DESKTOP_ENTRIES=	"Cataclysm-DDA" "" "" "cataclysm" "" ""
SOUND_DESC=		Sound support (SDL UI only)
SOUND_DISTFILES=	${SOUNDSET_FILES:S/$/:soundset/}
SOUND_EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
SOUND_USE=		SDL=mixer2
SOUND_MAKE_ARGS=	SOUND=1
SOUND_IMPLIES=		SDL
UI_DESC=		User inteface

SOUNDSET_FILES=	cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
REINPLACE_ARGS=	-i ''

NCURSES_USES=	ncurses
SDL_USE=	SDL=sdl2,ttf2,image2
SDL_USES=	pkgconfig
SDL_MAKE_ARGS=	TILES=1 TILESTARGET=cataclysm
SDL_FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/x11-fonts/terminus-font:patch
SDL_BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
NLS_USES=	gettext
NLS_LDFLAGS=	-lintl
NLS_MAKE_ARGS=	LOCALIZE=1
LUA_USES=	lua:51 pkgconfig
LUA_MAKE_ARGS=	LUA=1

.include <bsd.port.pre.mk>

.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
CXXFLAGS+=	-Wno-inconsistent-missing-override
.endif

.if ${CHOSEN_COMPILER_TYPE} == gcc
CPPFLAGS+=	-DCATA_NO_CPP11_STRING_CONVERSIONS
MAKE_ARGS+=	SOUND=1
USE_SDL+=	mixer2
SOUND_FILES=	cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
DISTFILES+=	${SOUND_FILES:S|$|:sound|}
.else
IGNORE=		Sound is not supported with ncurses UI.
.endif
.endif

post-patch:
	 @${REINPLACE_CMD} -e \
		'/CXXFLAGS/s|-O[0-3s]|| ; \
		 /LDFLAGS/s|-s$$|| ; \
		 s|$$(shell ncursesw5-config --cflags)|| ; \
		 s|$$(shell ncursesw5-config --libs)|-lncursesw -ltinfow| ; \
		 s|\($$(CXX)\) \($$(DEFINES)\)|\1 $$(CPPFLAGS) \2| ; \
		 s|\([[:blank:]]\)\($$(DATA_PREFIX)\)|\1$$(DESTDIR)\2| ; \
		 s|\([[:blank:]]\)\($$(BIN_PREFIX)\)|\1$$(DESTDIR)\2| ; \
		 s|--mode=|-m | ; \
		 s|--no-preserve=ownership|| ; \
		 s|-t || ; \
		 s|\([[:blank:]]\)\($$(LOCALE_DIR)\)|\1$$(DESTDIR)\2| ; \
		 s|\(=\)\($$(LOCALE_DIR)\)|\1$$(DESTDIR)\2|' \
		${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e \
		's|/usr/local/share/fonts|${LOCALBASE}/share/fonts|' \
		${WRKSRC}/src/sdltiles.cpp

post-patch-NLS-off:
	 @${REINPLACE_CMD} -e \
		'/LOCALE_DIR/s|^|#|' \
		${WRKSRC}/Makefile

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cataclysm
# replace bundled windows version of terminus font with X-compatible one
	${RM} ${STAGEDIR}${DATADIR}/font/terminus.fon
	${LN} -sf ${PREFIX}/share/fonts/terminus/ter-u14n.pcf.gz \
		${STAGEDIR}${DATADIR}/font/terminus.fon

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
		${STAGEDIR}${DOCSDIR})

post-install-SOUND-on:
	@${MKDIR} ${STAGEDIR}${DATADIR}/sound
	cd ${WRKSRC}/data/sound && ${INSTALL_DATA} soundset.json \
		${STAGEDIR}${DATADIR}/sound
	cd ${DISTDIR} && ${INSTALL_DATA} ${SOUNDSET_FILES} \
		${STAGEDIR}${DATADIR}/sound

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)games/cataclysm-dda/distinfo (-2 / +2 lines)
1	SHA256 (CleverRaven-Cataclysm-DDA-0.B_GH0.tar.gz) = fee109c68b6ee2aa988ec54b1fec20cd4b5baf202adef7001125f6a5de885757
2	SIZE (CleverRaven-Cataclysm-DDA-0.B_GH0.tar.gz) = 21837016
3	SHA256 (cataclysmthemeREV6.ogg) = fa305afea557b27ed341f6a10dcfab5aa07ecdd92e42b4dddec61eccb3c1c77f	1	SHA256 (cataclysmthemeREV6.ogg) = fa305afea557b27ed341f6a10dcfab5aa07ecdd92e42b4dddec61eccb3c1c77f
4	SIZE (cataclysmthemeREV6.ogg) = 7964468	2	SIZE (cataclysmthemeREV6.ogg) = 7964468
5	SHA256 (Dark_Days_Ahead_demo_2.ogg) = 75fe6b792ab06b842add070989acb9fe62f0acc5c17f344d724d774a772a68d4	3	SHA256 (Dark_Days_Ahead_demo_2.ogg) = 75fe6b792ab06b842add070989acb9fe62f0acc5c17f344d724d774a772a68d4
6	SIZE (Dark_Days_Ahead_demo_2.ogg) = 9182431	4	SIZE (Dark_Days_Ahead_demo_2.ogg) = 9182431
		5	SHA256 (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 69e947824626fffb505ca4ec44187ec94bba32c1e5957ba5c771b3445f958af6
		6	SIZE (CleverRaven-Cataclysm-DDA-0.C_GH0.tar.gz) = 26887684




--- src/cata_tiles.cpp.orig	2015-03-09 05:25:34 UTC
+++ src/cata_tiles.cpp
@@ -167,9 +167,6 @@ void cata_tiles::get_tile_information(st
 int cata_tiles::load_tileset(std::string path, int R, int G, int B)
 {
     std::string img_path = path;

     /** reinit tile_atlas */
     SDL_Surface *tile_atlas = IMG_Load(img_path.c_str());
 
@@ -285,7 +282,7 @@ void cata_tiles::load_tilejson_from_file
         JsonArray tiles_new = config.get_array("tiles-new");
         while (tiles_new.has_more()) {
             JsonObject tile_part_def = tiles_new.next_object();
-            const std::string tileset_image_path = tile_part_def.get_string("file");
+            const std::string tileset_image_path = FILENAMES["datadir"] + "/" + tile_part_def.get_string("file");
             int R = -1;
             int G = -1;
             int B = -1;




--- src/game.cpp.orig	2015-03-09 05:25:34 UTC
+++ src/game.cpp
@@ -9545,7 +9545,7 @@ int game::list_items(const int iLastStat
             if (ground_items.empty() && iLastState == 1) {
                 reset_item_list_state(w_items_border, iInfoHeight, bRadiusSort);
                 wrefresh(w_items_border);
-                mvwprintz(w_items, 10, 2, c_white, _("You dont see any items around you!"));
+                mvwprintz(w_items, 10, 2, c_white, _("You don't see any items around you!"));
             } else {
                 werase(w_items);
 
@@ -9808,7 +9808,7 @@ int game::list_monsters(const int iLastS
+
     //Open the file first
-    DIR *dir = opendir("memorial");
+    DIR *dir = opendir(memorialdir.c_str());
     if (!dir) {
 #if (defined _WIN32 || defined __WIN32__)
-        mkdir("memorial");
+        mkdir(memorialdir.c_str());
 #else
-        mkdir("memorial", 0777);
+        mkdir(memorialdir.c_str(), 0777);
 #endif
-        dir = opendir("memorial");
+        dir = opendir(memorialdir.c_str());
         if (!dir) {
             dbg(D_ERROR) << "game:write_memorial_file: Unable to make memorial directory.";
             debugmsg("Could not make './memorial' directory");
@@ -4581,7 +4583,7 @@ void game::write_memorial_file(std::stri
     }
 
     //Omit the name if too many unusable characters stripped
-    std::string memorial_file_path = string_format("memorial/%s%s.txt",
+    std::string memorial_file_path = string_format((memorialdir + "%s%s.txt").c_str(),
                                      player_name.str().length() <= (u.name.length() / 5) ? "" : player_name.str().c_str(),
                                      timestamp.c_str());
 
             if (vMonsters.empty()) {
                 wrefresh(w_monsters_border);
-                mvwprintz(w_monsters, 10, 2, c_white, _("You dont see any monsters around you!"));
+                mvwprintz(w_monsters, 10, 2, c_white, _("You don't see any monsters around you!"));
             } else {
                 if( static_cast<size_t>( iActive ) >= vMonsters.size() ) {
                     iActive = 0;




--- src/options.cpp.orig	2015-03-09 05:25:34 UTC
+++ src/options.cpp
@@ -513,8 +513,8 @@ void initOptions()
                                    false
                                   );
 
-    OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to reenable safemode"),
-                                        _("Number of turns after safemode is reenabled if no hostiles are in safemodeproximity distance."),
+    OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to re-enable safemode"),
+                                        _("Number of turns after safemode is re-enabled if no hostiles are in safemodeproximity distance."),
                                         1, 100, 50
                                        );
 

Line 0 Link Here

(-)games/cataclysm-dda/files/patch-src-player.cpp (+11 lines)
	1	--- src/player.cpp.orig 2015-03-09 05:25:34 UTC
	2	+++ src/player.cpp
	3	@@ -9788,7 +9788,7 @@ void player::pick_style() // Style selec
	4
	5	uimenu kmenu;
	6	kmenu.text = _("Select a style (press ? for style info)");
	7	- std::auto_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
	8	+ std::unique_ptr<ma_style_callback> ma_style_info(new ma_style_callback());
	9	kmenu.callback = ma_style_info.get();
	10	kmenu.addentry( 0, true, 'c', _("Cancel") );
	11	if (keep_hands_free) {




--- src/sdltiles.cpp.orig	2015-03-09 05:25:34 UTC
+++ src/sdltiles.cpp
@@ -1214,7 +1214,7 @@ static void save_font_list()
 #if (defined TILES)
+#include <sys/param.h>
 #include "catacurse.h"
 #include "options.h"
 #include "output.h"
@@ -1213,8 +1214,8 @@ static void save_font_list()
     wordexp("~/Library/Fonts", &exp, 0);
     font_folder_list(fout, exp.we_wordv[0]);
     wordfree(&exp);*/
-#elif (defined linux || defined __linux)
-    font_folder_list(fout, "/usr/share/fonts");
+#elif (defined linux || defined __linux || defined __FreeBSD__)
     font_folder_list(fout, "/usr/share/fonts");
     font_folder_list(fout, "/usr/local/share/fonts");
     wordexp_t exp;
     wordexp("~/.fonts", &exp, 0);




--- src/translations.cpp.orig	2015-03-09 05:25:34 UTC
+++ src/translations.cpp
@@ -72,7 +72,7 @@ void set_language(bool reload_options)
 #include "translations.h"
 
+#include <sys/param.h>
 #include <string>
 #ifdef LOCALIZE
 #undef __STRICT_ANSI__ // _putenv in minGW need that
@@ -72,7 +73,7 @@ void set_language(bool reload_options)
 
     // Step 2. Bind to gettext domain.
     const char *locale_dir;

Lines 6-11 Link Here

(-)games/cataclysm-dda/pkg-plist (-28 / +64 lines)
6	%%DATADIR%%/credits/de.credits	6	%%DATADIR%%/credits/de.credits
7	%%DATADIR%%/credits/en.credits	7	%%DATADIR%%/credits/en.credits
8	%%DATADIR%%/credits/es_AR.credits	8	%%DATADIR%%/credits/es_AR.credits
		9	%%DATADIR%%/credits/es_ES.credits
		10	%%DATADIR%%/credits/it_IT.credits
9	%%DATADIR%%/credits/ru.credits	11	%%DATADIR%%/credits/ru.credits
10	%%DATADIR%%/font/fixedsys.ttf	12	%%DATADIR%%/font/fixedsys.ttf
11	%%DATADIR%%/font/square.ttf	13	%%DATADIR%%/font/square.ttf
Lines 14-19 Link Here
14	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/blockheadtiles.png	16	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/blockheadtiles.png
15	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tile_config.json	17	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tile_config.json
16	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tileset.txt	18	%%SDL%%%%DATADIR%%/gfx/BlockheadTileset/tileset.txt
		19	%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/fallback.png
		20	%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tile_config.json
		21	%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tiles.png
		22	%%SDL%%%%DATADIR%%/gfx/ChestHoleTileset/tileset.txt
17	%%SDL%%%%DATADIR%%/gfx/DeonTileset/deontiles.png	23	%%SDL%%%%DATADIR%%/gfx/DeonTileset/deontiles.png
18	%%SDL%%%%DATADIR%%/gfx/DeonTileset/tile_config.json	24	%%SDL%%%%DATADIR%%/gfx/DeonTileset/tile_config.json
19	%%SDL%%%%DATADIR%%/gfx/DeonTileset/tileset.txt	25	%%SDL%%%%DATADIR%%/gfx/DeonTileset/tileset.txt
Lines 51-57 Link Here
51	%%SDL%%%%DATADIR%%/gfx/tinytile.png	57	%%SDL%%%%DATADIR%%/gfx/tinytile.png
52	%%DATADIR%%/json/LOADING_ORDER.md	58	%%DATADIR%%/json/LOADING_ORDER.md
53	%%DATADIR%%/json/bionics.json	59	%%DATADIR%%/json/bionics.json
54	%%DATADIR%%/json/boxing.json
55	%%DATADIR%%/json/bullet_pulling.json	60	%%DATADIR%%/json/bullet_pulling.json
56	%%DATADIR%%/json/construction.json	61	%%DATADIR%%/json/construction.json
57	%%DATADIR%%/json/doll_speech.json	62	%%DATADIR%%/json/doll_speech.json
Lines 61-66 Link Here
61	%%DATADIR%%/json/furniture.json	66	%%DATADIR%%/json/furniture.json
62	%%DATADIR%%/json/furniture/ags_furniture.json	67	%%DATADIR%%/json/furniture/ags_furniture.json
63	%%DATADIR%%/json/hints.json	68	%%DATADIR%%/json/hints.json
		69	%%DATADIR%%/json/item_actions.json
64	%%DATADIR%%/json/item_groups.json	70	%%DATADIR%%/json/item_groups.json
65	%%DATADIR%%/json/items/ags_items.json	71	%%DATADIR%%/json/items/ags_items.json
66	%%DATADIR%%/json/items/ammo.json	72	%%DATADIR%%/json/items/ammo.json
Lines 69-77 Link Here
69	%%DATADIR%%/json/items/armor.json	75	%%DATADIR%%/json/items/armor.json
70	%%DATADIR%%/json/items/bionics.json	76	%%DATADIR%%/json/items/bionics.json
71	%%DATADIR%%/json/items/books.json	77	%%DATADIR%%/json/items/books.json
		78	%%DATADIR%%/json/items/chemicals_and_resources.json
72	%%DATADIR%%/json/items/comestibles.json	79	%%DATADIR%%/json/items/comestibles.json
73	%%DATADIR%%/json/items/containers.json	80	%%DATADIR%%/json/items/containers.json
74	%%DATADIR%%/json/items/gi.json
75	%%DATADIR%%/json/items/handloaded_bullets.json	81	%%DATADIR%%/json/items/handloaded_bullets.json
76	%%DATADIR%%/json/items/martial_arts_manuals.json	82	%%DATADIR%%/json/items/martial_arts_manuals.json
77	%%DATADIR%%/json/items/melee.json	83	%%DATADIR%%/json/items/melee.json
Lines 83-91 Link Here
83	%%DATADIR%%/json/items/var_vehicle_parts.json	89	%%DATADIR%%/json/items/var_vehicle_parts.json
84	%%DATADIR%%/json/items/vehicle_parts.json	90	%%DATADIR%%/json/items/vehicle_parts.json
85	%%DATADIR%%/json/lab_notes.json	91	%%DATADIR%%/json/lab_notes.json
86	%%DATADIR%%/json/main.lua	92	%%LUA%%%%DATADIR%%/json/main.lua
87	%%DATADIR%%/json/map_extra_items.json	93	%%DATADIR%%/json/map_extra_items.json
88	%%DATADIR%%/json/mapgen/Prepper_house01.json	94	%%DATADIR%%/json/mapgen/Prepper_house01.json
		95	%%DATADIR%%/json/mapgen/abandoned01.json
89	%%DATADIR%%/json/mapgen/ags_station.json	96	%%DATADIR%%/json/mapgen/ags_station.json
90	%%DATADIR%%/json/mapgen/antique_store.json	97	%%DATADIR%%/json/mapgen/antique_store.json
91	%%DATADIR%%/json/mapgen/arcade.json	98	%%DATADIR%%/json/mapgen/arcade.json
Lines 93-98 Link Here
93	%%DATADIR%%/json/mapgen/bandit_camp.json	100	%%DATADIR%%/json/mapgen/bandit_camp.json
94	%%DATADIR%%/json/mapgen/bar.json	101	%%DATADIR%%/json/mapgen/bar.json
95	%%DATADIR%%/json/mapgen/bowling_alley.json	102	%%DATADIR%%/json/mapgen/bowling_alley.json
		103	%%DATADIR%%/json/mapgen/boxing.json
96	%%DATADIR%%/json/mapgen/cabin03.json	104	%%DATADIR%%/json/mapgen/cabin03.json
97	%%DATADIR%%/json/mapgen/coffee_shop.json	105	%%DATADIR%%/json/mapgen/coffee_shop.json
98	%%DATADIR%%/json/mapgen/diner.json	106	%%DATADIR%%/json/mapgen/diner.json
Lines 116-131 Link Here
116	%%DATADIR%%/json/mapgen/house09 .json	124	%%DATADIR%%/json/mapgen/house09 .json
117	%%DATADIR%%/json/mapgen/house10.json	125	%%DATADIR%%/json/mapgen/house10.json
118	%%DATADIR%%/json/mapgen/house11.json	126	%%DATADIR%%/json/mapgen/house11.json
		127	%%DATADIR%%/json/mapgen/house12.json
		128	%%DATADIR%%/json/mapgen/house13.json
		129	%%DATADIR%%/json/mapgen/house14.json
		130	%%DATADIR%%/json/mapgen/house15.json
		131	%%DATADIR%%/json/mapgen/house16.json
		132	%%DATADIR%%/json/mapgen/house17.json
		133	%%DATADIR%%/json/mapgen/house_dogs.json
119	%%DATADIR%%/json/mapgen/house_duplex.json	134	%%DATADIR%%/json/mapgen/house_duplex.json
120	%%DATADIR%%/json/mapgen/house_garage.json	135	%%DATADIR%%/json/mapgen/house_garage.json
121	%%DATADIR%%/json/mapgen/house_garage2.json	136	%%DATADIR%%/json/mapgen/house_garage2.json
122	%%DATADIR%%/json/mapgen/house_garage3.json	137	%%DATADIR%%/json/mapgen/house_garage3.json
123	%%DATADIR%%/json/mapgen/house_garage4.json	138	%%DATADIR%%/json/mapgen/house_garage4.json
124	%%DATADIR%%/json/mapgen/house_garage5.json	139	%%DATADIR%%/json/mapgen/house_garage5.json
		140	%%DATADIR%%/json/mapgen/house_garage_prepper.json
		141	%%DATADIR%%/json/mapgen/house_gardener.json
125	%%DATADIR%%/json/mapgen/house_library.json	142	%%DATADIR%%/json/mapgen/house_library.json
126	%%DATADIR%%/json/mapgen/house_modern_lx.json	143	%%DATADIR%%/json/mapgen/house_modern_lx.json
127	%%DATADIR%%/json/mapgen/house_patio.json	144	%%DATADIR%%/json/mapgen/house_patio.json
128	%%DATADIR%%/json/mapgen/house_porch.json	145	%%DATADIR%%/json/mapgen/house_porch.json
		146	%%DATADIR%%/json/mapgen/house_quiverfull.json
129	%%DATADIR%%/json/mapgen/house_rv.json	147	%%DATADIR%%/json/mapgen/house_rv.json
130	%%DATADIR%%/json/mapgen/house_tool_shed.json	148	%%DATADIR%%/json/mapgen/house_tool_shed.json
131	%%DATADIR%%/json/mapgen/jewel_store.json	149	%%DATADIR%%/json/mapgen/jewel_store.json
Lines 135-140 Link Here
135	%%DATADIR%%/json/mapgen/museum.json	153	%%DATADIR%%/json/mapgen/museum.json
136	%%DATADIR%%/json/mapgen/necropolis.json	154	%%DATADIR%%/json/mapgen/necropolis.json
137	%%DATADIR%%/json/mapgen/necropolisB1.json	155	%%DATADIR%%/json/mapgen/necropolisB1.json
		156	%%DATADIR%%/json/mapgen/office_tower_2.json
138	%%DATADIR%%/json/mapgen/pharmacy_1.json	157	%%DATADIR%%/json/mapgen/pharmacy_1.json
139	%%DATADIR%%/json/mapgen/pharmacy_1_open.json	158	%%DATADIR%%/json/mapgen/pharmacy_1_open.json
140	%%DATADIR%%/json/mapgen/pizza_parlor.json	159	%%DATADIR%%/json/mapgen/pizza_parlor.json
Lines 143-153 Link Here
143	%%DATADIR%%/json/mapgen/restaurant.json	162	%%DATADIR%%/json/mapgen/restaurant.json
144	%%DATADIR%%/json/mapgen/restaurant2.json	163	%%DATADIR%%/json/mapgen/restaurant2.json
145	%%DATADIR%%/json/mapgen/restaurant_fast.json	164	%%DATADIR%%/json/mapgen/restaurant_fast.json
		165	%%DATADIR%%/json/mapgen/s_gas_rural.json
146	%%DATADIR%%/json/mapgen/sai.json	166	%%DATADIR%%/json/mapgen/sai.json
147	%%DATADIR%%/json/mapgen/warehouse.json	167	%%DATADIR%%/json/mapgen/warehouse.json
148	%%DATADIR%%/json/martialarts.json	168	%%DATADIR%%/json/martialarts.json
149	%%DATADIR%%/json/materials.json	169	%%DATADIR%%/json/materials.json
150	%%DATADIR%%/json/monster_drops.json	170	%%DATADIR%%/json/monster_drops.json
		171	%%DATADIR%%/json/monster_factions.json
151	%%DATADIR%%/json/monstergroups.json	172	%%DATADIR%%/json/monstergroups.json
152	%%DATADIR%%/json/monsters.json	173	%%DATADIR%%/json/monsters.json
153	%%DATADIR%%/json/mutations.json	174	%%DATADIR%%/json/mutations.json
Lines 168-174 Link Here
168	%%DATADIR%%/json/npcs/npc.json	189	%%DATADIR%%/json/npcs/npc.json
169	%%DATADIR%%/json/overmap_specials.json	190	%%DATADIR%%/json/overmap_specials.json
170	%%DATADIR%%/json/overmap_terrain.json	191	%%DATADIR%%/json/overmap_terrain.json
171	%%DATADIR%%/json/preload.lua	192	%%LUA%%%%DATADIR%%/json/preload.lua
172	%%DATADIR%%/json/professions.json	193	%%DATADIR%%/json/professions.json
173	%%DATADIR%%/json/recipes/recipe_ammo.json	194	%%DATADIR%%/json/recipes/recipe_ammo.json
174	%%DATADIR%%/json/recipes/recipe_armor.json	195	%%DATADIR%%/json/recipes/recipe_armor.json
Lines 197-203 Link Here
197	%%DATADIR%%/json/vehicles/vehicles.json	218	%%DATADIR%%/json/vehicles/vehicles.json
198	%%LUA%%%%DATADIR%%/lua/autoexec.lua	219	%%LUA%%%%DATADIR%%/lua/autoexec.lua
199	%%LUA%%%%DATADIR%%/lua/class_definitions.lua	220	%%LUA%%%%DATADIR%%/lua/class_definitions.lua
200	%%DATADIR%%/mods/AutoGasStations/modinfo.json	221	%%DATADIR%%/mods/Animatronics/animatronics.json
		222	%%DATADIR%%/mods/Animatronics/bankrupt_pizzeria.json
		223	%%DATADIR%%/mods/Animatronics/dead_animatronics.json
		224	%%DATADIR%%/mods/Animatronics/modinfo.json
		225	%%DATADIR%%/mods/Animatronics/regional_map_settings.json
		226	%%DATADIR%%/mods/Animatronics/speech.json
201	%%DATADIR%%/mods/Boats/b_inflatable_boat_parts.json	227	%%DATADIR%%/mods/Boats/b_inflatable_boat_parts.json
202	%%DATADIR%%/mods/Boats/b_item_groups.json	228	%%DATADIR%%/mods/Boats/b_item_groups.json
203	%%DATADIR%%/mods/Boats/b_items.json	229	%%DATADIR%%/mods/Boats/b_items.json
Lines 227-244 Link Here
227	%%DATADIR%%/mods/Experimental_Z-Level/office_tower.json	253	%%DATADIR%%/mods/Experimental_Z-Level/office_tower.json
228	%%DATADIR%%/mods/Experimental_Z-Level/overmap_specials.json	254	%%DATADIR%%/mods/Experimental_Z-Level/overmap_specials.json
229	%%DATADIR%%/mods/Experimental_Z-Level/overmap_terrain.json	255	%%DATADIR%%/mods/Experimental_Z-Level/overmap_terrain.json
230	%%DATADIR%%/mods/Fast_Zombies/main.lua	256	%%LUA%%%%DATADIR%%/mods/Fast_Zombies/main.lua
231	%%DATADIR%%/mods/Fast_Zombies/modinfo.json	257	%%DATADIR%%/mods/Fast_Zombies/modinfo.json
232	%%DATADIR%%/mods/Medieval_pack/modinfo.json
233	%%DATADIR%%/mods/Mundane_Zombies/modinfo.json	258	%%DATADIR%%/mods/Mundane_Zombies/modinfo.json
234	%%DATADIR%%/mods/No_Energy_Weapons/modinfo.json	259	%%DATADIR%%/mods/No_Energy_Weapons/modinfo.json
235	%%DATADIR%%/mods/No_Flaming_Weapons/modinfo.json	260	%%DATADIR%%/mods/No_Flaming_Weapons/modinfo.json
		261	%%DATADIR%%/mods/No_Joke_Monsters/modinfo.json
236	%%DATADIR%%/mods/No_Medieval_Items/modinfo.json	262	%%DATADIR%%/mods/No_Medieval_Items/modinfo.json
237	%%DATADIR%%/mods/No_Mutagen/modinfo.json	263	%%DATADIR%%/mods/No_Mutagen/modinfo.json
238	%%DATADIR%%/mods/No_Old_guns/modinfo.json	264	%%DATADIR%%/mods/No_Old_guns/modinfo.json
239	%%DATADIR%%/mods/No_Powered_Armor/modinfo.json	265	%%DATADIR%%/mods/No_Powered_Armor/modinfo.json
240	%%DATADIR%%/mods/No_Religious_Books/modinfo.json	266	%%DATADIR%%/mods/No_Religious_Books/modinfo.json
241	%%DATADIR%%/mods/No_Reviving/main.lua	267	%%LUA%%%%DATADIR%%/mods/No_Reviving/main.lua
242	%%DATADIR%%/mods/No_Reviving/modinfo.json	268	%%DATADIR%%/mods/No_Reviving/modinfo.json
243	%%DATADIR%%/mods/No_Rivtech_Guns/modinfo.json	269	%%DATADIR%%/mods/No_Rivtech_Guns/modinfo.json
244	%%DATADIR%%/mods/No_Survivor_Armor/modinfo.json	270	%%DATADIR%%/mods/No_Survivor_Armor/modinfo.json
Lines 246-259 Link Here
246	%%DATADIR%%/mods/Only_Wildlife/modinfo.json	272	%%DATADIR%%/mods/Only_Wildlife/modinfo.json
247	%%DATADIR%%/mods/RL_Classes/classes.json	273	%%DATADIR%%/mods/RL_Classes/classes.json
248	%%DATADIR%%/mods/RL_Classes/modinfo.json	274	%%DATADIR%%/mods/RL_Classes/modinfo.json
249	%%DATADIR%%/mods/Remote_Control/modinfo.json	275	%%LUA%%%%DATADIR%%/mods/Slow_Zombies/main.lua
250	%%DATADIR%%/mods/Slow_Zombies/main.lua
251	%%DATADIR%%/mods/Slow_Zombies/modinfo.json	276	%%DATADIR%%/mods/Slow_Zombies/modinfo.json
		277	%%LUA%%%%DATADIR%%/mods/Zombie_Nightvision/main.lua
		278	%%DATADIR%%/mods/Zombie_Nightvision/modinfo.json
		279	%%DATADIR%%/mods/blazemod/blaze_ammo.json
		280	%%DATADIR%%/mods/blazemod/blaze_ammo_t.json
		281	%%DATADIR%%/mods/blazemod/blaze_other.json
		282	%%DATADIR%%/mods/blazemod/blaze_parts.json
		283	%%DATADIR%%/mods/blazemod/blaze_recipes.json
		284	%%DATADIR%%/mods/blazemod/blaze_weapons.json
		285	%%DATADIR%%/mods/blazemod/modinfo.json
252	%%DATADIR%%/mods/dev-default-mods.json	286	%%DATADIR%%/mods/dev-default-mods.json
253	%%DATADIR%%/mods/old_guns/modinfo.json	287	%%DATADIR%%/mods/necromancy/modinfo.json
		288	%%DATADIR%%/mods/necromancy/necronimicron.json
		289	%%DATADIR%%/mods/obsolete-mods.json
254	%%DATADIR%%/motd/de.motd	290	%%DATADIR%%/motd/de.motd
255	%%DATADIR%%/motd/en.motd	291	%%DATADIR%%/motd/en.motd
256	%%DATADIR%%/motd/es_AR.motd	292	%%DATADIR%%/motd/es_AR.motd
		293	%%DATADIR%%/motd/it_IT.motd
257	%%DATADIR%%/motd/ru.motd	294	%%DATADIR%%/motd/ru.motd
258	%%DATADIR%%/names/en.json	295	%%DATADIR%%/names/en.json
259	%%DATADIR%%/names/fr.json	296	%%DATADIR%%/names/fr.json
Lines 270-282 Link Here
270	%%SOUND%%%%DATADIR%%/sound/Dark_Days_Ahead_demo_2.ogg	307	%%SOUND%%%%DATADIR%%/sound/Dark_Days_Ahead_demo_2.ogg
271	%%SOUND%%%%DATADIR%%/sound/cataclysmthemeREV6.ogg	308	%%SOUND%%%%DATADIR%%/sound/cataclysmthemeREV6.ogg
272	%%SOUND%%%%DATADIR%%/sound/soundset.json	309	%%SOUND%%%%DATADIR%%/sound/soundset.json
273	%%PORTDOCS%%%%DOCSDIR%%/CMakeLists.txt	310	%%DATADIR%%/title/en.title
		311	%%DATADIR%%/title/ru.title
274	%%PORTDOCS%%%%DOCSDIR%%/CODE_STYLE.txt	312	%%PORTDOCS%%%%DOCSDIR%%/CODE_STYLE.txt
275	%%PORTDOCS%%%%DOCSDIR%%/COMPILER_SUPPORT.md	313	%%PORTDOCS%%%%DOCSDIR%%/COMPILER_SUPPORT.md
276	%%PORTDOCS%%%%DOCSDIR%%/COMPILING.md
277	%%PORTDOCS%%%%DOCSDIR%%/COMPILING_osx.md
278	%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
279	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPER_FAQ.md	314	%%PORTDOCS%%%%DOCSDIR%%/DEVELOPER_FAQ.md
		315	%%PORTDOCS%%%%DOCSDIR%%/EFFECTS_JSON.md
280	%%PORTDOCS%%%%DOCSDIR%%/ENUMS.md	316	%%PORTDOCS%%%%DOCSDIR%%/ENUMS.md
281	%%PORTDOCS%%%%DOCSDIR%%/GAMEMODES.md	317	%%PORTDOCS%%%%DOCSDIR%%/GAMEMODES.md
282	%%PORTDOCS%%%%DOCSDIR%%/GAME_BALANCE.txt	318	%%PORTDOCS%%%%DOCSDIR%%/GAME_BALANCE.txt
Lines 284-315 Link Here
284	%%PORTDOCS%%%%DOCSDIR%%/JSON_FLAGS.md	320	%%PORTDOCS%%%%DOCSDIR%%/JSON_FLAGS.md
285	%%PORTDOCS%%%%DOCSDIR%%/JSON_INFO.md	321	%%PORTDOCS%%%%DOCSDIR%%/JSON_INFO.md
286	%%PORTDOCS%%%%DOCSDIR%%/JSON_LOADING_ORDER.md	322	%%PORTDOCS%%%%DOCSDIR%%/JSON_LOADING_ORDER.md
287	%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
288	%%PORTDOCS%%%%DOCSDIR%%/LOADING_ORDER.md
289	%%PORTDOCS%%%%DOCSDIR%%/LUA_SUPPORT.md	323	%%PORTDOCS%%%%DOCSDIR%%/LUA_SUPPORT.md
290	%%PORTDOCS%%%%DOCSDIR%%/MAPGEN.md	324	%%PORTDOCS%%%%DOCSDIR%%/MAPGEN.md
291	%%PORTDOCS%%%%DOCSDIR%%/MODDING.txt	325	%%PORTDOCS%%%%DOCSDIR%%/MODDING.txt
292	%%PORTDOCS%%%%DOCSDIR%%/OLD_TODO.txt	326	%%PORTDOCS%%%%DOCSDIR%%/OLD_TODO.txt
293	%%PORTDOCS%%%%DOCSDIR%%/PLAYER_ACTIVITY.md	327	%%PORTDOCS%%%%DOCSDIR%%/PLAYER_ACTIVITY.md
294	%%PORTDOCS%%%%DOCSDIR%%/README.md	328	%%PORTDOCS%%%%DOCSDIR%%/RELEASE_CHECKLIST
295	%%PORTDOCS%%%%DOCSDIR%%/README.txt
296	%%PORTDOCS%%%%DOCSDIR%%/README_all_translators.txt
297	%%PORTDOCS%%%%DOCSDIR%%/TESTING.txt	329	%%PORTDOCS%%%%DOCSDIR%%/TESTING.txt
298	%%PORTDOCS%%%%DOCSDIR%%/TRANSLATING.md	330	%%PORTDOCS%%%%DOCSDIR%%/TRANSLATING.md
299	%%PORTDOCS%%%%DOCSDIR%%/changelog.txt	331	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/drinkable_milk/main.lua
300	%%PORTDOCS%%%%DOCSDIR%%/de.txt	332	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/drinkable_milk/modinfo.json
301	%%PORTDOCS%%%%DOCSDIR%%/doxygen_conf.txt	333	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/data.json
302	%%PORTDOCS%%%%DOCSDIR%%/freenode.txt	334	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/main.lua
303	%%PORTDOCS%%%%DOCSDIR%%/office_ascii_map.txt	335	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/elf_mod/modinfo.json
304	%%PORTDOCS%%%%DOCSDIR%%/sokoban.txt	336	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/modinfo.json
305	%%PORTDOCS%%%%DOCSDIR%%/tileset.txt	337	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/preload.lua
		338	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/lua_manhack_iuse/tools.json
		339	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/no_jam_spawn/main.lua
		340	%%PORTDOCS%%%%DOCSDIR%%/sample_mods/no_jam_spawn/modinfo.json
306	%%NLS%%share/locale/cs/LC_MESSAGES/cataclysm-dda.mo	341	%%NLS%%share/locale/cs/LC_MESSAGES/cataclysm-dda.mo
307	%%NLS%%share/locale/de/LC_MESSAGES/cataclysm-dda.mo	342	%%NLS%%share/locale/de/LC_MESSAGES/cataclysm-dda.mo
		343	%%NLS%%share/locale/el/LC_MESSAGES/cataclysm-dda.mo
308	%%NLS%%share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo	344	%%NLS%%share/locale/es_AR/LC_MESSAGES/cataclysm-dda.mo
309	%%NLS%%share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo	345	%%NLS%%share/locale/es_ES/LC_MESSAGES/cataclysm-dda.mo
310	%%NLS%%share/locale/fi/LC_MESSAGES/cataclysm-dda.mo	346	%%NLS%%share/locale/fi/LC_MESSAGES/cataclysm-dda.mo
311	%%NLS%%share/locale/fr/LC_MESSAGES/cataclysm-dda.mo	347	%%NLS%%share/locale/fr/LC_MESSAGES/cataclysm-dda.mo
312	%%NLS%%share/locale/it/LC_MESSAGES/cataclysm-dda.mo	348	%%NLS%%share/locale/it_IT/LC_MESSAGES/cataclysm-dda.mo
313	%%NLS%%share/locale/ja/LC_MESSAGES/cataclysm-dda.mo	349	%%NLS%%share/locale/ja/LC_MESSAGES/cataclysm-dda.mo
314	%%NLS%%share/locale/ko/LC_MESSAGES/cataclysm-dda.mo	350	%%NLS%%share/locale/ko/LC_MESSAGES/cataclysm-dda.mo
315	%%NLS%%share/locale/pl/LC_MESSAGES/cataclysm-dda.mo	351	%%NLS%%share/locale/pl/LC_MESSAGES/cataclysm-dda.mo

Return to bug 207988

Lines 2-13 Link Here

(-)games/cataclysm-dda/Makefile (-69 / +75 lines)
2	# $FreeBSD: head/games/cataclysm-dda/Makefile 408120 2016-02-05 00:04:44Z marino $	2	# $FreeBSD: head/games/cataclysm-dda/Makefile 408120 2016-02-05 00:04:44Z marino $
3		3
4	PORTNAME= cataclysm-dda	4	PORTNAME= cataclysm-dda
5	PORTVERSION= 0.B	5	PORTVERSION= 0.C
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= GH http://azmodean.polehammer.com/:sound	8	MASTER_SITES= http://polehammer.com/azmodean/:soundset
9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
11		9
12	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
13	COMMENT= Fork/variant of Cataclysm Roguelike by Whales	11	COMMENT= Fork/variant of Cataclysm Roguelike by Whales
Lines 17-107 Link Here
17	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
18	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
19		17
20	USES= alias compiler:c++11-lib execinfo gmake shebangfix ncurses
21	SHEBANG_FILES= lang/*.sh
22	bash_CMD= /bin/sh
23
24	USE_GITHUB= yes	18	USE_GITHUB= yes
25	GH_ACCOUNT= CleverRaven	19	GH_ACCOUNT= CleverRaven
26	GH_PROJECT= Cataclysm-DDA	20	GH_PROJECT= Cataclysm-DDA
27	MAKE_ARGS+= PREFIX=${PREFIX} RELEASE=1 USE_HOME_DIR=1
28	CXXFLAGS+= -I${LOCALBASE}/include
29	LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${LOCALBASE}/lib -lexecinfo
30		21
		22	USES= compiler:c++11-lib alias compiler execinfo gmake shebangfix
		23	SHEBANG_FILES= lang/*.sh
		24	bash_CMD= ${SH}
		25	MAKE_ARGS= CXX="${CXX}" LD="${CXX}" RELEASE=1
31		26
32	MAKE_JOBS_UNSAFE= yes	27	CPPFLAGS+= ${EXECINFO_CPPFLAGS}
		28	LDFLAGS+= ${EXECINFO_LDFLAGS} -lexecinfo
33		29
34	OPTIONS_DEFINE= NLS DOCS LUA SOUND	30	OPTIONS_DEFINE= DOCS LUA NLS SOUND
35	OPTIONS_DEFAULT=NLS DOCS NCURSES	31	OPTIONS_SINGLE= UI
36	OPTIONS_SINGLE= UI
37	OPTIONS_SINGLE_UI= NCURSES SDL	32	OPTIONS_SINGLE_UI= NCURSES SDL
		33	OPTIONS_DEFAULT= NCURSES
		34	OPTIONS_SUB= yes
38		35
39	UI_DESC= User Interface	36	LUA_USES= lua pkgconfig
40	SOUND_DESC= Sound support (SDL UI only)	37	LUA_MAKE_ARGS= LUA=1 LUA_BINARY="${LUA_CMD}"
		38	NCURSES_USES= ncurses
		39	NLS_USES= gettext
		40	NLS_MAKE_ARGS_OFF= LOCALIZE=0
		41	NLS_CPPFLAGS= -I${LOCALBASE}/include
		42	NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl
		43	SDL_RUN_DEPENDS= terminus-font>0:${PORTSDIR}/x11-fonts/terminus-font
		44	SDL_USES= pkgconfig
		45	SDL_USE= SDL=image2,ttf2
		46	SDL_MAKE_ARGS= TILES=1 TILESTARGET=cataclysm
		47	SDL_CPPFLAGS= $$(sdl2-config --cflags)
		48	SDL_LDFLAGS= $$(sdl2-config --libs)
		49	SDL_DESKTOP_ENTRIES= "Cataclysm-DDA" "" "" "cataclysm" "" ""
		50	SOUND_DESC= Sound support (SDL UI only)
		51	SOUND_DISTFILES= ${SOUNDSET_FILES:S/$/:soundset/}
		52	SOUND_EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
		53	SOUND_USE= SDL=mixer2
		54	SOUND_MAKE_ARGS= SOUND=1
		55	SOUND_IMPLIES= SDL
		56	UI_DESC= User inteface
41		57
42	OPTIONS_SUB= yes	58	SOUNDSET_FILES= cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
43	REINPLACE_ARGS= -i ''
44
45	NCURSES_USES= ncurses
46	SDL_USE= SDL=sdl2,ttf2,image2
47	SDL_USES= pkgconfig
48	SDL_MAKE_ARGS= TILES=1 TILESTARGET=cataclysm
49	SDL_FETCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-fonts/terminus-font:patch
50	SDL_BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
51	NLS_USES= gettext
52	NLS_LDFLAGS= -lintl
53	NLS_MAKE_ARGS= LOCALIZE=1
54	LUA_USES= lua:51 pkgconfig
55	LUA_MAKE_ARGS= LUA=1
56		59
57	.include <bsd.port.pre.mk>	60	.include <bsd.port.pre.mk>
58		61
59	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36	62	.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36
60	CXXFLAGS+= -Wno-inconsistent-missing-override	63	CXXFLAGS+= -Wno-inconsistent-missing-override
61	.endif	64	.endif
62		65
63	.if ${PORT_OPTIONS:MSOUND}	66	.if ${CHOSEN_COMPILER_TYPE} == gcc
64	.if ${PORT_OPTIONS:MSDL}	67	CPPFLAGS+= -DCATA_NO_CPP11_STRING_CONVERSIONS
65	MAKE_ARGS+= SOUND=1
66	USE_SDL+= mixer2
67	SOUND_FILES= cataclysmthemeREV6.ogg Dark_Days_Ahead_demo_2.ogg
68	DISTFILES+= ${SOUND_FILES:S\|$\|:sound\|}
69	.else
70	IGNORE= Sound is not supported with ncurses UI.
71	.endif
72	.endif	68	.endif
73		69
74	post-patch:	70	post-patch:
75	@${REINPLACE_CMD} -e '/^ CXX =/d ; /^ LD =/s/g++/$$(CXX)/ ; \	71	@${REINPLACE_CMD} -e \
76	/^ CXXFLAGS +=/s/-O[s0-3]//; /^ LOCALIZE *=/d ; \	72	'/CXXFLAGS/s\|-O[0-3s]\|\| ; \
77	s/\(-lncurses\)\(w*\)/\1\2 -ltinfo\2/ ; \	73	/LDFLAGS/s\|-s$$\|\| ; \
78	s/=$$(PREFIX)\//=$$(DESTDIR)$$(PREFIX)\// ; \	74	s\|$$(shell ncursesw5-config --cflags)\|\| ; \
79	/install/s/--mode=/-m / ; s/ -t\( $$(DATA_PREFIX)\)/\1/ ; \	75	s\|$$(shell ncursesw5-config --libs)\|-lncursesw -ltinfow\| ; \
80	/cp -R/s/--no-preserve=ownership// ; \	76	s\|\($$(CXX)\) \($$(DEFINES)\)\|\1 $$(CPPFLAGS) \2\| ; \
81	/^ LUA_BINARY =/s/lua/${LUA_CMD}/' ${WRKSRC}/Makefile	77	s\|\([[:blank:]]\)\($$(DATA_PREFIX)\)\|\1$$(DESTDIR)\2\| ; \
82	.if ! ${PORT_OPTIONS:MNLS}	78	s\|\([[:blank:]]\)\($$(BIN_PREFIX)\)\|\1$$(DESTDIR)\2\| ; \
83	@${REINPLACE_CMD} -e '/LOCALE_DIR/s/^/#/' ${WRKSRC}/Makefile	79	s\|--mode=\|-m \| ; \
84	.endif	80	s\|--no-preserve=ownership\|\| ; \
85	.if ${PORT_OPTIONS:MNCURSES} && ${NCURSESBASE} == /usr	81	s\|-t \|\| ; \
86	@${REINPLACE_CMD} -e 's/$$(shell ncursesw5-config --libs)/-lncursesw/ ; \	82	s\|\([[:blank:]]\)\($$(LOCALE_DIR)\)\|\1$$(DESTDIR)\2\| ; \
87	/$$(shell ncursesw5-config --cflags)/d' ${WRKSRC}/Makefile	83	s\|\(=\)\($$(LOCALE_DIR)\)\|\1$$(DESTDIR)\2\|' \
88	.endif	84	${WRKSRC}/Makefile
89	.if ${PORT_OPTIONS:MSDL}	85	@${REINPLACE_CMD} -e \
90	@${REINPLACE_CMD} -e '/"file":/s\|gfx\|${DATADIR}/&\|' \	86	's\|/usr/local/share/fonts\|${LOCALBASE}/share/fonts\|' \
91	${WRKSRC}/gfx/*/tile_config.json	87	${WRKSRC}/src/sdltiles.cpp
92	# replace bundled windows version of terminus font with X-compatible one	88
93	@${CAT} `cd ${PORTSDIR}/x11-fonts/terminus-font; make -V WRKSRC`/ter-u14n.bdf \	89	post-patch-NLS-off:
94	\| bdftopcf \| ${GZIP_CMD} > ${WRKSRC}/data/font/terminus.fon	90	@${REINPLACE_CMD} -e \
95	.endif	91	'/LOCALE_DIR/s\|^\|#\|' \
		92	${WRKSRC}/Makefile
96		93
97	post-install:	94	post-install:
98	.if ${PORT_OPTIONS:MSOUND}	95	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cataclysm
99	cd ${WRKSRC}/data && ${COPYTREE_SHARE} sound ${STAGEDIR}${DATADIR}	96	# replace bundled windows version of terminus font with X-compatible one
100	cd ${DISTDIR} && \	97	${RM} ${STAGEDIR}${DATADIR}/font/terminus.fon
101	${INSTALL_DATA} ${SOUND_FILES} ${STAGEDIR}${DATADIR}/sound	98	${LN} -sf ${PREFIX}/share/fonts/terminus/ter-u14n.pcf.gz \
102	.endif	99	${STAGEDIR}${DATADIR}/font/terminus.fon
		100
		101	post-install-DOCS-on:
103	@${MKDIR} ${STAGEDIR}${DOCSDIR}	102	@${MKDIR} ${STAGEDIR}${DOCSDIR}
104	${FIND} ${WRKSRC} \( -name ".md" -or -name ".txt" \) \	103	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
105	-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/ \;	104	${STAGEDIR}${DOCSDIR})
		105
		106	post-install-SOUND-on:
		107	@${MKDIR} ${STAGEDIR}${DATADIR}/sound
		108	cd ${WRKSRC}/data/sound && ${INSTALL_DATA} soundset.json \
		109	${STAGEDIR}${DATADIR}/sound
		110	cd ${DISTDIR} && ${INSTALL_DATA} ${SOUNDSET_FILES} \
		111	${STAGEDIR}${DATADIR}/sound
106		112
107	.include <bsd.port.post.mk>	113	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)games/cataclysm-dda/files/patch-src-cata_tiles.cpp (-3 / +12 lines)
1	--- src/cata_tiles.cpp.orig 2014-11-17 06:09:38.000000000 +0300	1	--- src/cata_tiles.cpp.orig 2015-03-09 05:25:34 UTC
2	+++ src/cata_tiles.cpp 2014-11-30 11:56:51.119502150 +0300	2	+++ src/cata_tiles.cpp
3	@@ -164,9 +164,6 @@ void cata_tiles::get_tile_information(st	3	@@ -167,9 +167,6 @@ void cata_tiles::get_tile_information(st
4	int cata_tiles::load_tileset(std::string path, int R, int G, int B)	4	int cata_tiles::load_tileset(std::string path, int R, int G, int B)
5	{	5	{
6	std::string img_path = path;	6	std::string img_path = path;
Lines 10-12 Link Here
10	/** reinit tile_atlas */	10	/** reinit tile_atlas */
11	SDL_Surface *tile_atlas = IMG_Load(img_path.c_str());	11	SDL_Surface *tile_atlas = IMG_Load(img_path.c_str());
12		12
		13	@@ -285,7 +282,7 @@ void cata_tiles::load_tilejson_from_file
		14	JsonArray tiles_new = config.get_array("tiles-new");
		15	while (tiles_new.has_more()) {
		16	JsonObject tile_part_def = tiles_new.next_object();
		17	- const std::string tileset_image_path = tile_part_def.get_string("file");
		18	+ const std::string tileset_image_path = FILENAMES["datadir"] + "/" + tile_part_def.get_string("file");
		19	int R = -1;
		20	int G = -1;
		21	int B = -1;

Lines 1-33 Link Here

(-)games/cataclysm-dda/files/patch-src-game.cpp (-31 / +18 lines)
1	--- src/game.cpp.orig 2014-11-17 06:09:38.000000000 +0300	1	--- src/game.cpp.orig 2015-03-09 05:25:34 UTC
2	+++ src/game.cpp 2014-11-23 14:15:08.005205207 +0300	2	+++ src/game.cpp
3	@@ -4535,15 +4535,17 @@ std::vector<std::string> game::list_acti	3	@@ -9545,7 +9545,7 @@ int game::list_items(const int iLastStat
4	void game::write_memorial_file(std::string sLastWords)	4	if (ground_items.empty() && iLastState == 1) {
5	{	5	reset_item_list_state(w_items_border, iInfoHeight, bRadiusSort);
		6	wrefresh(w_items_border);
		7	- mvwprintz(w_items, 10, 2, c_white, _("You dont see any items around you!"));
		8	+ mvwprintz(w_items, 10, 2, c_white, _("You don't see any items around you!"));
		9	} else {
		10	werase(w_items);
6		11
7	+ std::string memorialdir = FILENAMES["memorialdir"];	12	@@ -9808,7 +9808,7 @@ int game::list_monsters(const int iLastS
8	+
9	//Open the file first
10	- DIR *dir = opendir("memorial");
11	+ DIR *dir = opendir(memorialdir.c_str());
12	if (!dir) {
13	#if (defined _WIN32 \|\| defined __WIN32__)
14	- mkdir("memorial");
15	+ mkdir(memorialdir.c_str());
16	#else
17	- mkdir("memorial", 0777);
18	+ mkdir(memorialdir.c_str(), 0777);
19	#endif
20	- dir = opendir("memorial");
21	+ dir = opendir(memorialdir.c_str());
22	if (!dir) {
23	dbg(D_ERROR) << "game:write_memorial_file: Unable to make memorial directory.";
24	debugmsg("Could not make './memorial' directory");
25	@@ -4581,7 +4583,7 @@ void game::write_memorial_file(std::stri
26	}
27
28	//Omit the name if too many unusable characters stripped
29	- std::string memorial_file_path = string_format("memorial/%s%s.txt",
30	+ std::string memorial_file_path = string_format((memorialdir + "%s%s.txt").c_str(),
31	player_name.str().length() <= (u.name.length() / 5) ? "" : player_name.str().c_str(),
32	timestamp.c_str());
33		13
		14	if (vMonsters.empty()) {
		15	wrefresh(w_monsters_border);
		16	- mvwprintz(w_monsters, 10, 2, c_white, _("You dont see any monsters around you!"));
		17	+ mvwprintz(w_monsters, 10, 2, c_white, _("You don't see any monsters around you!"));
		18	} else {
		19	if( static_cast<size_t>( iActive ) >= vMonsters.size() ) {
		20	iActive = 0;

Line 0 Link Here

(-)games/cataclysm-dda/files/patch-src-options.cpp (+13 lines)
	1	--- src/options.cpp.orig 2015-03-09 05:25:34 UTC
	2	+++ src/options.cpp
	3	@@ -513,8 +513,8 @@ void initOptions()
	4	false
	5	);
	6
	7	- OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to reenable safemode"),
	8	- _("Number of turns after safemode is reenabled if no hostiles are in safemodeproximity distance."),
	9	+ OPTIONS["AUTOSAFEMODETURNS"] = cOpt("general", _("Turns to re-enable safemode"),
	10	+ _("Number of turns after safemode is re-enabled if no hostiles are in safemodeproximity distance."),
	11	1, 100, 50
	12	);
	13

Lines 1-19 Link Here

(-)games/cataclysm-dda/files/patch-src-sdltiles.cpp (-12 / +4 lines)
1	--- src/sdltiles.cpp.orig 2014-11-17 06:09:38.000000000 +0300	1	--- src/sdltiles.cpp.orig 2015-03-09 05:25:34 UTC
2	+++ src/sdltiles.cpp 2014-11-30 13:31:51.462125514 +0300	2	+++ src/sdltiles.cpp
3	@@ -1,4 +1,5 @@	3	@@ -1214,7 +1214,7 @@ static void save_font_list()
4	#if (defined TILES)
5	+#include <sys/param.h>
6	#include "catacurse.h"
7	#include "options.h"
8	#include "output.h"
9	@@ -1213,8 +1214,8 @@ static void save_font_list()
10	wordexp("~/Library/Fonts", &exp, 0);	4	wordexp("~/Library/Fonts", &exp, 0);
11	font_folder_list(fout, exp.we_wordv[0]);	5	font_folder_list(fout, exp.we_wordv[0]);
12	wordfree(&exp);*/	6	wordfree(&exp);*/
13	-#elif (defined linux \|\| defined __linux)	7	-#elif (defined linux \|\| defined __linux)
14	- font_folder_list(fout, "/usr/share/fonts");
15	+#elif (defined linux \|\| defined __linux \|\| defined __FreeBSD__)	8	+#elif (defined linux \|\| defined __linux \|\| defined __FreeBSD__)
16	+ font_folder_list(fout, "/usr/local/lib/X11/fonts");	9	font_folder_list(fout, "/usr/share/fonts");
17	font_folder_list(fout, "/usr/local/share/fonts");	10	font_folder_list(fout, "/usr/local/share/fonts");
18	wordexp_t exp;	11	wordexp_t exp;
19	wordexp("~/.fonts", &exp, 0);

Lines 1-13 Link Here

(-)games/cataclysm-dda/files/patch-src-translations.cpp (-10 / +3 lines)
1	--- src/translations.cpp.orig 2014-11-17 06:09:38.000000000 +0300	1	--- src/translations.cpp.orig 2015-03-09 05:25:34 UTC
2	+++ src/translations.cpp 2014-11-30 13:22:06.603147068 +0300	2	+++ src/translations.cpp
3	@@ -1,5 +1,6 @@	3	@@ -72,7 +72,7 @@ void set_language(bool reload_options)
4	#include "translations.h"
5
6	+#include <sys/param.h>
7	#include <string>
8	#ifdef LOCALIZE
9	#undef __STRICT_ANSI__ // _putenv in minGW need that
10	@@ -72,7 +73,7 @@ void set_language(bool reload_options)
11		4
12	// Step 2. Bind to gettext domain.	5	// Step 2. Bind to gettext domain.
13	const char *locale_dir;	6	const char *locale_dir;