Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Feb 2021 23:20:29 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r566008 - in head: . games/mangband games/mangband/files
Message-ID:  <202102182320.11INKTI0095401@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Thu Feb 18 23:20:29 2021
New Revision: 566008
URL: https://svnweb.freebsd.org/changeset/ports/566008

Log:
  Update games/mangband to latest upstream release
  
  Unmark BROKEN, generate patches for the bits (duplicate symbols) that
  broke the build, (these have been submitted upstream), massage messages
  and such. Changing version **DOES** mean that you can't connect to
  older servers, so include UPDATING to try to avoid people losing
  games (killed by pkg upgrade is so much more disheartening than
  killed by a Greater basilisk).
  
  Reported by:	linimon

Added:
  head/games/mangband/files/patch-src_common_z-file.c   (contents, props changed)
  head/games/mangband/files/patch-src_options.h   (contents, props changed)
  head/games/mangband/files/patch-src_server_save.c   (contents, props changed)
  head/games/mangband/files/patch-src_server_variable.c   (contents, props changed)
Deleted:
  head/games/mangband/files/patch-config.h
  head/games/mangband/files/patch-server_netserver.c
  head/games/mangband/files/patch-server_save.c
Modified:
  head/UPDATING
  head/games/mangband/Makefile
  head/games/mangband/distinfo
  head/games/mangband/files/pkg-message.in
  head/games/mangband/pkg-descr
  head/games/mangband/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/UPDATING	Thu Feb 18 23:20:29 2021	(r566008)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20210219:
+  AFFECTS: users of games/mangband
+  AUTHOR: adridg@FreeBSD.org
+
+  The client has updated from 1.1.3 (which has a single public server
+  left) to the current 1.5.3 (which has more public servers). If you
+  update, you can NOT connect to the old server any more. Remember
+  to finish your game before updating.
+
 20210210:
   AFFECTS: users of audio/spotifyd
   AUTHOR: rodrigo@FreeBSD.org

Modified: head/games/mangband/Makefile
==============================================================================
--- head/games/mangband/Makefile	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/games/mangband/Makefile	Thu Feb 18 23:20:29 2021	(r566008)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mangband
-PORTVERSION=	1.1.3
+PORTVERSION=	1.5.3
 CATEGORIES=	games
 MASTER_SITES=	http://mangband.org/download/
 
@@ -11,13 +11,9 @@ COMMENT=	Free online multiplayer real-time roguelike g
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: p_name
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: p_name
-
 ALL_TARGET=	mangclient mangband
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-USES=		dos2unix gmake ncurses
+USES=		dos2unix ncurses
 
 MAKE_ARGS=	"DATADIR=${DATADIR}"
 
@@ -34,7 +30,11 @@ X11_CONFIGURE_WITH=	x11
 
 SDL_LIB_DEPENDS=	libX11.so:x11/libX11
 SDL_CONFIGURE_WITH=	sdl
+SDL_USES=		sdl
 
+# Only relevant when OPTION SDL is on
+USE_SDL=		sdl
+
 PORTEXAMPLES=	*
 
 SUB_FILES=	pkg-message
@@ -47,6 +47,7 @@ do-install:
 	@echo "EDIT_DIR = \"${DATADIR}/edit\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
 	@echo "SAVE_DIR = \"${DATADIR}/save\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
 	@echo "DATA_DIR = \"${DATADIR}/data\"" >> ${STAGEDIR}${PREFIX}/etc/mangband.cfg.sample
