Attachment #58340 for bug #87954

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





USE_BZIP2=	yes
USE_GMAKE=	yes
USE_REINPLACE=	yes
USE_GL=		yes
USE_SDL=	image sdl ttf

post-patch:
	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \
			s|%%CFLAGS%%|${CFLAGS}| ; \
			s|%%DATADIR%%|${DATADIR}| ; \
			s|%%X11BASE%%|${X11BASE}|' \
				${WRKSRC}/${MAKEFILE}

post-install:
.if !defined(NOPORTDOCS)




--- Makefile.orig	Thu Jul 29 14:17:13 2004
+++ Makefile	Mon Oct 24 17:19:43 2005
@@ -1,10 +1,8 @@
-CC=g++
-CFLAGS=`sdl-config --cflags` #-g -Wall #-O2
+CFLAGS += -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 #CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2
 OBJS    := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}
-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU  
+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU
 #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU  
-PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin/
 DATADIR=$(PREFIX)/share/excido/
+DATADIR=%%DATADIR%%/
 
@@ -28,9 +26,9 @@
 
@@ -28,9 +27,9 @@
 
 install:
 	[ -d $(BINDIR) ] || mkdir $(BINDIR)

Return to bug 87954

Lines 21-36 Link Here

(-)excido/Makefile (-8 lines)
21		21
22	USE_BZIP2= yes	22	USE_BZIP2= yes
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24	USE_REINPLACE= yes
25	USE_GL= yes	24	USE_GL= yes
26	USE_SDL= image sdl ttf	25	USE_SDL= image sdl ttf
27
28	post-patch:
29	@${REINPLACE_CMD} -e 's\|sdl-config\|${SDL_CONFIG}\| ; \
30	s\|%%CFLAGS%%\|${CFLAGS}\| ; \
31	s\|%%DATADIR%%\|${DATADIR}\| ; \
32	s\|%%X11BASE%%\|${X11BASE}\|' \
33	${WRKSRC}/${MAKEFILE}
34		26
35	post-install:	27	post-install:
36	.if !defined(NOPORTDOCS)	28	.if !defined(NOPORTDOCS)

Lines 1-22 Link Here

(-)excido/files/patch-Makefile (-10 / +7 lines)
1	--- Makefile.orig Thu Jul 29 14:17:13 2004	1	--- Makefile.orig Thu Jul 29 14:17:13 2004
2	+++ Makefile Fri Aug 19 15:00:16 2005	2	+++ Makefile Mon Oct 24 17:19:43 2005
3	@@ -1,12 +1,11 @@	3	@@ -1,10 +1,8 @@
4	-CC=g++	4	-CC=g++
5	-CFLAGS=`sdl-config --cflags` #-g -Wall #-O2	5	-CFLAGS=`sdl-config --cflags` #-g -Wall #-O2
6	+CFLAGS=%%CFLAGS%% -I%%X11BASE%%/include `sdl-config --cflags` #-g -Wall #-O2	6	+CFLAGS += -I${X11BASE}/include `${SDL_CONFIG} --cflags`
7	#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2	7	#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2
8	OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}	8	OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}
9	-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU	9	-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU
10	+LIBS = -L%%X11BASE%%/lib `sdl-config --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU	10	+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU
11	#LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/.o SDL_ttf/.o -L. physfs/.o openal/.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU	11	#LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/.o SDL_ttf/.o -L. physfs/.o openal/.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU
12	PREFIX=/usr/local	12	-PREFIX=/usr/local
13	BINDIR=$(PREFIX)/bin/	13	BINDIR=$(PREFIX)/bin/
14	-DATADIR=$(PREFIX)/share/excido/	14	DATADIR=$(PREFIX)/share/excido/
15	+DATADIR=%%DATADIR%%/
16		15
17	INSTALL=/usr/bin/install	16	@@ -28,9 +26,9 @@
18
19	@@ -28,9 +27,9 @@
20		17
21	install:	18	install:
22	[ -d $(BINDIR) ] \|\| mkdir $(BINDIR)	19	[ -d $(BINDIR) ] \|\| mkdir $(BINDIR)