Attachment 164179 Details for Bug 205255 – Diff of ports tree

[patch] Diff of ports tree

nethack-v3.diff (text/plain), 31.72 KB, created by groot on 2015-12-13 14:00:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: groot

Created: 2015-12-13 14:00:16 UTC

Size: 31.72 KB

patch

obsolete

>Index: games/Makefile
>===================================================================
>--- games/Makefile	(revision 403658)
>+++ games/Makefile	(working copy)
>@@ -627,6 +627,8 @@
>     SUBDIR += nethack33-nox11
>     SUBDIR += nethack34
>     SUBDIR += nethack34-nox11
>+    SUBDIR += nethack36
>+    SUBDIR += nethack36-nox11
>     SUBDIR += netherearth
>     SUBDIR += netpanzer
>     SUBDIR += netradiant
>Index: games/nethack36/Makefile
>===================================================================
>--- games/nethack36/Makefile	(revision 403631)
>+++ games/nethack36/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nethack
>-PORTVERSION=	3.4.3
>-PORTREVISION=	8
>+PORTVERSION=	3.6.0
> CATEGORIES=	games
> MASTER_SITES=	SF
> DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
>@@ -32,42 +31,23 @@
> 
> .if !defined(PKGNAMESUFFIX)
> USE_XORG=	xaw xpm
>+CFLAGS+=	-DX11_GRAPHICS -DUSE_TILES
> GRAPHICS=	X11_GRAPHICS
> .else
> .if ${PKGNAMESUFFIX} == "-nox11"
> GRAPHICS=	# none
>-#
>-# Patch notes:
>-# 1) hpmon and statuscolors conflict with one another
>-# 2) menucolors patch must be applied before statuscolors
>-#
>-.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
>-IGNORE=		you cannot enable both HPMON and STATUSCOLORS
> .endif
>-.if defined(WITH_MENUCOLORS)
>-PATCHFILES+=	nh343-menucolor.diff
>-PATCH_SITES+=	http://bilious.alt.org/~paxed/nethack/
>-PATCH_DIST_STRIP=	-p1
>-CFLAGS+=	-DMENU_COLOR_REGEX_POSIX
> .endif
>-.if defined(WITH_STATUSCOLORS)
>-PATCHFILES+=	nh343-statuscolors.fixed.patch
>-PATCH_SITES+=	http://jdc.koitsu.org/nethack/ \
>-		LOCAL/wxs
>-PATCH_DIST_STRIP=	-p1
>-.endif
>-.if defined(WITH_HPMON)
>-PATCHFILES+=	hpmon.diff
>-PATCH_SITES+=	http://www.netsonic.fi/~walker/nh/ \
>-		LOCAL/wxs
>-PATCH_DIST_STRIP=	-p1
>-CFLAGS+=	-DHPMON
>-.endif
>-.endif
>-.endif
>+CFLAGS+=	-DNOMAIL -DSYSCF -USYSCF_FILE
> 
> OPTIONS_DEFINE=	DOCS
> 
>+# The data files which are generated with makedefs
>+# are all suceptible to a race: temporary files called
>+# grep.tmp are generated and deleted, and doing them in
>+# parallel will overwrite each other's data.
>+MAKE_JOBS_UNSAFE=yes
>+
> .include <bsd.port.pre.mk>
> 
> pre-everything::
>Index: games/nethack36/distinfo
>===================================================================
>--- games/nethack36/distinfo	(revision 403631)
>+++ games/nethack36/distinfo	(working copy)
>@@ -1,8 +1,2 @@
>-SHA256 (nethack-343-src.tgz) = bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
>-SIZE (nethack-343-src.tgz) = 3497458
>-SHA256 (nh343-menucolor.diff) = 21f37f759686ac405f1032648d38977096930200e04aeec989d8a450d5532733
>-SIZE (nh343-menucolor.diff) = 20010
>-SHA256 (nh343-statuscolors.fixed.patch) = 1c0c7a5e7a5cd564b5bd3fa790393f13ea584bdb0cbd4c34942e551cb9a6656e
>-SIZE (nh343-statuscolors.fixed.patch) = 19090
>-SHA256 (hpmon.diff) = d9369768f81f06e75b7349609bdff6fd9deff226452f04a89597190e4489074f
>-SIZE (hpmon.diff) = 2041
>+SHA256 (nethack-360-src.tgz) = 1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a
>+SIZE (nethack-360-src.tgz) = 4261282
>Index: games/nethack36/files/patch-include-config.h
>===================================================================
>--- games/nethack36/files/patch-include-config.h	(revision 403631)
>+++ games/nethack36/files/patch-include-config.h	(working copy)
>@@ -1,46 +1,27 @@
>---- include/config.h.orig	Mon Dec  8 00:39:13 2003
>-+++ include/config.h	Sun Sep  3 12:17:19 2006
>-@@ -85,9 +85,6 @@
>- #ifdef QT_GRAPHICS
>- # define DEFAULT_WC_TILED_MAP   /* Default to tiles if users doesn't say wc_ascii_map */
>- # define USER_SOUNDS		/* Use sounds */
>--# ifndef __APPLE__
>--#  define USER_SOUNDS_REGEX
>--# endif
>- # define USE_XPM		/* Use XPM format for images (required) */
>- # define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.ppm) */
>- # ifndef DEFAULT_WINDOW_SYS
>-@@ -126,7 +123,7 @@
>-  * would allow:
>-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
>-  */
>--/* # define USE_XPM */		/* Disable if you do not have the XPM library */
>-+# define USE_XPM		/* Disable if you do not have the XPM library */
>- # ifdef USE_XPM
>- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
>- # endif
>-@@ -169,11 +166,11 @@
>+--- include/config.h.orig	2015-11-17 05:58:34 UTC
>++++ include/config.h
>+@@ -250,11 +250,11 @@
>  
>- #ifdef UNIX
>+ #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
>  /* path and file name extension for compression program */
>--#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
>--#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
>-+/* #define COMPRESS "/usr/bin/compress"*/	/* Lempel-Ziv compression */
>-+/* #define COMPRESS_EXTENSION ".Z"	*/	/* compress's extension */
>+-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
>+-#define COMPRESS_EXTENSION ".Z"      /* compress's extension */
>++/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
>++/* #define COMPRESS_EXTENSION ".Z"      */ /* compress's extension */
>  /* An example of one alternative you might want to use: */
>--/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
>--/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
>-+#define COMPRESS "/usr/bin/gzip"	 	/* FSF gzip compression */
>-+#define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
>+-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
>+-/* #define COMPRESS_EXTENSION ".gz" */       /* normal gzip extension */
>++#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */
>++#define COMPRESS_EXTENSION ".gz"       /* normal gzip extension */
>  #endif
>  
>  #ifndef COMPRESS
>-@@ -204,7 +201,7 @@
>+@@ -317,7 +317,7 @@
>   * otherwise it will be the current directory.
>   */
>- # ifndef HACKDIR
>--#  define HACKDIR "/usr/games/lib/nethackdir"
>-+#  define HACKDIR "%%HACKDIR%%"
>- # endif
>+ #ifndef HACKDIR
>+-#define HACKDIR "/usr/games/lib/nethackdir"
>++#define HACKDIR "/usr/local/share/nethack"
>+ #endif
>  
>  /*
>Index: games/nethack36/files/patch-include-system.h
>===================================================================
>--- games/nethack36/files/patch-include-system.h	(revision 403631)
>+++ games/nethack36/files/patch-include-system.h	(working copy)
>@@ -1,13 +1,13 @@
>---- include/system.h.orig	Sat Aug 30 09:07:23 2003
>-+++ include/system.h	Tue Sep  2 00:39:39 2003
>-@@ -79,7 +79,9 @@
>- # if !defined(__SC__) && !defined(LINUX)
>- E  long NDECL(random);
>- # endif
>--# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
>+--- include/system.h.orig	2015-12-07 08:26:01 UTC
>++++ include/system.h
>+@@ -81,7 +81,9 @@ typedef long off_t;
>+ #if !defined(__SC__) && !defined(LINUX)
>+ E long NDECL(random);
>+ #endif
>+-#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
> +# if defined(__FreeBSD__)
> +E void FDECL(srandom, (unsigned long));
>-+# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
>++#elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
>+     || defined(RANDOM)
>  E void FDECL(srandom, (unsigned int));
>- # else
>- #  if !defined(bsdi) && !defined(__FreeBSD__)
>+ #else
>Index: games/nethack36/files/patch-include-unixconf.h
>===================================================================
>--- games/nethack36/files/patch-include-unixconf.h	(revision 403631)
>+++ games/nethack36/files/patch-include-unixconf.h	(working copy)
>@@ -1,45 +1,36 @@
>---- include/unixconf.h.orig	Mon Sep  1 22:34:19 2003
>-+++ include/unixconf.h	Mon Sep  1 22:35:16 2003
>+--- include/unixconf.h.orig	2015-11-17 10:54:25 UTC
>++++ include/unixconf.h
> @@ -19,13 +19,13 @@
>   */
>  
>  /* define exactly one of the following four choices */
>--/* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
>-+#define BSD 1		/* define for 4.n/Free/Open/Net BSD  */
>- 			/* also for relatives like SunOS 4.x, DG/UX, and */
>- 			/* older versions of Linux */
>- /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
>- 			/* Use BSD for < v3.0 */
>- 			/* "ULTRIX" not to be confused with "ultrix" */
>--#define SYSV		/* define for System V, Solaris 2.x, newer versions */
>-+/* #define SYSV */	/* define for System V, Solaris 2.x, newer versions */
>- 			/* of Linux */
>- /* #define HPUX */	/* Hewlett-Packard's Unix, version 6.5 or higher */
>- 			/* use SYSV for < v6.5 */
>-@@ -47,7 +47,7 @@
>- 			 * job control (note that AIX is SYSV otherwise)
>- 			 * Also define this for AIX 3.2 */
>+-/* #define BSD 1 */  /* define for 4.n/Free/Open/Net BSD  */
>++#define BSD 1        /* define for 4.n/Free/Open/Net BSD  */
>+                      /* also for relatives like SunOS 4.x, DG/UX, and */
>+                      /* older versions of Linux */
>+ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
>+                      /* Use BSD for < v3.0 */
>+                      /* "ULTRIX" not to be confused with "ultrix" */
>+-#define SYSV         /* define for System V, Solaris 2.x, newer versions */
>++/* #define SYSV */   /* define for System V, Solaris 2.x, newer versions */
>+                      /* of Linux */
>+ /* #define HPUX */   /* Hewlett-Packard's Unix, version 6.5 or higher */
>+                      /* use SYSV for < v6.5 */
>+@@ -46,7 +46,7 @@
>+                         * job control (note that AIX is SYSV otherwise)
>+                         * Also define this for AIX 3.2 */
>  
>--#define TERMINFO	/* uses terminfo rather than termcap */
>-+/* #define TERMINFO */	/* uses terminfo rather than termcap */
>- 			/* Should be defined for most SYSV, SVR4 (including
>- 			 * Solaris 2+), HPUX, and Linux systems.  In
>- 			 * particular, it should NOT be defined for the UNIXPC
>-@@ -143,7 +143,7 @@
>-  * A stat system call is done on the mailbox every MAILCKFREQ moves.
>-  */
>- 
>--#define MAIL			/* Deliver mail during the game */
>-+/* #define MAIL */			/* Deliver mail during the game */
>- 
>- /* The Andrew Message System does mail a little differently from normal
>-  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
>-@@ -284,7 +284,7 @@
>+-#define TERMINFO       /* uses terminfo rather than termcap */
>++/* #define TERMINFO */ /* uses terminfo rather than termcap */
>+                        /* Should be defined for most SYSV, SVR4 (including
>+                         * Solaris 2+), HPUX, and Linux systems.  In
>+                         * particular, it should NOT be defined for the UNIXPC
>+@@ -297,7 +297,7 @@
>  #endif
>  
>  #if defined(BSD) || defined(ULTRIX)
>--# if !defined(DGUX) && !defined(SUNOS4)
>-+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
>- #define memcpy(d, s, n)		bcopy(s, d, n)
>- #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
>- # endif
>+-#if !defined(DGUX) && !defined(SUNOS4)
>++#if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
>+ #define memcpy(d, s, n) bcopy(s, d, n)
>+ #define memcmp(s1, s2, n) bcmp(s2, s1, n)
>+ #endif
>Index: games/nethack36/files/patch-src-files.c
>===================================================================
>--- games/nethack36/files/patch-src-files.c	(revision 403631)
>+++ games/nethack36/files/patch-src-files.c	(working copy)
>@@ -1,10 +1,10 @@
>---- src/files.c.orig	Sun Feb 23 23:43:26 2003
>-+++ src/files.c	Thu Jun 19 11:51:59 2003
>-@@ -29,6 +29,7 @@
>- #endif
>+--- src/files.c.orig	2015-12-07 08:26:01 UTC
>++++ src/files.c
>+@@ -40,6 +40,7 @@ const
>  
>  #if defined(UNIX) && defined(QT_GRAPHICS)
>+ #include <sys/types.h>
> +#include <limits.h>
>  #include <dirent.h>
>+ #include <stdlib.h>
>  #endif
>- 
>Index: games/nethack36/files/patch-sys-unix-Makefile.doc
>===================================================================
>--- games/nethack36/files/patch-sys-unix-Makefile.doc	(revision 403631)
>+++ games/nethack36/files/patch-sys-unix-Makefile.doc	(working copy)
>@@ -1,6 +1,6 @@
>---- sys/unix/Makefile.doc.orig	2003-12-07 15:39:13.000000000 -0800
>-+++ sys/unix/Makefile.doc	2014-06-28 23:05:31.000000000 -0700
>-@@ -41,15 +41,15 @@
>+--- sys/unix/Makefile.doc.orig	2015-06-12 06:32:45 UTC
>++++ sys/unix/Makefile.doc
>+@@ -58,16 +58,16 @@ Guidebook.dvi:	Guidebook.tex
>  
>  
>  GAME	= nethack
>@@ -9,21 +9,23 @@
>  MANEXT	= 6
>  
>  # manual installation for most BSD-style systems
>--GAMEMANCREATE = cp nethack.6
>--LEVMANCREATE = cp lev_comp.6
>--DGNMANCREATE = cp dgn_comp.6
>--RCVRMANCREATE = cp recover.6
>--DLBMANCREATE = cp dlb.6
>-+GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
>-+LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
>-+DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
>-+RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
>-+DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
>+-GAMEMANCREATE = cat nethack.6 | $(NHGREP) >
>+-LEVMANCREATE = cat lev_comp.6 | $(NHGREP) >
>+-DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) >
>+-RCVRMANCREATE = cat recover.6 | $(NHGREP) >
>+-DLBMANCREATE = cat dlb.6 | $(NHGREP) >
>+-MDMANCREATE = cat makedefs.6 | $(NHGREP) >
>++GAMEMANCREATE = cat nethack.6 | $(NHGREP) > nethack.6.out ; ${BSD_INSTALL_MAN} nethack.6.out
>++LEVMANCREATE = cat lev_comp.6 | $(NHGREP) > lev_comp.6.out ; ${BSD_INSTALL_MAN} lev_comp.6.out
>++DGNMANCREATE = cat dgn_comp.6 | $(NHGREP) > dgn_comp.6.out ; ${BSD_INSTALL_MAN} dgn_comp.6.out
>++RCVRMANCREATE = cat recover.6 | $(NHGREP) > recover.6.out ; ${BSD_INSTALL_MAN} recover.6.out
>++DLBMANCREATE = cat dlb.6 | $(NHGREP) > dlb.6.out ; ${BSD_INSTALL_MAN} dlb.6.out
>++MDMANCREATE = cat makedefs.6 | $(NHGREP) > makedefs.6.out ; ${BSD_INSTALL_MAN} makedefs.6.out
>  # manual installation for most SYSV-style systems
>- # GAMEMANCREATE = nroff -man nethack.6 >
>- # LEVMANCREATE = nroff -man lev_comp.6 >
>-@@ -58,11 +58,11 @@
>- # DLBMANCREATE = nroff -man dlb.6 >
>+ # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
>+ # LEVMANCREATE = cat lev_comp.6 | $(NHGREP) | nroff -man - >
>+@@ -77,12 +77,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP)
>+ # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
>  
>  manpages:
> -	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
>@@ -31,11 +33,13 @@
> -	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
> -	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
> -	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
>+-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
> +	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
> +	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
> +	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
> +	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover.$(MANEXT)
> +	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb.$(MANEXT)
>++	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/makedefs.$(MANEXT)
>  
>  # manual creation for distribution
>- DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
>+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
>Index: games/nethack36/files/patch-sys-unix-Makefile.src
>===================================================================
>--- games/nethack36/files/patch-sys-unix-Makefile.src	(revision 403631)
>+++ games/nethack36/files/patch-sys-unix-Makefile.src	(working copy)
>@@ -1,17 +1,15 @@
>-diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
>---- sys.orig/unix/Makefile.src	Sun Dec  7 15:39:13 2003
>-+++ sys/unix/Makefile.src	Wed Jun 30 08:27:32 2004
>-@@ -146,19 +146,29 @@
>+--- sys/unix/Makefile.src.orig	2015-11-12 07:51:56 UTC
>++++ sys/unix/Makefile.src
>+@@ -149,19 +149,30 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un
>  # directories.  The ones given below is the usual spot for linux systems.
>  # The paths are for glibconfig.h and gnomesupport.h respectively.
>  #
> -GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
>-+GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
>++GNOMEINC=  $(shell ${GNOME_CONFIG} --cflags gnomeui)
>  
>  # flags for debugging:
>  # CFLAGS = -g -I../include
>  
>--CFLAGS = -O -I../include
> +CFLAGS += -I../include
> +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
> +CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
>@@ -22,8 +20,9 @@
> +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
> +CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
> +endif
>-+
>- LFLAGS = 
>+ #CFLAGS = -O -I../include
>+ #LFLAGS = 
>++LINK = $(CC)
>  
>  # The Qt and Be window systems are written in C++, while the rest of
>  # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
>@@ -31,14 +30,17 @@
> -CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
> -CXX=g++
> +CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
>-+#CXX=g++
>++# CXX=g++
>  #LINK=g++
>  #	For cross-compiling, eg. with gcc on Linux (see also CC further up):
>  #CXX=arm-linux-g++
>-@@ -215,7 +225,26 @@
>+@@ -222,8 +233,28 @@ WINBEOBJ =
>+ 
>  #
>  #
>- WINSRC = $(WINTTYSRC)
>+-#WINSRC = $(WINTTYSRC)
>+-#WINOBJ = $(WINTTYOBJ)
>++WINSRC = $(WINTTYSRC)
> +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
> +WINSRC += $(WINX11SRC)
> +endif
>@@ -49,7 +51,7 @@
> +WINSRC += $(WINGNOMESRC)
> +endif
> +
>- WINOBJ = $(WINTTYOBJ)
>++WINOBJ = $(WINTTYOBJ)
> +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
> +WINOBJ += $(WINX11OBJ)
> +endif
>@@ -59,14 +61,16 @@
> +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
> +WINOBJ += $(WINGNOMEOBJ)
> +endif
>++
>  
>  # on some systems the termcap library is in -ltermcap or -lcurses
>  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
>-@@ -231,23 +260,23 @@
>+@@ -239,23 +270,23 @@ WINBEOBJ =
>  # WINTTYLIB = -lcurses
>  # WINTTYLIB = -lcurses16
>  # WINTTYLIB = -lncurses
>- WINTTYLIB = -ltermlib
>+-#WINTTYLIB = -ltermlib
>++WINTTYLIB = -ltermlib
>  #
>  # libraries for X11
>  # If USE_XPM is defined in config.h, you will also need -lXpm here.
>@@ -89,10 +93,12 @@
>  #
>  # libraries for Gem port
>  WINGEMLIB = -le_gem -lgem
>-@@ -256,6 +285,15 @@
>+@@ -263,7 +294,17 @@ WINGEMLIB = -le_gem -lgem
>+ # libraries for BeOS 
>  WINBELIB = -lbe
>  
>- WINLIB = $(WINTTYLIB)
>+-#WINLIB = $(WINTTYLIB)
>++WINLIB = $(WINTTYLIB)
> +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
> +WINLIB += $(WINX11LIB)
> +endif
>@@ -102,10 +108,11 @@
> +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
> +WINLIB += $(WINGNOMELIB)
> +endif
>++
>  
>  # any other strange libraries your system needs (for Sysunix only -- the more
>  # specialized targets should already be right)
>-@@ -461,13 +499,13 @@
>+@@ -482,13 +523,13 @@ objects.o:
>  
>  # Qt windowport meta-object-compiler output
>  qt_kde0.moc: ../include/qt_kde0.h
>Index: games/nethack36/files/patch-sys-unix-Makefile.top
>===================================================================
>--- games/nethack36/files/patch-sys-unix-Makefile.top	(revision 403631)
>+++ games/nethack36/files/patch-sys-unix-Makefile.top	(working copy)
>@@ -1,105 +1,108 @@
>---- sys/unix/Makefile.top.orig	2003-12-07 15:39:13.000000000 -0800
>-+++ sys/unix/Makefile.top	2014-06-28 23:20:31.000000000 -0700
>-@@ -14,18 +14,17 @@
>- # MAKE = make
>- 
>- # make NetHack
>--PREFIX	 = /usr
>--GAME     = nethack
>-+GAME     = %%HACKNAME%%
>+--- sys/unix/Makefile.top.orig	2015-11-18 20:54:59 UTC
>++++ sys/unix/Makefile.top
>+@@ -21,15 +21,15 @@ NHSROOT=.
>+ GAME     = nethack
>  # GAME     = nethack.prg
>- GAMEUID  = games
>--GAMEGRP  = bin
>+ #GAMEUID  = games
>+-#GAMEGRP  = bin
> +GAMEGRP  = games
>  
>  # Permissions - some places use setgid instead of setuid, for instance
>  # See also the option "SECURE" in include/config.h
>--GAMEPERM = 04755
>+-#GAMEPERM = 04755
> -FILEPERM = 0644
> +GAMEPERM = 02755
> +FILEPERM = 0664
>+ # VARFILEPERM = 0644
>  EXEPERM  = 0755
> -DIRPERM  = 0755
> +DIRPERM  = 0775
>+ # VARDIRPERM = 0755
>  
>- # GAMEDIR also appears in config.h as "HACKDIR".
>- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
>-@@ -35,12 +34,12 @@
>- # therefore there should not be anything in GAMEDIR that you want to keep
>+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
>+@@ -39,10 +39,11 @@ DIRPERM  = 0755
>+ # therefore there should not be anything in HACKDIR that you want to keep
>  # (if there is, you'll have to do the installation by hand or modify the
>  # instructions)
>--GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
>-+GAMEDIR  = ${PREFIX}/share/%%HACKNAME%%
>- VARDIR  = $(GAMEDIR)
>--SHELLDIR = $(PREFIX)/games
>+-#HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
>+-#VARDIR  = $(HACKDIR)
>++HACKDIR  = ${PREFIX}/share/nethack
>++VARDIR  = $(HACKDIR)
>++INSTDIR = $(HACKDIR)
>+ # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
>+-#SHELLDIR = $(PREFIX)/games
> +SHELLDIR = ${PREFIX}/bin
>  
>  # per discussion in Install.X11 and Install.Qt
>--VARDATND = 
>-+# VARDATND = 
>- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
>- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
>- # for Atari/Gem
>-@@ -48,7 +47,7 @@
>+ #VARDATND = 
>+@@ -53,7 +54,7 @@ DIRPERM  = 0755
>  # for BeOS
>  # VARDATND = beostiles
>  # for Gnome
>--# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
>-+VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
>+-# VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
>++VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
>  
>- VARDATD = data oracles options quest.dat rumors
>+ VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
>  VARDAT = $(VARDATD) $(VARDATND)
>-@@ -183,49 +182,32 @@
>+@@ -201,56 +202,34 @@ dofiles:
>  		-e '}' 					\
>  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
>  	$(MAKE) dofiles-$${target-nodlb}
>--	cp src/$(GAME) $(GAMEDIR)
>--	cp util/recover $(GAMEDIR)
>--	-rm -f $(SHELLDIR)/$(GAME)
>-+	cp src/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME)
>-+	cp util/recover ${DESTDIR}$(GAMEDIR)
>-+	-rm -f ${DESTDIR}$(SHELLDIR)/$(GAME)
>- 	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
>+-	(cd dat ; cp symbols $(INSTDIR) )
>+-	cp src/$(GAME) $(INSTDIR)
>+-	cp util/recover $(INSTDIR)
>+-	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
>++	(cd dat ; cp symbols ${DESTDIR}$(INSTDIR) )
>++	cp src/$(GAME) ${DESTDIR}$(INSTDIR)
>++	cp util/recover ${DESTDIR}$(INSTDIR)
>++	-if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
>+ 	if test -n '$(SHELLDIR)'; then \
>+ 		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
>  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
>  		< sys/unix/nethack.sh \
>--		> $(SHELLDIR)/$(GAME)
>+-		> $(SHELLDIR)/$(GAME) ; fi
> -# set up their permissions
>--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
>+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
> -			$(CHGRP) $(GAMEGRP) $(GAME) recover )
>--	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
>--	chmod $(EXEPERM) $(GAMEDIR)/recover
>--	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
>--	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
>--	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
>-+		> ${DESTDIR}$(SHELLDIR)/$(GAME)
>+-	chmod $(GAMEPERM) $(INSTDIR)/$(GAME)
>+-	chmod $(EXEPERM) $(INSTDIR)/recover
>+-	-if test -n '$(SHELLDIR)'; then \
>+-		$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi
>+-	if test -n '$(SHELLDIR)'; then \
>+-		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
>+-		chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
>+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
>+-			$(CHGRP) $(GAMEGRP) symbols ; \
>+-			chmod $(FILEPERM) symbols )
>++		> ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
>  
>  dofiles-dlb: check-dlb
>--	( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
>+-	( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
> -# set up their permissions
>--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
>+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
> -			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
> -			chmod $(FILEPERM) nhdat $(DATNODLB) )
>-+	( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(GAMEDIR) )
>++	( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(INSTDIR) )
>  
>  dofiles-nodlb:
>  # copy over the game files
>--	( cd dat ; cp $(DAT) $(GAMEDIR) )
>+-	( cd dat ; cp $(DAT) $(INSTDIR) )
> -# set up their permissions
>--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
>+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
> -			$(CHGRP) $(GAMEGRP) $(DAT) ; \
> -			chmod $(FILEPERM) $(DAT) )
>-+	( cd dat ; cp $(DAT) ${DESTDIR}$(GAMEDIR) )
>++	( cd dat ; cp $(DAT) ${DESTDIR}$(INSTDIR) )
>  
>  update: $(GAME) recover $(VARDAT) dungeon spec_levs
>  #	(don't yank the old version out from under people who're playing it)
>--	-mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
>-+	-mv ${DESTDIR}$(GAMEDIR)/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME).old
>+-	-mv $(INSTDIR)/$(GAME) $(INSTDIR)/$(GAME).old
>++	-mv ${DESTDIR}$(INSTDIR)/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME).old
>  #	quest.dat is also kept open and has the same problems over NFS
>  #	(quest.dat may be inside nhdat if dlb is in use)
>--	-mv $(GAMEDIR)/quest.dat $(GAMEDIR)/quest.dat.old
>--	-mv $(GAMEDIR)/nhdat $(GAMEDIR)/nhdat.old
>-+	-mv ${DESTDIR}$(GAMEDIR)/quest.dat ${DESTDIR}$(GAMEDIR)/quest.dat.old
>-+	-mv ${DESTDIR}$(GAMEDIR)/nhdat ${DESTDIR}$(GAMEDIR)/nhdat.old
>+-	-mv $(INSTDIR)/quest.dat $(INSTDIR)/quest.dat.old
>+-	-mv $(INSTDIR)/nhdat $(INSTDIR)/nhdat.old
>++	-mv ${DESTDIR}$(INSTDIR)/quest.dat ${DESTDIR}$(INSTDIR)/quest.dat.old
>++	-mv ${DESTDIR}$(INSTDIR)/nhdat ${DESTDIR}$(INSTDIR)/nhdat.old
>  # set up new versions of the game files
>  	( $(MAKE) dofiles )
>  # touch time-sensitive files
>@@ -108,28 +111,32 @@
>  	touch $(VARDIR)/perm $(VARDIR)/record
>  # and a reminder
>  	@echo You may also want to install the man pages via the doc Makefile.
>-@@ -233,20 +215,14 @@
>- install: $(GAME) recover $(VARDAT) dungeon spec_levs
>+@@ -262,23 +241,16 @@ install: rootcheck $(GAME) recover $(VAR
>+ 	true; $(PREINSTALL)
>  # set up the directories
>  # not all mkdirs have -p; those that don't will create a -p directory
>--	-mkdir -p $(SHELLDIR)
>--	-rm -rf $(GAMEDIR) $(VARDIR)
>--	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
>-+	-mkdir -p ${DESTDIR}$(SHELLDIR)
>-+	-rm -rf ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR)
>-+	-mkdir -p ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR)
>- 	-rmdir ./-p
>--	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
>--	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
>--	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
>+-	-if test -n '$(SHELLDIR)'; then \
>+-		mkdir -p $(SHELLDIR); fi
>+-	rm -rf $(INSTDIR) $(VARDIR)
>+-	-mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save
>++	-if test -n '${DESTDIR}$(SHELLDIR)'; then \
>++		mkdir -p ${DESTDIR}$(SHELLDIR); fi
>++	rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
>++	-mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
>+ 	if test -d ./-p; then rmdir ./-p; fi
>+-	-$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save
>+-	$(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save
>+ # order counts here:
>+-	chmod $(DIRPERM) $(INSTDIR)
>+-	chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save
>  # set up the game files
>  	( $(MAKE) dofiles )
>  # set up some additional files
>--	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
>--	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
>--			$(CHGRP) $(GAMEGRP) perm record logfile ; \
>--			chmod $(FILEPERM) perm record logfile )
>-+	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile
>+-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile
>+-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile ; \
>+-			$(CHGRP) $(GAMEGRP) perm record logfile xlogfile ; \
>+-			chmod $(VARFILEPERM) perm record logfile xlogfile )
>++	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile
>+ 	true; $(POSTINSTALL)
>  # and a reminder
>  	@echo You may also want to reinstall the man pages via the doc Makefile.
>- 
>Index: games/nethack36/files/patch-sys-unix-Makefile.utl
>===================================================================
>--- games/nethack36/files/patch-sys-unix-Makefile.utl	(revision 403631)
>+++ games/nethack36/files/patch-sys-unix-Makefile.utl	(working copy)
>@@ -1,10 +1,11 @@
>---- sys/unix/Makefile.utl.orig	Mon Apr 17 22:36:44 2000
>-+++ sys/unix/Makefile.utl	Wed Oct 10 19:48:36 2001
>-@@ -89,7 +89,17 @@
>+--- sys/unix/Makefile.utl.orig	2015-12-07 08:26:01 UTC
>++++ sys/unix/Makefile.utl
>+@@ -92,8 +92,18 @@ NHSROOT=..
>  # flags for debugging:
>  # CFLAGS = -g -I../include
>  
>--CFLAGS = -O -I../include
>+-#CFLAGS = -O -I../include
>+-#LFLAGS =
> +CFLAGS += -I../include
> +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
> +CFLAGS += -DX11_GRAPHICS
>@@ -16,6 +17,7 @@
> +CFLAGS += -DGNOME_GRAPHICS
> +endif
> +
>- LFLAGS =
>++LFLAGS =
>  
>  LIBS =
>+ 
>Index: games/nethack36/files/patch-win-tty-termcap.c
>===================================================================
>--- games/nethack36/files/patch-win-tty-termcap.c	(revision 403631)
>+++ games/nethack36/files/patch-win-tty-termcap.c	(working copy)
>@@ -1,13 +1,13 @@
>---- win/tty/termcap.c.orig	Thu Jun 19 16:12:47 2003
>-+++ win/tty/termcap.c	Thu Jun 19 16:13:00 2003
>-@@ -217,10 +217,6 @@
>- 	    error("Terminal must backspace.");
>- # else
>- 	    if(!(BC = Tgetstr("bc"))) {	/* termcap also uses bc/bs */
>--#  ifndef MINIMAL_TERM
>--		if(!tgetflag("bs"))
>--			error("Terminal must backspace.");
>--#  endif
>- 		BC = tbufptr;
>- 		tbufptr += 2;
>- 		*BC = '\b';
>+--- win/tty/termcap.c.orig	2015-11-11 10:05:22 UTC
>++++ win/tty/termcap.c
>+@@ -206,10 +206,6 @@ int *wid, *hgt;
>+         error("Terminal must backspace.");
>+ #else
>+         if (!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */
>+-#ifndef MINIMAL_TERM
>+-            if (!tgetflag("bs"))
>+-                error("Terminal must backspace.");
>+-#endif
>+             BC = tbufptr;
>+             tbufptr += 2;
>+             *BC = '\b';
>Index: games/nethack36/files/patch-win_Qt_qt__win.cpp
>===================================================================
>--- games/nethack36/files/patch-win_Qt_qt__win.cpp	(nonexistent)
>+++ games/nethack36/files/patch-win_Qt_qt__win.cpp	(working copy)
>@@ -0,0 +1,23 @@
>+--- win/Qt/qt_win.cpp.orig	2015-06-12 06:32:45 UTC
>++++ win/Qt/qt_win.cpp
>+@@ -74,6 +74,11 @@ extern "C" {
>+ 
>+ }
>+ 
>++#ifdef Invisible
>++/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
>++#undef Invisible
>++#endif
>++
>+ #include "qt_win.h"
>+ #include <qregexp.h>
>+ #include <qpainter.h>
>+@@ -105,7 +110,7 @@ extern "C" {
>+ #ifdef Q_WS_MACX
>+ #  include <sys/malloc.h>
>+ #else
>+-#  include <malloc.h>
>++#  include <stdlib.h>
>+ #endif
>+ 
>+ #ifdef _WS_X11_
>
>Property changes on: games/nethack36/files/patch-win_Qt_qt__win.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: games/nethack36/files/pkg-deinstall.in
>===================================================================
>Index: games/nethack36/pkg-descr
>===================================================================
>Index: games/nethack36/pkg-plist
>===================================================================
>--- games/nethack36/pkg-plist	(revision 403631)
>+++ games/nethack36/pkg-plist	(working copy)
>@@ -79,11 +79,19 @@
> %%DATADIR%%/bigrm-3.lev
> %%DATADIR%%/bigrm-4.lev
> %%DATADIR%%/bigrm-5.lev
>+%%DATADIR%%/bigrm-10.lev
>+%%DATADIR%%/bigrm-6.lev
>+%%DATADIR%%/bigrm-7.lev
>+%%DATADIR%%/bigrm-8.lev
>+%%DATADIR%%/bigrm-9.lev
>+%%DATADIR%%/bogusmon
> %%DATADIR%%/castle.lev
> %%DATADIR%%/cmdhelp
> %%DATADIR%%/data
> %%DATADIR%%/dungeon
> %%DATADIR%%/earth.lev
>+%%DATADIR%%/engrave
>+%%DATADIR%%/epitaph
> %%DATADIR%%/fakewiz1.lev
> %%DATADIR%%/fakewiz2.lev
> %%DATADIR%%/fire.lev
>@@ -99,6 +107,8 @@
> %%DATADIR%%/mapbg.xpm
> %%DATADIR%%/medusa-1.lev
> %%DATADIR%%/medusa-2.lev
>+%%DATADIR%%/medusa-3.lev
>+%%DATADIR%%/medusa-4.lev
> %%DATADIR%%/minefill.lev
> %%DATADIR%%/minend-1.lev
> %%DATADIR%%/minend-2.lev
>@@ -115,8 +125,11 @@
> %%DATADIR%%/oracle.lev
> %%DATADIR%%/oracles
> %%DATADIR%%/orcus.lev
>+@mode 664
> %%DATADIR%%/perm
>+@mode
> %%DATADIR%%/pet_mark.xbm
>+%%DATADIR%%/pilemark.xbm
> %%DATADIR%%/quest.dat
> @mode 664
> %%DATADIR%%/record
>@@ -135,9 +148,11 @@
> %%DATADIR%%/soko3-2.lev
> %%DATADIR%%/soko4-1.lev
> %%DATADIR%%/soko4-2.lev
>+%%DATADIR%%/symbols
> %%DATADIR%%/tower1.lev
> %%DATADIR%%/tower2.lev
> %%DATADIR%%/tower3.lev
>+%%DATADIR%%/tribute
> %%DATADIR%%/valley.lev
> %%DATADIR%%/water.lev
> %%DATADIR%%/wizard1.lev
>@@ -145,6 +160,8 @@
> %%DATADIR%%/wizard3.lev
> %%DATADIR%%/wizhelp
> %%DATADIR%%/x11tiles
>+@mode 664
>+%%DATADIR%%/xlogfile
> @mode
> @owner
> @group
>@@ -151,6 +168,7 @@
> man/man6/dgn_comp.6.gz
> man/man6/dlb.6.gz
> man/man6/lev_comp.6.gz
>+man/man6/makedefs.6.gz
> man/man6/%%HACKNAME%%.6.gz
> man/man6/recover.6.gz
> %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
>Index: games/nethack36-nox11/Makefile
>===================================================================
>--- games/nethack36-nox11/Makefile	(revision 403658)
>+++ games/nethack36-nox11/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # Created by: Jeremy Chadwick <yoshi@parodius.com>
> # $FreeBSD$
> 
>-MASTERDIR=	${.CURDIR}/../nethack34
>+MASTERDIR=	${.CURDIR}/../nethack36
> 
> MAINTAINER=	glewis@FreeBSD.org
>

Actions: View | Diff

Attachments on bug 205255: 164139 | 164164 | 164178 | 164179 | 164468 | 164469 | 164470 | 164473 | 164475 | 165869