Attachment #91194 for bug #128491

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




#

PORTNAME=	el
PORTVERSION=	170
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	http://el.techwires.net/elc/ \
		${MASTER_SITE_GOOGLE_CODE} \
		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
DIST_SUBDIR=	${PORTNAME}


USE_GL=		yes

ALL_TARGET=	el.x86
MAKEFILE=	Makefile.linux
PLIST=		${WRKDIR}/pkg-plist

.include <bsd.port.pre.mk>

BROKEN=		Does not compile on sparc64
.endif

post-extract:
	@cd ${WRKSRC} && \
		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's|malloc.h|stdlib.h|g' "{}" \;

pre-install:
	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el
	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el

Lines 1-3 Link Here

(-)games/el/distinfo (-3 / +3 lines)
1	MD5 (el/el-140.tar.bz2) = 664e3f527bfe4b0692ad351707e51b94	1	MD5 (el/el-170.tar.bz2) = f4afd8b1267175163a4cbe64a63a13ab
2	SHA256 (el/el-140.tar.bz2) = 325f95ced420088874f70b3a6f9dd864e14cc67018d484abd3232244917da6ec	2	SHA256 (el/el-170.tar.bz2) = e9cec42d28a8c525883743a515acee6961e5378962514a603f97bc81d2765b31
3	SIZE (el/el-140.tar.bz2) = 1474451	3	SIZE (el/elc-170.tar.bz2) = 1876840




--- Makefile.bsdg	Sun Aug 19 19:21:10 2007
+++ Makefile.bsdg	Sun Aug 19 19:21:36 2007
@@ -1,7 +1,7 @@
 .PHONY: clean release docs
 
 # tune these for your setup & compile options
-OPTIONS=-DLINUX -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DAUTO_UPDATE -DCOUNTERS
+OPTIONS=-DFREEBSD -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DCOUNTERS
 
 #-DX86_64
 #-DTIMER_CHECK
@@ -25,20 +25,19 @@
 #-DAFK_FIX	# fixes afk messages to count only PM's, and store and count local messages if the option is selected
 #-DFONTS_FIX		# dynamically loads all fonts with the filename in the format font*.bmp, and makes them accessable in the options
 
-PLATFORM=-march=i686
-XDIR=-L/usr/X11R6/lib
+XDIR=-L$(LOCALBASE)/lib
 CWARN=
 #-Wdeclaration-after-statement -Wall -Werror
 CPPWARN=
 #-Wall -Werror
 
 # basic compiling and linking - rarely changed
-CFLAGS=$(PLATFORM) $(CWARN) -g -ggdb -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
-_CFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags)
-CXXFLAGS=$(PLATFORM) $(CPPWARN) -O -ggdb -pipe -I/usr/local/include $(OPTIONS)
-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
+CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
+_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags)
+CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS)
+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
 
-LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
+LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
 _LDFLAGS=$(XDIR) -lGL -lpthread -lz
 STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a
 
@@ -54,7 +53,7 @@
 	ignore.o init.o interface.o items.o	\
 	keys.o knowledge.o lights.o list.o loading_win.o loginwin.o	\
 	main.o manufacture.o map_io.o mapwin.o	\
-	md2loader.o md5.o misc.o multiplayer.o	\
+	md5.o misc.o multiplayer.o	\
 	new_actors.o new_character.o notepad.o	\
 	openingwin.o	\
 	particles.o paste.o pathfinder.o pm_log.o	\
@@ -78,11 +77,11 @@
 
 OBJS=$(COBJS) $(CXXOBJS)
 
-EXE=el.x86.bsd.bin
+EXE=el.x86
 
-CC=gcc
-CXX=g++
-LINK=gcc
+CC?=gcc
+CXX?=g++
+LINK?=gcc
 
 # the compile targets
 $(EXE): $(OBJS)




--- Makefile.linux.orig	2008-06-13 07:34:12.000000000 +0200
+++ Makefile.linux	2008-10-30 21:13:43.000000000 +0100
@@ -3,7 +3,7 @@
 -include make.conf
 
 # basic compiling and linking - rarely changed
-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
+OPTIONS = -DBSD -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
 CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
 _CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
 CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
@@ -75,7 +75,7 @@
 DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
 #(shell echo $OBJ |sed s/\.o/\.P/))
 