+	@find ${WRKDIR}/${DISTNAME}/lib -name Makefile.am -exec ${RM} {} +
 	@(cd ${WRKDIR}/${DISTNAME}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Modified: head/games/mangband/distinfo
==============================================================================
--- head/games/mangband/distinfo	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/games/mangband/distinfo	Thu Feb 18 23:20:29 2021	(r566008)
@@ -1,2 +1,3 @@
-SHA256 (mangband-1.1.3.tar.gz) = d4917c51fc84a0626db1b09f6cf8b0ebc4522dd8ab34334e56fba8275ede9069
-SIZE (mangband-1.1.3.tar.gz) = 1497078
+TIMESTAMP = 1613686288
+SHA256 (mangband-1.5.3.tar.gz) = 15b962364efe988f4402dd2fd4e026d030575addebd944ea1637aa355f7c80fb
+SIZE (mangband-1.5.3.tar.gz) = 2631908

Added: head/games/mangband/files/patch-src_common_z-file.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/mangband/files/patch-src_common_z-file.c	Thu Feb 18 23:20:29 2021	(r566008)
@@ -0,0 +1,14 @@
+--- src/common/z-file.c.orig	2021-02-18 22:29:46 UTC
++++ src/common/z-file.c
+@@ -84,8 +84,9 @@ unsigned _cdecl _dos_getfileattr(const char *, unsigne
+ /**
+  * Player info
+  */
+-int player_uid;
+-int player_egid;
++int player_uid = 0;
++int player_euid = 0;
++int player_egid = 0;
+ 
+ 
+ 

Added: head/games/mangband/files/patch-src_options.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/mangband/files/patch-src_options.h	Thu Feb 18 23:20:29 2021	(r566008)
@@ -0,0 +1,29 @@
+--- src/options.h.orig	2021-02-18 22:20:24 UTC
++++ src/options.h
+@@ -136,7 +136,7 @@
+ /*
+  * OPTION: Use the POSIX "termios" methods in "main-gcu.c"
+  */
+-/* #define USE_TPOSIX */
++#define USE_TPOSIX
+ 
+ /*
+  * OPTION: Use the "termio" methods in "main-gcu.c"
+@@ -154,7 +154,7 @@
+  * OPTION: Use the "curs_set()" call in "main-gcu.c".
+  * Hack -- This option will not work on most BSD machines
+  */
+-#if defined(SYS_V) || defined(linux)
++#if defined(SYS_V) || defined(linux) || defined(__FreeBSD__)
+ # define USE_CURS_SET
+ #endif
+ 
+@@ -571,7 +571,7 @@
+ /*
+  * OPTION: Attempt to prevent all "cheating"
+  */
+-/* #define VERIFY_HONOR */
++#define VERIFY_HONOR
+ 
+ 
+ /*

Added: head/games/mangband/files/patch-src_server_save.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/mangband/files/patch-src_server_save.c	Thu Feb 18 23:20:29 2021	(r566008)
@@ -0,0 +1,11 @@
+--- src/server/save.c.orig	2021-02-18 22:20:24 UTC
++++ src/server/save.c
+@@ -1109,7 +1109,7 @@ bool save_player(player_type *p_ptr)
+ #ifdef VERIFY_SAVEFILE
+ 
+ 		/* Lock on savefile */
+-		strcpy(temp, savefile);
++		strcpy(temp, p_ptr->savefile);
+ 		strcat(temp, ".lok");
+ 
+ 		/* Remove lock file */

Added: head/games/mangband/files/patch-src_server_variable.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/mangband/files/patch-src_server_variable.c	Thu Feb 18 23:20:29 2021	(r566008)
@@ -0,0 +1,15 @@
+--- src/server/variable.c.orig	2021-02-18 22:26:47 UTC
++++ src/server/variable.c
+@@ -254,10 +254,11 @@ s16b target_row;*/
+ /* Collection of connections/players */
+ element_group* players = NULL;
+ 
+-/* User info */
++/* User info in z-file.c 
+ int player_uid = 0;
+ int player_euid = 0;
+ int player_egid = 0;
++*/
+ 
+ /* The array of players */
+ player_type **Players;

Modified: head/games/mangband/files/pkg-message.in
==============================================================================
--- head/games/mangband/files/pkg-message.in	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/games/mangband/files/pkg-message.in	Thu Feb 18 23:20:29 2021	(r566008)
@@ -9,19 +9,11 @@ location:
     %%DATADIR%%/user
     %%DATADIR%%/xtra
 
-
 To provide a path for those directories ~/.mangrc should be used.
 Please copy example mangrc to your home directory and adjust it
 
-    su user
-
     cp %%EXAMPLESDIR%%/mangrc ~/.mangrc
-
-You could manually change Permissions with:
-
-    /bin/chmod 644 ~/.mangrc
-
-    exit
+    chmod 644 ~/.mangrc
 
 To run mangband server as an unpriviliged user, such user must be added
 to the games group. For example:

Modified: head/games/mangband/pkg-descr
==============================================================================
--- head/games/mangband/pkg-descr	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/games/mangband/pkg-descr	Thu Feb 18 23:20:29 2021	(r566008)
@@ -1,4 +1,4 @@
 MAngband is a free online multiplayer real-time roguelike game,
 derived from the single player game Angband.
 
-WWW: http://mangband.org/
+WWW: https://mangband.org/

Modified: head/games/mangband/pkg-plist
==============================================================================
--- head/games/mangband/pkg-plist	Thu Feb 18 22:57:19 2021	(r566007)
+++ head/games/mangband/pkg-plist	Thu Feb 18 23:20:29 2021	(r566008)
@@ -1,8 +1,10 @@
 @(,games,2550) bin/mangband
 bin/mangclient
 @sample etc/mangband.cfg.sample
-%%DATADIR%%/data/scores.raw
+%%DATADIR%%/bone/delete.me
+%%DATADIR%%/data/delete.me
 %%DATADIR%%/edit/artifact.txt
+%%DATADIR%%/edit/cost_adj.txt
 %%DATADIR%%/edit/ego_item.txt
 %%DATADIR%%/edit/flavor.txt
 %%DATADIR%%/edit/limits.txt
@@ -11,67 +13,77 @@ bin/mangclient
 %%DATADIR%%/edit/p_class.txt
 %%DATADIR%%/edit/p_hist.txt
 %%DATADIR%%/edit/p_race.txt
+%%DATADIR%%/edit/randarts.txt
+%%DATADIR%%/edit/shop_own.txt
+%%DATADIR%%/edit/socials.txt
 %%DATADIR%%/edit/terrain.txt
 %%DATADIR%%/edit/vault.txt
-%%DATADIR%%/file/delete.me
-%%DATADIR%%/help/delete.me
-%%DATADIR%%/save/server-level-100
-%%DATADIR%%/save/server-level-120
-%%DATADIR%%/save/server-level-20
-%%DATADIR%%/save/server-level-40
-%%DATADIR%%/save/server-level-60
-%%DATADIR%%/save/server-level-80
-%%DATADIR%%/text/attack.txt
-%%DATADIR%%/text/birth.txt
-%%DATADIR%%/text/command.txt
-%%DATADIR%%/text/dead.txt
-%%DATADIR%%/text/dungeon.txt
-%%DATADIR%%/text/general.txt
-%%DATADIR%%/text/help.hlp
-%%DATADIR%%/text/mangband.hlp
-%%DATADIR%%/text/news.txt
-%%DATADIR%%/text/option.txt
-%%DATADIR%%/text/version.txt
+%%DATADIR%%/help/attack.txt
+%%DATADIR%%/help/birth.txt
+%%DATADIR%%/help/command.txt
+%%DATADIR%%/help/dead.txt
+%%DATADIR%%/help/dungeon.txt
+%%DATADIR%%/help/general.txt
+%%DATADIR%%/help/help.hlp
+%%DATADIR%%/help/mangband.hlp
+%%DATADIR%%/help/news.txt
+%%DATADIR%%/help/option.txt
+%%DATADIR%%/help/version.txt
+%%DATADIR%%/pref/flvr-dvg.prf
+%%DATADIR%%/pref/flvr-new.prf
+%%DATADIR%%/pref/flvr-xxx.prf
+%%DATADIR%%/pref/font-ami.prf
+%%DATADIR%%/pref/font-ibm.prf
+%%DATADIR%%/pref/font-sdl.prf
+%%DATADIR%%/pref/font-sdl2.prf
+%%DATADIR%%/pref/font-tng.prf
+%%DATADIR%%/pref/font-win.prf
+%%DATADIR%%/pref/font-x11.prf
+%%DATADIR%%/pref/font-xxx.prf
+%%DATADIR%%/pref/font.prf
+%%DATADIR%%/pref/graf-ami.prf
+%%DATADIR%%/pref/graf-dvg.prf
+%%DATADIR%%/pref/graf-new.prf
+%%DATADIR%%/pref/graf-sdl.prf
+%%DATADIR%%/pref/graf-sdl2.prf
+%%DATADIR%%/pref/graf-win.prf
+%%DATADIR%%/pref/graf-x11.prf
+%%DATADIR%%/pref/graf-xxx.prf
+%%DATADIR%%/pref/graf.prf
+%%DATADIR%%/pref/pref-acn.prf
+%%DATADIR%%/pref/pref-emx.prf
+%%DATADIR%%/pref/pref-gcu.prf
+%%DATADIR%%/pref/pref-ibm.prf
+%%DATADIR%%/pref/pref-lsl.prf
+%%DATADIR%%/pref/pref-mac.prf
+%%DATADIR%%/pref/pref-sdl.prf
+%%DATADIR%%/pref/pref-sdl2.prf
+%%DATADIR%%/pref/pref-win.prf
+%%DATADIR%%/pref/pref-x11.prf
+%%DATADIR%%/pref/pref-xaw.prf
+%%DATADIR%%/pref/pref.prf
+%%DATADIR%%/pref/xtra-dvg.prf
+%%DATADIR%%/pref/xtra-new.prf
+%%DATADIR%%/pref/xtra-xxx.prf
+%%DATADIR%%/save/server.level.0.0.100
+%%DATADIR%%/save/server.level.0.0.120
+%%DATADIR%%/save/server.level.0.0.20
+%%DATADIR%%/save/server.level.0.0.40
+%%DATADIR%%/save/server.level.0.0.60
+%%DATADIR%%/save/server.level.0.0.80
 @group games
 @mode 0660
-%%DATADIR%%/user/font-ami.prf
-%%DATADIR%%/user/font-ibm.prf
-%%DATADIR%%/user/font-sdl.prf
-%%DATADIR%%/user/font-win.prf
-%%DATADIR%%/user/font-x11.prf
-%%DATADIR%%/user/graf-ami.prf
-%%DATADIR%%/user/graf-win.prf
-%%DATADIR%%/user/grey.prf
+%%DATADIR%%/user/inscribe.prf
+%%DATADIR%%/user/mouse.prf
 %%DATADIR%%/user/options.prf
-%%DATADIR%%/user/pref-acn.prf
-%%DATADIR%%/user/pref-emx.prf
-%%DATADIR%%/user/pref-ibm.prf
-%%DATADIR%%/user/pref-lsl.prf
-%%DATADIR%%/user/pref-mac.prf
-%%DATADIR%%/user/pref-sdl.prf
-%%DATADIR%%/user/pref-win.prf
-%%DATADIR%%/user/pref-x11.prf
-%%DATADIR%%/user/pref-xaw.prf
-%%DATADIR%%/user/pref.prf
-%%DATADIR%%/user/putty.prf
-%%DATADIR%%/user/user-gcu.prf
-%%DATADIR%%/user/user-x11.prf
+%%DATADIR%%/user/user.prf
 %%DATADIR%%/user/window.prf
-%%DATADIR%%/xtra/Sound/1UNCH.WAV
-%%DATADIR%%/xtra/Sound/BREATH.WAV
-%%DATADIR%%/xtra/Sound/DEATH.WAV
-%%DATADIR%%/xtra/Sound/DESTROY.WAV
-%%DATADIR%%/xtra/Sound/DROP.WAV
-%%DATADIR%%/xtra/Sound/HALLU.WAV
-%%DATADIR%%/xtra/Sound/HIT.WAV
-%%DATADIR%%/xtra/Sound/LEVEL.WAV
-%%DATADIR%%/xtra/Sound/MISS.WAV
-%%DATADIR%%/xtra/Sound/PYDIES.WAV
-%%DATADIR%%/xtra/Sound/TERROR.WAV
-%%DATADIR%%/xtra/Sound/VOMIT.WAV
+@mode 0644
 %%DATADIR%%/xtra/font/10X20.FON
 %%DATADIR%%/xtra/font/12X24.FON
 %%DATADIR%%/xtra/font/16x16.FON
+%%DATADIR%%/xtra/font/21X31TG.FON
+%%DATADIR%%/xtra/font/21X31TG.bdf
 %%DATADIR%%/xtra/font/5X8.FON
 %%DATADIR%%/xtra/font/6X10.FON
 %%DATADIR%%/xtra/font/6X12.FON
@@ -84,9 +96,41 @@ bin/mangclient
 %%DATADIR%%/xtra/font/8X13B.FON
 %%DATADIR%%/xtra/font/9X15.FON
 %%DATADIR%%/xtra/font/9X15B.FON
+%%DATADIR%%/xtra/font/AnonymousPro.ttf
+%%DATADIR%%/xtra/font/AnonymousPro_OFL.txt
 %%DATADIR%%/xtra/font/misc6x13.hex
 %%DATADIR%%/xtra/font/nethack10x19-10.hex
-%%DATADIR%%/xtra/graf/16x16.bmp
-%%DATADIR%%/xtra/graf/mask.bmp
+%%DATADIR%%/xtra/font/ui-cmd.ttf
+%%DATADIR%%/xtra/font/ui-cmd.txt
+%%DATADIR%%/xtra/graf/16x16.png
+%%DATADIR%%/xtra/graf/32x32.png
+%%DATADIR%%/xtra/graf/8x8.png
+%%DATADIR%%/xtra/graf/graphics.txt
+%%DATADIR%%/xtra/icon/mangclient.desktop
+%%DATADIR%%/xtra/icon/map-128.png
+%%DATADIR%%/xtra/icon/map-16.png
+%%DATADIR%%/xtra/icon/map-32.png
+%%DATADIR%%/xtra/icon/map-64.png
+%%DATADIR%%/xtra/sound/clunk.wav
+%%DATADIR%%/xtra/sound/breath.wav
+%%DATADIR%%/xtra/sound/death.wav
+%%DATADIR%%/xtra/sound/destroy.wav
+%%DATADIR%%/xtra/sound/drop.wav
+%%DATADIR%%/xtra/sound/eat.wav
+%%DATADIR%%/xtra/sound/flee.wav
+%%DATADIR%%/xtra/sound/hallu.wav
+%%DATADIR%%/xtra/sound/hit.wav
+%%DATADIR%%/xtra/sound/hit1.wav
+%%DATADIR%%/xtra/sound/kill.wav
+%%DATADIR%%/xtra/sound/kill1.wav
+%%DATADIR%%/xtra/sound/level.wav
+%%DATADIR%%/xtra/sound/miss.wav
+%%DATADIR%%/xtra/sound/miss1.wav
+%%DATADIR%%/xtra/sound/money.wav
+%%DATADIR%%/xtra/sound/opendoor.wav
+%%DATADIR%%/xtra/sound/shutdoor.wav
+%%DATADIR%%/xtra/sound/sound.cfg
+%%DATADIR%%/xtra/sound/thump.wav
+%%DATADIR%%/xtra/sound/vomit.wav
 @mode
 @group



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102182320.11INKTI0095401>