Add JNetHack 3.4.0-0.6. This port was repocopied from

japanese/nethack(32), but is mostly based on games/nethack34.

18 files changed, 454 insertions, 541 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 35e1c5308f6e..2f09e723e242 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -260,6 +260,7 @@
     SUBDIR += ndtpd
     SUBDIR += ne
     SUBDIR += nethack32
+    SUBDIR += nethack34
     SUBDIR += netscape-fonts
     SUBDIR += netscape3.language
     SUBDIR += netscape4-communicator
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 5b188c231913..14cc49c649d0 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -1,60 +1,35 @@
-# New ports collection makefile for:	nethack
-# Date created:		13 February 1995
-# Whom:			asami
+# New ports collection makefile for:	JNetHack 3.4.x
+# Date created:		16 June 2002
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	nethack
-PORTVERSION=	1.0.5.19970924
 CATEGORIES=	japanese games
-MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh322/src/ \
-		ftp://ftp.wtower.com/nethack/sources/
-DISTNAME=	${PORTNAME}-3.2.2
 
-PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/nethack/
-PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
+MAINTAINER=	knu@FreeBSD.org
 
-MAINTAINER=	max@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../../games/nethack34
 
-.include <bsd.port.pre.mk>
+FILESDIR=	${.CURDIR}/files
+PATCHDIR=	${.CURDIR}/files
+MD5_FILE=	${.CURDIR}/distinfo
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
-USE_XPM=	yes
-USE_GMAKE=	yes
-MAN6=		dlb.6 dgn_comp.6 lev_comp.6 nethack.6 recover.6
+PATCH_SITES=	http://downloads.sourceforge.jp/jnethack/606/
+PATCHFILES=	jnethack-${PORTVERSION}-0.6.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-pre-configure:
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+post-install: jnethack-post-install
 
-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
+jnethack-post-install:
 .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