-EXE=el.x86.linux.bin
+EXE=el.x86
 
 ifndef CC
 CC=gcc

Line 0 Link Here

(-)games/el/files/patch-make.defaults (+11 lines)
	1	--- make.defaults.orig 2008-10-30 21:10:31.000000000 +0100
	2	+++ make.defaults 2008-10-30 21:10:56.000000000 +0100
	3	@@ -54,7 +54,7 @@
	4	#FEATURES += ZLIBW # Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
	5
	6	PLATFORM=-march=i686
	7	-XDIR=-L/usr/X11R6/lib
	8	+XDIR=-L$(LOCALBASE)/lib
	9	CWARN=-Wall -Wdeclaration-after-statement
	10	# -Wno-pointer-sign -Wno-sign-compare -Werror
	11	CXXWARN=-Wall

Line 0 Link Here

(-)games/el/files/patch-text_aliases.c (+11 lines)
	1	--- text_aliases.c.orig 2008-10-30 21:20:59.000000000 +0100
	2	+++ text_aliases.c 2008-10-30 21:21:32.000000000 +0100
	3	@@ -2,6 +2,8 @@
	4	#include <string.h>
	5	#ifdef OSX
	6	#include <sys/malloc.h>
	7	+ #elif BSD
	8	+ #include <stdlib.h>
	9	#else
	10	#include <malloc.h>
	11	#endif




#

PORTNAME=	data
PORTVERSION=	170
CATEGORIES=	games
MASTER_SITES=	http://www.eternal-lands.com/
PKGNAMEPREFIX=	el-
DISTFILES=	${EL_DATA}
DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}

DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
PLIST=		${WRKDIR}/pkg-plist
WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-//}_install
EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}_install.zip

do-extract:
	@${MKDIR} ${WRKDIR}

Lines 1-3 Link Here

(-)games/el-data/distinfo (-3 / +3 lines)
1	MD5 (el/el_linux_install_140.zip) = 3e45142635cd0f4fcb769199d30eeff0	1	MD5 (el/el_linux_170_install.zip) = d3d32e1920efb172e7de58efe0db9788
2	SHA256 (el/el_linux_install_140.zip) = 713700920e461483910f9775e8202138ec8912770e533cf160d54e44f5057da7	2	SHA256 (el/el_linux_170_install.zip) = 32f0d76064bee90ab66b0d26cc2c4da7ee43c99d107a5b059435d7f2669a3efc
3	SIZE (el/el_linux_install_140.zip) = 40068971	3	SIZE (el/el_linux_170_install.zip) = 54118197

Return to bug 128491

Lines 6-15 Link Here

