21 files changed, 579 insertions, 447 deletions
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index d15ad0c2572f..2b060b127c0b 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.22 1998/10/16 03:41:49 jseger Exp $
+# $Id: Makefile,v 1.23 1998/11/20 23:38:11 flathill Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -28,4 +28,26 @@ pre-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nh_icon.xpm ${PREFIX}/lib/jnethackdir
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${WRKSRC}/doc/jGuidebook.txt ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${FILESDIR}/README ${PREFIX}/share/doc/ja/nethack
+.for i in README.j ChangeLog.j INSTALL.j
+	${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/nethack
+.endfor
+.endif
+	${MKDIR} ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack
+.for i in ibm nh10
+	${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack
+	${X11BASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \
+		> ${PREFIX}/share/examples/ja/nethack/$i.pcf
+	${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf
+	${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf
+.endfor
+	${CAT} ${PKGDIR}/MESSAGE
+
 .include <bsd.port.mk>
diff --git a/japanese/nethack/files/README b/japanese/nethack/files/README
new file mode 100644
index 000000000000..5a92507b5121
--- /dev/null
+++ b/japanese/nethack/files/README
@@ -0,0 +1,28 @@
+jnethack$B$N(BX$BHG$NM7$SJ}(B
+
+$B2hLL$N9-$5$O!"(B1024 x 768$B0J>e$K$7$F$*$-$^$7$g$&!#(B
+
+1. $B%j%=!<%9%U%!%$%k$r%3%T!<$7$^$9!#(B
+% cd /usr/local/share/examples/ja/nethack
+% xrdb -m JNetHack.ad
+# cp JNetHack.ad /usr/X11R6/lib/X11/app-defaults/JNetHack
+
+2. $B%U%)%s%H$r%3%T!<$7$^$9!#(B
+# cp ibm.pcf.gz nh10.pcf.gz /usr/X11R6/lib/X11/fonts/misc
+# mkfontdir /usr/X11R6/lib/X11/fonts/misc
+
+3. ~/.Xresources$B$K@_Dj$rDI2C$7$^$9!#(B
+   xdm$B$r;H$C$F$$$k>l9g$O!"(B~/.Xdefaults$B$G$9!#(B
+   $B$3$N:n6H$r$9$k$H!"%?%$%kI=<($5$l$k$h$&$K$J$j$^$9!#(B
+   1280 x 1024$B0J>e$N9-$$2hLL$,$*4+$a$G$9!#(B
+% echo "JNetHack.tile_file: x11tiles" >> ~/.Xresources
+% xrdb -m ~/.Xresources
+
+4. $B@_Dj40N;!"5/F0$7$^$9!#(B
+% jnethack &
+
+jnethack$B$K4X$9$k>pJs$O!"0J2<$N(BURL$B$r$4Mw2<$5$$!#(B
+	http://www.guru.gr.jp/~issei/jnethack/
+
+- Seiichirou Hiraoka
+flathill@FreeBSD.ORG
diff --git a/japanese/nethack/files/patch-ad b/japanese/nethack/files/patch-ad
index af7f997c2ad8..4a1d1cad9fd7 100644
--- a/japanese/nethack/files/patch-ad
+++ b/japanese/nethack/files/patch-ad
@@ -1,52 +1,40 @@
-*** 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 -ruN ./sys/unix/Makefile.top ../nethack-3.2.2/sys/unix/Makefile.top
+--- ./sys/unix/Makefile.top	Wed Dec 11 05:20:10 1996
++++ ../nethack-3.2.2/sys/unix/Makefile.top	Sun Nov 22 00:26:55 1998
+@@ -16,14 +16,14 @@
+ # make NetHack
+ GAME     = nethack
+ 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
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ #
+@@ -32,13 +32,13 @@
+ # 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  = ${PREFIX}/lib/$(GAME)dir
++SHELLDIR = ${PREFIX}/bin
+ 
+ # per discussion in Install.X11
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ 
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff --git a/japanese/nethack/files/patch-ae b/japanese/nethack/files/patch-ae
index a8a120c506cd..1b495ca33ae9 100644
--- a/japanese/nethack/files/patch-ae
+++ b/japanese/nethack/files/patch-ae
@@ -1,69 +1,52 @@
-*** 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 -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src
+--- ./sys/unix/Makefile.src	Sun Nov 22 00:50:19 1998
++++ ../nethack-3.2.2/sys/unix/Makefile.src	Sun Nov 22 00:52:12 1998
+@@ -127,8 +127,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -g -I../include
+-LFLAGS = -g
++CFLAGS += -O -I../include -I${X11BASE}/include
++LFLAGS = -L${X11BASE}/lib
+ 
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -149,8 +149,8 @@
+ 	winmisc.o winstat.o wintext.o winval.o tile.o
+ #
+ # 
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++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
+@@ -170,13 +170,14 @@
+ #
+ # 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 -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
++# BSD/OS 2.0 / FreeBSD 2.2/3.0
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm
+ #
+ #
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -204,7 +205,7 @@
+ #
+ # LIBS = -lxpg4
+ #
+-LIBS =
++LIBS = -lxpg4
+ 
+ # make NetHack
+ #JP by issei(96/5/27)
diff --git a/japanese/nethack/files/patch-af b/japanese/nethack/files/patch-af
index 9e71d2b11dc0..1f357cbc5bf6 100644
--- a/japanese/nethack/files/patch-af
+++ b/japanese/nethack/files/patch-af
@@ -1,12 +1,14 @@
-diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix//Makefile.src
---- ./sys/unix/Makefile.src	Sat Nov 21 01:23:57 1998
-+++ ../nethack-3.2.2/sys/unix/Makefile.src	Sat Nov 21 01:15:41 1998
-@@ -204,7 +204,7 @@
- #
- # LIBS = -lxpg4
- #
--LIBS =
-+LIBS = -lxpg4 -lSM -lICE
- 
- # make NetHack
- #JP by issei(96/5/27)
+diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
+--- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
++++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
+@@ -154,7 +154,7 @@
+ !
+ !
+ !
+-JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
++JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
+ JNetHack*international:	True
diff --git a/japanese/nethack/files/patch-ag b/japanese/nethack/files/patch-ag
index 1f357cbc5bf6..89eb18e12d3f 100644
--- a/japanese/nethack/files/patch-ag
+++ b/japanese/nethack/files/patch-ag
@@ -1,14 +1,21 @@
-diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
---- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
-+++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
-@@ -154,7 +154,7 @@
- !
- !
- !
--JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
-+JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
- JNetHack*international:	True
+diff -ruN ./src/polyself.c ../nethack-3.2.2/src/polyself.c
+--- ./src/polyself.c	Sun Nov 22 01:10:08 1998
++++ ../nethack-3.2.2/src/polyself.c	Sun Nov 22 01:12:25 1998
+@@ -171,7 +171,7 @@
+ 		    if (u.uhp <= 0) u.uhp = 1;
+ 		    if (u.uhpmax <= 0) u.uhpmax = 1;
+ 		} else {
+-/*JP		    Your("new form doesn't seem healthy enough to survive.");
++/*JP		    Your("new form doesn't seem healthy enough to survive.");*/
+ 		    Your("�������Ѥ������Ƥ��������Ϥ��ʤ��褦����");
+ 		    killer_format = KILLED_BY_AN;
+ /*JP		    killer="unsuccessful polymorph";*/
+@@ -181,7 +181,7 @@
+ 	}
+ /*JP	polyman("feel like a new %s!",
+ 		Role_is('E') ? "elf" : flags.female ? "woman" : "man");*/
+-	if(saved_sex == flags.female)
++	if(u.umonnum != PM_PLAYERMON || saved_sex == flags.female)
+ 	  polyman("�̤�%s�Ȥ������ޤ줫��ä��褦�ʵ���������",
+ 	      pl_character[0] == 'E' ? "�����" : "�ʹ�");
+ 	else
diff --git a/japanese/nethack/pkg-plist b/japanese/nethack/pkg-plist
index 9ba9eaec2ac6..d514aed418b5 100644
--- a/japanese/nethack/pkg-plist
+++ b/japanese/nethack/pkg-plist
@@ -117,8 +117,22 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@mode 664
 lib/jnethackdir/logfile
 lib/jnethackdir/record
 lib/jnethackdir/perm
+lib/jnethackdir/nh_icon.xpm
+lib/jnethackdir/pet_mark.xbm
+lib/jnethackdir/rip.xpm
+lib/jnethackdir/x11tiles
+share/doc/ja/nethack/jGuidebook.txt
+share/doc/ja/nethack/README
+share/doc/ja/nethack/README.j
+share/doc/ja/nethack/ChangeLog.j
+share/doc/ja/nethack/INSTALL.j
+share/examples/ja/nethack/nethack.rc
+share/examples/ja/nethack/JNetHack.ad
+share/examples/ja/nethack/nh10.pcf.gz
+share/examples/ja/nethack/ibm.pcf.gz
+@dirrm share/doc/ja/nethack
+@dirrm share/examples/ja/nethack
 @dirrm lib/jnethackdir
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index d15ad0c2572f..2b060b127c0b 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.22 1998/10/16 03:41:49 jseger Exp $
+# $Id: Makefile,v 1.23 1998/11/20 23:38:11 flathill Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -28,4 +28,26 @@ pre-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nh_icon.xpm ${PREFIX}/lib/jnethackdir
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${WRKSRC}/doc/jGuidebook.txt ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${FILESDIR}/README ${PREFIX}/share/doc/ja/nethack
+.for i in README.j ChangeLog.j INSTALL.j
+	${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/nethack
+.endfor
+.endif
+	${MKDIR} ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack
+.for i in ibm nh10
+	${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack
+	${X11BASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \
+		> ${PREFIX}/share/examples/ja/nethack/$i.pcf
+	${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf
+	${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf
+.endfor
+	${CAT} ${PKGDIR}/MESSAGE
+
 .include <bsd.port.mk>
diff --git a/japanese/nethack32/files/README b/japanese/nethack32/files/README
new file mode 100644
index 000000000000..5a92507b5121
--- /dev/null
+++ b/japanese/nethack32/files/README
@@ -0,0 +1,28 @@
+jnethack$B$N(BX$BHG$NM7$SJ}(B
+
+$B2hLL$N9-$5$O!"(B1024 x 768$B0J>e$K$7$F$*$-$^$7$g$&!#(B
+
+1. $B%j%=!<%9%U%!%$%k$r%3%T!<$7$^$9!#(B
+% cd /usr/local/share/examples/ja/nethack
+% xrdb -m JNetHack.ad
+# cp JNetHack.ad /usr/X11R6/lib/X11/app-defaults/JNetHack
+
+2. $B%U%)%s%H$r%3%T!<$7$^$9!#(B
+# cp ibm.pcf.gz nh10.pcf.gz /usr/X11R6/lib/X11/fonts/misc
+# mkfontdir /usr/X11R6/lib/X11/fonts/misc
+
+3. ~/.Xresources$B$K@_Dj$rDI2C$7$^$9!#(B
+   xdm$B$r;H$C$F$$$k>l9g$O!"(B~/.Xdefaults$B$G$9!#(B
+   $B$3$N:n6H$r$9$k$H!"%?%$%kI=<($5$l$k$h$&$K$J$j$^$9!#(B
+   1280 x 1024$B0J>e$N9-$$2hLL$,$*4+$a$G$9!#(B
+% echo "JNetHack.tile_file: x11tiles" >> ~/.Xresources
+% xrdb -m ~/.Xresources
+
+4. $B@_Dj40N;!"5/F0$7$^$9!#(B
+% jnethack &
+
+jnethack$B$K4X$9$k>pJs$O!"0J2<$N(BURL$B$r$4Mw2<$5$$!#(B
+	http://www.guru.gr.jp/~issei/jnethack/
+
+- Seiichirou Hiraoka
+flathill@FreeBSD.ORG
diff --git a/japanese/nethack32/files/patch-ad b/japanese/nethack32/files/patch-ad
index af7f997c2ad8..4a1d1cad9fd7 100644
--- a/japanese/nethack32/files/patch-ad
+++ b/japanese/nethack32/files/patch-ad
@@ -1,52 +1,40 @@
-*** 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 -ruN ./sys/unix/Makefile.top ../nethack-3.2.2/sys/unix/Makefile.top
+--- ./sys/unix/Makefile.top	Wed Dec 11 05:20:10 1996
++++ ../nethack-3.2.2/sys/unix/Makefile.top	Sun Nov 22 00:26:55 1998
+@@ -16,14 +16,14 @@
+ # make NetHack
+ GAME     = nethack
+ 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
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ #
+@@ -32,13 +32,13 @@
+ # 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  = ${PREFIX}/lib/$(GAME)dir
++SHELLDIR = ${PREFIX}/bin
+ 
+ # per discussion in Install.X11
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ 
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff --git a/japanese/nethack32/files/patch-ae b/japanese/nethack32/files/patch-ae
index a8a120c506cd..1b495ca33ae9 100644
--- a/japanese/nethack32/files/patch-ae
+++ b/japanese/nethack32/files/patch-ae
@@ -1,69 +1,52 @@
-*** 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 -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src
+--- ./sys/unix/Makefile.src	Sun Nov 22 00:50:19 1998
++++ ../nethack-3.2.2/sys/unix/Makefile.src	Sun Nov 22 00:52:12 1998
+@@ -127,8 +127,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -g -I../include
+-LFLAGS = -g
++CFLAGS += -O -I../include -I${X11BASE}/include
++LFLAGS = -L${X11BASE}/lib
+ 
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -149,8 +149,8 @@
+ 	winmisc.o winstat.o wintext.o winval.o tile.o
+ #
+ # 
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++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
+@@ -170,13 +170,14 @@
+ #
+ # 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 -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
++# BSD/OS 2.0 / FreeBSD 2.2/3.0
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm
+ #
+ #
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -204,7 +205,7 @@
+ #
+ # LIBS = -lxpg4
+ #
+-LIBS =
++LIBS = -lxpg4
+ 
+ # make NetHack
+ #JP by issei(96/5/27)
diff --git a/japanese/nethack32/files/patch-af b/japanese/nethack32/files/patch-af
index 9e71d2b11dc0..1f357cbc5bf6 100644
--- a/japanese/nethack32/files/patch-af
+++ b/japanese/nethack32/files/patch-af
@@ -1,12 +1,14 @@
-diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix//Makefile.src
---- ./sys/unix/Makefile.src	Sat Nov 21 01:23:57 1998
-+++ ../nethack-3.2.2/sys/unix/Makefile.src	Sat Nov 21 01:15:41 1998
-@@ -204,7 +204,7 @@
- #
- # LIBS = -lxpg4
- #
--LIBS =
-+LIBS = -lxpg4 -lSM -lICE
- 
- # make NetHack
- #JP by issei(96/5/27)
+diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
+--- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
++++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
+@@ -154,7 +154,7 @@
+ !
+ !
+ !
+-JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
++JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
+ JNetHack*international:	True
diff --git a/japanese/nethack32/files/patch-ag b/japanese/nethack32/files/patch-ag
index 1f357cbc5bf6..89eb18e12d3f 100644
--- a/japanese/nethack32/files/patch-ag
+++ b/japanese/nethack32/files/patch-ag
@@ -1,14 +1,21 @@
-diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
---- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
-+++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
-@@ -154,7 +154,7 @@
- !
- !
- !
--JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
-+JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
- JNetHack*international:	True
+diff -ruN ./src/polyself.c ../nethack-3.2.2/src/polyself.c
+--- ./src/polyself.c	Sun Nov 22 01:10:08 1998
++++ ../nethack-3.2.2/src/polyself.c	Sun Nov 22 01:12:25 1998
+@@ -171,7 +171,7 @@
+ 		    if (u.uhp <= 0) u.uhp = 1;
+ 		    if (u.uhpmax <= 0) u.uhpmax = 1;
+ 		} else {
+-/*JP		    Your("new form doesn't seem healthy enough to survive.");
++/*JP		    Your("new form doesn't seem healthy enough to survive.");*/
+ 		    Your("�������Ѥ������Ƥ��������Ϥ��ʤ��褦����");
+ 		    killer_format = KILLED_BY_AN;
+ /*JP		    killer="unsuccessful polymorph";*/
+@@ -181,7 +181,7 @@
+ 	}
+ /*JP	polyman("feel like a new %s!",
+ 		Role_is('E') ? "elf" : flags.female ? "woman" : "man");*/
+-	if(saved_sex == flags.female)
++	if(u.umonnum != PM_PLAYERMON || saved_sex == flags.female)
+ 	  polyman("�̤�%s�Ȥ������ޤ줫��ä��褦�ʵ���������",
+ 	      pl_character[0] == 'E' ? "�����" : "�ʹ�");
+ 	else
diff --git a/japanese/nethack32/pkg-plist b/japanese/nethack32/pkg-plist
index 9ba9eaec2ac6..d514aed418b5 100644
--- a/japanese/nethack32/pkg-plist
+++ b/japanese/nethack32/pkg-plist
@@ -117,8 +117,22 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@mode 664
 lib/jnethackdir/logfile
 lib/jnethackdir/record
 lib/jnethackdir/perm
+lib/jnethackdir/nh_icon.xpm
+lib/jnethackdir/pet_mark.xbm
+lib/jnethackdir/rip.xpm
+lib/jnethackdir/x11tiles
+share/doc/ja/nethack/jGuidebook.txt
+share/doc/ja/nethack/README
+share/doc/ja/nethack/README.j
+share/doc/ja/nethack/ChangeLog.j
+share/doc/ja/nethack/INSTALL.j
+share/examples/ja/nethack/nethack.rc
+share/examples/ja/nethack/JNetHack.ad
+share/examples/ja/nethack/nh10.pcf.gz
+share/examples/ja/nethack/ibm.pcf.gz
+@dirrm share/doc/ja/nethack
+@dirrm share/examples/ja/nethack
 @dirrm lib/jnethackdir
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index d15ad0c2572f..2b060b127c0b 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.22 1998/10/16 03:41:49 jseger Exp $
+# $Id: Makefile,v 1.23 1998/11/20 23:38:11 flathill Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -28,4 +28,26 @@ pre-install:
 	@cd ${WRKSRC}/doc; chmod 644 *.6
 	@cd ${WRKSRC}/doc; ${MAKE} PREFIX=${PREFIX} manpages
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nh_icon.xpm ${PREFIX}/lib/jnethackdir
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${WRKSRC}/doc/jGuidebook.txt ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_MAN} ${FILESDIR}/README ${PREFIX}/share/doc/ja/nethack
+.for i in README.j ChangeLog.j INSTALL.j
+	${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/nethack
+.endfor
+.endif
+	${MKDIR} ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc ${PREFIX}/share/examples/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad ${PREFIX}/share/examples/ja/nethack
+.for i in ibm nh10
+	${INSTALL_DATA} ${WRKSRC}/win/X11/$i.bdf ${PREFIX}/share/examples/ja/nethack
+	${X11BASE}/bin/bdftopcf ${PREFIX}/share/examples/ja/nethack/$i.bdf \
+		> ${PREFIX}/share/examples/ja/nethack/$i.pcf
+	${RM} ${PREFIX}/share/examples/ja/nethack/$i.bdf
+	${GZIP_CMD} ${PREFIX}/share/examples/ja/nethack/$i.pcf
+.endfor
+	${CAT} ${PKGDIR}/MESSAGE
+
 .include <bsd.port.mk>
diff --git a/japanese/nethack34/files/README b/japanese/nethack34/files/README
new file mode 100644
index 000000000000..5a92507b5121
--- /dev/null
+++ b/japanese/nethack34/files/README
@@ -0,0 +1,28 @@
+jnethack$B$N(BX$BHG$NM7$SJ}(B
+
+$B2hLL$N9-$5$O!"(B1024 x 768$B0J>e$K$7$F$*$-$^$7$g$&!#(B
+
+1. $B%j%=!<%9%U%!%$%k$r%3%T!<$7$^$9!#(B
+% cd /usr/local/share/examples/ja/nethack
+% xrdb -m JNetHack.ad
+# cp JNetHack.ad /usr/X11R6/lib/X11/app-defaults/JNetHack
+
+2. $B%U%)%s%H$r%3%T!<$7$^$9!#(B
+# cp ibm.pcf.gz nh10.pcf.gz /usr/X11R6/lib/X11/fonts/misc
+# mkfontdir /usr/X11R6/lib/X11/fonts/misc
+
+3. ~/.Xresources$B$K@_Dj$rDI2C$7$^$9!#(B
+   xdm$B$r;H$C$F$$$k>l9g$O!"(B~/.Xdefaults$B$G$9!#(B
+   $B$3$N:n6H$r$9$k$H!"%?%$%kI=<($5$l$k$h$&$K$J$j$^$9!#(B
+   1280 x 1024$B0J>e$N9-$$2hLL$,$*4+$a$G$9!#(B
+% echo "JNetHack.tile_file: x11tiles" >> ~/.Xresources
+% xrdb -m ~/.Xresources
+
+4. $B@_Dj40N;!"5/F0$7$^$9!#(B
+% jnethack &
+
+jnethack$B$K4X$9$k>pJs$O!"0J2<$N(BURL$B$r$4Mw2<$5$$!#(B
+	http://www.guru.gr.jp/~issei/jnethack/
+
+- Seiichirou Hiraoka
+flathill@FreeBSD.ORG
diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad
index af7f997c2ad8..4a1d1cad9fd7 100644
--- a/japanese/nethack34/files/patch-ad
+++ b/japanese/nethack34/files/patch-ad
@@ -1,52 +1,40 @@
-*** 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 -ruN ./sys/unix/Makefile.top ../nethack-3.2.2/sys/unix/Makefile.top
+--- ./sys/unix/Makefile.top	Wed Dec 11 05:20:10 1996
++++ ../nethack-3.2.2/sys/unix/Makefile.top	Sun Nov 22 00:26:55 1998
+@@ -16,14 +16,14 @@
+ # make NetHack
+ GAME     = nethack
+ 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
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ #
+@@ -32,13 +32,13 @@
+ # 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  = ${PREFIX}/lib/$(GAME)dir
++SHELLDIR = ${PREFIX}/bin
+ 
+ # per discussion in Install.X11
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ 
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff --git a/japanese/nethack34/files/patch-ae b/japanese/nethack34/files/patch-ae
index a8a120c506cd..1b495ca33ae9 100644
--- a/japanese/nethack34/files/patch-ae
+++ b/japanese/nethack34/files/patch-ae
@@ -1,69 +1,52 @@
-*** 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 -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix/Makefile.src
+--- ./sys/unix/Makefile.src	Sun Nov 22 00:50:19 1998
++++ ../nethack-3.2.2/sys/unix/Makefile.src	Sun Nov 22 00:52:12 1998
+@@ -127,8 +127,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -g -I../include
+-LFLAGS = -g
++CFLAGS += -O -I../include -I${X11BASE}/include
++LFLAGS = -L${X11BASE}/lib
+ 
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -149,8 +149,8 @@
+ 	winmisc.o winstat.o wintext.o winval.o tile.o
+ #
+ # 
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++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
+@@ -170,13 +170,14 @@
+ #
+ # 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 -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
++# BSD/OS 2.0 / FreeBSD 2.2/3.0
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm
+ #
+ #
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -204,7 +205,7 @@
+ #
+ # LIBS = -lxpg4
+ #
+-LIBS =
++LIBS = -lxpg4
+ 
+ # make NetHack
+ #JP by issei(96/5/27)
diff --git a/japanese/nethack34/files/patch-af b/japanese/nethack34/files/patch-af
index 9e71d2b11dc0..1f357cbc5bf6 100644
--- a/japanese/nethack34/files/patch-af
+++ b/japanese/nethack34/files/patch-af
@@ -1,12 +1,14 @@
-diff -ruN ./sys/unix/Makefile.src ../nethack-3.2.2/sys/unix//Makefile.src
---- ./sys/unix/Makefile.src	Sat Nov 21 01:23:57 1998
-+++ ../nethack-3.2.2/sys/unix/Makefile.src	Sat Nov 21 01:15:41 1998
-@@ -204,7 +204,7 @@
- #
- # LIBS = -lxpg4
- #
--LIBS =
-+LIBS = -lxpg4 -lSM -lICE
- 
- # make NetHack
- #JP by issei(96/5/27)
+diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
+--- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
++++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
+@@ -154,7 +154,7 @@
+ !
+ !
+ !
+-JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
+-                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
++JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
++                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
+ JNetHack*international:	True
diff --git a/japanese/nethack34/files/patch-ag b/japanese/nethack34/files/patch-ag
index 1f357cbc5bf6..89eb18e12d3f 100644
--- a/japanese/nethack34/files/patch-ag
+++ b/japanese/nethack34/files/patch-ag
@@ -1,14 +1,21 @@
-diff -ruN ./win/X11/JNetHack.ad ../nethack-3.2.2/win/X11/JNetHack.ad
---- ./win/X11/JNetHack.ad	Sat Nov 21 01:38:14 1998
-+++ ../nethack-3.2.2/win/X11/JNetHack.ad	Sat Nov 21 01:40:00 1998
-@@ -154,7 +154,7 @@
- !
- !
- !
--JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-normal--14-*-iso8859-1,\
--                  -*-fixed-medium-r-*--14-*-jisx0208.1983-*
-+JNetHack*fontSet: -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-1,\
-+                  -*-fixed-medium-r-*--14-*-*-*-*-*-jisx0208.1983-*
- JNetHack*international:	True
+diff -ruN ./src/polyself.c ../nethack-3.2.2/src/polyself.c
+--- ./src/polyself.c	Sun Nov 22 01:10:08 1998
++++ ../nethack-3.2.2/src/polyself.c	Sun Nov 22 01:12:25 1998
+@@ -171,7 +171,7 @@
+ 		    if (u.uhp <= 0) u.uhp = 1;
+ 		    if (u.uhpmax <= 0) u.uhpmax = 1;
+ 		} else {
+-/*JP		    Your("new form doesn't seem healthy enough to survive.");
++/*JP		    Your("new form doesn't seem healthy enough to survive.");*/
+ 		    Your("�������Ѥ������Ƥ��������Ϥ��ʤ��褦����");
+ 		    killer_format = KILLED_BY_AN;
+ /*JP		    killer="unsuccessful polymorph";*/
+@@ -181,7 +181,7 @@
+ 	}
+ /*JP	polyman("feel like a new %s!",
+ 		Role_is('E') ? "elf" : flags.female ? "woman" : "man");*/
+-	if(saved_sex == flags.female)
++	if(u.umonnum != PM_PLAYERMON || saved_sex == flags.female)
+ 	  polyman("�̤�%s�Ȥ������ޤ줫��ä��褦�ʵ���������",
+ 	      pl_character[0] == 'E' ? "�����" : "�ʹ�");
+ 	else
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index 9ba9eaec2ac6..d514aed418b5 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -117,8 +117,22 @@ lib/jnethackdir/water.lev
 lib/jnethackdir/wizard1.lev
 lib/jnethackdir/wizard2.lev
 lib/jnethackdir/wizard3.lev
-@mode 664
 lib/jnethackdir/logfile
 lib/jnethackdir/record
 lib/jnethackdir/perm
+lib/jnethackdir/nh_icon.xpm
+lib/jnethackdir/pet_mark.xbm
+lib/jnethackdir/rip.xpm
+lib/jnethackdir/x11tiles
+share/doc/ja/nethack/jGuidebook.txt
+share/doc/ja/nethack/README
+share/doc/ja/nethack/README.j
+share/doc/ja/nethack/ChangeLog.j
+share/doc/ja/nethack/INSTALL.j
+share/examples/ja/nethack/nethack.rc
+share/examples/ja/nethack/JNetHack.ad
+share/examples/ja/nethack/nh10.pcf.gz
+share/examples/ja/nethack/ibm.pcf.gz
+@dirrm share/doc/ja/nethack
+@dirrm share/examples/ja/nethack
 @dirrm lib/jnethackdir