Attachment #156316 for bug #199912

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




	"Game;" false
.endif

post-patch: .SILENT
	${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \
		/^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \
		s|-I/usr/include || ; \
		s|sdl-config|$$(SDL_CONFIG)| ; \
		s|$$(USRLIB)|$$(LOCALBASE)/lib| ; \
		/^CLIENT_LIBS=/s|$$| -lintl| ; \
		/^SERVER_LIBS=/s|$$| -L$$(LOCALBASE)/lib|' \
		${BUILD_WRKSRC}/Makefile

do-install:
.for f in ${PLIST_FILES:Mbin/*}
	${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f}




--- source/enet/unix.c.orig	2013-10-22 18:57:22 UTC
+++ source/enet/unix.c
@@ -97,7 +97,7 @@ enet_address_set_host (ENetAddress * add
     char buffer [2048];
     int errnum;
 
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
 #else
     hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
@@ -150,7 +150,7 @@ enet_address_get_host (const ENetAddress
 
     in.s_addr = address -> host;
 
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
     gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
 #else
     hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);




--- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
+++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
@@ -1,9 +1,7 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
-CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
 override CXXFLAGS+= -Wall -fsigned-char
 
 PLATFORM= $(shell uname -s)
-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
 
 INCLUDES= -I. -Ibot -I../enet/include
 
@@ -22,8 +20,8 @@
 else
 USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
 # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
 endif
 
 CLIENT_OBJS= \
@@ -87,8 +85,8 @@
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
 SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
 else
-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -L../enet/.libs -lenet -lz
+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
 endif
 
 SERVER_OBJS= \

Lines 1-5 Link Here

(-)assaultcube/files/patch-source_src_bot_bot_waypoint.cpp (-2 / +2 lines)
1	--- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 22:50:03.000000000 +0400	1	--- source/src/bot/bot_waypoint.cpp.orig 2013-11-10 18:50:03 UTC
2	+++ source/src/bot/bot_waypoint.cpp 2015-02-13 07:33:14.000000000 +0400	2	+++ source/src/bot/bot_waypoint.cpp
3	@@ -848,7 +848,7 @@	3	@@ -848,7 +848,7 @@
4		4
5	if (!pWP)	5	if (!pWP)

Lines 1-5 Link Here

(-)assaultcube/files/patch-source_src_console.h (-2 / +2 lines)
1	--- source/src/console.h.orig 2013-10-09 12:27:31.000000000 +0400	1	--- source/src/console.h.orig 2013-10-09 08:27:31 UTC
2	+++ source/src/console.h 2013-10-11 02:23:35.000000000 +0400	2	+++ source/src/console.h
3	@@ -127,7 +127,7 @@	3	@@ -127,7 +127,7 @@
4	}	4	}
5	};	5	};

Lines 1-5 Link Here

(-)assaultcube/files/patch-source_src_master.cpp (-2 / +2 lines)
1	--- source/src/master.cpp.orig 2013-10-09 12:27:37.000000000 +0400	1	--- source/src/master.cpp.orig 2013-10-09 08:27:37 UTC
2	+++ source/src/master.cpp 2013-10-11 02:26:24.000000000 +0400	2	+++ source/src/master.cpp
3	@@ -510,7 +510,7 @@	3	@@ -510,7 +510,7 @@
4	authreq &a = c.authreqs.add();	4	authreq &a = c.authreqs.add();
5	a.reqtime = servtime;	5	a.reqtime = servtime;

Return to bug 199912

Lines 64-69 Link Here

(-)assaultcube/Makefile (+10 lines)
64	"Game;" false	64	"Game;" false
65	.endif	65	.endif
66		66
		67	post-patch: .SILENT
		68	${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \
		69	/^INCLUDES=/s\|$$\| -I$$(LOCALBASE)/include\| ; \
		70	s\|-I/usr/include \|\| ; \
		71	s\|sdl-config\|$$(SDL_CONFIG)\| ; \
		72	s\|$$(USRLIB)\|$$(LOCALBASE)/lib\| ; \
		73	/^CLIENT_LIBS=/s\|$$\| -lintl\| ; \
		74	/^SERVER_LIBS=/s\|$$\| -L$$(LOCALBASE)/lib\|' \
		75	${BUILD_WRKSRC}/Makefile
		76
67	do-install:	77	do-install:
68	.for f in ${PLIST_FILES:Mbin/*}	78	.for f in ${PLIST_FILES:Mbin/*}
69	${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f}	79	${INSTALL_SCRIPT} ${WRKDIR}/${f:T} ${STAGEDIR}${PREFIX}/${f}

Line 0 Link Here

(-)assaultcube/files/patch-source_enet_unix.c (+20 lines)
	1	--- source/enet/unix.c.orig 2013-10-22 18:57:22 UTC
	2	+++ source/enet/unix.c
	3	@@ -97,7 +97,7 @@ enet_address_set_host (ENetAddress * add
	4	char buffer [2048];
	5	int errnum;
	6
	7	-#if defined(linux) \|\| defined(__linux) \|\| defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
	8	+#if defined(linux) \|\| defined(__linux) \|\| defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__DragonFly__)
	9	gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
	10	#else
	11	hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
	12	@@ -150,7 +150,7 @@ enet_address_get_host (const ENetAddress
	13
	14	in.s_addr = address -> host;
	15
	16	-#if defined(linux) \|\| defined(__linux) \|\| defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)
	17	+#if defined(linux) \|\| defined(__linux) \|\| defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__DragonFly__)
	18	gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
	19	#else
	20	hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);

Lines 1-35 Link Here

(-)assaultcube/files/patch-source_src_Makefile (-35 lines)
1	--- source/src/Makefile.orig 2013-10-29 13:20:58.000000000 +0400
2	+++ source/src/Makefile 2013-10-29 17:00:06.000000000 +0400
3	@@ -1,9 +1,7 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer
5	-CXX=clang++ # Use clang++, as g++ optimizations cause crashes...
6	override CXXFLAGS+= -Wall -fsigned-char
7
8	PLATFORM= $(shell uname -s)
9	-PLATFORM_PREFIX=native
10	+PLATFORM_PREFIX=FreeBSD
11
12	INCLUDES= -I. -Ibot -I../enet/include
13
14	@@ -22,8 +20,8 @@
15	else
16	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
17	# override CXXFLAGS+= -rdynamic # clang++ doesn't use this...
18	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
19	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
20	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
21	+CLIENT_LIBS= -L../enet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl -lintl
22	endif
23
24	CLIENT_OBJS= \
25	@@ -87,8 +85,8 @@
26	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
27	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
28	else
29	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
30	-SERVER_LIBS= -L../enet/.libs -lenet -lz
31	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
32	+SERVER_LIBS= -L../enet/.libs -lenet -lz -L${LOCALBASE}/lib
33	endif
34
35	SERVER_OBJS= \