Attachment #145667 for bug #192585

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




SCONS_ARGS=	installbindir=${PREFIX}/bin installdatadir=${DATADIR}

PLIST_FILES=	bin/dangerdeep bin/crosssection bin/damagemodel \
		bin/oceantest bin/portal bin/viewmodel \
		man/man6/dangerdeep.6.gz

MAN6=		dangerdeep.6
PORTDOCS=	CREDITS README

NO_STAGE=	yes
.include <bsd.port.pre.mk>

.if defined(PACKAGE_BUILDING)
SCONS_ARGS+=	usex86sse=-1	# disable MMX/SSE on the build cluster
.endif

.if ${OSVERSION} >= 1000000
BROKEN=		Does not compile on FreeBSD 10
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/share/games/dangerdeep|${DATADIR}|; \
		s|Linux|"Danger from the Deep"|' ${WRKSRC}/doc/man/dangerdeep.6

do-install:
	@cd ${WRKSRC}/build/freebsd && \
		${INSTALL_PROGRAM} dangerdeep crosssection damagemodel oceantest \
			portal viewmodel ${STAGEDIR}${PREFIX}/bin

	${INSTALL_MAN} ${WRKSRC}/doc/man/dangerdeep.6 ${STAGEDIR}${PREFIX}/man/man6
	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/dangerdeep.6

.if !defined(NOPORTDOCS)
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-11 Link Here

(-)dangerdeep/files/patch-SConstruct (-3 / +3 lines)
1	--- SConstruct.orig 2007-06-11 14:29:13.000000000 -0400	1	--- ./SConstruct.orig 2007-06-11 14:29:13.000000000 -0400
2	+++ SConstruct 2007-12-20 20:52:35.000000000 -0500	2	+++ ./SConstruct 2014-08-11 09:56:15.000000000 -0400
3	@@ -62,7 +62,7 @@	3	@@ -62,7 +62,7 @@
4	if (debug == 1):	4	if (debug == 1):
5	env.Append(CCFLAGS = '-g')	5	env.Append(CCFLAGS = '-g')
6	env.Append(CPPDEFINES = ['DEBUG'])	6	env.Append(CPPDEFINES = ['DEBUG'])
7	-elif (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7'):	7	-elif (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7'):
8	+elif (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8') or (sys.platform == 'freebsd9'):	8	+elif (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8') or (sys.platform == 'freebsd9') or (sys.platform == 'freebsd10'):
9	print "Compiling for FreeBSD Environment"	9	print "Compiling for FreeBSD Environment"
10	env = Environment(ENV = os.environ)	10	env = Environment(ENV = os.environ)
11	LOCALBASE = os.environ['LOCALBASE']	11	LOCALBASE = os.environ['LOCALBASE']




--- ./src/condvar.h.orig	2007-06-11 11:16:23.000000000 -0400
+++ ./src/condvar.h	2014-08-11 09:56:15.000000000 -0400
@@ -43,13 +43,13 @@
 
 	/// wait on condition
 	///@param m - mutex to encapsulate waiting condition
-	void wait(mutex& m);
+	void wait(::mutex& m);
 
 	/// wait on condition with timeout
 	///@param m - mutex to encapsulate waiting condition
 	///@param ms - timeout value in milliseconds
 	///@return true when woken up by signal, false on timeout
-	bool timed_wait(mutex& m, unsigned ms);
+	bool timed_wait(::mutex& m, unsigned ms);
 
 	/// send signal to threads that are waiting on the condition.
 	///@note Note that before sending the signal you must make the condition false that would

Line 0 Link Here

(-)dangerdeep/files/patch-src__faulthandler.h (+10 lines)
	1	--- ./src/faulthandler.h.orig 2007-06-11 14:29:30.000000000 -0400
	2	+++ ./src/faulthandler.h 2014-08-11 10:17:47.000000000 -0400
	3	@@ -46,6 +46,7 @@
	4	#include <execinfo.h>
	5	#include <stdio.h>
	6	#include <stdlib.h>
	7	+#include <unistd.h>
	8	#include <cxxabi.h> // Needed for __cxa_demangle
	9	#include <signal.h>
	10	#include <string>




