git: 8ca6d1e17e28 - main - games/el: update to 1.9.5.9

Jose Alonso Cardenas Marquez acm at FreeBSD.org
Sat Jul 31 04:18:36 UTC 2021 

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8ca6d1e17e28cdd48921205e5a9bd6eab6d83ee6

commit 8ca6d1e17e28cdd48921205e5a9bd6eab6d83ee6
Author:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
AuthorDate: 2021-07-31 04:13:56 +0000
Commit:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
CommitDate: 2021-07-31 04:18:26 +0000

    games/el: update to 1.9.5.9
    
    ChangeLog at:   https://github.com/raduprv/Eternal-Lands/releases/tag/1.9.5.9-1
    Many other smaller changes, bug fixes and improvements including a fix for region sounds on maps.
---
 games/el-data/Makefile             | 20 ++++++++------------
 games/el-data/distinfo             | 14 +++++++-------
 games/el/Makefile                  |  6 +++---
 games/el/distinfo                  |  6 +++---
 games/el/files/patch-Makefile.bsd  |  8 ++++----
 games/el/files/patch-make.defaults | 10 +++++-----
 games/el/files/patch-platform.h    |  4 ++--
 7 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/games/el-data/Makefile b/games/el-data/Makefile
index 076576fa6697..c4b1e3bbebf2 100644
--- a/games/el-data/Makefile
+++ b/games/el-data/Makefile
@@ -1,14 +1,10 @@
-# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
-
 PORTNAME=	data
-PORTVERSION=	1.9.5.7
+DISTVERSION=	1.9.5.9-1
 PORTEPOCH=	1
 CATEGORIES=	games
