Attachment #148282 for bug #194341




# $FreeBSD$

PORTNAME=	pingus
PORTVERSION=	0.7.6
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	http://pingus.seul.org/files/ \
		${MASTER_SITE_GOOGLE_CODE}

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

LICENSE=	GPLv3

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

USES=		iconv scons tar:bzip2 compiler:features
MAKE_ARGS=	with_linuxusbmouse=0 \
		with_linuxevdev=0
USE_SDL=	sdl image mixer


DESKTOP_ENTRIES="Pingus" "${COMMENT}" \
		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
		"pingus" "" false

PLIST=		${WRKDIR}/pkg-plist

.include <bsd.port.pre.mk>

.if !${COMPILER_FEATURES:Mc++0x}
IGNORE_MSG=	pingus needs a compiler supporting c++0x. Try gcc 4.6 \
		or clang 3.2 (or greater) and specify CC and CXX in /etc/make.conf
IGNORE=	${IGNORE_MSG}
.endif

post-patch:
	${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/SConscript
	${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConscript
	${REINPLACE_CMD} -r 's|(CPPPATH.*)\[\]|\1\["${LOCALBASE}/include", \
		"${LOCALBASE}/include/SDL"\]|' ${WRKSRC}/SConscript
	${REINPLACE_CMD} -r 's|(LIBPATH.*)\[\]|\1\["${LOCALBASE}/lib"\]|' \
		${WRKSRC}/SConscript

do-build:
# shouldn't be necessary, but scons will fail to build without this
	cd ${WRKSRC} && ${MAKE_CMD}

pre-install:
	@${RM} -f ${PLIST}
	@${PRINTF} "#!/bin/sh\nexec \"${DATADIR}/pingus\" --datadir \"${DATADIR}\"" > ${WRKSRC}/build/${PORTNAME}.sh
	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
	@${ECHO_CMD} "%%DATADIR%%/${PORTNAME}" >> ${PLIST}
	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
	@cd ${WRKSRC}/data && \
		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \

	@${MKDIR} ${STAGEDIR}${DATADIR}
	@cd ${WRKSRC}/data && \
		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/data/images/icons/pingus.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico

.include <bsd.port.post.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




--- 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 {

Line 0 Link Here

(-)files/patch-src-pingus-pingus_main.cpp (+11 lines)
	1	--- src/pingus/pingus_main.cpp 2014-07-15 15:03:31.000000000 -0700
	2	+++ src/pingus/pingus_main.cpp 2014-07-15 15:03:53.000000000 -0700
	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 2014-07-15 15:07:05.000000000 -0700
	2	+++ src/pingus/screens/pingus_menu.cpp 2014-07-15 15:07:22.000000000 -0700
	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");

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-util-file_reader.hpp (+10 lines)
	1	--- src/util/file_reader.hpp 2014-07-15 14:54:36.000000000 -0700
	2	+++ src/util/file_reader.hpp 2014-07-15 14:54:48.000000000 -0700
	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 194341

Lines 2-20 Link Here

(-)Makefile (-11 / +33 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	6	PORTREVISION= 1
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= http://pingus.seul.org/files/	8	MASTER_SITES= http://pingus.seul.org/files/ \
		9	${MASTER_SITE_GOOGLE_CODE}
9		10
10	MAINTAINER= acm@FreeBSD.org	11	MAINTAINER= acm@FreeBSD.org
11	COMMENT= Free Lemmings-like game	12	COMMENT= Free Lemmings-like game
12		13
		14	LICENSE= GPLv3
		15
13	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \	16	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
14	libboost_regex.so:${PORTSDIR}/devel/boost-libs \	17	libboost_signals.so:${PORTSDIR}/devel/boost-libs \
15	libphysfs.so:${PORTSDIR}/devel/physfs	18	libphysfs.so:${PORTSDIR}/devel/physfs
16		19
17	USES= iconv scons tar:bzip2	20	USES= iconv scons tar:bzip2 compiler:features
18	MAKE_ARGS= with_linuxusbmouse=0 \	21	MAKE_ARGS= with_linuxusbmouse=0 \
19	with_linuxevdev=0	22	with_linuxevdev=0
20	USE_SDL= sdl image mixer	23	USE_SDL= sdl image mixer
Lines 21-37 Link Here
21		24
22	DESKTOP_ENTRIES="Pingus" "${COMMENT}" \	25	DESKTOP_ENTRIES="Pingus" "${COMMENT}" \
23	"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \	26	"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
24	"pingus" "" "false"	27	"pingus" "" false
25		28
26	PLIST= ${WRKDIR}/pkg-plist	29	PLIST= ${WRKDIR}/pkg-plist
27		30
		31	.include <bsd.port.pre.mk>
		32
		33	.if !${COMPILER_FEATURES:Mc++0x}
		34	IGNORE_MSG= pingus needs a compiler supporting c++0x. Try gcc 4.6 \
		35	or clang 3.2 (or greater) and specify CC and CXX in /etc/make.conf
		36	IGNORE= ${IGNORE_MSG}
		37	.endif
		38
28	post-patch:	39	post-patch:
29	@${REINPLACE_CMD} -e 's\|add_path("data")\|add_path("${DATADIR}")\|g' \	40	${REINPLACE_CMD} -e 's\|gcc\|${CC}\|' ${WRKSRC}/SConscript
30	${WRKSRC}/src/pingus_main.cpp	41	${REINPLACE_CMD} -e 's\|g++\|${CXX}\|' ${WRKSRC}/SConscript
		42	${REINPLACE_CMD} -r 's\|(CPPPATH.*)\[\]\|\1\["${LOCALBASE}/include", \
		43	"${LOCALBASE}/include/SDL"\]\|' ${WRKSRC}/SConscript
		44	${REINPLACE_CMD} -r 's\|(LIBPATH.*)\[\]\|\1\["${LOCALBASE}/lib"\]\|' \
		45	${WRKSRC}/SConscript
31		46
		47	do-build:
		48	# shouldn't be necessary, but scons will fail to build without this
		49	cd ${WRKSRC} && ${MAKE_CMD}
		50
32	pre-install:	51	pre-install:
33	@${RM} -f ${PLIST}	52	@${RM} -f ${PLIST}
		53	@${PRINTF} "#!/bin/sh\nexec \"${DATADIR}/pingus\" --datadir \"${DATADIR}\"" > ${WRKSRC}/build/${PORTNAME}.sh
34	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}	54	@${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST}
		55	@${ECHO_CMD} "%%DATADIR%%/${PORTNAME}" >> ${PLIST}
35	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}	56	@${ECHO_CMD} "share/pixmaps/${PORTNAME}.ico" >> ${PLIST}
36	@cd ${WRKSRC}/data && \	57	@cd ${WRKSRC}/data && \
37	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/\|' >> ${PLIST} && \	58	${FIND} * -type f \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/\|' >> ${PLIST} && \
Lines 42-48 Link Here
42	@${MKDIR} ${STAGEDIR}${DATADIR}	63	@${MKDIR} ${STAGEDIR}${DATADIR}
43	@cd ${WRKSRC}/data && \	64	@cd ${WRKSRC}/data && \
44	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}	65	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
45	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}	66	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
46	${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico	67	${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${DATADIR}
		68	${INSTALL_DATA} ${WRKSRC}/data/images/icons/pingus.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
47		69
48	.include <bsd.port.mk>	70	.include <bsd.port.post.mk>

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))