Upgrade, 1.0.3 -> 1.0.5.2.2. It's beta, but who cares, it's nethack! :)

Submitted by:	max@sfc.wide.ad.jp

27 files changed, 993 insertions, 471 deletions

diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index c116276648a9..c3e8a294b13e 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3 + 1.0.3
+# Version required:	3.2.1 + 1.0.5.2
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/06/19 04:25:39 asami Exp $
+# $Id: Makefile,v 1.4 1996/06/26 22:22:33 gpalmer Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	jp-nethack-1.0.3
+DISTNAME=	nethack-3.2.1
+PKGNAME=	jp-nethack-1.0.5.2.2
 CATEGORIES+=	japanese games
 MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
-PATCHFILES=	jnethack-1.0.3.gz
+PATCHFILES=	jnethack-1.0.5.1.gz jn-1.0.5.2-beta-960821.gz \
+		jn-1.0.5.2-beta-960822.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	max@sfc.wide.ad.jp
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 FETCH_BEFORE_ARGS=	-NP
@@ -26,13 +27,15 @@ pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
 pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
-
+	@cd ${WRKSRC}/doc; chmod 644 *.6
+	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
 post-install:
+.if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man6/dgn_comp.6
 	gzip -9nf ${PREFIX}/man/man6/lev_comp.6
 	gzip -9nf ${PREFIX}/man/man6/nethack.6
 	gzip -9nf ${PREFIX}/man/man6/recover.6
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/nethack/distinfo b/japanese/nethack/distinfo
index 84b428d641b4..20d86ff4fa17 100644
--- a/japanese/nethack/distinfo
+++ b/japanese/nethack/distinfo
@@ -1,2 +1,4 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
-MD5 (jnethack-1.0.3.gz) = 8e4aa182860d90bfd0fe0d3ea08989f0
+MD5 (nethack-3.2.1.tar.gz) = e253abfa02a81b33119ce0647f76c787
+MD5 (jnethack-1.0.5.1.gz) = bb4272ddd04857a945c3c6186efad0e8
+MD5 (jn-1.0.5.2-beta-960821.gz) = 4b10917711cad1c6fca89147467079d5
+MD5 (jn-1.0.5.2-beta-960822.gz) = 5dbf9d30fae714cb3ffa3988c6199629
diff --git a/japanese/nethack/files/patch-aa b/japanese/nethack/files/patch-aa
index 1eef9ce91569..cedfc6b0d9fe 100644
--- a/japanese/nethack/files/patch-aa
+++ b/japanese/nethack/files/patch-aa
@@ -1,76 +1,63 @@
---- ./include/unixconf.h.org	Wed Dec 21 04:44:02 1994
-+++ ./include/unixconf.h	Wed Dec 21 04:48:04 1994
-@@ -33,7 +33,7 @@
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
- #define NETWORK	/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
--#define SUNOS4	/* SunOS 4.x */
-+/* #define SUNOS4	/* SunOS 4.x */
- /* #define NEWSOS4  /* NEWS-OS 4.x */
- /* #define LINUX  /* Another Unix clone running on Intel processors */
- /* #define GENIX	/* Yet Another Unix Clone */
-@@ -42,11 +42,11 @@
- /* #define UNIXPC	/* use in addition to SYSV for AT&T 7300/3B1 */
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			   job control (note that AIX is SYSV otherwise) */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* or ANSI color support on termcap systems */
- 			/* or X11 color	*/
--/* #define POSIX_JOB_CONTROL	/* use System V POSIX job control */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_JOB_CONTROL	/* use System V POSIX job control */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
-                         /* define for platforms using the GNU libraries */
-                         /* linux, etc .. */
- 
-@@ -108,7 +108,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
---- ./include/config.h.org	Wed Dec 21 04:44:01 1994
-+++ ./include/config.h	Wed Dec 21 04:48:46 1994
-@@ -273,12 +273,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/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 */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -300,7 +300,7 @@
-  * If you define HACKDIR, then this will be the default playground;
-  * otherwise it will be the current directory.
-  */
--#define HACKDIR "/usr/games/lib/jnethackdir" 	/* nethack directory */
-+#define HACKDIR "/usr/local/lib/jnethackdir" 	/* nethack directory */
- 
- /*
-  * Some system administrators are stupid enough to make Hack suid root
---- ./sys/unix/Makefile.top.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.top	Wed Dec 21 04:46:51 1994
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = /usr/local/lib/$(GAME)dir
-+SHELLDIR = /usr/local/bin
- 
- # by issei 1994/2/5, 1994/6/25
- #DATHELP = help hh cmdhelp history opthelp wizhelp
+*** include/unixconf.h.orig	Thu Aug 29 23:53:22 1996
+--- include/unixconf.h	Fri Aug 30 00:06:59 1996
+***************
+*** 31,37 ****
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! #define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+--- 31,37 ----
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! /*#define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+***************
+*** 43,54 ****
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! /* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! /* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! /* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+--- 43,54 ----
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+***************
+*** 126,132 ****
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! #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
+--- 126,132 ----
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! /* #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
diff --git a/japanese/nethack/files/patch-ab b/japanese/nethack/files/patch-ab
index 7b6dc6a3bb5e..f8e8c48bac9b 100644
--- a/japanese/nethack/files/patch-ab
+++ b/japanese/nethack/files/patch-ab
@@ -1,12 +1,80 @@
---- ./include/system.h.org	Mon Apr  5 08:54:19 1993
-+++ ./include/system.h	Fri Dec  9 23:41:34 1994
-@@ -131,7 +131,9 @@
- E int FDECL(write, (int,char *,int));
- E int FDECL(link, (const char *, const char*));
- #else
-+#ifndef __FreeBSD__
- E long FDECL(lseek, (int,long,int));
-+#endif
- # ifdef POSIX_TYPES
- E int FDECL(write, (int, const void *,unsigned));
- # else
+*** include/config.h.orig	Thu Aug 29 23:53:20 1996
+--- include/config.h	Fri Aug 30 00:14:46 1996
+***************
+*** 210,216 ****
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! /* #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+--- 210,216 ----
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+***************
+*** 267,273 ****
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+--- 267,273 ----
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+***************
+*** 307,318 ****
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! # define COMPRESS "/usr/ucb/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 */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+--- 307,318 ----
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! /* # define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
+! /* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+  
+  /* An example of one alternative you might want to use: */
+! # define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
+! # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+***************
+*** 342,348 ****
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/games/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
+--- 342,348 ----
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/local/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
diff --git a/japanese/nethack/files/patch-ac b/japanese/nethack/files/patch-ac
index 569b1d25c55b..038c95335165 100644
--- a/japanese/nethack/files/patch-ac
+++ b/japanese/nethack/files/patch-ac
@@ -1,11 +1,19 @@
---- ./sys/unix/Makefile.src.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.src	Wed Dec 21 04:50:14 1994
-@@ -97,7 +97,7 @@
- 
- # by issei(94/6/12)
- #
--CFLAGS = -g -I../include -I/usr/local/X11R6/include
-+CFLAGS = -O2 -I../include -I/usr/X11R6/include
- LFLAGS =
- 
- 
+*** sys/unix/Makefile.doc.orig	Thu Apr  4 14:17:35 1996
+--- sys/unix/Makefile.doc	Fri Aug 30 00:16:46 1996
+***************
+*** 31,37 ****
+  
+  
+  GAME	= nethack
+! MANDIR	= /usr/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
+--- 31,37 ----
+  
+  
+  GAME	= nethack
+! MANDIR	= ${PREFIX}/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
diff --git a/japanese/nethack/files/patch-ad b/japanese/nethack/files/patch-ad
index 12052c86c16a..af7f997c2ad8 100644
--- a/japanese/nethack/files/patch-ad
+++ b/japanese/nethack/files/patch-ad
@@ -1,19 +1,52 @@
---- ./sys/unix/Makefile.doc.org	Mon Jan 11 13:02:31 1993
-+++ ./sys/unix/Makefile.doc	Sat Dec 10 00:14:52 1994
-@@ -21,7 +21,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= /usr/local/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
-@@ -36,6 +36,7 @@
- # RCVRMANCREATE = nroff -man recover.6 >
- 
- manpages:
-+	-mkdir $(MANDIR)
- 	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
- 	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
- 	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+*** sys/unix/Makefile.top.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.top	Fri Aug 30 00:27:52 1996
+***************
+*** 18,31 ****
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = bin
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 04755
+! FILEPERM = 0644
+  EXEPERM  = 0755
+! DIRPERM  = 0755
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+--- 18,31 ----
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = games
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 02755
+! FILEPERM = 0664
+  EXEPERM  = 0755
+! DIRPERM  = 0775
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+***************
+*** 34,41 ****
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = /usr/games/lib/$(GAME)dir
+! SHELLDIR = /usr/games
+  
+  # per discussion in Install.X11
+  VARDATND = 
+--- 34,41 ----
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
+! SHELLDIR = ${PREFIX}/bin
+  
+  # per discussion in Install.X11
+  VARDATND = 
diff --git a/japanese/nethack/files/patch-ae b/japanese/nethack/files/patch-ae
index 4a17a97af72c..a8a120c506cd 100644
--- a/japanese/nethack/files/patch-ae
+++ b/japanese/nethack/files/patch-ae
@@ -1,11 +1,69 @@
---- ./sys/unix/Makefile.utl.org	Wed Dec 21 05:25:10 1994
-+++ ./sys/unix/Makefile.utl	Wed Dec 21 05:46:22 1994
-@@ -72,7 +72,7 @@
- #
- # by issei 1994/1/10
- # lex is required 8bit through for japanese. 
--LEX	= flex -8
-+LEX	= lex -8
-  
- # these are the names of the output files from YACC/LEX. Under MS-DOS
- # and similar systems, they may differ
+*** sys/unix/Makefile.src.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.src	Fri Aug 30 00:36:19 1996
+***************
+*** 126,133 ****
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS = -g -I../include
+! LFLAGS = -g
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+--- 126,133 ----
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS += -O -I../include -I${X11BASE}/include
+! LFLAGS = -L${X11BASE}/lib
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+***************
+*** 148,155 ****
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC)
+! WINOBJ = $(WINTTYOBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+--- 148,155 ----
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC) $(WINX11SRC)
+! WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+***************
+*** 167,179 ****
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
+--- 167,179 ----
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB) $(WINX11LIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
diff --git a/japanese/nethack/pkg-descr b/japanese/nethack/pkg-descr
index 7799d1a9bb4b..6b839de453d3 100644
--- a/japanese/nethack/pkg-descr
+++ b/japanese/nethack/pkg-descr
@@ -1,11 +1,13 @@
-This is the Japanese version 1.0.3 (original 3.1.3) of nethack.  You
-and your puppy (or kitten) will explore the deep dungeons to retrieve
-the long-lost magical item that causes so much trouble to anyone.
+This is the Japanese version 1.0.5.2-beta-960822 (original 3.2.1) of
+nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
 - Satoshi
 asami@cs.berkeley.edu
 
-P.S. There is a newsgroup "rec.games.roguelike.nethack" if you are
+P.S. There are newsgroups "rec.games.roguelike.nethack" and
+"fj.rec.games.roguelike" if you are
      truly interested.
diff --git a/japanese/nethack/pkg-plist b/japanese/nethack/pkg-plist
index e40839f497fa..d15cdba525b0 100644
--- a/japanese/nethack/pkg-plist
+++ b/japanese/nethack/pkg-plist
@@ -1,10 +1,8 @@
 bin/jnethack
-man/man6/dgn_comp.6.gz
-man/man6/lev_comp.6.gz
-man/man6/nethack.6.gz
-man/man6/recover.6.gz
-lib/jnethackdir/save
-lib/jnethackdir/jnethack
+@exec mkdir %D/lib/jnethackdir/save
+@exec chmod 775 %D/lib/jnethackdir/save
+@exec chown games.games %D/lib/jnethackdir/save
+@unexec rmdir %D/lib/jnethackdir/save
 lib/jnethackdir/A-filla.lev
 lib/jnethackdir/A-fillb.lev
 lib/jnethackdir/A-goal.lev
@@ -25,6 +23,11 @@ lib/jnethackdir/E-fillb.lev
 lib/jnethackdir/E-goal.lev
 lib/jnethackdir/E-locate.lev
 lib/jnethackdir/E-start.lev
+lib/jnethackdir/F-filla.lev
+lib/jnethackdir/F-fillb.lev
+lib/jnethackdir/F-goal.lev
+lib/jnethackdir/F-locate.lev
+lib/jnethackdir/F-start.lev
 lib/jnethackdir/H-filla.lev
 lib/jnethackdir/H-fillb.lev
 lib/jnethackdir/H-goal.lev
@@ -69,7 +72,11 @@ lib/jnethackdir/air.lev
 lib/jnethackdir/asmodeus.lev
 lib/jnethackdir/astral.lev
 lib/jnethackdir/baalz.lev
-lib/jnethackdir/bigroom.lev
+lib/jnethackdir/bigrm-1.lev
+lib/jnethackdir/bigrm-2.lev
+lib/jnethackdir/bigrm-3.lev
+lib/jnethackdir/bigrm-4.lev
+lib/jnethackdir/bigrm-5.lev
 lib/jnethackdir/castle.lev
 lib/jnethackdir/data
 lib/jnethackdir/dungeon
@@ -77,11 +84,12 @@ lib/jnethackdir/earth.lev
 lib/jnethackdir/fakewiz1.lev
 lib/jnethackdir/fakewiz2.lev
 lib/jnethackdir/fire.lev
+lib/jnethackdir/history
 lib/jnethackdir/jcmdhelp
 lib/jnethackdir/jhelp
 lib/jnethackdir/jhh
-lib/jnethackdir/jhistory
 lib/jnethackdir/jjj
+lib/jnethackdir/jnethack
 lib/jnethackdir/jopthelp
 lib/jnethackdir/joracles
 lib/jnethackdir/jrumors
@@ -92,9 +100,11 @@ lib/jnethackdir/license
 lib/jnethackdir/logfile
 lib/jnethackdir/medusa-1.lev
 lib/jnethackdir/medusa-2.lev
-lib/jnethackdir/mine_end.lev
 lib/jnethackdir/minefill.lev
-lib/jnethackdir/minetown.lev
+lib/jnethackdir/minend-1.lev
+lib/jnethackdir/minend-2.lev
+lib/jnethackdir/minetn-1.lev
+lib/jnethackdir/minetn-2.lev
 lib/jnethackdir/options
 lib/jnethackdir/oracle.lev
 lib/jnethackdir/orcus.lev
@@ -110,5 +120,8 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@exec chmod 755 %D/lib/jnethackdir
-@unexec rmdir %D/lib/jnethackdir
+man/man6/nethack.6.gz
+man/man6/lev_comp.6.gz
+man/man6/dgn_comp.6.gz
+man/man6/recover.6.gz
+man/man6/dlb.6.gz
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index c116276648a9..c3e8a294b13e 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3 + 1.0.3
+# Version required:	3.2.1 + 1.0.5.2
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/06/19 04:25:39 asami Exp $
+# $Id: Makefile,v 1.4 1996/06/26 22:22:33 gpalmer Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	jp-nethack-1.0.3
+DISTNAME=	nethack-3.2.1
+PKGNAME=	jp-nethack-1.0.5.2.2
 CATEGORIES+=	japanese games
 MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
-PATCHFILES=	jnethack-1.0.3.gz
+PATCHFILES=	jnethack-1.0.5.1.gz jn-1.0.5.2-beta-960821.gz \
+		jn-1.0.5.2-beta-960822.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	max@sfc.wide.ad.jp
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 FETCH_BEFORE_ARGS=	-NP
@@ -26,13 +27,15 @@ pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
 pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
-
+	@cd ${WRKSRC}/doc; chmod 644 *.6
+	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
 post-install:
+.if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man6/dgn_comp.6
 	gzip -9nf ${PREFIX}/man/man6/lev_comp.6
 	gzip -9nf ${PREFIX}/man/man6/nethack.6
 	gzip -9nf ${PREFIX}/man/man6/recover.6
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/nethack32/distinfo b/japanese/nethack32/distinfo
index 84b428d641b4..20d86ff4fa17 100644
--- a/japanese/nethack32/distinfo
+++ b/japanese/nethack32/distinfo
@@ -1,2 +1,4 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
-MD5 (jnethack-1.0.3.gz) = 8e4aa182860d90bfd0fe0d3ea08989f0
+MD5 (nethack-3.2.1.tar.gz) = e253abfa02a81b33119ce0647f76c787
+MD5 (jnethack-1.0.5.1.gz) = bb4272ddd04857a945c3c6186efad0e8
+MD5 (jn-1.0.5.2-beta-960821.gz) = 4b10917711cad1c6fca89147467079d5
+MD5 (jn-1.0.5.2-beta-960822.gz) = 5dbf9d30fae714cb3ffa3988c6199629
diff --git a/japanese/nethack32/files/patch-aa b/japanese/nethack32/files/patch-aa
index 1eef9ce91569..cedfc6b0d9fe 100644
--- a/japanese/nethack32/files/patch-aa
+++ b/japanese/nethack32/files/patch-aa
@@ -1,76 +1,63 @@
---- ./include/unixconf.h.org	Wed Dec 21 04:44:02 1994
-+++ ./include/unixconf.h	Wed Dec 21 04:48:04 1994
-@@ -33,7 +33,7 @@
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
- #define NETWORK	/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
--#define SUNOS4	/* SunOS 4.x */
-+/* #define SUNOS4	/* SunOS 4.x */
- /* #define NEWSOS4  /* NEWS-OS 4.x */
- /* #define LINUX  /* Another Unix clone running on Intel processors */
- /* #define GENIX	/* Yet Another Unix Clone */
-@@ -42,11 +42,11 @@
- /* #define UNIXPC	/* use in addition to SYSV for AT&T 7300/3B1 */
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			   job control (note that AIX is SYSV otherwise) */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* or ANSI color support on termcap systems */
- 			/* or X11 color	*/
--/* #define POSIX_JOB_CONTROL	/* use System V POSIX job control */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_JOB_CONTROL	/* use System V POSIX job control */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
-                         /* define for platforms using the GNU libraries */
-                         /* linux, etc .. */
- 
-@@ -108,7 +108,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
---- ./include/config.h.org	Wed Dec 21 04:44:01 1994
-+++ ./include/config.h	Wed Dec 21 04:48:46 1994
-@@ -273,12 +273,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/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 */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -300,7 +300,7 @@
-  * If you define HACKDIR, then this will be the default playground;
-  * otherwise it will be the current directory.
-  */
--#define HACKDIR "/usr/games/lib/jnethackdir" 	/* nethack directory */
-+#define HACKDIR "/usr/local/lib/jnethackdir" 	/* nethack directory */
- 
- /*
-  * Some system administrators are stupid enough to make Hack suid root
---- ./sys/unix/Makefile.top.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.top	Wed Dec 21 04:46:51 1994
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = /usr/local/lib/$(GAME)dir
-+SHELLDIR = /usr/local/bin
- 
- # by issei 1994/2/5, 1994/6/25
- #DATHELP = help hh cmdhelp history opthelp wizhelp
+*** include/unixconf.h.orig	Thu Aug 29 23:53:22 1996
+--- include/unixconf.h	Fri Aug 30 00:06:59 1996
+***************
+*** 31,37 ****
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! #define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+--- 31,37 ----
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! /*#define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+***************
+*** 43,54 ****
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! /* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! /* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! /* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+--- 43,54 ----
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+***************
+*** 126,132 ****
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! #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
+--- 126,132 ----
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! /* #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
diff --git a/japanese/nethack32/files/patch-ab b/japanese/nethack32/files/patch-ab
index 7b6dc6a3bb5e..f8e8c48bac9b 100644
--- a/japanese/nethack32/files/patch-ab
+++ b/japanese/nethack32/files/patch-ab
@@ -1,12 +1,80 @@
---- ./include/system.h.org	Mon Apr  5 08:54:19 1993
-+++ ./include/system.h	Fri Dec  9 23:41:34 1994
-@@ -131,7 +131,9 @@
- E int FDECL(write, (int,char *,int));
- E int FDECL(link, (const char *, const char*));
- #else
-+#ifndef __FreeBSD__
- E long FDECL(lseek, (int,long,int));
-+#endif
- # ifdef POSIX_TYPES
- E int FDECL(write, (int, const void *,unsigned));
- # else
+*** include/config.h.orig	Thu Aug 29 23:53:20 1996
+--- include/config.h	Fri Aug 30 00:14:46 1996
+***************
+*** 210,216 ****
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! /* #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+--- 210,216 ----
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+***************
+*** 267,273 ****
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+--- 267,273 ----
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+***************
+*** 307,318 ****
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! # define COMPRESS "/usr/ucb/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 */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+--- 307,318 ----
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! /* # define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
+! /* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+  
+  /* An example of one alternative you might want to use: */
+! # define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
+! # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+***************
+*** 342,348 ****
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/games/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
+--- 342,348 ----
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/local/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
diff --git a/japanese/nethack32/files/patch-ac b/japanese/nethack32/files/patch-ac
index 569b1d25c55b..038c95335165 100644
--- a/japanese/nethack32/files/patch-ac
+++ b/japanese/nethack32/files/patch-ac
@@ -1,11 +1,19 @@
---- ./sys/unix/Makefile.src.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.src	Wed Dec 21 04:50:14 1994
-@@ -97,7 +97,7 @@
- 
- # by issei(94/6/12)
- #
--CFLAGS = -g -I../include -I/usr/local/X11R6/include
-+CFLAGS = -O2 -I../include -I/usr/X11R6/include
- LFLAGS =
- 
- 
+*** sys/unix/Makefile.doc.orig	Thu Apr  4 14:17:35 1996
+--- sys/unix/Makefile.doc	Fri Aug 30 00:16:46 1996
+***************
+*** 31,37 ****
+  
+  
+  GAME	= nethack
+! MANDIR	= /usr/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
+--- 31,37 ----
+  
+  
+  GAME	= nethack
+! MANDIR	= ${PREFIX}/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
diff --git a/japanese/nethack32/files/patch-ad b/japanese/nethack32/files/patch-ad
index 12052c86c16a..af7f997c2ad8 100644
--- a/japanese/nethack32/files/patch-ad
+++ b/japanese/nethack32/files/patch-ad
@@ -1,19 +1,52 @@
---- ./sys/unix/Makefile.doc.org	Mon Jan 11 13:02:31 1993
-+++ ./sys/unix/Makefile.doc	Sat Dec 10 00:14:52 1994
-@@ -21,7 +21,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= /usr/local/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
-@@ -36,6 +36,7 @@
- # RCVRMANCREATE = nroff -man recover.6 >
- 
- manpages:
-+	-mkdir $(MANDIR)
- 	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
- 	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
- 	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+*** sys/unix/Makefile.top.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.top	Fri Aug 30 00:27:52 1996
+***************
+*** 18,31 ****
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = bin
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 04755
+! FILEPERM = 0644
+  EXEPERM  = 0755
+! DIRPERM  = 0755
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+--- 18,31 ----
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = games
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 02755
+! FILEPERM = 0664
+  EXEPERM  = 0755
+! DIRPERM  = 0775
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+***************
+*** 34,41 ****
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = /usr/games/lib/$(GAME)dir
+! SHELLDIR = /usr/games
+  
+  # per discussion in Install.X11
+  VARDATND = 
+--- 34,41 ----
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
+! SHELLDIR = ${PREFIX}/bin
+  
+  # per discussion in Install.X11
+  VARDATND = 
diff --git a/japanese/nethack32/files/patch-ae b/japanese/nethack32/files/patch-ae
index 4a17a97af72c..a8a120c506cd 100644
--- a/japanese/nethack32/files/patch-ae
+++ b/japanese/nethack32/files/patch-ae
@@ -1,11 +1,69 @@
---- ./sys/unix/Makefile.utl.org	Wed Dec 21 05:25:10 1994
-+++ ./sys/unix/Makefile.utl	Wed Dec 21 05:46:22 1994
-@@ -72,7 +72,7 @@
- #
- # by issei 1994/1/10
- # lex is required 8bit through for japanese. 
--LEX	= flex -8
-+LEX	= lex -8
-  
- # these are the names of the output files from YACC/LEX. Under MS-DOS
- # and similar systems, they may differ
+*** sys/unix/Makefile.src.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.src	Fri Aug 30 00:36:19 1996
+***************
+*** 126,133 ****
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS = -g -I../include
+! LFLAGS = -g
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+--- 126,133 ----
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS += -O -I../include -I${X11BASE}/include
+! LFLAGS = -L${X11BASE}/lib
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+***************
+*** 148,155 ****
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC)
+! WINOBJ = $(WINTTYOBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+--- 148,155 ----
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC) $(WINX11SRC)
+! WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+***************
+*** 167,179 ****
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
+--- 167,179 ----
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB) $(WINX11LIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
diff --git a/japanese/nethack32/pkg-descr b/japanese/nethack32/pkg-descr
index 7799d1a9bb4b..6b839de453d3 100644
--- a/japanese/nethack32/pkg-descr
+++ b/japanese/nethack32/pkg-descr
@@ -1,11 +1,13 @@
-This is the Japanese version 1.0.3 (original 3.1.3) of nethack.  You
-and your puppy (or kitten) will explore the deep dungeons to retrieve
-the long-lost magical item that causes so much trouble to anyone.
+This is the Japanese version 1.0.5.2-beta-960822 (original 3.2.1) of
+nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
 - Satoshi
 asami@cs.berkeley.edu
 
-P.S. There is a newsgroup "rec.games.roguelike.nethack" if you are
+P.S. There are newsgroups "rec.games.roguelike.nethack" and
+"fj.rec.games.roguelike" if you are
      truly interested.
diff --git a/japanese/nethack32/pkg-plist b/japanese/nethack32/pkg-plist
index e40839f497fa..d15cdba525b0 100644
--- a/japanese/nethack32/pkg-plist
+++ b/japanese/nethack32/pkg-plist
@@ -1,10 +1,8 @@
 bin/jnethack
-man/man6/dgn_comp.6.gz
-man/man6/lev_comp.6.gz
-man/man6/nethack.6.gz
-man/man6/recover.6.gz
-lib/jnethackdir/save
-lib/jnethackdir/jnethack
+@exec mkdir %D/lib/jnethackdir/save
+@exec chmod 775 %D/lib/jnethackdir/save
+@exec chown games.games %D/lib/jnethackdir/save
+@unexec rmdir %D/lib/jnethackdir/save
 lib/jnethackdir/A-filla.lev
 lib/jnethackdir/A-fillb.lev
 lib/jnethackdir/A-goal.lev
@@ -25,6 +23,11 @@ lib/jnethackdir/E-fillb.lev
 lib/jnethackdir/E-goal.lev
 lib/jnethackdir/E-locate.lev
 lib/jnethackdir/E-start.lev
+lib/jnethackdir/F-filla.lev
+lib/jnethackdir/F-fillb.lev
+lib/jnethackdir/F-goal.lev
+lib/jnethackdir/F-locate.lev
+lib/jnethackdir/F-start.lev
 lib/jnethackdir/H-filla.lev
 lib/jnethackdir/H-fillb.lev
 lib/jnethackdir/H-goal.lev
@@ -69,7 +72,11 @@ lib/jnethackdir/air.lev
 lib/jnethackdir/asmodeus.lev
 lib/jnethackdir/astral.lev
 lib/jnethackdir/baalz.lev
-lib/jnethackdir/bigroom.lev
+lib/jnethackdir/bigrm-1.lev
+lib/jnethackdir/bigrm-2.lev
+lib/jnethackdir/bigrm-3.lev
+lib/jnethackdir/bigrm-4.lev
+lib/jnethackdir/bigrm-5.lev
 lib/jnethackdir/castle.lev
 lib/jnethackdir/data
 lib/jnethackdir/dungeon
@@ -77,11 +84,12 @@ lib/jnethackdir/earth.lev
 lib/jnethackdir/fakewiz1.lev
 lib/jnethackdir/fakewiz2.lev
 lib/jnethackdir/fire.lev
+lib/jnethackdir/history
 lib/jnethackdir/jcmdhelp
 lib/jnethackdir/jhelp
 lib/jnethackdir/jhh
-lib/jnethackdir/jhistory
 lib/jnethackdir/jjj
+lib/jnethackdir/jnethack
 lib/jnethackdir/jopthelp
 lib/jnethackdir/joracles
 lib/jnethackdir/jrumors
@@ -92,9 +100,11 @@ lib/jnethackdir/license
 lib/jnethackdir/logfile
 lib/jnethackdir/medusa-1.lev
 lib/jnethackdir/medusa-2.lev
-lib/jnethackdir/mine_end.lev
 lib/jnethackdir/minefill.lev
-lib/jnethackdir/minetown.lev
+lib/jnethackdir/minend-1.lev
+lib/jnethackdir/minend-2.lev
+lib/jnethackdir/minetn-1.lev
+lib/jnethackdir/minetn-2.lev
 lib/jnethackdir/options
 lib/jnethackdir/oracle.lev
 lib/jnethackdir/orcus.lev
@@ -110,5 +120,8 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@exec chmod 755 %D/lib/jnethackdir
-@unexec rmdir %D/lib/jnethackdir
+man/man6/nethack.6.gz
+man/man6/lev_comp.6.gz
+man/man6/dgn_comp.6.gz
+man/man6/recover.6.gz
+man/man6/dlb.6.gz
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index c116276648a9..c3e8a294b13e 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3 + 1.0.3
+# Version required:	3.2.1 + 1.0.5.2
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/06/19 04:25:39 asami Exp $
+# $Id: Makefile,v 1.4 1996/06/26 22:22:33 gpalmer Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	jp-nethack-1.0.3
+DISTNAME=	nethack-3.2.1
+PKGNAME=	jp-nethack-1.0.5.2.2
 CATEGORIES+=	japanese games
 MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/jnethack/
-PATCHFILES=	jnethack-1.0.3.gz
+PATCHFILES=	jnethack-1.0.5.1.gz jn-1.0.5.2-beta-960821.gz \
+		jn-1.0.5.2-beta-960822.gz
 
-MAINTAINER=	asami@FreeBSD.ORG
+MAINTAINER=	max@sfc.wide.ad.jp
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 FETCH_BEFORE_ARGS=	-NP
@@ -26,13 +27,15 @@ pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
 pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
-
+	@cd ${WRKSRC}/doc; chmod 644 *.6
+	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
 post-install:
+.if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man6/dgn_comp.6
 	gzip -9nf ${PREFIX}/man/man6/lev_comp.6
 	gzip -9nf ${PREFIX}/man/man6/nethack.6
 	gzip -9nf ${PREFIX}/man/man6/recover.6
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/nethack34/distinfo b/japanese/nethack34/distinfo
index 84b428d641b4..20d86ff4fa17 100644
--- a/japanese/nethack34/distinfo
+++ b/japanese/nethack34/distinfo
@@ -1,2 +1,4 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
-MD5 (jnethack-1.0.3.gz) = 8e4aa182860d90bfd0fe0d3ea08989f0
+MD5 (nethack-3.2.1.tar.gz) = e253abfa02a81b33119ce0647f76c787
+MD5 (jnethack-1.0.5.1.gz) = bb4272ddd04857a945c3c6186efad0e8
+MD5 (jn-1.0.5.2-beta-960821.gz) = 4b10917711cad1c6fca89147467079d5
+MD5 (jn-1.0.5.2-beta-960822.gz) = 5dbf9d30fae714cb3ffa3988c6199629
diff --git a/japanese/nethack34/files/patch-aa b/japanese/nethack34/files/patch-aa
index 1eef9ce91569..cedfc6b0d9fe 100644
--- a/japanese/nethack34/files/patch-aa
+++ b/japanese/nethack34/files/patch-aa
@@ -1,76 +1,63 @@
---- ./include/unixconf.h.org	Wed Dec 21 04:44:02 1994
-+++ ./include/unixconf.h	Wed Dec 21 04:48:04 1994
-@@ -33,7 +33,7 @@
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
- #define NETWORK	/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
--#define SUNOS4	/* SunOS 4.x */
-+/* #define SUNOS4	/* SunOS 4.x */
- /* #define NEWSOS4  /* NEWS-OS 4.x */
- /* #define LINUX  /* Another Unix clone running on Intel processors */
- /* #define GENIX	/* Yet Another Unix Clone */
-@@ -42,11 +42,11 @@
- /* #define UNIXPC	/* use in addition to SYSV for AT&T 7300/3B1 */
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			   job control (note that AIX is SYSV otherwise) */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* or ANSI color support on termcap systems */
- 			/* or X11 color	*/
--/* #define POSIX_JOB_CONTROL	/* use System V POSIX job control */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_JOB_CONTROL	/* use System V POSIX job control */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
-                         /* define for platforms using the GNU libraries */
-                         /* linux, etc .. */
- 
-@@ -108,7 +108,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
---- ./include/config.h.org	Wed Dec 21 04:44:01 1994
-+++ ./include/config.h	Wed Dec 21 04:48:46 1994
-@@ -273,12 +273,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/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 */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -300,7 +300,7 @@
-  * If you define HACKDIR, then this will be the default playground;
-  * otherwise it will be the current directory.
-  */
--#define HACKDIR "/usr/games/lib/jnethackdir" 	/* nethack directory */
-+#define HACKDIR "/usr/local/lib/jnethackdir" 	/* nethack directory */
- 
- /*
-  * Some system administrators are stupid enough to make Hack suid root
---- ./sys/unix/Makefile.top.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.top	Wed Dec 21 04:46:51 1994
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = /usr/local/lib/$(GAME)dir
-+SHELLDIR = /usr/local/bin
- 
- # by issei 1994/2/5, 1994/6/25
- #DATHELP = help hh cmdhelp history opthelp wizhelp
+*** include/unixconf.h.orig	Thu Aug 29 23:53:22 1996
+--- include/unixconf.h	Fri Aug 30 00:06:59 1996
+***************
+*** 31,37 ****
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! #define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+--- 31,37 ----
+  
+  /* define any of the following that are appropriate */
+  /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
+! /*#define NETWORK		/* if running on a networked system */
+  			/* e.g. Suns sharing a playground through NFS */
+  #define SUNOS4	/* SunOS 4.x */
+  /* #define NEWSOS4	/* NEWS-OS 4.x */
+***************
+*** 43,54 ****
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! /* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! /* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! /* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+--- 43,54 ----
+  /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
+  			 * job control (note that AIX is SYSV otherwise)
+  			 * Also define this for AIX 3.2 */
+! #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
+  			/* and/or ANSI color support on termcap systems */
+  			/* and/or X11 color */
+! #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
+  			 * (e.g., VSUSP) */
+! #define POSIX_TYPES	/* use POSIX types for system calls and termios */
+  			/* define for many recent OS releases, including
+  			 * those with specific defines (since types are
+  			 * changing toward the standard from earlier chaos).
+***************
+*** 126,132 ****
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! #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
+--- 126,132 ----
+   * A stat system call is done on the mailbox every MAILCKFREQ moves.
+   */
+  
+! /* #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
diff --git a/japanese/nethack34/files/patch-ab b/japanese/nethack34/files/patch-ab
index 7b6dc6a3bb5e..f8e8c48bac9b 100644
--- a/japanese/nethack34/files/patch-ab
+++ b/japanese/nethack34/files/patch-ab
@@ -1,12 +1,80 @@
---- ./include/system.h.org	Mon Apr  5 08:54:19 1993
-+++ ./include/system.h	Fri Dec  9 23:41:34 1994
-@@ -131,7 +131,9 @@
- E int FDECL(write, (int,char *,int));
- E int FDECL(link, (const char *, const char*));
- #else
-+#ifndef __FreeBSD__
- E long FDECL(lseek, (int,long,int));
-+#endif
- # ifdef POSIX_TYPES
- E int FDECL(write, (int, const void *,unsigned));
- # else
+*** include/config.h.orig	Thu Aug 29 23:53:20 1996
+--- include/config.h	Fri Aug 30 00:14:46 1996
+***************
+*** 210,216 ****
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! /* #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+--- 210,216 ----
+   * Some combinations make no sense.  See the installation document.
+   */
+  #define TTY_GRAPHICS	/* good old tty based graphics */
+! #define X11_GRAPHICS	/* X11 interface */
+  
+  /*
+  ** added by issei, Tue May 24 11:55:10 JST 1994
+***************
+*** 267,273 ****
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+--- 267,273 ----
+   * 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 */
+  # ifdef USE_XPM
+  #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
+  # endif
+***************
+*** 307,318 ****
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! # define COMPRESS "/usr/ucb/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 */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+--- 307,318 ----
+  
+  #ifdef UNIX
+  /* path and file name extension for compression program */
+! /* # define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
+! /* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
+  
+  /* An example of one alternative you might want to use: */
+! # define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
+! # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
+  #endif
+  #ifndef COMPRESS
+  # define INTERNAL_COMP	/* control use of NetHack's compression routines */
+***************
+*** 342,348 ****
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/games/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
+--- 342,348 ----
+   * otherwise it will be the current directory.
+   */
+  # ifndef HACKDIR
+! #  define HACKDIR "/usr/local/lib/jnethackdir"	/* nethack directory */
+  # endif
+  
+  /*
diff --git a/japanese/nethack34/files/patch-ac b/japanese/nethack34/files/patch-ac
index 569b1d25c55b..038c95335165 100644
--- a/japanese/nethack34/files/patch-ac
+++ b/japanese/nethack34/files/patch-ac
@@ -1,11 +1,19 @@
---- ./sys/unix/Makefile.src.org	Wed Dec 21 04:43:32 1994
-+++ ./sys/unix/Makefile.src	Wed Dec 21 04:50:14 1994
-@@ -97,7 +97,7 @@
- 
- # by issei(94/6/12)
- #
--CFLAGS = -g -I../include -I/usr/local/X11R6/include
-+CFLAGS = -O2 -I../include -I/usr/X11R6/include
- LFLAGS =
- 
- 
+*** sys/unix/Makefile.doc.orig	Thu Apr  4 14:17:35 1996
+--- sys/unix/Makefile.doc	Fri Aug 30 00:16:46 1996
+***************
+*** 31,37 ****
+  
+  
+  GAME	= nethack
+! MANDIR	= /usr/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
+--- 31,37 ----
+  
+  
+  GAME	= nethack
+! MANDIR	= ${PREFIX}/man/man6
+  MANEXT	= 6
+  
+  # manual installation for most BSD-style systems
diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad
index 12052c86c16a..af7f997c2ad8 100644
--- a/japanese/nethack34/files/patch-ad
+++ b/japanese/nethack34/files/patch-ad
@@ -1,19 +1,52 @@
---- ./sys/unix/Makefile.doc.org	Mon Jan 11 13:02:31 1993
-+++ ./sys/unix/Makefile.doc	Sat Dec 10 00:14:52 1994
-@@ -21,7 +21,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= /usr/local/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
-@@ -36,6 +36,7 @@
- # RCVRMANCREATE = nroff -man recover.6 >
- 
- manpages:
-+	-mkdir $(MANDIR)
- 	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
- 	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
- 	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+*** sys/unix/Makefile.top.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.top	Fri Aug 30 00:27:52 1996
+***************
+*** 18,31 ****
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = bin
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 04755
+! FILEPERM = 0644
+  EXEPERM  = 0755
+! DIRPERM  = 0755
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+--- 18,31 ----
+  #GAME     = nethack
+  GAME     = jnethack
+  GAMEUID  = games
+! GAMEGRP  = games
+  
+  # Permissions - some places use setgid instead of setuid, for instance
+  # See also the option "SECURE" in include/config.h
+! GAMEPERM = 02755
+! FILEPERM = 0664
+  EXEPERM  = 0755
+! DIRPERM  = 0775
+  
+  # GAMEDIR also appears in config.h as "HACKDIR".
+  #
+***************
+*** 34,41 ****
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = /usr/games/lib/$(GAME)dir
+! SHELLDIR = /usr/games
+  
+  # per discussion in Install.X11
+  VARDATND = 
+--- 34,41 ----
+  # therefore there should not be anything in GAMEDIR that you want to keep
+  # (if there is, you'll have to do the installation by hand or modify the
+  # instructions)
+! GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
+! SHELLDIR = ${PREFIX}/bin
+  
+  # per discussion in Install.X11
+  VARDATND = 
diff --git a/japanese/nethack34/files/patch-ae b/japanese/nethack34/files/patch-ae
index 4a17a97af72c..a8a120c506cd 100644
--- a/japanese/nethack34/files/patch-ae
+++ b/japanese/nethack34/files/patch-ae
@@ -1,11 +1,69 @@
---- ./sys/unix/Makefile.utl.org	Wed Dec 21 05:25:10 1994
-+++ ./sys/unix/Makefile.utl	Wed Dec 21 05:46:22 1994
-@@ -72,7 +72,7 @@
- #
- # by issei 1994/1/10
- # lex is required 8bit through for japanese. 
--LEX	= flex -8
-+LEX	= lex -8
-  
- # these are the names of the output files from YACC/LEX. Under MS-DOS
- # and similar systems, they may differ
+*** sys/unix/Makefile.src.orig	Thu Aug 29 23:52:47 1996
+--- sys/unix/Makefile.src	Fri Aug 30 00:36:19 1996
+***************
+*** 126,133 ****
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS = -g -I../include
+! LFLAGS = -g
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+--- 126,133 ----
+  # flags for debugging:
+  # CFLAGS = -g -I../include
+  
+! CFLAGS += -O -I../include -I${X11BASE}/include
+! LFLAGS = -L${X11BASE}/lib
+  
+  
+  # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+***************
+*** 148,155 ****
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC)
+! WINOBJ = $(WINTTYOBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+--- 148,155 ----
+  	winmisc.o winstat.o wintext.o winval.o tile.o
+  #
+  # 
+! WINSRC = $(WINTTYSRC) $(WINX11SRC)
+! WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+  
+  # on some systems the termcap library is in -ltermcap or -lcurses
+  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+***************
+*** 167,179 ****
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
+--- 167,179 ----
+  #
+  # libraries for X11
+  # If USE_XPM is defined in config.h, you will also need -lXpm here.
+! WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
+  # WINX11LIB = -lXaw -lXmu -lXt -lX11
+  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
+  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+  #
+  #
+! WINLIB = $(WINTTYLIB) $(WINX11LIB)
+  
+  # any other strange libraries your system needs (for Sysunix only -- the more
+  # specialized targets should already be right)
diff --git a/japanese/nethack34/pkg-descr b/japanese/nethack34/pkg-descr
index 7799d1a9bb4b..6b839de453d3 100644
--- a/japanese/nethack34/pkg-descr
+++ b/japanese/nethack34/pkg-descr
@@ -1,11 +1,13 @@
-This is the Japanese version 1.0.3 (original 3.1.3) of nethack.  You
-and your puppy (or kitten) will explore the deep dungeons to retrieve
-the long-lost magical item that causes so much trouble to anyone.
+This is the Japanese version 1.0.5.2-beta-960822 (original 3.2.1) of
+nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
 - Satoshi
 asami@cs.berkeley.edu
 
-P.S. There is a newsgroup "rec.games.roguelike.nethack" if you are
+P.S. There are newsgroups "rec.games.roguelike.nethack" and
+"fj.rec.games.roguelike" if you are
      truly interested.
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index e40839f497fa..d15cdba525b0 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -1,10 +1,8 @@
 bin/jnethack
-man/man6/dgn_comp.6.gz
-man/man6/lev_comp.6.gz
-man/man6/nethack.6.gz
-man/man6/recover.6.gz
-lib/jnethackdir/save
-lib/jnethackdir/jnethack
+@exec mkdir %D/lib/jnethackdir/save
+@exec chmod 775 %D/lib/jnethackdir/save
+@exec chown games.games %D/lib/jnethackdir/save
+@unexec rmdir %D/lib/jnethackdir/save
 lib/jnethackdir/A-filla.lev
 lib/jnethackdir/A-fillb.lev
 lib/jnethackdir/A-goal.lev
@@ -25,6 +23,11 @@ lib/jnethackdir/E-fillb.lev
 lib/jnethackdir/E-goal.lev
 lib/jnethackdir/E-locate.lev
 lib/jnethackdir/E-start.lev
+lib/jnethackdir/F-filla.lev
+lib/jnethackdir/F-fillb.lev
+lib/jnethackdir/F-goal.lev
+lib/jnethackdir/F-locate.lev
+lib/jnethackdir/F-start.lev
 lib/jnethackdir/H-filla.lev
 lib/jnethackdir/H-fillb.lev
 lib/jnethackdir/H-goal.lev
@@ -69,7 +72,11 @@ lib/jnethackdir/air.lev
 lib/jnethackdir/asmodeus.lev
 lib/jnethackdir/astral.lev
 lib/jnethackdir/baalz.lev
-lib/jnethackdir/bigroom.lev
+lib/jnethackdir/bigrm-1.lev
+lib/jnethackdir/bigrm-2.lev
+lib/jnethackdir/bigrm-3.lev
+lib/jnethackdir/bigrm-4.lev
+lib/jnethackdir/bigrm-5.lev
 lib/jnethackdir/castle.lev
 lib/jnethackdir/data
 lib/jnethackdir/dungeon
@@ -77,11 +84,12 @@ lib/jnethackdir/earth.lev
 lib/jnethackdir/fakewiz1.lev
 lib/jnethackdir/fakewiz2.lev
 lib/jnethackdir/fire.lev
+lib/jnethackdir/history
 lib/jnethackdir/jcmdhelp
 lib/jnethackdir/jhelp
 lib/jnethackdir/jhh
-lib/jnethackdir/jhistory
 lib/jnethackdir/jjj
+lib/jnethackdir/jnethack
 lib/jnethackdir/jopthelp
 lib/jnethackdir/joracles
 lib/jnethackdir/jrumors
@@ -92,9 +100,11 @@ lib/jnethackdir/license
 lib/jnethackdir/logfile
 lib/jnethackdir/medusa-1.lev
 lib/jnethackdir/medusa-2.lev
-lib/jnethackdir/mine_end.lev
 lib/jnethackdir/minefill.lev
-lib/jnethackdir/minetown.lev
+lib/jnethackdir/minend-1.lev
+lib/jnethackdir/minend-2.lev
+lib/jnethackdir/minetn-1.lev
+lib/jnethackdir/minetn-2.lev
 lib/jnethackdir/options
 lib/jnethackdir/oracle.lev
 lib/jnethackdir/orcus.lev
@@ -110,5 +120,8 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@exec chmod 755 %D/lib/jnethackdir
-@unexec rmdir %D/lib/jnethackdir
+man/man6/nethack.6.gz
+man/man6/lev_comp.6.gz
+man/man6/dgn_comp.6.gz
+man/man6/recover.6.gz
+man/man6/dlb.6.gz