Index: head/games/el/Makefile =================================================================== --- head/games/el/Makefile (revision 525891) +++ head/games/el/Makefile (revision 525892) @@ -1,45 +1,45 @@ # Created by: Janni # $FreeBSD$ PORTNAME= el -PORTVERSION= 1.9.5.4 +PORTVERSION= 1.9.5.6 PORTEPOCH= 1 CATEGORIES= games MAINTAINER= acm@FreeBSD.org COMMENT= Eternal Lands is a free 3D MMORPG BROKEN_sparc64= fails to build on sparc64 LIB_DEPENDS= libpng.so:graphics/png \ libvorbis.so:audio/libvorbis \ libcal3d.so:graphics/cal3d RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/el.ini:games/el-data USES= compiler:c++11-lang gl gmake gnome iconv openal:al,alut sdl xorg USE_GNOME= libxml2 -USE_SDL= sdl net image +USE_SDL= sdl2 net2 image2 USE_GL= gl USE_XORG= x11 USE_GITHUB= yes GH_ACCOUNT= raduprv GH_PROJECT= Eternal-Lands LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lX11 LLD_UNSAFE= yes ALL_TARGET= el.bin MAKEFILE= Makefile.bsd PLIST_FILES= bin/el \ %%DATADIR%%/el.bin pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/el @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el @${ECHO} "exec ${DATADIR}/el.bin" >> ${WRKDIR}/el do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/el ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${STAGEDIR}${DATADIR} .include Index: head/games/el/distinfo =================================================================== --- head/games/el/distinfo (revision 525891) +++ head/games/el/distinfo (revision 525892) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577816823 -SHA256 (raduprv-Eternal-Lands-1.9.5.4_GH0.tar.gz) = fa602e8d235ba0002e1054bea7ee77434021d3893c9ad5e90d67c93752fb5ad8 -SIZE (raduprv-Eternal-Lands-1.9.5.4_GH0.tar.gz) = 2833391 +TIMESTAMP = 1581446959 +SHA256 (raduprv-Eternal-Lands-1.9.5.6_GH0.tar.gz) = 3d43f74e74b87ffbcbd567970381904908f96c478bbf6f06a18c7a72f1f98525 +SIZE (raduprv-Eternal-Lands-1.9.5.6_GH0.tar.gz) = 2841673 Index: head/games/el/files/patch-Makefile.bsd =================================================================== --- head/games/el/files/patch-Makefile.bsd (revision 525891) +++ head/games/el/files/patch-Makefile.bsd (revision 525892) @@ -1,49 +1,56 @@ ---- Makefile.bsd.orig 2014-01-06 15:25:15.000000000 +0100 -+++ Makefile.bsd 2014-01-06 15:49:31.000000000 +0100 -@@ -2,17 +2,19 @@ +--- Makefile.bsd 2020-01-05 15:02:58.000000000 -0500 ++++ Makefile.bsd 2020-02-11 14:01:38.149884000 -0500 +@@ -2,23 +2,25 @@ -include make.conf +XDIR=-L$(LOCALBASE)/lib + # basic compiling and linking - rarely changed OPTIONS = -DBSD -DUSE_FILE32API -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST -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) -+CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) -+_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++CXXFLAGS+=$(CXXWARN) $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) ++_CXXFLAGS=-fomit-frame-pointer -ffast-math $(OPTIONS) $(shell sdl2-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES) 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+=$(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+=$(shell sdl2-config --libs) $(shell xml2-config --libs) -lSDL2_net -lSDL2_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \ $(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS)) -_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++ +_LDFLAGS=$(XDIR) -lGL -pthread # This works on Ubuntu 8.04 (LTS) at least # Install these packages in addition to those required for a standard build -@@ -86,16 +88,16 @@ + # libasound2-dev libaudio-dev libartsc0-dev libesd0-dev libpulse-dev libaa1-dev libgpmg1-dev libdirectfb-dev + LIBD=/usr/lib +-STATICLIBS=$(LIBD)/libSDL_net.a $(LIBD)/libSDL.a $(LIBD)/libSDL_image.a $(LIBD)/libopenal.a $(LIBD)/libvorbisfile.a $(LIBD)/libvorbis.a $(LIBD)/libogg.a $(LIBD)/libxml2.a $(LIBD)/libcal3d.a $(LIBD)/libpng.a $(LIBD)/libasound.a $(LIBD)/libaudio.a $(LIBD)/libartsc.a $(LIBD)/libesd.a $(LIBD)/libpulse-simple.a $(LIBD)/libpulse.a $(LIBD)/libaa.a $(LIBD)/libgpm.a $(LIBD)/libcurses.a $(LIBD)/libslang.a $(LIBD)/libdirectfb.a $(LIBD)/libdirect.a $(LIBD)/libfusion.a $(LIBD)/librt.a $(LIBD)/libtiff.a $(LIBD)/libjpeg.a $(LIBD)/libGLU.a $(LIBD)/libz.a ++STATICLIBS=$(LIBD)/libSDL2_net.a $(LIBD)/libSDL2.a $(LIBD)/libSDL2_image.a $(LIBD)/libopenal.a $(LIBD)/libvorbisfile.a $(LIBD)/libvorbis.a $(LIBD)/libogg.a $(LIBD)/libxml2.a $(LIBD)/libcal3d.a $(LIBD)/libpng.a $(LIBD)/libasound.a $(LIBD)/libaudio.a $(LIBD)/libartsc.a $(LIBD)/libesd.a $(LIBD)/libpulse-simple.a $(LIBD)/libpulse.a $(LIBD)/libaa.a $(LIBD)/libgpm.a $(LIBD)/libcurses.a $(LIBD)/libslang.a $(LIBD)/libdirectfb.a $(LIBD)/libdirect.a $(LIBD)/libfusion.a $(LIBD)/librt.a $(LIBD)/libtiff.a $(LIBD)/libjpeg.a $(LIBD)/libGLU.a $(LIBD)/libz.a + + # the objects we need + ENCYCLOPEDIA_COBJ = books/fontdef.o books/parser.o books/symbol.o books/typesetter.o sort.o symbol_table.o +@@ -84,16 +86,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.bsd.bin +EXE=el.bin ifndef CC -CC=gcc +CC?=gcc endif ifndef CXX -CXX=g++ +CXX?=g++ endif ifndef LINK -LINK=gcc +LINK?=$(CXX) endif all: $(EXE)