games/nlarn: update 0.7.3 to 0.7.6

  - patch applied with changes;
  - this port now uses 'localbase' and 'ncurses:port'
  - build fine for 12, 13 and 14.

  RELEASE NOTES

  * https://nlarn.github.io/news/2020/05/23/release-0.7.6

Reported by:	Alex <r7st.guru % gmail.com>
PR:		257088

34 files changed, 387 insertions, 24 deletions

diff --git a/games/nlarn/Makefile b/games/nlarn/Makefile
index f6b6ea05ac22..e28fd5a3f895 100644
--- a/games/nlarn/Makefile
+++ b/games/nlarn/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	nlarn
 DISTVERSIONPREFIX=	NLarn-
-DISTVERSION=	0.7.3
-PORTREVISION=	1
+DISTVERSION=	0.7.6
 CATEGORIES=	games
 
 MAINTAINER=	egypcio@FreeBSD.org
@@ -12,18 +11,18 @@ COMMENT=	Roguelike game and as such a remake of the classic game Larn
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake gnome lua:53 ncurses pkgconfig
+USES=		gmake gnome localbase lua:53 ncurses:port pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	glib20 introspection:build
 
 post-configure:
 	${REINPLACE_CMD} 's|/usr/share/nlarn|${DATADIR}|' \