+	${INSTALL_DATA} ${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} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/nethack34/distinfo b/japanese/nethack34/distinfo
index 74dec47449b2..7adc51bd59a5 100644
--- a/japanese/nethack34/distinfo
+++ b/japanese/nethack34/distinfo
@@ -1,2 +1,2 @@
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (jnethack-1.0.5.19970924.gz) = e4a89938096327f1ab40564559f74dd0
+MD5 (nethack-340.tgz) = 0093f14fbbe449d5b188bfb6aa4eae4f
+MD5 (jnethack-3.4.0-0.6.diff.gz) = b171270afea3e9f45cbc0af474a5237b
diff --git a/japanese/nethack34/files/README b/japanese/nethack34/files/README
deleted file mode 100644
index 5a92507b5121..000000000000
--- a/japanese/nethack34/files/README
+++ /dev/null
@@ -1,28 +0,0 @@
-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-aa b/japanese/nethack34/files/patch-aa
index cedfc6b0d9fe..eabd3c3d987d 100644
--- a/japanese/nethack34/files/patch-aa
+++ b/japanese/nethack34/files/patch-aa
@@ -1,63 +1,20 @@
-*** 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
+--- include/config.h.orig	Sun Jun 16 03:02:11 2002
++++ include/config.h	Sun Jun 16 03:05:19 2002
+@@ -216,7 +216,7 @@
+ /* #define COMPRESS "/usr/bin/compress"	*/ /* Lempel-Ziv compression */
+ /* #define COMPRESS_EXTENSION ".Z" */		/* compress's extension */
+ /* An example of one alternative you might want to use: */
+- #define COMPRESS "/usr/local/bin/gzip" 	/* FSF gzip compression */
++ #define COMPRESS "/usr/bin/gzip"	 	/* FSF gzip compression */
+  #define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
+ #endif
+ 
+@@ -251,7 +251,7 @@
+ #  ifdef __APPLE__
+ #    define HACKDIR "jnethackdir"	/* nethack directory */
+ #  else
+-#    define HACKDIR "/usr/games/lib/jnethackdir"
++#    define HACKDIR "%%PREFIX%%/lib/jnethack"
+ #  endif
+ # endif
+ 
diff --git a/japanese/nethack34/files/patch-ab b/japanese/nethack34/files/patch-ab
deleted file mode 100644
index f8e8c48bac9b..000000000000
--- a/japanese/nethack34/files/patch-ab
+++ /dev/null
@@ -1,80 +0,0 @@
-*** 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 038c95335165..2d5897d43a29 100644
--- a/japanese/nethack34/files/patch-ac
+++ b/japanese/nethack34/files/patch-ac
@@ -1,19 +1,20 @@
-*** 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
+--- include/unixconf.h.orig	Sun Jun 16 13:00:22 2002
++++ include/unixconf.h	Sun Jun 16 13:01:19 2002
+@@ -25,7 +25,7 @@
+ /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
+ 			/* Use BSD for < v3.0 */
+ 			/* "ULTRIX" not to be confused with "ultrix" */
+-/* #define SYSV	*/	/* define for System V, Solaris 2.x, newer versions */
++#define SYSV		/* define for System V, Solaris 2.x, newer versions */
+ 			/* of Linux */
+ /* #define HPUX */	/* Hewlett-Packard's Unix, version 6.5 or higher */
+ 			/* use SYSV for < v6.5 */
+@@ -143,7 +143,7 @@
+  * A stat system call is done on the mailbox every MAILCKFREQ moves.
+  */
+ 
+-#define MAIL			/* Deliver mail during the game */
++/* #define MAIL */	       	/* Deliver mail during the game */
+ 
+ /* The Andrew Message System does mail a little differently from normal
+  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad
index 4a1d1cad9fd7..79dd127afa1c 100644
--- a/japanese/nethack34/files/patch-ad
+++ b/japanese/nethack34/files/patch-ad
@@ -1,40 +1,118 @@
-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)
+--- sys/unix/Makefile.src.orig	Sun Jun 16 03:02:10 2002
++++ sys/unix/Makefile.src	Sun Jun 16 03:09:37 2002
+@@ -147,19 +147,28 @@
+ # directories.  The ones given below is the usual spot for linux systems.
+ # The paths are for glibconfig.h and gnomesupport.h respectively.
+ #
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
+ 
+ # flags for debugging:
+ # CFLAGS = -g -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
+ 
+-CFLAGS = -W -g -O -I../include
+ LFLAGS =
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LD line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LD=g++
+ 
+ # flags for IPv6 support
+@@ -222,7 +231,26 @@
+ #
+ #
+ WINSRC = $(WINTTYSRC)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINSRC += $(WINX11SRC)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINSRC += $(WINQTSRC)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINSRC += $(WINGNOMESRC)
++endif
++
+ WINOBJ = $(WINTTYOBJ)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINOBJ += $(WINX11OBJ)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINOBJ += $(WINQTOBJ)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINOBJ += $(WINGNOMEOBJ)
++endif
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -242,19 +270,19 @@
+ #
+ # 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 -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib
+ # 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
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
+ # libraries for Gnome
+-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
++WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) -lgnugetopt
+ #
+ # libraries for Gem port
+ WINGEMLIB = -le_gem -lgem
+@@ -263,6 +291,15 @@
+ WINBELIB = -lbe
+ 
+ WINLIB = $(WINTTYLIB)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINLIB += $(WINX11LIB)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINLIB += $(WINQTLIB)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINLIB += $(WINGNOMELIB)
++endif
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -472,13 +509,13 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
++	${MOC} ../include/qt_kde0.h > qt_kde0.moc
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
++	${MOC} ../include/qt_win.h > qt_win.moc
+ 
+ qttableview.moc: ../include/qttableview.h
+-	$(QTDIR)/bin/moc ../include/qttableview.h > qttableview.moc
++	${MOC} ../include/qttableview.h > qttableview.moc
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/japanese/nethack34/files/patch-ae b/japanese/nethack34/files/patch-ae
index 1b495ca33ae9..b8b059dd1fa5 100644
--- a/japanese/nethack34/files/patch-ae
+++ b/japanese/nethack34/files/patch-ae
@@ -1,52 +1,50 @@
-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
+--- sys/unix/Makefile.top.orig	Sun Jun 16 03:02:10 2002
++++ sys/unix/Makefile.top	Sun Jun 16 03:11:41 2002
+@@ -14,18 +14,17 @@
+ # MAKE = make
  
+ # make NetHack
+-PREFIX	 = /usr
+ GAME     = jnethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+-GAMEGRP  = bin
++GAMEGRP  = games
  
- # 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)
+ # 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
  
- # 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)
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,12 +34,12 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = $(PREFIX)/lib/$(GAME)
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
  
- # 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
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+ # VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+@@ -48,7 +47,7 @@
+ # for BeOS
+ # VARDATND = beostiles
+ # for Gnome
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
  
- # make NetHack
- #JP by issei(96/5/27)
+ VARDATD = data joracles options quest.dat jrumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff --git a/japanese/nethack34/files/patch-af b/japanese/nethack34/files/patch-af
index 1f357cbc5bf6..9a7b5f4fe852 100644
--- a/japanese/nethack34/files/patch-af
+++ b/japanese/nethack34/files/patch-af
@@ -1,14 +1,41 @@
-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
+--- sys/unix/Makefile.doc.orig	Sun Jun 16 03:02:10 2002
++++ sys/unix/Makefile.doc	Sun Jun 16 03:15:50 2002
+@@ -38,15 +38,15 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/local/man/man6
++MANDIR	= ${PREFIX}/man/man
+ MANEXT	= 6
+ 
+ # manual installation for most BSD-style systems
+-GAMEMANCREATE = cp nethack.6
+-LEVMANCREATE = cp lev_comp.6
+-DGNMANCREATE = cp dgn_comp.6
+-RCVRMANCREATE = cp recover.6
+-DLBMANCREATE = cp dlb.6
++GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
++LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
++DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
++RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
++DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
+ # manual installation for most SYSV-style systems
+ # GAMEMANCREATE = nroff -man nethack.6 >
+ # LEVMANCREATE = nroff -man lev_comp.6 >
+@@ -55,11 +55,11 @@
+ # DLBMANCREATE = nroff -man dlb.6 >
+ 
+ manpages:
+-	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+-	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+-	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
+-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
++	-$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+ 
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/japanese/nethack34/files/patch-ag b/japanese/nethack34/files/patch-ag
index 89eb18e12d3f..56aed0a0e35b 100644
--- a/japanese/nethack34/files/patch-ag
+++ b/japanese/nethack34/files/patch-ag
@@ -1,21 +1,21 @@
-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
+--- sys/unix/Makefile.utl.orig	Sun Jun 16 03:02:10 2002
++++ sys/unix/Makefile.utl	Sun Jun 16 03:13:16 2002
+@@ -89,7 +89,17 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
++
+ LFLAGS =
+ 
+ LIBS =
diff --git a/japanese/nethack34/files/patch-ah b/japanese/nethack34/files/patch-ah
deleted file mode 100644
index 7775dda0cbda..000000000000
--- a/japanese/nethack34/files/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
---- sys/unix/Makefile.utl.orig	Sun Feb 13 07:26:46 2000
-+++ sys/unix/Makefile.utl	Sun Feb 13 07:27:42 2000
-@@ -86,8 +86,8 @@
- # if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
- # YACC     = yacc
- # LEX      = lex
--YACC     = bison -y
--# YACC     = byacc
-+# YACC     = bison -y
-+YACC     = byacc
- LEX      = flex -8
-  
- # these are the names of the output files from YACC/LEX. Under MS-DOS
diff --git a/japanese/nethack34/files/patch-ai b/japanese/nethack34/files/patch-ai
deleted file mode 100644
index d552369e306c..000000000000
--- a/japanese/nethack34/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/system.h.orig      Sun Mar 31 20:46:35 2002
-+++ include/system.h   Sun Mar 31 20:55:33 2002
-@@ -507,7 +507,7 @@
- #  endif
- # endif
- 
--# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC)
-+# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || defined(BSD)
- E time_t FDECL(time, (time_t *));
- # else
- E long FDECL(time, (time_t *));
diff --git a/japanese/nethack34/files/patch-ja b/japanese/nethack34/files/patch-ja
new file mode 100644
index 000000000000..9b865d411e2a
--- /dev/null
+++ b/japanese/nethack34/files/patch-ja
@@ -0,0 +1,14 @@
+--- include/winX.h.orig	Sun Jun 16 13:15:58 2002
++++ include/winX.h	Sun Jun 16 13:21:39 2002
+@@ -378,11 +378,7 @@
+ E void FDECL(clear_text_buffer,(struct text_buffer*));
+ E void FDECL(free_text_buffer,(struct text_buffer*));
+ #ifdef GRAPHIC_TOMBSTONE
+-#ifndef XI18N
+ E void FDECL(calculate_rip_text, (int));
+-#else
+-E void FDECL(calculate_rip_text, (int, XFontSet));
+-#endif
+ #endif
+ 
+ 
diff --git a/japanese/nethack34/pkg-comment b/japanese/nethack34/pkg-comment
index 70ca7a893988..581246ce8408 100644
--- a/japanese/nethack34/pkg-comment
+++ b/japanese/nethack34/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+Japanized NetHack
diff --git a/japanese/nethack34/pkg-descr b/japanese/nethack34/pkg-descr
index 43cdc2077a2c..383abd25fbef 100644
--- a/japanese/nethack34/pkg-descr
+++ b/japanese/nethack34/pkg-descr
@@ -1,15 +1,4 @@
-This is the Japanese version 1.0.5.19970924 (original 3.2.2) 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.
+JNetHack is Japanized NetHack, with all messages translated to
+Japanese.
 
-Take care, and try not to miss meals.
-
-WWW: http://www.win.tue.nl/games/roguelike/nethack/
-
-- Satoshi
-asami@cs.berkeley.edu
-
-P.S. There are newsgroups "rec.games.roguelike.nethack" and
-"fj.rec.games.roguelike" if you are
-     truly interested.
+WWW:	http://sourceforge.jp/projects/jnethack/
diff --git a/japanese/nethack34/pkg-message b/japanese/nethack34/pkg-message
deleted file mode 100644
index 0f98a4799d29..000000000000
--- a/japanese/nethack34/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
---------
-If you want to play jnethack on X, see
-	/usr/local/share/doc/ja/nethack/README
-
-See also /usr/local/share/doc/ja/nethack/jGuideBook.txt
---------
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index b29642a13853..8c6179bf6361 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -1,141 +1,152 @@
 bin/jnethack
-lib/jnethackdir/jnethack
-@exec mkdir %D/lib/jnethackdir/save
-@exec chmod -R 775 %D/lib/jnethackdir
-@exec chmod 2755 %D/lib/jnethackdir/jnethack
-@exec chown games:games %D/lib/jnethackdir/save
-@unexec rm -rf %D/lib/jnethackdir/save
-lib/jnethackdir/A-filla.lev
-lib/jnethackdir/A-fillb.lev
-lib/jnethackdir/A-goal.lev
-lib/jnethackdir/A-locate.lev
-lib/jnethackdir/A-start.lev
-lib/jnethackdir/B-filla.lev
-lib/jnethackdir/B-fillb.lev
-lib/jnethackdir/B-goal.lev
-lib/jnethackdir/B-locate.lev
-lib/jnethackdir/B-start.lev
-lib/jnethackdir/C-filla.lev
-lib/jnethackdir/C-fillb.lev
-lib/jnethackdir/C-goal.lev
-lib/jnethackdir/C-locate.lev
-lib/jnethackdir/C-start.lev
-lib/jnethackdir/E-filla.lev
-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
-lib/jnethackdir/H-locate.lev
-lib/jnethackdir/H-start.lev
-lib/jnethackdir/K-filla.lev
-lib/jnethackdir/K-fillb.lev
-lib/jnethackdir/K-goal.lev
-lib/jnethackdir/K-locate.lev
-lib/jnethackdir/K-start.lev
-lib/jnethackdir/P-filla.lev
-lib/jnethackdir/P-fillb.lev
-lib/jnethackdir/P-goal.lev
-lib/jnethackdir/P-locate.lev
-lib/jnethackdir/P-start.lev
-lib/jnethackdir/R-filla.lev
-lib/jnethackdir/R-fillb.lev
-lib/jnethackdir/R-goal.lev
-lib/jnethackdir/R-locate.lev
-lib/jnethackdir/R-start.lev
-lib/jnethackdir/S-filla.lev
-lib/jnethackdir/S-fillb.lev
-lib/jnethackdir/S-goal.lev
-lib/jnethackdir/S-locate.lev
-lib/jnethackdir/S-start.lev
-lib/jnethackdir/T-filla.lev
-lib/jnethackdir/T-fillb.lev
-lib/jnethackdir/T-goal.lev
-lib/jnethackdir/T-locate.lev
-lib/jnethackdir/T-start.lev
-lib/jnethackdir/V-filla.lev
-lib/jnethackdir/V-fillb.lev
-lib/jnethackdir/V-goal.lev
-lib/jnethackdir/V-locate.lev
-lib/jnethackdir/V-start.lev
-lib/jnethackdir/W-filla.lev
-lib/jnethackdir/W-fillb.lev
-lib/jnethackdir/W-goal.lev
-lib/jnethackdir/W-locate.lev
-lib/jnethackdir/W-start.lev
-lib/jnethackdir/air.lev
-lib/jnethackdir/asmodeus.lev
-lib/jnethackdir/astral.lev
-lib/jnethackdir/baalz.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
-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/jjj
-lib/jnethackdir/jopthelp
-lib/jnethackdir/joracles
-lib/jnethackdir/jrumors
-lib/jnethackdir/juiblex.lev
-lib/jnethackdir/jwizhelp
-lib/jnethackdir/knox.lev
-lib/jnethackdir/license
-lib/jnethackdir/medusa-1.lev
-lib/jnethackdir/medusa-2.lev
-lib/jnethackdir/minefill.lev
-lib/jnethackdir/minend-1.lev
-lib/jnethackdir/minend-2.lev
-lib/jnethackdir/minetn-1.lev
-lib/jnethackdir/minetn-2.lev
-lib/jnethackdir/nh_icon.xpm
-lib/jnethackdir/options
-lib/jnethackdir/oracle.lev
-lib/jnethackdir/orcus.lev
-lib/jnethackdir/pet_mark.xbm
-lib/jnethackdir/quest.dat
-lib/jnethackdir/rip.xpm
-lib/jnethackdir/sanctum.lev
-lib/jnethackdir/tower1.lev
-lib/jnethackdir/tower2.lev
-lib/jnethackdir/tower3.lev
-lib/jnethackdir/valley.lev
-lib/jnethackdir/water.lev
-lib/jnethackdir/wizard1.lev
-lib/jnethackdir/wizard2.lev
-lib/jnethackdir/wizard3.lev
-lib/jnethackdir/x11tiles
+lib/jnethack/jnethack
+@exec mkdir %D/lib/jnethack/save
+@exec chmod -R 775 %D/lib/jnethack
+@exec chmod 2755 %D/lib/jnethack/nethack
+@exec chown games:games %D/lib/jnethack/save
+@unexec rm -rf %D/lib/jnethack/save
+lib/jnethack/Arc-fila.lev
+lib/jnethack/Arc-filb.lev
+lib/jnethack/Arc-goal.lev
+lib/jnethack/Arc-loca.lev
+lib/jnethack/Arc-strt.lev
+lib/jnethack/Bar-fila.lev
+lib/jnethack/Bar-filb.lev
+lib/jnethack/Bar-goal.lev
+lib/jnethack/Bar-loca.lev
+lib/jnethack/Bar-strt.lev
+lib/jnethack/Cav-fila.lev
+lib/jnethack/Cav-filb.lev
+lib/jnethack/Cav-goal.lev
+lib/jnethack/Cav-loca.lev
+lib/jnethack/Cav-strt.lev
+lib/jnethack/Hea-fila.lev
+lib/jnethack/Hea-filb.lev
+lib/jnethack/Hea-goal.lev
+lib/jnethack/Hea-loca.lev
+lib/jnethack/Hea-strt.lev
+lib/jnethack/Kni-fila.lev
+lib/jnethack/Kni-filb.lev
+lib/jnethack/Kni-goal.lev
+lib/jnethack/Kni-loca.lev
+lib/jnethack/Kni-strt.lev
+lib/jnethack/Mon-fila.lev
+lib/jnethack/Mon-filb.lev
+lib/jnethack/Mon-goal.lev
+lib/jnethack/Mon-loca.lev
+lib/jnethack/Mon-strt.lev
+lib/jnethack/Pri-fila.lev
+lib/jnethack/Pri-filb.lev
+lib/jnethack/Pri-goal.lev
+lib/jnethack/Pri-loca.lev
+lib/jnethack/Pri-strt.lev
+lib/jnethack/Ran-fila.lev
+lib/jnethack/Ran-filb.lev
+lib/jnethack/Ran-goal.lev
+lib/jnethack/Ran-loca.lev
+lib/jnethack/Ran-strt.lev
+lib/jnethack/Rog-fila.lev
+lib/jnethack/Rog-filb.lev
+lib/jnethack/Rog-goal.lev
+lib/jnethack/Rog-loca.lev
+lib/jnethack/Rog-strt.lev
+lib/jnethack/Sam-fila.lev
+lib/jnethack/Sam-filb.lev
+lib/jnethack/Sam-goal.lev
+lib/jnethack/Sam-loca.lev
+lib/jnethack/Sam-strt.lev
+lib/jnethack/Tou-fila.lev
+lib/jnethack/Tou-filb.lev
+lib/jnethack/Tou-goal.lev
+lib/jnethack/Tou-loca.lev
+lib/jnethack/Tou-strt.lev
+lib/jnethack/Val-fila.lev
+lib/jnethack/Val-filb.lev
+lib/jnethack/Val-goal.lev
+lib/jnethack/Val-loca.lev
+lib/jnethack/Val-strt.lev
+lib/jnethack/Wiz-fila.lev
+lib/jnethack/Wiz-filb.lev
+lib/jnethack/Wiz-goal.lev
+lib/jnethack/Wiz-loca.lev
+lib/jnethack/Wiz-strt.lev
+lib/jnethack/air.lev
+lib/jnethack/asmodeus.lev
+lib/jnethack/astral.lev
+lib/jnethack/baalz.lev
+lib/jnethack/bigrm-1.lev
+lib/jnethack/bigrm-2.lev
+lib/jnethack/bigrm-3.lev
+lib/jnethack/bigrm-4.lev
+lib/jnethack/bigrm-5.lev
+lib/jnethack/castle.lev
+lib/jnethack/credit.xpm
+lib/jnethack/data
+lib/jnethack/dungeon
+lib/jnethack/earth.lev
+lib/jnethack/fakewiz1.lev
+lib/jnethack/fakewiz2.lev
+lib/jnethack/fire.lev
+lib/jnethack/floor.xpm
+lib/jnethack/jcmdhelp
+lib/jnethack/jhelp
+lib/jnethack/jhh
+lib/jnethack/jhistory
+lib/jnethack/jjj
+lib/jnethack/jopthelp
+lib/jnethack/joracles
+lib/jnethack/jrumors
+lib/jnethack/juiblex.lev
+lib/jnethack/jwizhelp
+lib/jnethack/knox.lev
+lib/jnethack/license
+lib/jnethack/mapbg.xpm
+lib/jnethack/medusa-1.lev
+lib/jnethack/medusa-2.lev
+lib/jnethack/minefill.lev
+lib/jnethack/minend-1.lev
+lib/jnethack/minend-2.lev
+lib/jnethack/minend-3.lev
+lib/jnethack/minetn-1.lev
+lib/jnethack/minetn-2.lev
+lib/jnethack/minetn-3.lev
+lib/jnethack/minetn-4.lev
+lib/jnethack/minetn-5.lev
+lib/jnethack/minetn-6.lev
+lib/jnethack/minetn-7.lev
+lib/jnethack/options
+lib/jnethack/oracle.lev
+lib/jnethack/orcus.lev
+lib/jnethack/pet_mark.xbm
+lib/jnethack/quest.dat
+lib/jnethack/rip.xpm
+lib/jnethack/sanctum.lev
+lib/jnethack/soko1-1.lev
+lib/jnethack/soko1-2.lev
+lib/jnethack/soko2-1.lev
+lib/jnethack/soko2-2.lev
+lib/jnethack/soko3-1.lev
+lib/jnethack/soko3-2.lev
+lib/jnethack/soko4-1.lev
+lib/jnethack/soko4-2.lev
+lib/jnethack/t32-1024.xpm
+lib/jnethack/tower1.lev
+lib/jnethack/tower2.lev
+lib/jnethack/tower3.lev
+lib/jnethack/valley.lev
+lib/jnethack/water.lev
+lib/jnethack/wizard1.lev
+lib/jnethack/wizard2.lev
+lib/jnethack/wizard3.lev
+lib/jnethack/x11tiles
 @mode 664
-lib/jnethackdir/logfile
-lib/jnethackdir/perm
-lib/jnethackdir/record
-@dirrm lib/jnethackdir
-share/doc/ja/nethack/ChangeLog.j
-share/doc/ja/nethack/INSTALL.j
-share/doc/ja/nethack/README
-share/doc/ja/nethack/README.j
-share/doc/ja/nethack/jGuidebook.txt
-share/examples/ja/nethack/JNetHack.ad
-share/examples/ja/nethack/ibm.pcf.gz
-share/examples/ja/nethack/nethack.rc
-share/examples/ja/nethack/nh10.pcf.gz
-@dirrm share/examples/ja/nethack
-@unexec rmdir %D/share/examples/ja 2>/dev/null || true
-@dirrm share/doc/ja/nethack
+lib/jnethack/logfile
+lib/jnethack/record
+lib/jnethack/perm
+@mode
+%%PORTDOCS%%share/doc/nethack/Guidebook.txt
+%%PORTDOCS%%@dirrm share/doc/nethack
+@dirrm lib/jnethack
+%%PORTDOCS%%share/doc/ja/nethack/ChangeLog.j
+%%PORTDOCS%%share/doc/ja/nethack/INSTALL.j
+%%PORTDOCS%%share/doc/ja/nethack/README.j