Attachment #91412 for bug #128743

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




#

PORTNAME=	widelands
DISTVERSION=	build13rc
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	SFE
DISTNAME=	${PORTNAME}-${DISTVERSION:C/^b/B/}-src
DISTNAME=	${PORTNAME}-${DISTVERSION}-source

MAINTAINER=	freebsd@chillt.de
COMMENT=	Realtime strategy game inspired by Settlers II

LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
		boost_thread.4:${PORTSDIR}/devel/boost

WRKSRC=		${WRKDIR}/widelands
PLIST=		${WRKDIR}/pkg-plist
USE_BZIP2=	yes
USE_PYTHON_BUILD=	2.4+
USE_GETTEXT=	yes
USE_SDL=	sdl mixer image net ttf gfx
USE_GCC=	4.2+

PLIST_FILES=	bin/widelands

WRKSRC=		${WRKDIR}/widelands

SCONS_ARGS=	CXXFLAGS="${CXXFLAGS}" LINKFLAGS="${LDFLAGS}" \
		CPPPATH=${LOCALBASE}/include LIBPATH=${LOCALBASE}/lib \
		CC="${CC}" CXX="${CXX}" \
		install_prefix=${PREFIX} bindir=bin datadir=share/widelands \
		localedir=share/widelands/locale build=release

post-extract:
	@cd ${WRKSRC}/utils && ${TAR} xf scons-local-1.0.1.tar.gz

post-patch:
	@${REINPLACE_CMD} -e '/prefer_localdata/ s|True|False|' \
		${WRKSRC}/worlds/SConscript
	@${REINPLACE_CMD} -e '/ifndef/ s|__APPLE__|__FreeBSD__|' \
		${WRKSRC}/src/backtrace.cc
	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
		${WRKSRC}/utils/buildlocale.py

do-build:
	@cd ${WRKSRC} && ${PYTHON_CMD} utils/scons.py ${SCONS_ARGS}
		(cd utils && ${TAR} xf scons-local-0.96.1.tar.gz) && \
		${PYTHON_CMD} utils/scons.py ${SCONS_ARGS}