-		${WRKSRC}/src/game.c
+		${WRKSRC}/src/nlarn.c
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/nlarn ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/nlarn.ini-sample ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/nlarn/distinfo b/games/nlarn/distinfo
index 869df82a87b6..afd36ecf642e 100644
--- a/games/nlarn/distinfo
+++ b/games/nlarn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547652196
-SHA256 (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = f604286374774d48cb96baa6fa09902e1d190e0f9ae47d80a7494a90a1eba7db
-SIZE (nlarn-nlarn-NLarn-0.7.3_GH0.tar.gz) = 912955
+TIMESTAMP = 1625847355
+SHA256 (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 6c8e68b6bb098f7310251c65b6362726ba1d14cc7c3a62bbadd4678a5542cc49
+SIZE (nlarn-nlarn-NLarn-0.7.6_GH0.tar.gz) = 919158
diff --git a/games/nlarn/files/patch-Makefile b/games/nlarn/files/patch-Makefile
new file mode 100644
index 000000000000..decaab43299a
--- /dev/null
+++ b/games/nlarn/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2020-05-23 06:13:27 UTC
++++ Makefile
+@@ -104,7 +104,7 @@ LDFLAGS += $(shell pkg-config --libs glib-2.0)
+ 
+ # Unless requested otherwise build with curses.
+ ifneq ($(SDLPDCURSES),Y)
+-	LDFLAGS += -lcurses -lpanel
++	LDFLAGS += $(shell pkg-config --libs ncurses) -lpanel
+ else
+ 	PDCLIB   := PDCurses/sdl2/pdcurses.a
+ 	CFLAGS   += $(shell pkg-config --cflags SDL2_ttf) -IPDCurses -DSDLPDCURSES
diff --git a/games/nlarn/files/patch-inc_extdefs.h b/games/nlarn/files/patch-inc_extdefs.h
new file mode 100644
index 000000000000..5c70dad1e05b
--- /dev/null
+++ b/games/nlarn/files/patch-inc_extdefs.h
@@ -0,0 +1,53 @@
+--- inc/extdefs.h.orig	2021-07-09 19:20:11 UTC
++++ inc/extdefs.h
+@@ -0,0 +1,50 @@
++/*
++ * nlarn.h
++ * Copyright (C) 2009-2020 Joachim de Groot <jdegroot@web.de>
++ *
++ * NLarn is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * NLarn is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ * See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef __EXTDEFS_H_
++#define __EXTDEFS_H_
++
++#include <setjmp.h>
++
++#include "game.h"
++#include "position.h"
++
++/* game version string */
++extern const char *nlarn_version;
++
++/* the entire game */
++extern game *nlarn;
++
++/* death jump buffer - used to return to the main loop when the player has died */
++extern jmp_buf nlarn_death_jump;
++
++/* file paths */
++extern const char *nlarn_libdir;
++extern const char *nlarn_mesgfile;
++extern const char *nlarn_helpfile;
++extern const char *nlarn_mazefile;
++extern const char *nlarn_fortunes;
++extern const char *nlarn_highscores;
++extern const char *nlarn_inifile;
++extern const char *nlarn_savefile;
++
++extern const position pos_invalid;
++
++/* textual representation of the player's gender */
++extern const char *player_sex_str[PS_MAX];
++#endif
diff --git a/games/nlarn/files/patch-inc_nlarn.h b/games/nlarn/files/patch-inc_nlarn.h
index 9d95530ca962..e69de29bb2d1 100644
--- a/games/nlarn/files/patch-inc_nlarn.h
+++ b/games/nlarn/files/patch-inc_nlarn.h
@@ -1,10 +0,0 @@
---- inc/nlarn.h.orig	2018-09-08 19:56:33 UTC
-+++ inc/nlarn.h
-@@ -31,6 +31,6 @@
- #endif
- 
- /* the entire game */
--game *nlarn;
-+extern game *nlarn;
- 
- #endif
diff --git a/games/nlarn/files/patch-inc_player.h b/games/nlarn/files/patch-inc_player.h
new file mode 100644
index 000000000000..5442d91b4acf
--- /dev/null
+++ b/games/nlarn/files/patch-inc_player.h
@@ -0,0 +1,12 @@
+--- inc/player.h.orig	2020-05-23 06:13:27 UTC
++++ inc/player.h
+@@ -79,9 +79,6 @@ typedef enum _player_sex
+     PS_MAX
+ } player_sex;
+ 
+-/* textual representation of the player's gender */
+-const char *player_sex_str[PS_MAX];
+-
+ typedef struct _player_settings
+ {
+     gboolean auto_pickup[IT_MAX]; /* automatically pick up item of enabled types */
diff --git a/games/nlarn/files/patch-inc_position.h b/games/nlarn/files/patch-inc_position.h
index 8aa8e93b0628..32848d57d88a 100644
--- a/games/nlarn/files/patch-inc_position.h
+++ b/games/nlarn/files/patch-inc_position.h
@@ -1,11 +1,11 @@
---- inc/position.h.orig	2018-09-08 19:56:33 UTC
+--- inc/position.h.orig	2020-05-23 06:13:27 UTC
 +++ inc/position.h
-@@ -52,7 +52,7 @@ typedef union _position
+@@ -52,8 +52,6 @@ typedef union _position
      guint32 val;
  } position;
  
 -const position pos_invalid;
-+extern const position pos_invalid;
- 
+-
  typedef struct _rectangle
  {
+     guint64 x1: 16;
diff --git a/games/nlarn/files/patch-src_amulets.c b/games/nlarn/files/patch-src_amulets.c
new file mode 100644
index 000000000000..f705bf6d4b6c
--- /dev/null
+++ b/games/nlarn/files/patch-src_amulets.c
@@ -0,0 +1,11 @@
+--- src/amulets.c.orig	2020-05-23 06:13:27 UTC
++++ src/amulets.c
+@@ -19,7 +19,7 @@
+ #include <glib.h>
+ #include "amulets.h"
+ #include "items.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ 
+ const amulet_data amulets[AM_MAX] =
+ {
diff --git a/games/nlarn/files/patch-src_buildings.c b/games/nlarn/files/patch-src_buildings.c
new file mode 100644
index 000000000000..549bcc528a0a
--- /dev/null
+++ b/games/nlarn/files/patch-src_buildings.c
@@ -0,0 +1,11 @@
+--- src/buildings.c.orig	2020-05-23 06:13:27 UTC
++++ src/buildings.c
+@@ -25,7 +25,7 @@
+ #include "game.h"
+ #include "gems.h"
+ #include "items.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "scrolls.h"
+ 
diff --git a/games/nlarn/files/patch-src_config.c b/games/nlarn/files/patch-src_config.c
new file mode 100644
index 000000000000..414ddc5d8e0a
--- /dev/null
+++ b/games/nlarn/files/patch-src_config.c
@@ -0,0 +1,11 @@
+--- src/config.c.orig	2020-05-23 06:13:27 UTC
++++ src/config.c
+@@ -22,7 +22,7 @@
+ 
+ #include "config.h"
+ #include "display.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "items.h"
+ #include "player.h"
+ 
diff --git a/games/nlarn/files/patch-src_container.c b/games/nlarn/files/patch-src_container.c
new file mode 100644
index 000000000000..e46e80153cbe
--- /dev/null
+++ b/games/nlarn/files/patch-src_container.c
@@ -0,0 +1,11 @@
+--- src/container.c.orig	2020-05-23 06:13:27 UTC
++++ src/container.c
+@@ -20,7 +20,7 @@
+ 
+ #include "container.h"
+ #include "display.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "random.h"
+ 
diff --git a/games/nlarn/files/patch-src_display.c b/games/nlarn/files/patch-src_display.c
new file mode 100644
index 000000000000..f92e2db71f67
--- /dev/null
+++ b/games/nlarn/files/patch-src_display.c
@@ -0,0 +1,11 @@
+--- src/display.c.orig	2020-05-23 06:13:27 UTC
++++ src/display.c
+@@ -24,7 +24,7 @@
+ #include "display.h"
+ #include "fov.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "spheres.h"
+ 
+ typedef struct _display_colset
diff --git a/games/nlarn/files/patch-src_effects.c b/games/nlarn/files/patch-src_effects.c
new file mode 100644
index 000000000000..864dbbd87e6b
--- /dev/null
+++ b/games/nlarn/files/patch-src_effects.c
@@ -0,0 +1,11 @@
+--- src/effects.c.orig	2020-05-23 06:13:27 UTC
++++ src/effects.c
+@@ -22,7 +22,7 @@
+ #include "cJSON.h"
+ #include "effects.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "random.h"
+ 
+ static const effect_data effects[ET_MAX] =
diff --git a/games/nlarn/files/patch-src_fov.c b/games/nlarn/files/patch-src_fov.c
new file mode 100644
index 000000000000..564d49ef7ad3
--- /dev/null
+++ b/games/nlarn/files/patch-src_fov.c
@@ -0,0 +1,11 @@
+--- src/fov.c.orig	2020-05-23 06:13:27 UTC
++++ src/fov.c
+@@ -21,7 +21,7 @@
+ #include "fov.h"
+ #include "game.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "position.h"
+ 
+ static void fov_calculate_octant(fov *fv, map *m, position center,
diff --git a/games/nlarn/files/patch-src_game.c b/games/nlarn/files/patch-src_game.c
new file mode 100644
index 000000000000..5b29cf868f8c
--- /dev/null
+++ b/games/nlarn/files/patch-src_game.c
@@ -0,0 +1,19 @@
+--- src/game.c.orig	2020-05-23 06:13:27 UTC
++++ src/game.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <zlib.h>
+ #include <glib/gstdio.h>
++#include <unistd.h>
+ 
+ #if (defined __unix) || (defined __unix__) || (defined __APPLE__)
+ # include <sys/file.h>
+@@ -42,7 +43,7 @@
+ #include "config.h"
+ #include "display.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "spheres.h"
+ #include "random.h"
diff --git a/games/nlarn/files/patch-src_inventory.c b/games/nlarn/files/patch-src_inventory.c
new file mode 100644
index 000000000000..591a21a51a00
--- /dev/null
+++ b/games/nlarn/files/patch-src_inventory.c
@@ -0,0 +1,11 @@
+--- src/inventory.c.orig	2020-05-23 06:13:27 UTC
++++ src/inventory.c
+@@ -22,7 +22,7 @@
+ #include "game.h"
+ #include "inventory.h"
+ #include "items.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "potions.h"
+ 
+ /* functions */
diff --git a/games/nlarn/files/patch-src_items.c b/games/nlarn/files/patch-src_items.c
new file mode 100644
index 000000000000..420414fec757
--- /dev/null
+++ b/games/nlarn/files/patch-src_items.c
@@ -0,0 +1,11 @@
+--- src/items.c.orig	2020-05-23 06:13:27 UTC
++++ src/items.c
+@@ -27,7 +27,7 @@
+ #include "gems.h"
+ #include "items.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "potions.h"
+ #include "random.h"
diff --git a/games/nlarn/files/patch-src_map.c b/games/nlarn/files/patch-src_map.c
new file mode 100644
index 000000000000..f0827d3ce86f
--- /dev/null
+++ b/games/nlarn/files/patch-src_map.c
@@ -0,0 +1,11 @@
+--- src/map.c.orig	2020-05-23 06:13:27 UTC
++++ src/map.c
+@@ -23,7 +23,7 @@
+ #include "display.h"
+ #include "items.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "random.h"
+ #include "sobjects.h"
+ #include "spheres.h"
diff --git a/games/nlarn/files/patch-src_monsters.c b/games/nlarn/files/patch-src_monsters.c
new file mode 100644
index 000000000000..24d5042b13d2
--- /dev/null
+++ b/games/nlarn/files/patch-src_monsters.c
@@ -0,0 +1,11 @@
+--- src/monsters.c.orig	2020-05-23 06:13:27 UTC
++++ src/monsters.c
+@@ -26,7 +26,7 @@
+ #include "items.h"
+ #include "map.h"
+ #include "monsters.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "pathfinding.h"
+ #include "random.h"
+ 
diff --git a/games/nlarn/files/patch-src_nlarn.c b/games/nlarn/files/patch-src_nlarn.c
new file mode 100644
index 000000000000..3ac4a48c5328
--- /dev/null
+++ b/games/nlarn/files/patch-src_nlarn.c
@@ -0,0 +1,10 @@
+--- src/nlarn.c.orig	2020-05-23 06:13:27 UTC
++++ src/nlarn.c
+@@ -46,6 +46,7 @@
+ #include "scoreboard.h"
+ #include "sobjects.h"
+ #include "traps.h"
++#include "extdefs.h"
+ 
+ /* see https://stackoverflow.com/q/36764885/1519878 */
+ #define _STR(x) #x
diff --git a/games/nlarn/files/patch-src_pathfinding.c b/games/nlarn/files/patch-src_pathfinding.c
new file mode 100644
index 000000000000..3568bb13dcac
--- /dev/null
+++ b/games/nlarn/files/patch-src_pathfinding.c
@@ -0,0 +1,11 @@
+--- src/pathfinding.c.orig	2020-05-23 06:13:27 UTC
++++ src/pathfinding.c
+@@ -16,7 +16,7 @@
+  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "pathfinding.h"
+ #include "player.h"
+ 
diff --git a/games/nlarn/files/patch-src_player.c b/games/nlarn/files/patch-src_player.c
new file mode 100644
index 000000000000..e5fb3d166543
--- /dev/null
+++ b/games/nlarn/files/patch-src_player.c
@@ -0,0 +1,18 @@
+--- src/player.c.orig	2020-05-23 06:13:27 UTC
++++ src/player.c
+@@ -27,13 +27,13 @@
+ #include "display.h"
+ #include "fov.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "random.h"
+ #include "scoreboard.h"
+ #include "sobjects.h"
+ 
+-const char *player_sex_str[] = {"not defined", "male", "female"};
++const char *player_sex_str[PS_MAX] = {"not defined", "male", "female"};
+ 
+ static const char aa1[] = "mighty evil master";
+ static const char aa2[] = "apprentice demi-god";
diff --git a/games/nlarn/files/patch-src_position.c b/games/nlarn/files/patch-src_position.c
new file mode 100644
index 000000000000..afd3fea14f32
--- /dev/null
+++ b/games/nlarn/files/patch-src_position.c
@@ -0,0 +1,11 @@
+--- src/position.c.orig	2020-05-23 06:13:27 UTC
++++ src/position.c
+@@ -22,7 +22,7 @@
+ #include "cJSON.h"
+ #include "display.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "position.h"
+ 
+ #define POS_MAX_XY (1<<10)
diff --git a/games/nlarn/files/patch-src_potions.c b/games/nlarn/files/patch-src_potions.c
new file mode 100644
index 000000000000..d1058997c559
--- /dev/null
+++ b/games/nlarn/files/patch-src_potions.c
@@ -0,0 +1,11 @@
+--- src/potions.c.orig	2020-05-23 06:13:27 UTC
++++ src/potions.c
+@@ -20,7 +20,7 @@
+ 
+ #include "display.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "potions.h"
+ #include "random.h"
diff --git a/games/nlarn/files/patch-src_rings.c b/games/nlarn/files/patch-src_rings.c
new file mode 100644
index 000000000000..8f45d65262a6
--- /dev/null
+++ b/games/nlarn/files/patch-src_rings.c
@@ -0,0 +1,11 @@
+--- src/rings.c.orig	2020-05-23 06:13:27 UTC
++++ src/rings.c
+@@ -18,7 +18,7 @@
+ 
+ #include <glib.h>
+ 
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "rings.h"
+ 
+ const ring_data rings[RT_MAX] =
diff --git a/games/nlarn/files/patch-src_scoreboard.c b/games/nlarn/files/patch-src_scoreboard.c
new file mode 100644
index 000000000000..88e801397244
--- /dev/null
+++ b/games/nlarn/files/patch-src_scoreboard.c
@@ -0,0 +1,11 @@
+--- src/scoreboard.c.orig	2020-05-23 06:13:27 UTC
++++ src/scoreboard.c
+@@ -25,7 +25,7 @@
+ # include <sys/file.h>
+ #endif
+ 
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "scoreboard.h"
+ #include "cJSON.h"
+ 
diff --git a/games/nlarn/files/patch-src_scrolls.c b/games/nlarn/files/patch-src_scrolls.c
new file mode 100644
index 000000000000..b65aa605c7d0
--- /dev/null
+++ b/games/nlarn/files/patch-src_scrolls.c
@@ -0,0 +1,11 @@
+--- src/scrolls.c.orig	2020-05-23 06:13:27 UTC
++++ src/scrolls.c
+@@ -21,7 +21,7 @@
+ 
+ #include "display.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "random.h"
+ #include "scrolls.h"
+ 
diff --git a/games/nlarn/files/patch-src_sobjects.c b/games/nlarn/files/patch-src_sobjects.c
new file mode 100644
index 000000000000..3831fee2fb42
--- /dev/null
+++ b/games/nlarn/files/patch-src_sobjects.c
@@ -0,0 +1,11 @@
+--- src/sobjects.c.orig	2020-05-23 06:13:27 UTC
++++ src/sobjects.c
+@@ -21,7 +21,7 @@
+ #include "display.h"
+ #include "game.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "sobjects.h"
+ #include "player.h"
+ #include "random.h"
diff --git a/games/nlarn/files/patch-src_spells.c b/games/nlarn/files/patch-src_spells.c
new file mode 100644
index 000000000000..1327775cb9b4
--- /dev/null
+++ b/games/nlarn/files/patch-src_spells.c
@@ -0,0 +1,11 @@
+--- src/spells.c.orig	2020-05-23 06:13:27 UTC
++++ src/spells.c
+@@ -21,7 +21,7 @@
+ 
+ #include "display.h"
+ #include "map.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "random.h"
+ #include "sobjects.h"
+ #include "spells.h"
diff --git a/games/nlarn/files/patch-src_spheres.c b/games/nlarn/files/patch-src_spheres.c
new file mode 100644
index 000000000000..ede65b01bb75
--- /dev/null
+++ b/games/nlarn/files/patch-src_spheres.c
@@ -0,0 +1,11 @@
+--- src/spheres.c.orig	2020-05-23 06:13:27 UTC
++++ src/spheres.c
+@@ -19,7 +19,7 @@
+ #include <glib.h>
+ 
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "random.h"
+ #include "spheres.h"
+ 
diff --git a/games/nlarn/files/patch-src_traps.c b/games/nlarn/files/patch-src_traps.c
new file mode 100644
index 000000000000..43b6f20d50dd
--- /dev/null
+++ b/games/nlarn/files/patch-src_traps.c
@@ -0,0 +1,11 @@
+--- src/traps.c.orig	2020-05-23 06:13:27 UTC
++++ src/traps.c
+@@ -21,7 +21,7 @@
+ #include "display.h"
+ #include "effects.h"
+ #include "game.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "random.h"
+ #include "traps.h"
diff --git a/games/nlarn/files/patch-src_utils.c b/games/nlarn/files/patch-src_utils.c
new file mode 100644
index 000000000000..d7268f1254be
--- /dev/null
+++ b/games/nlarn/files/patch-src_utils.c
@@ -0,0 +1,11 @@
+--- src/utils.c.orig	2020-05-23 06:13:27 UTC
++++ src/utils.c
+@@ -21,7 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "utils.h"
+ 
+ static const guint LOG_MAX_LENGTH = 100;
diff --git a/games/nlarn/files/patch-src_weapons.c b/games/nlarn/files/patch-src_weapons.c
new file mode 100644
index 000000000000..374eda753ac6
--- /dev/null
+++ b/games/nlarn/files/patch-src_weapons.c
@@ -0,0 +1,11 @@
+--- src/weapons.c.orig	2020-05-23 06:13:27 UTC
++++ src/weapons.c
+@@ -22,7 +22,7 @@
+ #include "items.h"
+ #include "map.h"
+ #include "monsters.h"
+-#include "nlarn.h"
++#include "extdefs.h"
+ #include "player.h"
+ #include "random.h"
+ #include "weapons.h"
diff --git a/games/nlarn/pkg-plist b/games/nlarn/pkg-plist
index 1137c58c62ba..035ed6279afe 100644
--- a/games/nlarn/pkg-plist
+++ b/games/nlarn/pkg-plist
@@ -4,8 +4,6 @@ bin/nlarn
 %%DATADIR%%/fortune
 %%DATADIR%%/maze
 %%DATADIR%%/maze_doc.txt
-%%DATADIR%%/monsters.lua
 %%DATADIR%%/nlarn-128.bmp
 %%DATADIR%%/nlarn.hlp
-%%DATADIR%%/nlarn.ini-sample
 %%DATADIR%%/nlarn.msg