(-)games/el/Makefile (-8 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= el	8	PORTNAME= el
9	PORTVERSION= 140	9	PORTVERSION= 170
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \	11	MASTER_SITES= http://el.techwires.net/elc/ \
		12	${MASTER_SITE_GOOGLE_CODE} \
13	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}	13	${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
14	DIST_SUBDIR= ${PORTNAME}	14	DIST_SUBDIR= ${PORTNAME}
15		15
Lines 31-37 Link Here
31	USE_GL= yes	31	USE_GL= yes
32		32
33	ALL_TARGET= el.x86	33	ALL_TARGET= el.x86
34	MAKEFILE= Makefile.bsdg	34	MAKEFILE= Makefile.linux
35	PLIST= ${WRKDIR}/pkg-plist	35	PLIST= ${WRKDIR}/pkg-plist
36		36
37	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
Lines 44-53 Link Here
44	BROKEN= Does not compile on sparc64	44	BROKEN= Does not compile on sparc64
45	.endif	45	.endif
46		46
47	post-extract:
48	@cd ${WRKSRC} && \
49	${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's\|malloc.h\|stdlib.h\|g' "{}" \;
50
51	pre-install:	47	pre-install:
52	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el	48	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el
53	@${ECHO} "cd ${DATADIR} \|\| exit 1 " >> ${WRKDIR}/el	49	@${ECHO} "cd ${DATADIR} \|\| exit 1 " >> ${WRKDIR}/el

Lines 1-63 Link Here

(-)games/el/files/patch-Makefile.bsdg (-63 lines)
1	--- Makefile.bsdg Sun Aug 19 19:21:10 2007
2	+++ Makefile.bsdg Sun Aug 19 19:21:36 2007
3	@@ -1,7 +1,7 @@
4	.PHONY: clean release docs
5
6	# tune these for your setup & compile options
7	-OPTIONS=-DLINUX -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DAUTO_UPDATE -DCOUNTERS
8	+OPTIONS=-DFREEBSD -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DCOUNTERS
9
10	#-DX86_64
11	#-DTIMER_CHECK
12	@@ -25,20 +25,19 @@
13	#-DAFK_FIX # fixes afk messages to count only PM's, and store and count local messages if the option is selected
14	#-DFONTS_FIX # dynamically loads all fonts with the filename in the format font*.bmp, and makes them accessable in the options
15
16	-PLATFORM=-march=i686
17	-XDIR=-L/usr/X11R6/lib
18	+XDIR=-L$(LOCALBASE)/lib
19	CWARN=
20	#-Wdeclaration-after-statement -Wall -Werror
21	CPPWARN=
22	#-Wall -Werror
23
24	# basic compiling and linking - rarely changed
25	-CFLAGS=$(PLATFORM) $(CWARN) -g -ggdb -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
26	-_CFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags)
27	-CXXFLAGS=$(PLATFORM) $(CPPWARN) -O -ggdb -pipe -I/usr/local/include $(OPTIONS)
28	-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
29	+CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
30	+_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags)
31	+CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS)
32	+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
33
34	-LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
35	+LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
36	_LDFLAGS=$(XDIR) -lGL -lpthread -lz
37	STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a
38
39	@@ -54,7 +53,7 @@
40	ignore.o init.o interface.o items.o \
41	keys.o knowledge.o lights.o list.o loading_win.o loginwin.o \
42	main.o manufacture.o map_io.o mapwin.o \
43	- md2loader.o md5.o misc.o multiplayer.o \
44	+ md5.o misc.o multiplayer.o \
45	new_actors.o new_character.o notepad.o \
46	openingwin.o \
47	particles.o paste.o pathfinder.o pm_log.o \
48	@@ -78,11 +77,11 @@
49
50	OBJS=$(COBJS) $(CXXOBJS)
51
52	-EXE=el.x86.bsd.bin
53	+EXE=el.x86
54
55	-CC=gcc
56	-CXX=g++
57	-LINK=gcc
58	+CC?=gcc
59	+CXX?=g++
60	+LINK?=gcc
61
62	# the compile targets
63	$(EXE): $(OBJS)

Line 0 Link Here

(-)games/el/files/patch-Makefile.linux (+20 lines)
	1	--- Makefile.linux.orig 2008-06-13 07:34:12.000000000 +0200
	2	+++ Makefile.linux 2008-10-30 21:13:43.000000000 +0100
	3	@@ -3,7 +3,7 @@
	4	-include make.conf
	5
	6	# basic compiling and linking - rarely changed
	7	-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
	8	+OPTIONS = -DBSD -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
	9	CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
	10	_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
	11	CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
	12	@@ -75,7 +75,7 @@
	13	DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
	14	#(shell echo $OBJ \|sed s/\.o/\.P/))
	15
	16	-EXE=el.x86.linux.bin
	17	+EXE=el.x86
	18
	19	ifndef CC
	20	CC=gcc

Lines 6-14 Link Here

(-)games/el-data/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= data	8	PORTNAME= data
9	PORTVERSION= 140	9	PORTVERSION= 170
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://el.beplacid.net/downloads/	11	MASTER_SITES= http://www.eternal-lands.com/
12	PKGNAMEPREFIX= el-	12	PKGNAMEPREFIX= el-
13	DISTFILES= ${EL_DATA}	13	DISTFILES= ${EL_DATA}
14	DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}	14	DIST_SUBDIR= ${PKGNAMEPREFIX:S/-//}
Lines 23-29 Link Here
23	DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX:S/-//}	23	DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
24	PLIST= ${WRKDIR}/pkg-plist	24	PLIST= ${WRKDIR}/pkg-plist
25	WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX:S/-//}_install	25	WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX:S/-//}_install
26	EL_DATA= ${PKGNAMEPREFIX:S/-/_/}linux_install_${PORTVERSION}.zip	26	EL_DATA= ${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}_install.zip
27		27
28	do-extract:	28	do-extract:
29	@${MKDIR} ${WRKDIR}	29	@${MKDIR} ${WRKDIR}