Attachment #148819 for bug #194711

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




# $FreeBSD$

PORTNAME=	pingus
PORTVERSION=	0.7.6
PORTREVISION=	13
CATEGORIES=	games
MASTER_SITES=	GOOGLE_CODE \
		http://mirror.amdmi3.ru/distfiles/

MAINTAINER=	acm@FreeBSD.org
COMMENT=	Free Lemmings-like game

LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
		libboost_signals.so:${PORTSDIR}/devel/boost-libs
		libphysfs.so:${PORTSDIR}/devel/physfs

USES=		compiler:c++11-lib iconv scons tar:bzip2
USE_GL=		gl
		with_linuxevdev=0
USE_SDL=	sdl image mixer
LIBS+=		${ICONV_LIB}
MAKE_ARGS+=	LIBS="${LIBS}"

PLIST_FILES=	bin/${PORTNAME} \
		share/pixmaps/${PORTNAME}.png
PORTDATA=	*

DESKTOP_ENTRIES="Pingus" \
		"" \
		"${PORTNAME}" \
		"${PORTNAME}" \
		"Game;LogicGame;" \
		false

post-patch:
	@${REINPLACE_CMD} -e '/g_path_manager.set_path("data")/ s|data|${DATADIR}|g' \
		${WRKSRC}/src/pingus/pingus_main.cpp
	@${REINPLACE_CMD} -e '/CheckLib.*iconv/ d' ${WRKSRC}/SConscript

pre-install:
	@${RM} -f ${PLIST}
	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
	@cd ${WRKSRC}/data && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}

do-install:
	@${MKDIR} ${STAGEDIR}${DATADIR}
	@cd ${WRKSRC}/data && \
		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/data/images/icons/pingus-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pingus-0.7.2.tar.bz2) = 8d24fbab29ca9401ae1a6a34f7a52eda5de0a9320940e771c6f04f991f5d0052	1	SHA256 (pingus-0.7.6.tar.bz2) = 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460
2	SIZE (pingus-0.7.2.tar.bz2) = 11055748	2	SIZE (pingus-0.7.6.tar.bz2) = 12622268




Properly split multiple arguments passed via CXXFLAGS
--- SConscript.orig	2014-10-17 23:53:30.000000000 +0400
+++ SConscript	2014-10-17 23:53:48.000000000 +0400
@@ -119,6 +119,9 @@
             'CheckSDLLib': CheckSDLLib,
             'CheckIconv': CheckIconv,
             })
+
+        self.env["CXXFLAGS"] = sum(map (lambda x: x.split(" "), self.env["CXXFLAGS"]), [])
+
         self.fatal_error = ""
         self.reports = ""
 




--- SConstruct	2007-12-21 22:00:22.000000000 -0500
+++ SConstruct	2007-12-21 22:03:19.000000000 -0500
@@ -409,7 +409,7 @@
    not (os.path.exists('config.py') and os.path.exists('config.h')) and \
    not GetOption('clean'):
     opts = DefineOptions(None, ARGUMENTS)
-    env = Environment(options = opts)
+    env = Environment(ENV = os.environ, options = opts)
     Help(opts.GenerateHelpText(env))
 
     opts.Update(env)
@@ -422,7 +422,8 @@
     if os.environ.has_key('PKG_CONFIG_PATH'):
         env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
     
-    env['CPPPATH'] += ['.', 'src/']
+    env['CPPPATH'] = Split(env['CPPPATH'])
+    env['LIBPATH'] = Split(env['LIBPATH'])
 
     config_h_defines = []      
 
@@ -510,7 +511,6 @@
 
     config_h = open('config.h', 'w')
     config_h.write('#define VERSION "0.7.2"\n')
-    config_h.write('#define ENABLE_BINRELOC 1\n')
     config_h.write('#define ICONV_CONST %s\n' % iconv_const)
     for (v,k) in config_h_defines:
         config_h.write('#define %s %s\n' % (v, k))

Lines 1-11 Link Here

