Index: head/games/el/Makefile =================================================================== --- head/games/el/Makefile (revision 226539) +++ head/games/el/Makefile (revision 226540) @@ -1,60 +1,56 @@ # New ports collection makefile for: el # Date created: 25 January 2005 # Whom: Janni # # $FreeBSD$ # PORTNAME= el PORTVERSION= 180 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ openal.0:${PORTSDIR}/audio/openal \ vorbis.4:${PORTSDIR}/audio/libvorbis \ cal3d.12:${PORTSDIR}/graphics/cal3d \ alut.1:${PORTSDIR}/audio/freealut RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data PROJECTHOST= bsdistfiles USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= libxml2 USE_SDL= sdl net image USE_GL= yes ALL_TARGET= el.x86 MAKEFILE= Makefile.linux PLIST= ${WRKDIR}/pkg-plist .include -.if ${ARCH} == amd64 -CFLAGS+= -DX86_64 -.endif - .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/el @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el @${ECHO} "exec ${DATADIR}/el.x86" >> ${WRKDIR}/el @${ECHO} "bin/el" > ${PLIST} @${ECHO} "%%DATADIR%%/el.x86" >> ${PLIST} @${ECHO} "@dirrmtry %%DATADIR%%" >> ${PLIST} do-install: @${MKDIR} ${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/el ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/el.x86 ${DATADIR} .include Property changes on: head/games/el/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.21 \ No newline at end of property +1.22 \ No newline at end of property Index: head/games/el/files/patch-Makefile.linux =================================================================== --- head/games/el/files/patch-Makefile.linux (revision 226539) +++ head/games/el/files/patch-Makefile.linux (revision 226540) @@ -1,48 +1,48 @@ --- Makefile.linux 2009-01-19 23:45:49.000000000 -0500 +++ Makefile.linux 2009-01-19 23:52:26.000000000 -0500 @@ -2,16 +2,18 @@ -include make.conf +XDIR=-L$(LOCALBASE)/lib + # basic compiling and linking - rarely changed -OPTIONS = -DLINUX -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) -_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) +OPTIONS = -DBSD -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -+CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CFLAGS=$(CFLAGS) $(PLATFORM) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS+=$(PLATFORM) $(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CXXFLAGS=$(CXXFLAGS) $(PLATFORM) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS+=$(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS+=$(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ZLIB_LIBS = -lz PNG_SCREENSHOT_LIBS = -lpng -LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ +LDFLAGS=`$(SDL_CONFIG) --libs` $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS)) _LDFLAGS=$(XDIR) -lGL -lpthread -lz STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS) @@ -75,16 +77,16 @@ 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 +CC?=gcc endif ifndef CXX -CXX=g++ +CXX?=g++ endif ifndef LINK -LINK=gcc +LINK?=gcc endif # the compile targets Property changes on: head/games/el/files/patch-Makefile.linux ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/games/el/files/patch-platform.h =================================================================== --- head/games/el/files/patch-platform.h (nonexistent) +++ head/games/el/files/patch-platform.h (revision 226540) @@ -0,0 +1,11 @@ +--- platform.h 2009-01-20 09:51:39.000000000 -0500 ++++ platform.h 2009-01-20 09:51:58.000000000 -0500 +@@ -11,7 +11,7 @@ + // http://predef.sourceforge.net/prearch.html , these ought to work on + // gcc, Sun Studio and Visual Studio. + // Throw in ia64 as well, though I doubt anyone will play EL on that. +-#if defined (__x86_64__) || defined (_M_X64) || defined (__ia64__) || defined (_M_IA64) ++#if defined (__x86_64__) || defined (_M_X64) || defined (__ia64__) || defined (_M_IA64) || defined (__amd64__) + #define X86_64 + #endif + Property changes on: head/games/el/files/patch-platform.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property