Attachment #146197 for bug #192419




# $FreeBSD$

PORTNAME=	ufoai
PORTVERSION=	2.5
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source
DIST_SUBDIR=	${PORTNAME}

MAINTAINER=	m.tsatsenko@gmail.com
COMMENT=	Strategy game featuring tactical combat

LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \

		libjpeg.so:${PORTSDIR}/graphics/jpeg \
		libpng15.so:${PORTSDIR}/graphics/png \
		libcurl.so:${PORTSDIR}/ftp/curl \
		libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
		libtheora.so:${PORTSDIR}/multimedia/libtheora \
		libxvidcore.so:${PORTSDIR}/multimedia/xvid \
		libmxml.so:${PORTSDIR}/textproc/mxml
BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data

USE_GL=		yes
USE_SDL=	sdl image mixer ttf
USE_CXXSTD=	c++11
USES=		compiler:c++11-lang execinfo gettext gmake openal:soft pkgconfig \
		python:build tar:bzip2
HAS_CONFIGURE=	yes
CONFIGURE_ARGS+=	--enable-release --target-os=freebsd
CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lexecinfo
CFLAGS+=	-I${LOCALBASE}/include

UFO2MAP_DESC=		Install UFO tools
UFORADIANT_DESC=	Install UFO map editor

.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>

.if ${PORT_OPTIONS:MSERVER}
CONFIGURE_ARGS+=	--enable-ufoded
UFO_FILES+=	ufoded
PLIST_SUB+=	UFOSERVER=""

PLIST_SUB+=	UFOSERVER="@comment "
.endif

.if ${PORT_OPTIONS:MUFO2MAP}
CONFIGURE_ARGS+=	--enable-ufo2map
UFO_FILES+=	ufo2map
PLIST_SUB+=	UFO2MAP=""

PLIST_SUB+=	UFO2MAP="@comment "
.endif

.if ${PORT_OPTIONS:MUFORADIANT}
CONFIGURE_ARGS+=--enable-uforadiant
USE_GNOME+=	gtk20 glib20 gtksourceview2 libxml2
LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
RADIANT_FILES=	colours.xml game.xml input.xml mapdef.template menu.xml user.xml
RADIANT_DIRS=	bitmaps i18n prefabs sourceviewer
PLIST_SUB+=	UFORADIANT=""
.else

PLIST_SUB+=	UFORADIANT="@comment "
.endif

.if ${OSVERSION} < 1000024
FAVORITE_COMPILER=	gcc
.endif

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 900000
BROKEN=	Fails to build on 8.x
.endif