(-)files/patch-src-editor-editor__screen.hpp (-11 lines)
1	--- src/editor/editor_screen.hpp.orig 2007-09-30 20:07:08.000000000 +0400
2	+++ src/editor/editor_screen.hpp 2013-08-23 23:08:40.689231327 +0400
3	@@ -27,7 +27,7 @@
4
5	class DrawingContext;
6	class FileDialog;
7	-class GUI::GUIManager;
8	+namespace GUI { class GUIManager; }
9	class Pathname;
10
11	namespace Editor {

Lines 1-11 Link Here

(-)files/patch-src-screenshot.cpp (-11 lines)
1	--- src/screenshot.cpp.orig 2007-09-30 18:07:08.000000000 +0200
2	+++ src/screenshot.cpp 2012-04-29 06:49:26.000000000 +0200
3	@@ -159,7 +159,7 @@
4	return;
5	}
6
7	- if (setjmp(png_ptr->jmpbuf))
8	+ if (setjmp(png_jmpbuf(png_ptr)))
9	{
10	// If we get here, we had a problem reading the file
11	fclose(fp);

Lines 1-11 Link Here

(-)files/patch-src-tinygettext_iconv.cpp (-11 lines)
1	--- src/tinygettext/iconv.cpp 2007-10-05 11:17:23.000000000 -0500
2	+++ src/tinygettext/iconv.cpp 2007-10-05 11:17:35.000000000 -0500
3	@@ -78,7 +78,7 @@
4	size_t in_size = text.size();
5	size_t out_size = 4*in_size; // Worst case scenario: ASCII -> UTF-32?
6	std::string result(out_size, ' ');
7	- ICONV_CONST char* in_str = &text[0];
8	+ const char* in_str = &text[0];
9	char* out_str = &result[0];
10
11	// Try to convert the text.

Line 0 Link Here

(-)files/patch-src__pingus__pingus_main.cpp (+11 lines)
	1	--- src/pingus/pingus_main.cpp.orig 2011-12-25 01:46:47.000000000 +0400
	2	+++ src/pingus/pingus_main.cpp 2014-10-17 23:57:58.000000000 +0400
	3	@@ -465,7 +465,7 @@
	4	void
	5	PingusMain::print_greeting_message()
	6	{
	7	- std::string greeting = "Welcome to Pingus "VERSION;
	8	+ std::string greeting = "Welcome to Pingus " VERSION;
	9	greeting += "!";
	10	std::cout << greeting << std::endl;
	11	for (unsigned int i = 0; i < greeting.length(); ++i)

Line 0 Link Here

(-)files/patch-src__pingus__screens__pingus_menu.cpp (+11 lines)
	1	--- src/pingus/screens/pingus_menu.cpp.orig 2011-12-25 01:46:47.000000000 +0400
	2	+++ src/pingus/screens/pingus_menu.cpp 2014-10-17 23:58:35.000000000 +0400
	3	@@ -153,7 +153,7 @@
	4	gc.get_height()/2 - 280));
	5
	6	gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
	7	- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
	8	+ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
	9	"See the file AUTHORS for a complete list of contributors.\n"
	10	"Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
	11	"welcome to redistribute it under certain conditions; see the file COPYING for details.\n");

Line 0 Link Here

(-)files/patch-src__util__file_reader.hpp (+10 lines)
	1	--- src/util/file_reader.hpp.orig 2011-12-25 01:46:47.000000000 +0400
	2	+++ src/util/file_reader.hpp 2014-10-17 23:56:43.000000000 +0400
	3	@@ -19,6 +19,7 @@
	4
	5	#include <memory>
	6	#include <vector>
	7	+#include <string>
	8
	9	class Size;
	10	class Color;

Return to bug 194711

Lines 2-48 Link Here