-MASTER_SITES=	https://github.com/raduprv/Eternal-Lands/releases/download/${PORTVERSION}/:data \
-		http://www.gm.fh-koeln.de/~linke/EL-Downloads/:sound \
-		http://www.gm.fh-koeln.de/~linke/EL-Downloads/:music
+MASTER_SITES=	https://github.com/raduprv/Eternal-Lands/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	el-
-DISTFILES=	${EL_DATA}:data
+DISTFILES=	${EL_DATA}
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm at FreeBSD.org
@@ -21,7 +17,7 @@ DOS2UNIX_GLOB=	*.ini *.txt
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-/_/}data
-EL_DATA=	${PKGNAMEPREFIX:S/-/_/}${PORTVERSION:S/.//g:S/7//g}_p7_data_files${EXTRACT_SUFX}
+EL_DATA=	eternallands-data_${DISTVERSION}${EXTRACT_SUFX}
 
 PORTDATA=	*
 
@@ -33,22 +29,22 @@ ELMUSIC_DESC=	Install additional music files
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MELSOUND}
-DISTFILES+=	EL_sound_191${EXTRACT_SUFX}:sound
+DISTFILES+=	eternallands-sound_${DISTVERSION:S/-1//}${EXTRACT_SUFX}
 .endif
 
 .if ${PORT_OPTIONS:MELMUSIC}
-DISTFILES+=	EL_music_full${EXTRACT_SUFX}:music
+DISTFILES+=	eternallands-music_${DISTVERSION:S/-1//}${EXTRACT_SUFX}
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${UNZIP_CMD} -q ${_DISTDIR}/${EL_DATA} -d ${WRKDIR}
 .if ${PORT_OPTIONS:MELSOUND}
-	@${UNZIP_CMD} -q ${_DISTDIR}/EL_sound_191${EXTRACT_SUFX} -d ${WRKSRC}
+	@${UNZIP_CMD} -q ${_DISTDIR}/eternallands-sound_${DISTVERSION:S/-1//}${EXTRACT_SUFX} -d ${WRKSRC}
 .endif
 .if ${PORT_OPTIONS:MELMUSIC}
 	@${MKDIR} ${WRKSRC}/music
-	@${UNZIP_CMD} -q ${_DISTDIR}/EL_music_full${EXTRACT_SUFX} -d ${WRKSRC}/music
+	@${UNZIP_CMD} -q ${_DISTDIR}/eternallands-music_${DISTVERSION:S/-1//}${EXTRACT_SUFX} -d ${WRKSRC}/music
 .endif
 
 post-extract:
diff --git a/games/el-data/distinfo b/games/el-data/distinfo
index 8dc27f55d076..25a2a8ffee63 100644
--- a/games/el-data/distinfo
+++ b/games/el-data/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1587184609
-SHA256 (el/el_195_p7_data_files.zip) = 32fc28333058955f1b1c11e21ee514d9596743ee6a3628c3bbbba2e4de7d533f
-SIZE (el/el_195_p7_data_files.zip) = 63878875
-SHA256 (el/EL_sound_191.zip) = 1d7e2e31849b8bcc9519cd431047e1c01fe462840decf59550c7eb57ba6f9399
-SIZE (el/EL_sound_191.zip) = 42979627
-SHA256 (el/EL_music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec
-SIZE (el/EL_music_full.zip) = 65511882
+TIMESTAMP = 1627698011
+SHA256 (el/eternallands-data_1.9.5.9-1.zip) = 00f105ce44998b939bb92361c113961f2220afa0a3b21e53beed35968ae23ae4
+SIZE (el/eternallands-data_1.9.5.9-1.zip) = 66147974
+SHA256 (el/eternallands-sound_1.9.5.9.zip) = 13a030bf5aca4e9e881707216f269df5826ff00345c93afac94a3f58455af542
+SIZE (el/eternallands-sound_1.9.5.9.zip) = 42907788
+SHA256 (el/eternallands-music_1.9.5.9.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec
+SIZE (el/eternallands-music_1.9.5.9.zip) = 65511882
diff --git a/games/el/Makefile b/games/el/Makefile
index 22e16736fbe8..e416a590f21c 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -1,8 +1,7 @@
 # Created by: Janni
 
 PORTNAME=	el
-PORTVERSION=	1.9.5.8
-PORTREVISION=	1
+DISTVERSION=	1.9.5.9-1
 PORTEPOCH=	1
 CATEGORIES=	games
 
@@ -11,6 +10,7 @@ COMMENT=	Eternal Lands is a free 3D MMORPG
 
 BROKEN_sparc64=		fails to build on sparc64
 
+BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libvorbis.so:audio/libvorbis \
 		libcal3d.so:graphics/cal3d
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/el.ini:games/el-data
 USES=		compiler:c++11-lang desktop-file-utils gl gmake gnome iconv \
 		openal:al,alut sdl xorg
 USE_GNOME=	libxml2
-USE_SDL=	sdl2 net2 image2
+USE_SDL=	sdl2 net2 image2 ttf2
 USE_GL=		gl glu
 USE_XORG=	x11
 USE_GITHUB=	yes
diff --git a/games/el/distinfo b/games/el/distinfo
index 7aa5ff46b64d..9a3968754461 100644
--- a/games/el/distinfo
+++ b/games/el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588892844
-SHA256 (raduprv-Eternal-Lands-1.9.5.8_GH0.tar.gz) = 8c8d430c9cc3ae71c93c1f2eb65d410bbb9e67256a5b611444048699e07ab960
-SIZE (raduprv-Eternal-Lands-1.9.5.8_GH0.tar.gz) = 2863932
+TIMESTAMP = 1627692684
+SHA256 (raduprv-Eternal-Lands-1.9.5.9-1_GH0.tar.gz) = 9d9078f46a9be0b798ffe7fd2769a315522914c0884bdde0e950cb7ab4f71e42
+SIZE (raduprv-Eternal-Lands-1.9.5.9-1_GH0.tar.gz) = 3808122
diff --git a/games/el/files/patch-Makefile.bsd b/games/el/files/patch-Makefile.bsd
index 765c6b1f3250..e4b709f4dc90 100644
--- a/games/el/files/patch-Makefile.bsd
+++ b/games/el/files/patch-Makefile.bsd
@@ -1,5 +1,5 @@
---- Makefile.bsd	2020-01-05 15:02:58.000000000 -0500
-+++ Makefile.bsd	2020-02-11 14:01:38.149884000 -0500
+--- Makefile.bsd.orig	2021-04-11 19:03:51 UTC
++++ Makefile.bsd
 @@ -2,23 +2,25 @@
  
  -include make.conf
@@ -19,7 +19,7 @@
  
  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 sdl2-config --libs) $(shell xml2-config --libs) -lSDL2_net -lSDL2_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 -lSDL2_ttf -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
@@ -33,7 +33,7 @@
  
  # 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 @@
+@@ -85,16 +87,16 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
  DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
  #(shell echo $OBJ |sed s/\.o/\.P/))
  
diff --git a/games/el/files/patch-make.defaults b/games/el/files/patch-make.defaults
index a72d12696501..c87918939cf5 100644
--- a/games/el/files/patch-make.defaults
+++ b/games/el/files/patch-make.defaults
@@ -1,15 +1,15 @@
---- make.defaults.orig
+--- make.defaults.orig	2021-04-11 19:03:51 UTC
 +++ make.defaults
-@@ -69,8 +69,6 @@ FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the pr
+@@ -73,8 +73,6 @@ FEATURES += TTF                 # Add ability to use T
  
  
  
 -PLATFORM=-march=native
 -XDIR=-L/usr/X11R6/lib
- CWARN=-Wall -Wdeclaration-after-statement
+ CWARN=-Wall -Wdeclaration-after-statement -W -Wno-unused-parameter -Wno-sign-compare
  # -Wno-pointer-sign -Wno-sign-compare -Werror
- CXXWARN=-Wall 
-@@ -86,7 +84,3 @@ CXXWARN=-Wall
+ CXXWARN=-std=c++11 -Wall -W -Wno-unused-parameter -Wno-sign-compare -Wno-cast-function-type
+@@ -90,7 +88,3 @@ CXXWARN=-std=c++11 -Wall -W -Wno-unused-parameter -Wno
  #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
  #EXTRA_LIBS=-lz
  #EXTRA_STATICLIBS=libs/zlib.a
diff --git a/games/el/files/patch-platform.h b/games/el/files/patch-platform.h
index c0a7bfdbabe7..45a1ae797260 100644
--- a/games/el/files/patch-platform.h
+++ b/games/el/files/patch-platform.h
@@ -1,5 +1,5 @@
---- platform.h.orig	2014-01-06 18:17:50.000000000 +0400
-+++ platform.h	2014-11-21 19:53:36.000000000 +0300
+--- platform.h.orig	2021-04-11 19:03:51 UTC
++++ platform.h
 @@ -11,7 +11,7 @@
  // http://predef.sourceforge.net/prearch.html , these ought to work on
  // gcc, Sun Studio and Visual Studio.

More information about the dev-commits-ports-all mailing list