Attachment #130955 for bug #174989

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

Lines 6-20 Link Here

(-)sauerbraten/Makefile (-4 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= sauerbraten	8	PORTNAME= sauerbraten
9	PORTVERSION= 20100728	9	PORTVERSION= 20130104
10	PORTREVISION= 2	10	PORTREVISION= 0
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2010_07_19	12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2013_01_04
13	DISTNAME= ${PORTNAME}_2010_07_28_justice_edition_linux	13	DISTNAME= ${PORTNAME}_2013_01_04_collect_edition_linux
14		14
15	MAINTAINER= acm@FreeBSD.org	15	MAINTAINER= acm@FreeBSD.org
16	COMMENT= First person shooter based on Cube	16	COMMENT= First person shooter based on Cube
17		17
		18	LICENSE_COMB= multi
		19	LICENSE= MIT ZLIB
		20
18	USE_GMAKE= yes	21	USE_GMAKE= yes
19	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
20	USE_BZIP2= yes	23	USE_BZIP2= yes
Lines 48-53 Link Here
48	USE_SDL= image mixer sdl	51	USE_SDL= image mixer sdl
49	ALL_TARGET+= client	52	ALL_TARGET+= client
50	SAUER_BIN+= client	53	SAUER_BIN+= client
		54
		55	DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
		56	"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
		57	"Application;Game;" ${FALSE}
51	.endif	58	.endif
52		59
53	.if !defined(WITHOUT_DEDICATED)	60	.if !defined(WITHOUT_DEDICATED)

Lines 1-2 Link Here

(-)sauerbraten/distinfo (-2 / +2 lines)
1	SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c	1	SHA256 (sauerbraten_2013_01_04_collect_edition_linux.tar.bz2) = 043721c640261174166eb8f32a5d953abe3312da99e0e1c049747dcc1b7f0353
2	SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953	2	SIZE (sauerbraten_2013_01_04_collect_edition_linux.tar.bz2) = 589950837




--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
+++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
@@ -1,8 +1,7 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
 
 PLATFORM= $(shell uname -s)
-PLATFORM_PREFIX= native

 
 INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
 
@@ -36,8 +35,8 @@
 endif
 CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
 else	
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -105,8 +104,8 @@
 SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 else
-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
 MASTER_LIBS= $(SERVER_LIBS)
 endif
 SERVER_OBJS= \
 	shared/crypto-standalone.o \

Return to bug 174989

Lines 1-8 Link Here

(-)sauerbraten/files/patch-src_Makefile (-11 / +11 lines)
1	--- src/Makefile.orig 2010-05-14 01:30:28.000000000 +0700	1	--- src/Makefile.orig 2012-08-28 09:30:07.000000000 +0400
2	+++ src/Makefile 2010-09-24 18:44:00.000000000 +0700	2	+++ src/Makefile 2013-01-05 04:42:38.000000000 +0400
3	@@ -1,8 +1,7 @@	3	@@ -1,8 +1,7 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
5	override CXXFLAGS+= -Wall -fsigned-char	5	override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
6		6
7	PLATFORM= $(shell uname -s)	7	PLATFORM= $(shell uname -s)
8	-PLATFORM_PREFIX= native	8	-PLATFORM_PREFIX= native
Lines 10-34 Link Here
10		10
11	INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include	11	INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
12		12
13	@@ -20,8 +19,8 @@	13	@@ -36,8 +35,8 @@
14	CLIENT_INCLUDES= $(INCLUDES) -Iinclude	14	endif
15	CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm	15	CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
16	else	16	else
17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`	17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
18	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL	18	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include	19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
20	+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL	20	+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
21	endif	21	endif
22	ifeq ($(PLATFORM),Linux)	22	ifeq ($(PLATFORM),Linux)
23	CLIENT_LIBS+= -lrt	23	CLIENT_LIBS+= -lrt
24	@@ -90,8 +89,8 @@	24	@@ -105,8 +104,8 @@
25	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude	25	SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
26	SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm	26	MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
27	else	27	else
28	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)	28	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
29	-SERVER_LIBS= -Lenet/.libs -lenet -lz	29	-SERVER_LIBS= -Lenet/.libs -lenet -lz
30	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include	30	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
31	+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib	31	+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
		32	MASTER_LIBS= $(SERVER_LIBS)
32	endif	33	endif
33	SERVER_OBJS= \	34	SERVER_OBJS= \
34	shared/crypto-standalone.o \