pre-install:
	@${RM} -f ${PLIST}
	@${ECHO_CMD} bin/widelands > ${PLIST}
	@for f in COPYING CREDITS ChangeLog README developers editor_readme ; do \
		${ECHO_CMD} %%DATADIR%%/doc/$$f >> ${PLIST} ; \
	done
	@cd ${WRKSRC} && for d in campaigns maps ; do \
		${LS} -1d $$d/*.wmf | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} ; \
	done
	@cd ${WRKSRC} && for d in fonts game_server music pics sound tribes worlds ; do \
		${FIND} $$d -type f \! -name SConscript | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} ; \
	done
	@for d in doc campaigns maps ; do \
		${ECHO_CMD} "@dirrm %%DATADIR%%/$$d" >> ${PLIST} ; \
	done
	@cd ${WRKSRC} && for d in fonts game_server music pics sound tribes worlds ; do \
		${FIND} $$d -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST} ; \
	done
	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}

do-install:
	@cd ${WRKSRC} && ${PYTHON_CMD} utils/scons.py ${SCONS_ARGS} install

post-install:
	@${FIND} ${DATADIR} -type f | \
		${SED} -e 's|^${PREFIX}/||' >> ${TMPPLIST}
	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
		${SED} -e 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (widelands-build10-source.tar.bz2) = 9e452baf7b8f22a27b4e371e2150e017	1	MD5 (widelands-Build13rc-src.tar.bz2) = 8639ce8e357346daa5b60a7ac905f1d9
2	SHA256 (widelands-build10-source.tar.bz2) = f67508066db1739839945f8c814a71a0e4a43904ff4a7f4e7cd3c269bcda18af	2	SHA256 (widelands-Build13rc-src.tar.bz2) = 50a3a2eefd3f2b19bd5a6e643d1ef0091780b037af0df4d54cafd352153a3bc1
3	SIZE (widelands-build10-source.tar.bz2) = 28526726	3	SIZE (widelands-Build13rc-src.tar.bz2) = 45349994




--- SConstruct.orig	2008-10-06 21:43:03.000000000 +0400
+++ SConstruct	2008-11-09 18:44:06.000000000 +0300
@@ -101,7 +101,7 @@
 #
 # Create configuration objects
 
+SConsignFile('build/scons-signatures')
+
 opts=cli_options()
 
-env=Environment(options=opts)
+env=Environment(options=opts, ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
 env.Tool("ctags", toolpath=['build/scons-tools'])
 env.Tool("PNGShrink", toolpath=['build/scons-tools'])
 env.Tool("astyle", toolpath=['build/scons-tools'])
@@ -287,7 +289,6 @@
 
 ################################################################### Build things
 
-SConsignFile('build/scons-signatures')
 BUILDDIR='build/'+TARGET+'-'+env['build']
 Export('env', 'Glob', 'BUILDDIR', 'PhonyTarget')
 




--- build/scons-tools/scons_configure.py.orig	2008-10-05 18:59:26.000000000 +0400
+++ build/scons-tools/scons_configure.py	2008-11-10 01:24:38.000000000 +0300
@@ -439,16 +439,16 @@
 	conf.CheckCompilerFlag('-fbounds-check', env)
 	conf.CheckCompilerFlag('-pipe', env)
 
-	if env.optimize:
-		# !!!! -fomit-frame-pointer breaks execeptions !!!!
-		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
-		conf.CheckCompilerFlag('-finline-functions', env)
-		conf.CheckCompilerFlag('-ffast-math', env)
-		conf.CheckCompilerFlag('-funroll-loops', env)
-		conf.CheckCompilerFlag('-O3', env)
-	else:
-		conf.CheckCompilerFlag('-O0', env)
-		conf.CheckCompilerFlag('-funit-at-a-time', env)
+#	if env.optimize:
+#		# !!!! -fomit-frame-pointer breaks execeptions !!!!
+#		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
+#		conf.CheckCompilerFlag('-finline-functions', env)
+#		conf.CheckCompilerFlag('-ffast-math', env)
+#		conf.CheckCompilerFlag('-funroll-loops', env)
+#		conf.CheckCompilerFlag('-O3', env)
+#	else:
+#		conf.CheckCompilerFlag('-O0', env)
+#		conf.CheckCompilerFlag('-funit-at-a-time', env)
 
 	if env.profile:
 		conf.CheckCompilerFlag('-pg', env)




--- src/SConscript.orig	Mon Feb 19 19:33:47 2007
+++ src/SConscript	Sat Jun  2 02:47:39 2007
@@ -5,7 +5,7 @@
 
 SRC=Glob('*.cc')
 
-srcenv=env.Copy()
+srcenv=env.Copy(CPPPATH=[], LIBPATH=[])
 
 srcenv.Append(CPPPATH=[
 		'#/src',
@@ -22,6 +22,7 @@
 srcenv.Append(LIBS='editor', LIBPATH='editor')
 srcenv.Append(LIBS='editoruimenus', LIBPATH='editor/ui_menus')
 srcenv.Append(LIBS='editortools', LIBPATH='editor/tools')
+srcenv.Append(CPPPATH=env['CPPPATH'], LIBPATH=env['LIBPATH'])
 
 SConscript('editor/SConscript')
 SConscript('ui/ui_basic/SConscript')

Return to bug 128743

Lines 6-65 Link Here

(-)Makefile (-35 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= widelands	8	PORTNAME= widelands
9	DISTVERSION= build10	9	DISTVERSION= build13rc
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= SFE
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	DISTNAME= ${PORTNAME}-${DISTVERSION:C/^b/B/}-src
14	DISTNAME= ${PORTNAME}-${DISTVERSION}-source
15		13
16	MAINTAINER= freebsd@chillt.de	14	MAINTAINER= freebsd@chillt.de
17	COMMENT= Realtime strategy game inspired by Settlers II	15	COMMENT= Realtime strategy game inspired by Settlers II
18		16
19	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png	17	LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
		18	boost_thread.4:${PORTSDIR}/devel/boost
20		19
21	WRKSRC= ${WRKDIR}/widelands
22	PLIST= ${WRKDIR}/pkg-plist
23	USE_BZIP2= yes	20	USE_BZIP2= yes
24	USE_PYTHON_BUILD= 2.4+	21	USE_PYTHON_BUILD= 2.4+
25	USE_GETTEXT= yes	22	USE_GETTEXT= yes
26	USE_SDL= mixer image net ttf	23	USE_SDL= sdl mixer image net ttf gfx
		24	USE_GCC= 4.2+
		25
		26	PLIST_FILES= bin/widelands
		27
		28	WRKSRC= ${WRKDIR}/widelands
27		29
28	SCONS_ARGS= CXXFLAGS="${CXXFLAGS}" LINKFLAGS="${LDFLAGS}" \	30	SCONS_ARGS= CXXFLAGS="${CXXFLAGS}" LINKFLAGS="${LDFLAGS}" \
29	CPPPATH=${LOCALBASE}/include LIBPATH=${LOCALBASE}/lib \	31	CPPPATH=${LOCALBASE}/include LIBPATH=${LOCALBASE}/lib \
30	CC="${CC}" CXX="${CXX}" \	32	CC="${CC}" CXX="${CXX}" \
31	install_prefix=${PREFIX} bindir=bin datadir=share/widelands	33	install_prefix=${PREFIX} bindir=bin datadir=share/widelands \
		34	localedir=share/widelands/locale build=release
		35
		36	post-extract:
		37	@cd ${WRKSRC}/utils && ${TAR} xf scons-local-1.0.1.tar.gz
32		38
33	post-patch:	39	post-patch:
34	@${REINPLACE_CMD} -e 's\|, True\|\|' ${WRKSRC}/worlds/SConscript	40	@${REINPLACE_CMD} -e '/prefer_localdata/ s\|True\|False\|' \
35	@${RM} -f ${WRKSRC}/worlds/SConscript.bak	41	${WRKSRC}/worlds/SConscript
		42	@${REINPLACE_CMD} -e '/ifndef/ s\|__APPLE__\|__FreeBSD__\|' \
		43	${WRKSRC}/src/backtrace.cc
		44	@${REINPLACE_CMD} -e 's\|/usr/bin/python\|${PYTHON_CMD}\|' \
		45	${WRKSRC}/utils/buildlocale.py
36		46
37	do-build:	47	do-build:
38	@cd ${WRKSRC} && \	48	@cd ${WRKSRC} && ${PYTHON_CMD} utils/scons.py ${SCONS_ARGS}
39	(cd utils && ${TAR} xf scons-local-0.96.1.tar.gz) && \
40	${PYTHON_CMD} utils/scons.py ${SCONS_ARGS}
41
42	pre-install:
43	@${RM} -f ${PLIST}
44	@${ECHO_CMD} bin/widelands > ${PLIST}
45	@for f in COPYING CREDITS ChangeLog README developers editor_readme ; do \
46	${ECHO_CMD} %%DATADIR%%/doc/$$f >> ${PLIST} ; \
47	done
48	@cd ${WRKSRC} && for d in campaigns maps ; do \
49	${LS} -1d $$d/*.wmf \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/\|' >> ${PLIST} ; \
50	done
51	@cd ${WRKSRC} && for d in fonts game_server music pics sound tribes worlds ; do \
52	${FIND} $$d -type f \! -name SConscript \| ${SORT} \| ${SED} -e 's\|^\|%%DATADIR%%/\|' >> ${PLIST} ; \
53	done
54	@for d in doc campaigns maps ; do \
55	${ECHO_CMD} "@dirrm %%DATADIR%%/$$d" >> ${PLIST} ; \
56	done
57	@cd ${WRKSRC} && for d in fonts game_server music pics sound tribes worlds ; do \
58	${FIND} $$d -type d \| ${SORT} -r \| ${SED} -e 's\|^\|@dirrm %%DATADIR%%/\|' >> ${PLIST} ; \
59	done
60	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
61		49
62	do-install:	50	do-install:
63	@cd ${WRKSRC} && ${PYTHON_CMD} utils/scons.py ${SCONS_ARGS} install	51	@cd ${WRKSRC} && ${PYTHON_CMD} utils/scons.py ${SCONS_ARGS} install
64		52
		53	post-install:
		54	@${FIND} ${DATADIR} -type f \| \
		55	${SED} -e 's\|^${PREFIX}/\|\|' >> ${TMPPLIST}
		56	@${FIND} ${DATADIR} -type d \| ${SORT} -r \| \
		57	${SED} -e 's\|^${PREFIX}/\|@dirrm \|' >> ${TMPPLIST}
		58
65	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)files/patch-SConstruct (-19 / +7 lines)
1	--- SConstruct.orig Mon Mar 12 21:39:30 2007	1	--- SConstruct.orig 2008-10-06 21:43:03.000000000 +0400
2	+++ SConstruct Sat Jun 2 03:49:26 2007	2	+++ SConstruct 2008-11-09 18:44:06.000000000 +0300
3	@@ -122,9 +122,11 @@	3	@@ -101,7 +101,7 @@
4	#
5	# Create configuration objects
6		4
7	+SConsignFile('build/scons-signatures')
8	+
9	opts=cli_options()	5	opts=cli_options()
10		6
11	-env=Environment(options=opts)	7	-env=Environment(options=opts)
12	+env=Environment(options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))	8	+env=Environment(options=opts, ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
13	env.Help(opts.GenerateHelpText(env))	9	env.Tool("ctags", toolpath=['build/scons-tools'])
14		10	env.Tool("PNGShrink", toolpath=['build/scons-tools'])
15	conf=env.Configure(conf_dir='#/build/sconf_temp',log_file='#build/config.log',	11	env.Tool("astyle", toolpath=['build/scons-tools'])
16	@@ -287,7 +289,6 @@
17
18	################################################################### Build things
19
20	-SConsignFile('build/scons-signatures')
21	BUILDDIR='build/'+TARGET+'-'+env['build']
22	Export('env', 'Glob', 'BUILDDIR', 'PhonyTarget')
23

Added Link Here

(-)files/patch-build-scons-tools-scons_configure.py (+29 lines)
1	--- build/scons-tools/scons_configure.py.orig 2008-10-05 18:59:26.000000000 +0400
2	+++ build/scons-tools/scons_configure.py 2008-11-10 01:24:38.000000000 +0300
3	@@ -439,16 +439,16 @@
4	conf.CheckCompilerFlag('-fbounds-check', env)
5	conf.CheckCompilerFlag('-pipe', env)
6
7	- if env.optimize:
8	- # !!!! -fomit-frame-pointer breaks execeptions !!!!
9	- conf.CheckCompilerFlag('-fexpensive-optimizations', env)
10	- conf.CheckCompilerFlag('-finline-functions', env)
11	- conf.CheckCompilerFlag('-ffast-math', env)
12	- conf.CheckCompilerFlag('-funroll-loops', env)
13	- conf.CheckCompilerFlag('-O3', env)
14	- else:
15	- conf.CheckCompilerFlag('-O0', env)
16	- conf.CheckCompilerFlag('-funit-at-a-time', env)
17	+# if env.optimize:
18	+# # !!!! -fomit-frame-pointer breaks execeptions !!!!
19	+# conf.CheckCompilerFlag('-fexpensive-optimizations', env)
20	+# conf.CheckCompilerFlag('-finline-functions', env)
21	+# conf.CheckCompilerFlag('-ffast-math', env)
22	+# conf.CheckCompilerFlag('-funroll-loops', env)
23	+# conf.CheckCompilerFlag('-O3', env)
24	+# else:
25	+# conf.CheckCompilerFlag('-O0', env)
26	+# conf.CheckCompilerFlag('-funit-at-a-time', env)
27
28	if env.profile:
29	conf.CheckCompilerFlag('-pg', env)

Removed Link Here

(-)files/patch-src_SConscript (-19 lines)
1	--- src/SConscript.orig Mon Feb 19 19:33:47 2007
2	+++ src/SConscript Sat Jun 2 02:47:39 2007
3	@@ -5,7 +5,7 @@
4
5	SRC=Glob('*.cc')
6
7	-srcenv=env.Copy()
8	+srcenv=env.Copy(CPPPATH=[], LIBPATH=[])
9
10	srcenv.Append(CPPPATH=[
11	'#/src',
12	@@ -22,6 +22,7 @@
13	srcenv.Append(LIBS='editor', LIBPATH='editor')
14	srcenv.Append(LIBS='editoruimenus', LIBPATH='editor/ui_menus')
15	srcenv.Append(LIBS='editortools', LIBPATH='editor/tools')
16	+srcenv.Append(CPPPATH=env['CPPPATH'], LIBPATH=env['LIBPATH'])
17
18	SConscript('editor/SConscript')
19	SConscript('ui/ui_basic/SConscript')