(-)Makefile (-26 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pingus	4	PORTNAME= pingus
5	PORTVERSION= 0.7.2	5	PORTVERSION= 0.7.6
6	PORTREVISION= 13
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= http://pingus.seul.org/files/	7	MASTER_SITES= GOOGLE_CODE \
		8	http://mirror.amdmi3.ru/distfiles/
9		9
10	MAINTAINER= acm@FreeBSD.org	10	MAINTAINER= acm@FreeBSD.org
11	COMMENT= Free Lemmings-like game	11	COMMENT= Free Lemmings-like game
12		12
13	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \	13	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
14	libboost_regex.so:${PORTSDIR}/devel/boost-libs \	14	libboost_signals.so:${PORTSDIR}/devel/boost-libs
15	libphysfs.so:${PORTSDIR}/devel/physfs
16		15
17	USES= iconv scons tar:bzip2	16	USES= compiler:c++11-lib iconv scons tar:bzip2
18	MAKE_ARGS= with_linuxusbmouse=0 \	17	USE_GL= gl
19	with_linuxevdev=0
20	USE_SDL= sdl image mixer	18	USE_SDL= sdl image mixer
		19	LIBS+= ${ICONV_LIB}
		20	MAKE_ARGS+= LIBS="${LIBS}"
21		21
22	DESKTOP_ENTRIES="Pingus" "${COMMENT}" \	22	PLIST_FILES= bin/${PORTNAME} \
23	"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \	23	share/pixmaps/${PORTNAME}.png
24	"pingus" "" "false"	24	PORTDATA= *
25		25
26	PLIST= ${WRKDIR}/pkg-plist	26	DESKTOP_ENTRIES="Pingus" \
		27	"" \
		28	"${PORTNAME}" \
		29	"${PORTNAME}" \
		30	"Game;LogicGame;" \
		31	false
27		32
28	post-patch:	33	post-patch:
29	@${REINPLACE_CMD} -e 's\|add_path("data")\|add_path("${DATADIR}")\|g' \	34	@${REINPLACE_CMD} -e '/g_path_manager.set_path("data")/ s\|data\|${DATADIR}\|g' \
30	${WRKSRC}/src/pingus_main.cpp	35	${WRKSRC}/src/pingus/pingus_main.cpp
		36	@${REINPLACE_CMD} -e '/CheckLib.*iconv/ d' ${WRKSRC}/SConscript
31		37
32	pre-install:
33	@${RM} -f ${PLIST}
34	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
35	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
36	@cd ${WRKSRC}/data && \
37	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/\|' >> ${PLIST} && \
38	${FIND} * -type d \| ${SORT} -r \| ${SED} -e 's\|^\|@dirrm %%DATADIR%%/\|' >> ${PLIST}
39	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
40
41	do-install:	38	do-install:
42	@${MKDIR} ${STAGEDIR}${DATADIR}
43	@cd ${WRKSRC}/data && \	39	@cd ${WRKSRC}/data && \
44	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}	40	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
45	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	41	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
46	${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico	42	${INSTALL_DATA} ${WRKSRC}/data/images/icons/pingus-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
47		43
48	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-SConscript (+13 lines)
	1	Properly split multiple arguments passed via CXXFLAGS
	2	--- SConscript.orig 2014-10-17 23:53:30.000000000 +0400
	3	+++ SConscript 2014-10-17 23:53:48.000000000 +0400
	4	@@ -119,6 +119,9 @@
	5	'CheckSDLLib': CheckSDLLib,
	6	'CheckIconv': CheckIconv,
	7	})
	8	+
	9	+ self.env["CXXFLAGS"] = sum(map (lambda x: x.split(" "), self.env["CXXFLAGS"]), [])
	10	+
	11	self.fatal_error = ""
	12	self.reports = ""
	13

Lines 1-29 Link Here

(-)files/patch-SConstruct (-29 lines)
1	--- SConstruct 2007-12-21 22:00:22.000000000 -0500
2	+++ SConstruct 2007-12-21 22:03:19.000000000 -0500
3	@@ -409,7 +409,7 @@
4	not (os.path.exists('config.py') and os.path.exists('config.h')) and \
5	not GetOption('clean'):
6	opts = DefineOptions(None, ARGUMENTS)
7	- env = Environment(options = opts)
8	+ env = Environment(ENV = os.environ, options = opts)
9	Help(opts.GenerateHelpText(env))
10
11	opts.Update(env)
12	@@ -422,7 +422,8 @@
13	if os.environ.has_key('PKG_CONFIG_PATH'):
14	env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
15
16	- env['CPPPATH'] += ['.', 'src/']
17	+ env['CPPPATH'] = Split(env['CPPPATH'])
18	+ env['LIBPATH'] = Split(env['LIBPATH'])
19
20	config_h_defines = []
21
22	@@ -510,7 +511,6 @@
23
24	config_h = open('config.h', 'w')
25	config_h.write('#define VERSION "0.7.2"\n')
26	- config_h.write('#define ENABLE_BINRELOC 1\n')
27	config_h.write('#define ICONV_CONST %s\n' % iconv_const)
28	for (v,k) in config_h_defines:
29	config_h.write('#define %s %s\n' % (v, k))