--- ./src/mutex.h.orig	2007-06-11 11:16:23.000000000 -0400
+++ ./src/mutex.h	2014-08-11 09:59:15.000000000 -0400
@@ -58,7 +58,7 @@
 class mutex_locker
 {
  protected:
-	mutex& mymutex;
+	::mutex& mymutex;
  private:
 	mutex_locker();
 	mutex_locker(const mutex_locker& );
@@ -67,7 +67,7 @@
 	/// create mutex locker
 	///@param mtx - mutex to lock
 	///@note will instantly lock the mutex that was given as parameter
-	mutex_locker(mutex& mtx) : mymutex(mtx) { mymutex.lock(); }
+	mutex_locker(::mutex& mtx) : mymutex(mtx) { mymutex.lock(); }
 
 	/// destroy mutex locker
 	///@note will unlock the mutex that was given to the constructor

Line 0 Link Here

(-)dangerdeep/files/patch-src__subsim.cpp (+10 lines)
	1	--- ./src/subsim.cpp.orig 2007-06-11 11:16:23.000000000 -0400
	2	+++ ./src/subsim.cpp 2014-08-11 09:56:15.000000000 -0400
	3	@@ -31,6 +31,7 @@
	4	#else
	5	#include "oglext/OglExt.h"
	6	#endif
	7	+#include <unistd.h>
	8	#include <glu.h>
	9	#include <SDL.h>
	10	#include <SDL_net.h>




--- ./src/thread.h.orig	2007-06-11 11:16:23.000000000 -0400
+++ ./src/thread.h	2014-08-11 10:14:00.000000000 -0400
@@ -25,6 +25,7 @@
 
 #include "condvar.h"
 #include <stdexcept>
+#include <string>
 #include <stdint.h>
 
 /// base class for threads.
@@ -47,7 +48,7 @@
 	struct SDL_Thread* thread_id;
 	bool thread_abort_request;
 	thread_state_t thread_state;
-	mutex thread_state_mutex;
+	::mutex thread_state_mutex;
 	condvar thread_start_cond;
 	std::string thread_error_message; // to pass exception texts via thread boundaries
 

Return to bug 192585

Lines 23-45 Link Here

(-)dangerdeep/Makefile (-12 / +7 lines)
23	SCONS_ARGS= installbindir=${PREFIX}/bin installdatadir=${DATADIR}	23	SCONS_ARGS= installbindir=${PREFIX}/bin installdatadir=${DATADIR}
24		24
25	PLIST_FILES= bin/dangerdeep bin/crosssection bin/damagemodel \	25	PLIST_FILES= bin/dangerdeep bin/crosssection bin/damagemodel \
26	bin/oceantest bin/portal bin/viewmodel	26	bin/oceantest bin/portal bin/viewmodel \
27	PLIST_DIRS= %%DATADIR%%	27	man/man6/dangerdeep.6.gz
28		28
29	MAN6= dangerdeep.6
30	PORTDOCS= CREDITS README	29	PORTDOCS= CREDITS README
31		30
32	NO_STAGE= yes
33	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
34		32
35	.if defined(PACKAGE_BUILDING)	33	.if defined(PACKAGE_BUILDING)
36	SCONS_ARGS+= usex86sse=-1 # disable MMX/SSE on the build cluster	34	SCONS_ARGS+= usex86sse=-1 # disable MMX/SSE on the build cluster
37	.endif	35	.endif
38		36
39	.if ${OSVERSION} >= 1000000
40	BROKEN= Does not compile on FreeBSD 10
41	.endif
42
43	post-patch:	37	post-patch:
44	@${REINPLACE_CMD} -e 's\|/usr/share/games/dangerdeep\|${DATADIR}\|; \	38	@${REINPLACE_CMD} -e 's\|/usr/share/games/dangerdeep\|${DATADIR}\|; \
45	s\|Linux\|"Danger from the Deep"\|' ${WRKSRC}/doc/man/dangerdeep.6	39	s\|Linux\|"Danger from the Deep"\|' ${WRKSRC}/doc/man/dangerdeep.6
Lines 52-64 Link Here
52	do-install:	46	do-install:
53	@cd ${WRKSRC}/build/freebsd && \	47	@cd ${WRKSRC}/build/freebsd && \
54	${INSTALL_PROGRAM} dangerdeep crosssection damagemodel oceantest \	48	${INSTALL_PROGRAM} dangerdeep crosssection damagemodel oceantest \
55	portal viewmodel ${PREFIX}/bin	49	portal viewmodel ${STAGEDIR}${PREFIX}/bin
56		50
57	${INSTALL_MAN} ${WRKSRC}/doc/man/dangerdeep.6 ${PREFIX}/man/man6	51	${INSTALL_MAN} ${WRKSRC}/doc/man/dangerdeep.6 ${STAGEDIR}${PREFIX}/man/man6
		52	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man6/dangerdeep.6
58		53
59	.if !defined(NOPORTDOCS)	54	.if !defined(NOPORTDOCS)
60	${MKDIR} ${DOCSDIR}	55	${MKDIR} ${STAGEDIR}${DOCSDIR}
61	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${DOCSDIR}	56	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${STAGEDIR}${DOCSDIR}
62	.endif	57	.endif
63		58
64	.include <bsd.port.post.mk>	59	.include <bsd.port.post.mk>

Line 0 Link Here

(-)dangerdeep/files/patch-src__condvar.h (+18 lines)
	1	--- ./src/condvar.h.orig 2007-06-11 11:16:23.000000000 -0400
	2	+++ ./src/condvar.h 2014-08-11 09:56:15.000000000 -0400
	3	@@ -43,13 +43,13 @@
	4
	5	/// wait on condition
	6	///@param m - mutex to encapsulate waiting condition
	7	- void wait(mutex& m);
	8	+ void wait(::mutex& m);
	9
	10	/// wait on condition with timeout
	11	///@param m - mutex to encapsulate waiting condition
	12	///@param ms - timeout value in milliseconds
	13	///@return true when woken up by signal, false on timeout
	14	- bool timed_wait(mutex& m, unsigned ms);
	15	+ bool timed_wait(::mutex& m, unsigned ms);
	16
	17	/// send signal to threads that are waiting on the condition.
	18	///@note Note that before sending the signal you must make the condition false that would

Line 0 Link Here

(-)dangerdeep/files/patch-src__mutex.h (+20 lines)
	1	--- ./src/mutex.h.orig 2007-06-11 11:16:23.000000000 -0400
	2	+++ ./src/mutex.h 2014-08-11 09:59:15.000000000 -0400
	3	@@ -58,7 +58,7 @@
	4	class mutex_locker
	5	{
	6	protected:
	7	- mutex& mymutex;
	8	+ ::mutex& mymutex;
	9	private:
	10	mutex_locker();
	11	mutex_locker(const mutex_locker& );
	12	@@ -67,7 +67,7 @@
	13	/// create mutex locker
	14	///@param mtx - mutex to lock
	15	///@note will instantly lock the mutex that was given as parameter
	16	- mutex_locker(mutex& mtx) : mymutex(mtx) { mymutex.lock(); }
	17	+ mutex_locker(::mutex& mtx) : mymutex(mtx) { mymutex.lock(); }
	18
	19	/// destroy mutex locker
	20	///@note will unlock the mutex that was given to the constructor

Line 0 Link Here

(-)dangerdeep/files/patch-src__thread.h (+19 lines)
	1	--- ./src/thread.h.orig 2007-06-11 11:16:23.000000000 -0400
	2	+++ ./src/thread.h 2014-08-11 10:14:00.000000000 -0400
	3	@@ -25,6 +25,7 @@
	4
	5	#include "condvar.h"
	6	#include <stdexcept>
	7	+#include <string>
	8	#include <stdint.h>
	9
	10	/// base class for threads.
	11	@@ -47,7 +48,7 @@
	12	struct SDL_Thread* thread_id;
	13	bool thread_abort_request;
	14	thread_state_t thread_state;
	15	- mutex thread_state_mutex;
	16	+ ::mutex thread_state_mutex;
	17	condvar thread_start_cond;
	18	std::string thread_error_message; // to pass exception texts via thread boundaries
	19