post-extract:
	@${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models
	${REINPLACE_CMD} \
		-e 's|DEFAULT_COMPILER_CC=cc|DEFAULT_COMPILER_CC=${CC}|' \
		-e 's|DEFAULT_COMPILER_CXX=c++|DEFAULT_COMPILER_CXX=${CXX}|' \
		${WRKSRC}/configure
.if ${CHOSEN_COMPILER_TYPE} == "clang"
	${REINPLACE_CMD} \
		-e 's|-falign-loops=2 -falign-jumps=2 -falign-functions=2||' \
		${WRKSRC}/build/modes/release.mk
.endif

# Resolve name collision with jpeg-8 and API png
post-patch:
	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
		-e 's|png_check_sig(PngFileBuffer.buffer, 8)|!png_sig_cmp(PngFileBuffer.buffer, 0, 8)|' \
		${WRKSRC}/src/client/renderer/r_image.c

post-build:
	@cd ${WRKSRC} && ${MAKE_CMD} lang
.if $(PORT_OPTIONS:MUFORADIANT)
	@cd ${WRKSRC} && ${MAKE_CMD} uforadiant
.endif

do-install:
	${MKDIR} ${STAGEDIR}${UFO_DIR}
.for FILE in ${UFO_FILES}
	@${SED} \
		-e 's|@UFODIR@|${UFO_DIR}|' \
		-e 's|@APP@|${FILE}|' \
		${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}
	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${UFO_DIR}
	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${STAGEDIR}${PREFIX}/bin
.endfor
	${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/base
	${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${STAGEDIR}${PREFIX}/${DATADIR}/base

.if ${PORT_OPTIONS:MUFORADIANT}
	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant
.	if defined(WITH_UFORADIANT)
	@${MKDIR} ${UFO_DIR}/radiant
	@${SED} \
		-e 's|@UFODIR@|${UFO_DIR}/radiant|' \
		-e 's|@APP@|uforadiant|' \
		${FILESDIR}/run.sh.in > ${WRKDIR}/uforadiant
	${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant ${STAGEDIR}${UFO_DIR}/radiant
	${INSTALL_SCRIPT} ${WRKDIR}/uforadiant ${STAGEDIR}${PREFIX}/bin

.for FILE in ${RADIANT_FILES}
	${INSTALL_DATA} ${WRKSRC}/radiant/${FILE} ${STAGEDIR}${UFO_DIR}/radiant
.endfor
				${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/radiant/${DIRE}/{}" \; && \
					${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${UFO_DIR}/radiant/${DIRE}/{}" \;
.		endfor
.	endif

.for DIRE in ${RADIANT_DIRS}
	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant/${DIRE}
	cd ${WRKSRC}/radiant/${DIRE} && \
		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \; && \
		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \;
.endfor
.endif

	cd ${WRKSRC}/base/i18n && \
		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; && \
			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \;
	${LN} -s ${PREFIX}/${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)games/ufoai/distinfo (-2 / +2 lines)
1	SHA256 (ufoai/ufoai-2.4-source.tar.bz2) = 254a61b770f141374d57e5c2589048be9298d0a920e914c6e72c2b98255bb94f	1	SHA256 (ufoai/ufoai-2.5-source.tar.bz2) = 0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f
2	SIZE (ufoai/ufoai-2.4-source.tar.bz2) = 16875353	2	SIZE (ufoai/ufoai-2.5-source.tar.bz2) = 24239539

Line 0 Link Here

(-)games/ufoai/files/patch-src__client__battlescape__cl_particle.cpp (+11 lines)
	1	--- ./src/client/battlescape/cl_particle.cpp.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/client/battlescape/cl_particle.cpp 2014-08-07 16:49:53.693302810 +0200
	3	@@ -138,7 +138,7 @@
	4	CASSERT(lengthof(pc_strings) == PC_NUM_PTLCMDS);
	5
	6	/** @brief particle commands parameter and types */
	7	-static const int pc_types[PC_NUM_PTLCMDS] = {
	8	+static const unsigned int pc_types[PC_NUM_PTLCMDS] = {
	9	0,
	10
	11	V_UNTYPED, V_UNTYPED, V_UNTYPED,




--- ./src/client/renderer/r_state.cpp.orig	2014-06-05 06:18:39.000000000 +0200
+++ ./src/client/renderer/r_state.cpp	2014-08-07 16:49:53.695310143 +0200
@@ -147,7 +147,8 @@
 
 void R_BindArray (GLenum target, GLenum type, const void* array)
 {
-	switch (target) {
+	const int v = static_cast<int>(target);
+	switch (v) {
 	case GL_VERTEX_ARRAY:
 		glVertexPointer(COMPONENTS_VERTEX_ARRAY3D, type, 0, array);
 		break;
@@ -180,7 +181,8 @@
  */
 void R_BindDefaultArray (GLenum target)
 {
-	switch (target) {
+	const int v = static_cast<int>(target);
+	switch (v) {
 	case GL_VERTEX_ARRAY:
 		R_BindArray(target, GL_FLOAT, r_state.vertex_array_3d);
 		break;

Line 0 Link Here

(-)games/ufoai/files/patch-src__game__g_ai.cpp (+11 lines)
	1	--- ./src/game/g_ai.cpp.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/game/g_ai.cpp 2014-08-07 16:49:53.698302816 +0200
	3	@@ -35,6 +35,8 @@
	4	#include "g_vis.h"
	5	#include "g_reaction.h"
	6
	7	+#include <cstdlib>
	8	+
	9	typedef struct aiAction_s {
	10	pos3_t to; /*< grid pos to walk to for performing the action /
	11	pos3_t stop; /*< grid pos to end turn at (e.g. hiding spots) /

Line 0 Link Here

(-)games/ufoai/files/patch-src__libs__vorbis__config.h (+11 lines)
	1	--- ./src/libs/vorbis/config.h.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/libs/vorbis/config.h 2014-08-07 16:49:53.700302995 +0200
	3	@@ -14,7 +14,7 @@
	4
	5	/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
	6	*/
	7	-#define HAVE_ALLOCA_H 1
	8	+/* #define HAVE_ALLOCA_H 1 */
	9
	10	/* Define to 1 if you have the <dlfcn.h> header file. */
	11	#define HAVE_DLFCN_H 1

Line 0 Link Here

(-)games/ufoai/files/patch-src__tools__radiant__radiant__exec.cpp (+11 lines)
	1	--- ./src/tools/radiant/radiant/exec.cpp.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/tools/radiant/radiant/exec.cpp 2014-08-07 16:49:53.703302732 +0200
	3	@@ -28,6 +28,8 @@
	4
	5	#if defined (__FreeBSD__) \|\| defined(__OpenBSD__)
	6	# include <signal.h>
	7	+# include <sys/types.h>
	8	+# include <sys/wait.h>
	9	#elif defined(__linux__)
	10	# include <sys/wait.h>
	11	#endif

Line 0 Link Here

(-)games/ufoai/files/patch-src__tools__radiant__radiant__ui__colourscheme__ColourScheme.h (+11 lines)
	1	--- ./src/tools/radiant/radiant/ui/colourscheme/ColourScheme.h.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/tools/radiant/radiant/ui/colourscheme/ColourScheme.h 2014-08-07 16:51:10.093299939 +0200
	3	@@ -52,8 +52,6 @@
	4	ColourItem _emptyColour;
	5
	6	public:
	7	- // Constructors
	8	- ColourScheme() {};
	9	// Constructs a ColourScheme from a given xml::node
	10	ColourScheme(xml::Node& schemeNode);
	11




--- ./src/tools/radiant/radiant/ui/colourscheme/ColourSchemeManager.cpp.orig	2014-06-05 06:18:39.000000000 +0200
+++ ./src/tools/radiant/radiant/ui/colourscheme/ColourSchemeManager.cpp	2014-08-07 16:55:49.627279079 +0200
@@ -5,13 +5,15 @@
 #include "stream/stringstream.h"
 #include "stream/textfilestream.h"
 
+#include <stdexcept>
+
 namespace ui {
 
 /*	returns true, if the scheme called <name> exists
  */
 bool ColourSchemeManager::schemeExists(const std::string& name) {
 	ColourSchemeMap::iterator it = _colourSchemes.find(name);
-	return (it != _colourSchemes.end());
+	return it != _colourSchemes.end();
 }
 
 ColourSchemeMap& ColourSchemeManager::getSchemeList() {
@@ -19,11 +21,15 @@
 }
 
 ColourScheme& ColourSchemeManager::getActiveScheme() {
-	return _colourSchemes[_activeScheme];
+	return getScheme(_activeScheme);
 }
 
 ColourScheme& ColourSchemeManager::getScheme(const std::string& name) {
-	return _colourSchemes[name];
+	ColourSchemeMap::iterator i = _colourSchemes.find(name);
+	if (i == _colourSchemes.end()) {
+		throw std::runtime_error("ColourSchemeManager: active scheme not found");
+	}
+	return i->second;
 }
 
 /*	Returns true, if the scheme called <name> is currently active
@@ -32,9 +38,7 @@
 	if (schemeExists(name)) {
 		return (name == _activeScheme);
 	}
-	else {
-		return false;
-	}
+	return false;
 }
 
 void ColourSchemeManager::setActive(const std::string& name) {
@@ -53,7 +57,7 @@
 		globalOutputStream() << "Dump: Schemename: " << it->first << "\n";
 
 		// Retrieve the list with all the ColourItems of this scheme
-		ColourItemMap& colourMap = _colourSchemes[it->first].getColourMap();
+		ColourItemMap& colourMap = getScheme(it->first).getColourMap();
 
 		//globalOutputStream() << "Dump: Number of ColourItems: " << colourMap.size();
 		globalOutputStream() << "\n";
@@ -95,7 +99,8 @@
 	xml::Node schemeNode = GlobalRegistry().createKeyWithName(basePath, "colourscheme", name);
 
 	// Set the readonly attribute if necessary
-	if (_colourSchemes[name].isReadOnly()) {
+	ColourScheme& scheme = getScheme(name);
+	if (scheme.isReadOnly()) {
 		schemeNode.setAttributeValue("readonly", "1");
 	}
 
@@ -108,7 +113,7 @@
 	std::string schemePath = basePath + "/colourscheme[@name='" + name + "']";
 
 	// Retrieve the list with all the ColourItems of this scheme
-	ColourItemMap& colourMap = _colourSchemes[name].getColourMap();
+	ColourItemMap& colourMap = scheme.getColourMap();
 
 	// Cycle through all the ColourItems and save them into the registry
 	for (ColourItemMap::iterator it = colourMap.begin(); it != colourMap.end(); ++it) {
@@ -157,7 +162,7 @@
 			// If the scheme is already in the list, skip it
 			if (!schemeExists(schemeName)) {
 				// Construct the ColourScheme class from the xml::node
-				_colourSchemes[schemeName] = ColourScheme(schemeNodes[i]);
+				_colourSchemes.insert(std::pair<std::string,ColourScheme>(schemeName, ColourScheme(schemeNodes[i])));
 
 				// Check, if this is the currently active scheme
 				if (schemeNodes[i].getAttributeValue("active") == "1") {
@@ -179,8 +184,11 @@
 void ColourSchemeManager::copyScheme(const std::string& fromName, const std::string& toName) {
 	if (schemeExists(fromName)) {
 		// Copy the actual entry
-		_colourSchemes[toName] = _colourSchemes[fromName];
-		_colourSchemes[toName].setReadOnly(false);
+		ColourScheme& copy = getScheme(fromName);
+		std::pair<ColourSchemeMap::iterator, bool> i = _colourSchemes.insert(std::pair<std::string,ColourScheme>(toName, copy));
+		if (i.second) {
+			i.first->second.setReadOnly(false);
+		}
 	}
 	else {
 		globalOutputStream() << "ColourSchemeManager: Scheme " << fromName << " does not exist!\n";
@@ -189,11 +197,11 @@
 
 Vector3 ColourSchemeManager::getColourVector3(const std::string& colourName) {
 	// Cast the ColourItem object onto a Vector3
-	return _colourSchemes[_activeScheme].getColour(colourName);
+	return getActiveScheme().getColour(colourName);
 }
 
 ColourItem& ColourSchemeManager::getColour(const std::string& colourName) {
-	return _colourSchemes[_activeScheme].getColour(colourName);
+	return getActiveScheme().getColour(colourName);
 }
 
 } // namespace ui

Lines 5-8 Link Here

(-)games/ufoai/pkg-descr (-1 / +1 lines)
5	research team study the aliens and their technologies in order to learn as much	5	research team study the aliens and their technologies in order to learn as much
6	as possible about their technology, their goals and the aliens themselves.	6	as possible about their technology, their goals and the aliens themselves.
7		7
8	WWW: http://ufoai.ninex.info/	8	WWW: http://ufoai.org/

Lines 111-116 Link Here

(-)games/ufoai/pkg-plist (+65 lines)
111	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/pathfinding.png	111	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/pathfinding.png
112	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/redo.png	112	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/redo.png
113	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/refresh_models.png	113	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/refresh_models.png
		114	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/rotation_pivot_origin.png
114	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mouseresize.png	115	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mouseresize.png
115	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mouserotate.png	116	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mouserotate.png
116	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mousescale.png	117	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/select_mousescale.png
Lines 142-151 Link Here
142	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/view_forcelight.png	143	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/view_forcelight.png
143	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/window_regular.png	144	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/window_regular.png
144	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/window_split.png	145	%%UFORADIANT%%lib/ufoai/radiant/bitmaps/window_split.png
		146	%%UFORADIANT%%lib/ufoai/radiant/colours.xml
		147	%%UFORADIANT%%lib/ufoai/radiant/game.xml
145	%%UFORADIANT%%lib/ufoai/radiant/i18n/de/LC_MESSAGES/uforadiant.mo	148	%%UFORADIANT%%lib/ufoai/radiant/i18n/de/LC_MESSAGES/uforadiant.mo
146	%%UFORADIANT%%lib/ufoai/radiant/i18n/en/LC_MESSAGES/uforadiant.mo	149	%%UFORADIANT%%lib/ufoai/radiant/i18n/en/LC_MESSAGES/uforadiant.mo
147	%%UFORADIANT%%lib/ufoai/radiant/i18n/ru/LC_MESSAGES/uforadiant.mo	150	%%UFORADIANT%%lib/ufoai/radiant/i18n/ru/LC_MESSAGES/uforadiant.mo
148	%%UFORADIANT%%lib/ufoai/radiant/i18n/zh_CN/LC_MESSAGES/uforadiant.mo	151	%%UFORADIANT%%lib/ufoai/radiant/i18n/zh_CN/LC_MESSAGES/uforadiant.mo
		152	%%UFORADIANT%%lib/ufoai/radiant/input.xml
		153	%%UFORADIANT%%lib/ufoai/radiant/mapdef.template
		154	%%UFORADIANT%%lib/ufoai/radiant/menu.xml
149	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/gas_tank_01.jpg	155	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/gas_tank_01.jpg
150	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/stand.map	156	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/stand.map
151	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/katana.jpg	157	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/katana.jpg
Lines 200-209 Link Here
200	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/puma.map	206	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/puma.map
201	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/trailer.jpg	207	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/trailer.jpg
202	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/trailer.map	208	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/trailer.map
		209	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/transport.jpg
		210	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/transport.map
203	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van.jpg	211	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van.jpg
204	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van.map	212	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van.map
205	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van3.jpg	213	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van3.jpg
206	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van3.map	214	%%UFORADIANT%%lib/ufoai/radiant/prefabs/cars/van3.map
		215	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/fountain01.jpg
		216	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/fountain01.map
207	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/street_corner.jpg	217	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/street_corner.jpg
208	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/sign01.jpg	218	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/sign01.jpg
209	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/powerline.map	219	%%UFORADIANT%%lib/ufoai/radiant/prefabs/city/powerline.map
Lines 252-257 Link Here
252	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.jpg	262	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.jpg
253	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.map	263	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.map
254	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.txt	264	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles.txt
		265	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_2.jpg
		266	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_2.map
255	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_pod.jpg	267	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_pod.jpg
256	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_pod.map	268	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_herakles_pod.map
257	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_raptor.jpg	269	%%UFORADIANT%%lib/ufoai/radiant/prefabs/dropships/drop_raptor.jpg
Lines 308-313 Link Here
308	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/kitchen/sink.map	320	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/kitchen/sink.map
309	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair.jpg	321	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair.jpg
310	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair.map	322	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair.map
		323	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair2_small.jpg
		324	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/armchair2_small.map
		325	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/bench2_small.jpg
		326	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/bench2_small.map
311	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch.jpg	327	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch.jpg
312	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch.map	328	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch.map
313	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch2.jpg	329	%%UFORADIANT%%lib/ufoai/radiant/prefabs/household/living_room/couch2.jpg
Lines 380-385 Link Here
380	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/crate_sqb_1.jpg	396	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/crate_sqb_1.jpg
381	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/barrel.map	397	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/barrel.map
382	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/crate_rec_1.map	398	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/crate_rec_1.map
		399	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/alien_battery1.jpg
		400	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/alien_battery1.map
		401	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/alien_seat1.jpg
		402	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/alien_seat1.map
		403	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/box001.jpg
		404	%%UFORADIANT%%lib/ufoai/radiant/prefabs/alien/box001.map
383	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/house1.map	405	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/house1.map
384	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/storage.jpg	406	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/storage.jpg
385	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/storage.mat	407	%%UFORADIANT%%lib/ufoai/radiant/prefabs/houses/storage.mat
Lines 407-412 Link Here
407	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator.map	429	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator.map
408	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator_big.jpg	430	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator_big.jpg
409	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator_big.map	431	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/generator_big.map
		432	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/minicrane.jpg
		433	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/minicrane.map
410	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/mixer.jpg	434	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/mixer.jpg
411	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/mixer.map	435	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/mixer.map
412	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/three_forklifts.jpg	436	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/three_forklifts.jpg
Lines 415-420 Link Here
415	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/workbench.map	439	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/workbench.map
416	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/cons_lights.map	440	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/cons_lights.map
417	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/workbench.jpg	441	%%UFORADIANT%%lib/ufoai/radiant/prefabs/machines/workbench.jpg
		442	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel.jpg
		443	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel.map
418	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel1.jpg	444	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel1.jpg
419	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel1.map	445	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel1.map
420	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel2.jpg	446	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/barrel2.jpg
Lines 459-464 Link Here
459	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton4.map	485	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton4.map
460	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton5.jpg	486	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton5.jpg
461	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton5.map	487	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/carton5.map
		488	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cartwheel.jpg
		489	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cartwheel.map
462	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cash_point.jpg	490	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cash_point.jpg
463	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cash_point.map	491	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cash_point.map
464	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cliff.jpg	492	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/cliff.jpg
Lines 471-476 Link Here
471	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2.map	499	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2.map
472	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2_open.jpg	500	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2_open.jpg
473	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2_open.map	501	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container2_open.map
		502	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container3.jpg
		503	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container3.map
		504	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container3_open.jpg
		505	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/container3_open.map
474	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate1.jpg	506	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate1.jpg
475	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate1.map	507	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate1.map
476	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate2.jpg	508	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/crate2.jpg
Lines 529-534 Link Here
529	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack2.map	561	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack2.map
530	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack_newspaper.jpg	562	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack_newspaper.jpg
531	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack_newspaper.map	563	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/rack_newspaper.map
		564	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/radar.jpg
		565	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/radar.map
532	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sawmill.jpg	566	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sawmill.jpg
533	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sawmill.map	567	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sawmill.map
534	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/seesaw.jpg	568	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/seesaw.jpg
Lines 595-600 Link Here
595	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sunshade.map	629	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/sunshade.map
596	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/swing.jpg	630	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/swing.jpg
597	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/swing.map	631	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/swing.map
		632	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/switchboard.jpg
		633	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/switchboard.map
598	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/tabletennistable.jpg	634	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/tabletennistable.jpg
599	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/tabletennistable.map	635	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/tabletennistable.map
600	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/telephone.jpg	636	%%UFORADIANT%%lib/ufoai/radiant/prefabs/misc/telephone.jpg
Lines 676-687 Link Here
676	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/truck_red.map	712	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/truck_red.map
677	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/water_truck.jpg	713	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/water_truck.jpg
678	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/water_truck.map	714	%%UFORADIANT%%lib/ufoai/radiant/prefabs/trucks/water_truck.map
		715	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_bomber.jpg
		716	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_bomber.map
		717	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_corrupter.jpg
		718	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_corrupter.map
		719	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_fighter.jpg
		720	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_fighter.map
		721	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_gunboat.jpg
		722	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_gunboat.map
		723	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_gunboat.mat
		724	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout.jpg
		725	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout.map
		726	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout/back_01.jpg
		727	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout/back_01.map
		728	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout/back_03.jpg
		729	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/crashed_scout/back_03.map
679	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_bomber.jpg	730	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_bomber.jpg
680	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_bomber.map	731	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_bomber.map
		732	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_bomber.mat
681	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_corrupter.jpg	733	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_corrupter.jpg
682	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_corrupter.map	734	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_corrupter.map
683	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_fighter.jpg	735	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_fighter.jpg
684	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_fighter.map	736	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_fighter.map
		737	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_gunboat.jpg
		738	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_gunboat.map
		739	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_gunboat.mat
685	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_harvester.jpg	740	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_harvester.jpg
686	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_harvester.map	741	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_harvester.map
687	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_scout.jpg	742	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_scout.jpg
Lines 688-693 Link Here
688	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_scout.map	743	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_scout.map
689	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply.jpg	744	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply.jpg
690	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply.map	745	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply.map
		746	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply_new.jpg
		747	%%UFORADIANT%%lib/ufoai/radiant/prefabs/ufos/ufo_supply_new.map
		748	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/fir2_medium.jpg
		749	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/fir2_medium.map
		750	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/palm_a.jpg
		751	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/palm_a.map
		752	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/pine.jpg
		753	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/pine.map
691	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/fern2.map	754	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/fern2.map
692	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/gumtree2.map	755	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/gumtree2.map
693	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/plant12.map	756	%%UFORADIANT%%lib/ufoai/radiant/prefabs/vegetation/plant12.map
Lines 777-782 Link Here
777	%%UFORADIANT%%lib/ufoai/radiant/sourceviewer/ufo.lang	840	%%UFORADIANT%%lib/ufoai/radiant/sourceviewer/ufo.lang
778	%%UFORADIANT%%lib/ufoai/radiant/sourceviewer/ump.lang	841	%%UFORADIANT%%lib/ufoai/radiant/sourceviewer/ump.lang
779	%%UFORADIANT%%lib/ufoai/radiant/uforadiant	842	%%UFORADIANT%%lib/ufoai/radiant/uforadiant
		843	%%UFORADIANT%%lib/ufoai/radiant/user.xml
780	@dirrm %%DATADIR%%/base/i18n/zh_CN/LC_MESSAGES	844	@dirrm %%DATADIR%%/base/i18n/zh_CN/LC_MESSAGES
781	@dirrm %%DATADIR%%/base/i18n/zh_CN	845	@dirrm %%DATADIR%%/base/i18n/zh_CN
782	@dirrm %%DATADIR%%/base/i18n/uk/LC_MESSAGES	846	@dirrm %%DATADIR%%/base/i18n/uk/LC_MESSAGES
Lines 864-869 Link Here
864	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/misc	928	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/misc
865	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/office	929	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/office
866	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/trucks	930	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/trucks
		931	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/ufos/crashed_scout
867	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/ufos	932	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs/ufos
868	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs	933	%%UFORADIANT%%@dirrm lib/ufoai/radiant/prefabs
869	%%UFORADIANT%%@dirrm lib/ufoai/radiant/sourceviewer	934	%%UFORADIANT%%@dirrm lib/ufoai/radiant/sourceviewer

Lines 2-8 Link Here

(-)games/ufoai-data/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= data	4	PORTNAME= data
5	PORTVERSION= 2.4	5	PORTVERSION= 2.5
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF/ufoai/UFO_AI%202.x/${PORTVERSION}	7	MASTER_SITES= SF/ufoai/UFO_AI%202.x/${PORTVERSION}
8	PKGNAMEPREFIX= ufoai-	8	PKGNAMEPREFIX= ufoai-
Lines 10-16 Link Here
10	EXTRACT_SUFX= .tar	10	EXTRACT_SUFX= .tar
11	DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}	11	DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}
12		12
13	MAINTAINER= acm@FreeBSD.org	13	MAINTAINER= m.tsatsenko@gmail.com
14	COMMENT= UFO alien invasion data files	14	COMMENT= UFO alien invasion data files
15		15
16	# See http://ufoai.org/wiki/License	16	# See http://ufoai.org/wiki/License

Lines 1-2 Link Here

(-)games/ufoai-data/distinfo (-2 / +2 lines)
1	SHA256 (ufoai/ufoai-2.4-data.tar) = 6bb322fc0362781d07439799de32c677884cef7c96fcf17dd87c62cc108030b7	1	SHA256 (ufoai/ufoai-2.5-data.tar) = 0d12041cba3aaaba1ce114650c36586d286dcce51c721844c06fdace06e307b8
2	SIZE (ufoai/ufoai-2.4-data.tar) = 937062400	2	SIZE (ufoai/ufoai-2.5-data.tar) = 1269913600

Return to bug 192419

Lines 2-15 Link Here

(-)games/ufoai/Makefile (-49 / +61 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ufoai	4	PORTNAME= ufoai
5	PORTVERSION= 2.4	5	PORTVERSION= 2.5
6	PORTREVISION= 3
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
9	DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source	8	DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source
10	DIST_SUBDIR= ${PORTNAME}	9	DIST_SUBDIR= ${PORTNAME}
11		10
12	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= m.tsatsenko@gmail.com
13	COMMENT= Strategy game featuring tactical combat	12	COMMENT= Strategy game featuring tactical combat
14		13
15	LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \	14	LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \
Lines 16-33 Link Here
16	libjpeg.so:${PORTSDIR}/graphics/jpeg \	15	libjpeg.so:${PORTSDIR}/graphics/jpeg \
17	libpng15.so:${PORTSDIR}/graphics/png \	16	libpng15.so:${PORTSDIR}/graphics/png \
18	libcurl.so:${PORTSDIR}/ftp/curl \	17	libcurl.so:${PORTSDIR}/ftp/curl \
19	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
20	libtheora.so:${PORTSDIR}/multimedia/libtheora \	18	libtheora.so:${PORTSDIR}/multimedia/libtheora \
21	libxvidcore.so:${PORTSDIR}/multimedia/xvid \	19	libxvidcore.so:${PORTSDIR}/multimedia/xvid \
22	libmxml.so:${PORTSDIR}/textproc/mxml	20	libmxml.so:${PORTSDIR}/textproc/mxml
23	BUILD_DEPENDS= ${LOCALBASE}/include/mxml.h:${PORTSDIR}/textproc/mxml	21	BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
24	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data	22	RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data
25		23
26	USE_GL= yes	24	USE_GL= yes
27	USE_SDL= sdl image mixer ttf	25	USE_SDL= sdl image mixer ttf
28	USES= gettext gmake openal:soft pkgconfig tar:bzip2	26	USE_CXXSTD= c++11
		27	USES= compiler:c++11-lang execinfo gettext gmake openal:soft pkgconfig \
		28	python:build tar:bzip2
29	HAS_CONFIGURE= yes	29	HAS_CONFIGURE= yes
30	CONFIGURE_ARGS+= --enable-release	30	CONFIGURE_ARGS+= --enable-release --target-os=freebsd
31	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	31	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
32	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lexecinfo	32	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lexecinfo
33	CFLAGS+= -I${LOCALBASE}/include	33	CFLAGS+= -I${LOCALBASE}/include
Lines 45-54 Link Here
45	UFO2MAP_DESC= Install UFO tools	45	UFO2MAP_DESC= Install UFO tools
46	UFORADIANT_DESC= Install UFO map editor	46	UFORADIANT_DESC= Install UFO map editor
47		47
48	NO_STAGE= yes	48	.include <bsd.port.options.mk>
49	.include <bsd.port.pre.mk>
50		49
51	.if $(PORT_OPTIONS:MSERVER)	50	.if ${PORT_OPTIONS:MSERVER}
52	CONFIGURE_ARGS+= --enable-ufoded	51	CONFIGURE_ARGS+= --enable-ufoded
53	UFO_FILES+= ufoded	52	UFO_FILES+= ufoded
54	PLIST_SUB+= UFOSERVER=""	53	PLIST_SUB+= UFOSERVER=""
Lines 57-63 Link Here
57	PLIST_SUB+= UFOSERVER="@comment "	56	PLIST_SUB+= UFOSERVER="@comment "
58	.endif	57	.endif
59		58
60	.if $(PORT_OPTIONS:MUFO2MAP)	59	.if ${PORT_OPTIONS:MUFO2MAP}
61	CONFIGURE_ARGS+= --enable-ufo2map	60	CONFIGURE_ARGS+= --enable-ufo2map
62	UFO_FILES+= ufo2map	61	UFO_FILES+= ufo2map
63	PLIST_SUB+= UFO2MAP=""	62	PLIST_SUB+= UFO2MAP=""
Lines 66-76 Link Here
66	PLIST_SUB+= UFO2MAP="@comment "	65	PLIST_SUB+= UFO2MAP="@comment "
67	.endif	66	.endif
68		67
69	.if $(PORT_OPTIONS:MUFORADIANT)	68	.if ${PORT_OPTIONS:MUFORADIANT}
70	CONFIGURE_ARGS+=--enable-uforadiant	69	CONFIGURE_ARGS+=--enable-uforadiant
71	USE_GNOME+= gtk20 glib20 gtksourceview2 libxml2	70	USE_GNOME+= gtk20 glib20 gtksourceview2 libxml2
72	LIB_DEPENDS+= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext	71	LIB_DEPENDS+= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
73	RADIANT_FILE= uforadiant	72	RADIANT_FILES= colours.xml game.xml input.xml mapdef.template menu.xml user.xml
74	RADIANT_DIRS= bitmaps i18n prefabs sourceviewer	73	RADIANT_DIRS= bitmaps i18n prefabs sourceviewer
75	PLIST_SUB+= UFORADIANT=""	74	PLIST_SUB+= UFORADIANT=""
76	.else	75	.else
Lines 78-135 Link Here
78	PLIST_SUB+= UFORADIANT="@comment "	77	PLIST_SUB+= UFORADIANT="@comment "
79	.endif	78	.endif
80		79
		80	.if ${OSVERSION} < 1000024
		81	FAVORITE_COMPILER= gcc
		82	.endif
		83
		84	.include <bsd.port.pre.mk>
		85
		86	.if ${OSVERSION} < 900000
		87	BROKEN= Fails to build on 8.x
		88	.endif
		89
81	post-extract:	90	post-extract:
82	@${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models	91	@${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models
		92	${REINPLACE_CMD} \
		93	-e 's\|DEFAULT_COMPILER_CC=cc\|DEFAULT_COMPILER_CC=${CC}\|' \
		94	-e 's\|DEFAULT_COMPILER_CXX=c++\|DEFAULT_COMPILER_CXX=${CXX}\|' \
		95	${WRKSRC}/configure
		96	.if ${CHOSEN_COMPILER_TYPE} == "clang"
		97	${REINPLACE_CMD} \
		98	-e 's\|-falign-loops=2 -falign-jumps=2 -falign-functions=2\|\|' \
		99	${WRKSRC}/build/modes/release.mk
		100	.endif
83		101
84	# Resolve name collision with jpeg-8 and API png
85	post-patch:
86	${REINPLACE_CMD} -e 's\|jpeg_mem_src\|local_jpeg_mem_src\|' \
87	-e 's\|png_set_gray_1_2_4_to_8\|png_set_expand_gray_1_2_4_to_8\|' \
88	-e 's\|png_check_sig(PngFileBuffer.buffer, 8)\|!png_sig_cmp(PngFileBuffer.buffer, 0, 8)\|' \
89	${WRKSRC}/src/client/renderer/r_image.c
90
91	post-build:	102	post-build:
92	@cd ${WRKSRC} && ${MAKE_CMD} lang	103	@cd ${WRKSRC} && ${MAKE_CMD} lang
93	. if defined(WITH_UFORADIANT)	104	.if $(PORT_OPTIONS:MUFORADIANT)
94	@cd ${WRKSRC} && ${MAKE_CMD} uforadiant	105	@cd ${WRKSRC} && ${MAKE_CMD} uforadiant
95	. endif	106	.endif
96		107
97	do-install:	108	do-install:
98	@${MKDIR} ${UFO_DIR}	109	${MKDIR} ${STAGEDIR}${UFO_DIR}
99	. for FILE in ${UFO_FILES}	110	.for FILE in ${UFO_FILES}
100	@${SED} \	111	@${SED} \
101	-e 's\|@UFODIR@\|${UFO_DIR}\|' \	112	-e 's\|@UFODIR@\|${UFO_DIR}\|' \
102	-e 's\|@APP@\|${FILE}\|' \	113	-e 's\|@APP@\|${FILE}\|' \
103	${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}	114	${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}
104	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR}	115	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${UFO_DIR}
105	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin	116	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${STAGEDIR}${PREFIX}/bin
106	. endfor	117	.endfor
		118	${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/base
		119	${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${STAGEDIR}${PREFIX}/${DATADIR}/base
107		120
108	${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${PREFIX}/${DATADIR}/base	121	.if ${PORT_OPTIONS:MUFORADIANT}
109		122	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant
110	. if defined(WITH_UFORADIANT)
111	@${MKDIR} ${UFO_DIR}/radiant
112	@${SED} \	123	@${SED} \
113	-e 's\|@UFODIR@\|${UFO_DIR}/radiant\|' \	124	-e 's\|@UFODIR@\|${UFO_DIR}/radiant\|' \
114	-e 's\|@APP@\|${RADIANT_FILE}\|' \	125	-e 's\|@APP@\|uforadiant\|' \
115	${FILESDIR}/run.sh.in > ${WRKDIR}/${RADIANT_FILE}	126	${FILESDIR}/run.sh.in > ${WRKDIR}/uforadiant
116	${INSTALL_PROGRAM} ${WRKSRC}/radiant/${RADIANT_FILE} ${UFO_DIR}/radiant	127	${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant ${STAGEDIR}${UFO_DIR}/radiant
117	${INSTALL_SCRIPT} ${WRKDIR}/${RADIANT_FILE} ${PREFIX}/bin	128	${INSTALL_SCRIPT} ${WRKDIR}/uforadiant ${STAGEDIR}${PREFIX}/bin
118		129
119	. for DIRE in ${RADIANT_DIRS}	130	.for FILE in ${RADIANT_FILES}
120	@${MKDIR} ${UFO_DIR}/radiant/${DIRE}	131	${INSTALL_DATA} ${WRKSRC}/radiant/${FILE} ${STAGEDIR}${UFO_DIR}/radiant
121	@cd ${WRKSRC}/radiant/${DIRE} && \	132	.endfor
122	${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/radiant/${DIRE}/{}" \; && \
123	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${UFO_DIR}/radiant/${DIRE}/{}" \;
124	. endfor
125	. endif
126		133
127	@cd ${WRKSRC}/base/i18n && \	134	.for DIRE in ${RADIANT_DIRS}
128	${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/base/i18n/{}" \; && \	135	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant/${DIRE}
129	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/base/i18n/{}" \;	136	cd ${WRKSRC}/radiant/${DIRE} && \
130	${LN} -s ${PREFIX}/${DATADIR}/base ${UFO_DIR}/base	137	${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \; && \
		138	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \;
		139	.endfor
		140	.endif
131		141
132	post-install:	142	cd ${WRKSRC}/base/i18n && \
133	@${CAT} ${PKGMESSAGE}	143	${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; && \
		144	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \;
		145	${LN} -s ${PREFIX}/${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base
134		146
135	.include <bsd.port.post.mk>	147	.include <bsd.port.post.mk>

Line 0 Link Here

(-)games/ufoai/files/patch-src__client__renderer__r_state.cpp (+22 lines)
	1	--- ./src/client/renderer/r_state.cpp.orig 2014-06-05 06:18:39.000000000 +0200
	2	+++ ./src/client/renderer/r_state.cpp 2014-08-07 16:49:53.695310143 +0200
	3	@@ -147,7 +147,8 @@
	4
	5	void R_BindArray (GLenum target, GLenum type, const void* array)
	6	{
	7	- switch (target) {
	8	+ const int v = static_cast<int>(target);
	9	+ switch (v) {
	10	case GL_VERTEX_ARRAY:
	11	glVertexPointer(COMPONENTS_VERTEX_ARRAY3D, type, 0, array);
	12	break;
	13	@@ -180,7 +181,8 @@
	14	*/
	15	void R_BindDefaultArray (GLenum target)
	16	{
	17	- switch (target) {
	18	+ const int v = static_cast<int>(target);
	19	+ switch (v) {
	20	case GL_VERTEX_ARRAY:
	21	R_BindArray(target, GL_FLOAT, r_state.vertex_array_3d);
	22	break;