Stage japanese/nethack34 and unbreak

 * Update to the latest jnethack patch
 * Remove BROKEN flag
 * Add staging support (inspired by games/nethack)
 * Use base compiler instead of gcc
 * Quick fix for bug 192743 (chown and chmod)
 * marino: Use SUB_FILES instead of roll-your-own pkg-deinstall
 * marino: Remove unnecessary loop for REINPLACE_CMD
 * marino: Simplify docs installation, remove two loops
 * marino: Unmask configure commands
 * marino: Use parentheses and "&&" instead of just ";" on compounds
 * marino: Beef up pkg-descr for those unfamiliar with NetHack

PR:		193206
Submitted by:	WATANABE Kazuhiro

12 files changed, 623 insertions, 192 deletions

diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 70baf7ec6a1c..97711e6bebc5 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-src
 
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-PATCH_SITE_SUBDIR=	jnethack/15876
-PATCHFILES=	jnethack-${PORTVERSION}-0.7.diff.gz
+PATCH_SITE_SUBDIR=	jnethack/58545
+PATCHFILES=	jnethack-${PORTVERSION}-0.11.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,61 +18,60 @@ COMMENT=	Japanized NetHack
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-BROKEN=		Fails to build
-
-USES=		bison gmake tar:tgz
+USES=		gmake tar:tgz
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
-PLIST_SUB=	HACKNAME="${HACKNAME}" \
-		HACKDIR="${HACKDIR}" \
-		HACKDOCSDIR="${HACKDOCSDIR}"
+PLIST_SUB=	HACKNAME="${HACKNAME}"
+
+MAKE_JOBS_UNSAFE=	yes
 
-MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 # Configure these variables as you want them to be.
 HACKNAME?=	jnethack
-HACKDIR?=	lib/${HACKNAME}
-HACKDOCSDIR?=	share/doc/ja/nethack
+HACKDIR?=	share/${HACKNAME}
 
-.if !defined(PKGNAMESUFFIX)
-USE_XORG=	xaw xpm
-GRAPHICS=	X11_GRAPHICS
-.else
-.if ${PKGNAMESUFFIX} == "-nox11"
-GRAPHICS=	# none
-.endif
-.endif
+DATADIR=	${PREFIX}/${HACKDIR}
+DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	HACKDIR=${HACKDIR}
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS SHELL X11
+OPTIONS_DEFAULT=SHELL X11
 
-OPTIONS_DEFINE=	DOCS
+SHELL_DESC=	Shell support
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MX11}
+USE_XORG=	xaw xpm
+GRAPHICS=	X11_GRAPHICS
+.endif
+
 post-patch:
-.for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
-	${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f}
-.endfor
-	${REINPLACE_CMD} -e 's|<regex.h>|<gnuregex.h>|g' ${WRKSRC}/src/sounds.c
-	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
-.if defined(WITHOUT_SHELL)
-	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h
+	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
+		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
+		${WRKSRC}/include/config.h \
+		${WRKSRC}/sys/unix/Makefile.top \
+		${WRKSRC}/sys/unix/Makefile.doc
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
+		${WRKSRC}/win/Qt/qt_win.cpp
+.if ! ${PORT_OPTIONS:MSHELL}
+	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' \
+		${WRKSRC}/include/unixconf.h
+.endif
+.if ! ${PORT_OPTIONS:MX11}
+	@${REINPLACE_CMD} -e 's|# define XI18N|/* # define XI18N|' \
+		${WRKSRC}/include/config.h
 .endif
 
-pre-configure:
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+do-configure:
+	(cd ${WRKSRC}/sys/unix && ${SH} setup.sh)
 
 post-install:
-# Makefile.top digs bin/lib somehow
-	${RMDIR} ${PREFIX}/bin/lib
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/${HACKDOCSDIR}
-.for i in README.j ChangeLog.j INSTALL.j
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${HACKDOCSDIR}
-.endfor
-.endif
-	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
+	(cd ${WRKSRC}/doc && \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages)
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${PREFIX}/${HACKDOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README.j ChangeLog.j INSTALL.j \
+		doc/Guidebook.txt doc/jGuidebook.txt ${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/nethack34/distinfo b/japanese/nethack34/distinfo
index 6ab460096de2..c0d770c9552c 100644
--- a/japanese/nethack34/distinfo
+++ b/japanese/nethack34/distinfo
@@ -1,4 +1,4 @@
 SHA256 (nethack-343-src.tgz) = bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
 SIZE (nethack-343-src.tgz) = 3497458
-SHA256 (jnethack-3.4.3-0.7.diff.gz) = e686fea476d00c2f8461dcf3ea6cc9a013cd50d82389bc254177b33dc864c259
-SIZE (jnethack-3.4.3-0.7.diff.gz) = 925046
+SHA256 (jnethack-3.4.3-0.11.diff.gz) = fbc071f6b33c53d89e8f13319ced952e605499a21d2086077296c631caff7389
+SIZE (jnethack-3.4.3-0.11.diff.gz) = 956624
diff --git a/japanese/nethack34/files/patch-include-config.h b/japanese/nethack34/files/patch-include-config.h
new file mode 100644
index 000000000000..ea08b4c0aea9
--- /dev/null
+++ b/japanese/nethack34/files/patch-include-config.h
@@ -0,0 +1,11 @@
+--- include/config.h.orig	2014-08-28 15:09:32.000000000 +0900
++++ include/config.h	2014-08-28 15:10:15.000000000 +0900
+@@ -219,7 +219,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/jnethackdir"
++#  define HACKDIR "%%HACKDIR%%"
+ # endif
+ 
+ /*
diff --git a/japanese/nethack34/files/patch-include-system.h b/japanese/nethack34/files/patch-include-system.h
new file mode 100644
index 000000000000..9c0bce6a7791
--- /dev/null
+++ b/japanese/nethack34/files/patch-include-system.h
@@ -0,0 +1,13 @@
+--- include/system.h.orig	2014-08-28 14:59:56.000000000 +0900
++++ include/system.h	2014-08-28 15:15:45.000000000 +0900
+@@ -79,7 +79,9 @@
+ # if !defined(__SC__) && !defined(LINUX)
+ E  long NDECL(random);
+ # endif
+-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
++# if defined(__FreeBSD__)
++E void FDECL(srandom, (unsigned long));
++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
+ E void FDECL(srandom, (unsigned int));
+ # else
+ #  if !defined(bsdi) && !defined(__FreeBSD__)
diff --git a/japanese/nethack34/files/patch-include-unixconf.h b/japanese/nethack34/files/patch-include-unixconf.h
new file mode 100644
index 000000000000..edfcbe892d10
--- /dev/null
+++ b/japanese/nethack34/files/patch-include-unixconf.h
@@ -0,0 +1,20 @@
+--- include/unixconf.h.orig	2014-08-28 14:59:56.000000000 +0900
++++ include/unixconf.h	2014-08-28 15:23:59.000000000 +0900
+@@ -19,7 +19,7 @@
+  */
+ 
+ /* define exactly one of the following four choices */
+-/* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
++#define BSD 1		/* define for 4.n/Free/Open/Net BSD  */
+ 			/* also for relatives like SunOS 4.x, DG/UX, and */
+ 			/* older versions of Linux */
+ /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
+@@ -284,7 +284,7 @@
+ #endif
+ 
+ #if defined(BSD) || defined(ULTRIX)
+-# if !defined(DGUX) && !defined(SUNOS4)
++# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
+ #define memcpy(d, s, n)		bcopy(s, d, n)
+ #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
+ # endif
diff --git a/japanese/nethack34/files/patch-sys-unix-Makefile.doc b/japanese/nethack34/files/patch-sys-unix-Makefile.doc
new file mode 100644
index 000000000000..4fa2c4ac3971
--- /dev/null
+++ b/japanese/nethack34/files/patch-sys-unix-Makefile.doc
@@ -0,0 +1,43 @@
+--- sys/unix/Makefile.doc.orig	2014-09-01 16:25:39.000000000 +0900
++++ sys/unix/Makefile.doc	2014-09-01 16:26:31.000000000 +0900
+@@ -40,16 +40,16 @@
+ 	latex Guidebook.tex
+ 
+ 
+-GAME	= nethack
+-MANDIR	= /usr/local/man/man6
++GAME	= %%HACKNAME%%
++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 >
+@@ -58,11 +58,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) ${DESTDIR}$(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover.$(MANEXT)
++	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+ 
+ # 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-sys-unix-Makefile.src b/japanese/nethack34/files/patch-sys-unix-Makefile.src
new file mode 100644
index 000000000000..a8fce6186a63
--- /dev/null
+++ b/japanese/nethack34/files/patch-sys-unix-Makefile.src
@@ -0,0 +1,130 @@
+--- sys/unix/Makefile.src.orig	2014-08-26 22:41:21.000000000 +0900
++++ sys/unix/Makefile.src	2014-08-26 22:41:59.000000000 +0900
+@@ -72,7 +72,7 @@
+ #
+ #	If you are using GCC 2.2.2 or higher on a DPX/2, just use:
+ #
+-CC = gcc
++#CC = gcc
+ #
+ #	For HP/UX 10.20 with GCC:
+ # CC = gcc -D_POSIX_SOURCE
+@@ -149,19 +149,29 @@
+ # 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 = -W -g -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
++endif
++
+ LFLAGS = 
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LINK=g++
+ #	For cross-compiling, eg. with gcc on Linux (see also CC further up):
+ #CXX=arm-linux-g++
+@@ -228,8 +238,27 @@
+ #
+ #
+ WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++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
+ # Sysatt uses shared library in lieu of this option
+@@ -248,19 +277,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${LOCALBASE}/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}
+ #
+ # 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) ${LDFLAGS}
+ #
+ # libraries for Gem port
+ WINGEMLIB = -le_gem -lgem
+@@ -269,6 +298,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)
+@@ -478,13 +516,13 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
++	${MOC} -o qt_kde0.moc ../include/qt_kde0.h
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
++	${MOC} -o qt_win.moc ../include/qt_win.h
+ 
+ qttableview.moc: ../include/qttableview.h
+-	$(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
++	${MOC} -o qttableview.moc ../include/qttableview.h
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/japanese/nethack34/files/patch-sys-unix-Makefile.top b/japanese/nethack34/files/patch-sys-unix-Makefile.top
new file mode 100644
index 000000000000..8ba7b99028ba
--- /dev/null
+++ b/japanese/nethack34/files/patch-sys-unix-Makefile.top
@@ -0,0 +1,140 @@
+--- sys/unix/Makefile.top.orig	2014-09-01 22:34:32.000000000 +0900
++++ sys/unix/Makefile.top	2014-09-01 22:36:34.000000000 +0900
+@@ -14,7 +14,6 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
+ GAME     = jnethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+@@ -22,10 +21,10 @@
+ 
+ # 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".
+ # 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}/share/jnethack
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+ # for Atari/Gem
+@@ -48,7 +47,7 @@
+ # for BeOS
+ # VARDATND = beostiles
+ # for Gnome
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+ 
+ VARDATD = data joracles options quest.dat jrumors
+ VARDAT = $(VARDATD) $(VARDATND)
+@@ -185,55 +184,38 @@
+ 		-e '}' 					\
+ 	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
+ 	$(MAKE) dofiles-$${target-nodlb}
+-	cp src/$(GAME) $(GAMEDIR)
+-	cp util/recover $(GAMEDIR)
+-	-rm -f $(SHELLDIR)/$(GAME)
++	${BSD_INSTALL_PROGRAM} src/$(GAME) ${DESTDIR}$(GAMEDIR)
++	${BSD_INSTALL_PROGRAM} util/recover ${DESTDIR}$(GAMEDIR)
++	-rm -f ${DESTDIR}$(SHELLDIR)/$(GAME)
+ 	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
+ 		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
+ 		< sys/unix/nethack.sh \
+-		> $(SHELLDIR)/$(GAME)
+-# set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+-			$(CHGRP) $(GAMEGRP) $(GAME) recover )
+-	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
+-	chmod $(EXEPERM) $(GAMEDIR)/recover
+-	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
+-	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
+-	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
++		> ${DESTDIR}$(SHELLDIR)/$(GAME)
+ 
+ dofiles-dlb: check-dlb
+-	( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
++	( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(GAMEDIR) )
+ #	( cd win/X11 ; cp JNetHack.ad $(GAMEDIR)/JNetHack )
+ #	( cd win/gtk ; cp GTKRC $(GAMEDIR)/gtkrc )
+ #	( bdftopcf win/X11/nh10.bdf > $(GAMEDIR)/nh10.pcf ; mkfontdir $(GAMEDIR))
+-# set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
+-			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
+-			chmod $(FILEPERM) nhdat $(DATNODLB) )
+ 
+ dofiles-nodlb:
+ # copy over the game files
+-	( cd dat ; cp $(DAT) $(GAMEDIR) )
++	( cd dat ; cp $(DAT) ${DESTDIR}$(GAMEDIR) )
+ #	( cd win/X11 ; cp JNetHack.ad $(GAMEDIR)/JNetHack )
+ #	( cd win/gtk ; cp GTKRC $(GAMEDIR)/gtkrc )
+ #	( bdftopcf win/X11/nh10.bdf > $(GAMEDIR)/nh10.pcf ; mkfontdir $(GAMEDIR))
+-# set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
+-			$(CHGRP) $(GAMEGRP) $(DAT) ; \
+-			chmod $(FILEPERM) $(DAT) )
+ 
+ update: $(GAME) recover $(VARDAT) dungeon spec_levs
+ #	(don't yank the old version out from under people who're playing it)
+-	-mv $(GAMEDIR)/$(GAME) $(GAMEDIR)/$(GAME).old
++	-mv ${DESTDIR}$(GAMEDIR)/$(GAME) ${DESTDIR}$(GAMEDIR)/$(GAME).old
+ #	quest.dat is also kept open and has the same problems over NFS
+ #	(quest.dat may be inside nhdat if dlb is in use)
+-	-mv $(GAMEDIR)/quest.dat $(GAMEDIR)/quest.dat.old
+-	-mv $(GAMEDIR)/nhdat $(GAMEDIR)/nhdat.old
++	-mv ${DESTDIR}$(GAMEDIR)/quest.dat ${DESTDIR}$(GAMEDIR)/quest.dat.old
++	-mv ${DESTDIR}$(GAMEDIR)/nhdat ${DESTDIR}$(GAMEDIR)/nhdat.old
+ # set up new versions of the game files
+ 	( $(MAKE) dofiles )
+ # touch time-sensitive files
+ 	-touch -c $(VARDIR)/bones* $(VARDIR)/?lock* $(VARDIR)/wizard*
+-	-touch -c $(VARDIR)/save/*
+ 	touch $(VARDIR)/perm $(VARDIR)/record
+ # and a reminder
+ 	@echo You may also want to install the man pages via the doc Makefile.
+@@ -241,20 +223,15 @@
+ install: $(GAME) recover $(VARDAT) dungeon spec_levs
+ # set up the directories
+ # not all mkdirs have -p; those that don't will create a -p directory
+-	-mkdir -p $(SHELLDIR)
+-	-rm -rf $(GAMEDIR) $(VARDIR)
+-	-mkdir -p $(SHELLDIR)/lib $(GAMEDIR) $(VARDIR) $(VARDIR)/save
++	-mkdir -p ${DESTDIR}$(SHELLDIR)
++	-rm -rf ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR)
++	-mkdir -p ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
+ 	-rmdir ./-p
+-	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+-	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+-	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
++	-chmod $(DIRPERM) ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
+ # set up the game files
+ 	( $(MAKE) dofiles )
+ # set up some additional files
+-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
+-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
+-			$(CHGRP) $(GAMEGRP) perm record logfile ; \
+-			chmod $(FILEPERM) perm record logfile )
++	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile
+ # and a reminder
+ 	@echo You may also want to reinstall the man pages via the doc Makefile.
+ 
diff --git a/japanese/nethack34/files/patch-sys-unix-Makefile.utl b/japanese/nethack34/files/patch-sys-unix-Makefile.utl
new file mode 100644
index 000000000000..eef1658475ce
--- /dev/null
+++ b/japanese/nethack34/files/patch-sys-unix-Makefile.utl
@@ -0,0 +1,42 @@
+--- sys/unix/Makefile.utl.orig	2014-08-27 14:21:34.000000000 +0900
++++ sys/unix/Makefile.utl	2014-08-27 15:19:11.000000000 +0900
+@@ -15,7 +15,7 @@
+ 
+ # if you are using gcc as your compiler,
+ #	uncomment the CC definition below if it's not in your environment
+-CC = gcc
++#CC = gcc
+ #
+ #	For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
+ #
+@@ -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 =
+@@ -101,9 +111,9 @@
+ 
+ # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
+ # if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
+-# YACC     = yacc
++YACC     = yacc
+ # LEX      = lex
+-YACC     = bison -y
++# YACC     = bison -y
+ # YACC     = byacc
+ LEX      = flex -8
+  
diff --git a/japanese/nethack34/files/pkg-deinstall.in b/japanese/nethack34/files/pkg-deinstall.in
new file mode 100644
index 000000000000..04e356acdf02
--- /dev/null
+++ b/japanese/nethack34/files/pkg-deinstall.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ "${2}" = "POST-DEINSTALL" ]; then
+	if [ -d "${PKG_PREFIX}/%%HACKDIR%%" ]; then
+		echo
+		echo "The ${1} save files have not been removed."
+		echo
+		echo "If you are deleting ${1} permanently then you can "
+		echo "remove the save files with the command:"
+		echo
+		echo "	rm -rf ${PKG_PREFIX}/%%HACKDIR%%"
+		echo
+	fi
+fi
diff --git a/japanese/nethack34/pkg-descr b/japanese/nethack34/pkg-descr
index 7a5e42b10c47..75e2a60dc8a5 100644
--- a/japanese/nethack34/pkg-descr
+++ b/japanese/nethack34/pkg-descr
@@ -1,4 +1,9 @@
 JNetHack is Japanized NetHack, with all messages translated to
 Japanese.
 
+NetHack is a single-player roguelike video game released in 1987 with
+ASCII graphics.  It is a descendent of an earlier game called Hack (1985),
+which is a descendent of Rogue (1980).  The player takes the part of a
+dungeon-delving character in search of the Amulet of yendor.
+
 WWW: http://sourceforge.jp/projects/jnethack/
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index fb4e205d01d0..b3b6adf35f5e 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -1,151 +1,165 @@
+@mode 555
 bin/%%HACKNAME%%
-%%HACKDIR%%/%%HACKNAME%%
-@exec mkdir %D/%%HACKDIR%%/save
-@exec chmod -R 775 %D/%%HACKDIR%%
-@exec chmod 2755 %D/%%HACKDIR%%/%%HACKNAME%%
-@exec chown games:games %D/%%HACKDIR%%/save
-@dirrmtry %%HACKDIR%%/save
-%%HACKDIR%%/Arc-fila.lev
-%%HACKDIR%%/Arc-filb.lev
-%%HACKDIR%%/Arc-goal.lev
-%%HACKDIR%%/Arc-loca.lev
-%%HACKDIR%%/Arc-strt.lev
-%%HACKDIR%%/Bar-fila.lev
-%%HACKDIR%%/Bar-filb.lev
-%%HACKDIR%%/Bar-goal.lev
-%%HACKDIR%%/Bar-loca.lev
-%%HACKDIR%%/Bar-strt.lev
-%%HACKDIR%%/Cav-fila.lev
-%%HACKDIR%%/Cav-filb.lev
-%%HACKDIR%%/Cav-goal.lev
-%%HACKDIR%%/Cav-loca.lev
-%%HACKDIR%%/Cav-strt.lev
-%%HACKDIR%%/Hea-fila.lev
-%%HACKDIR%%/Hea-filb.lev
-%%HACKDIR%%/Hea-goal.lev
-%%HACKDIR%%/Hea-loca.lev
-%%HACKDIR%%/Hea-strt.lev
-%%HACKDIR%%/Kni-fila.lev
-%%HACKDIR%%/Kni-filb.lev
-%%HACKDIR%%/Kni-goal.lev
-%%HACKDIR%%/Kni-loca.lev
-%%HACKDIR%%/Kni-strt.lev
-%%HACKDIR%%/Mon-fila.lev
-%%HACKDIR%%/Mon-filb.lev
-%%HACKDIR%%/Mon-goal.lev
-%%HACKDIR%%/Mon-loca.lev
-%%HACKDIR%%/Mon-strt.lev
-%%HACKDIR%%/Pri-fila.lev
-%%HACKDIR%%/Pri-filb.lev
-%%HACKDIR%%/Pri-goal.lev
-%%HACKDIR%%/Pri-loca.lev
-%%HACKDIR%%/Pri-strt.lev
-%%HACKDIR%%/Ran-fila.lev
-%%HACKDIR%%/Ran-filb.lev
-%%HACKDIR%%/Ran-goal.lev
-%%HACKDIR%%/Ran-loca.lev
-%%HACKDIR%%/Ran-strt.lev
-%%HACKDIR%%/Rog-fila.lev
-%%HACKDIR%%/Rog-filb.lev
-%%HACKDIR%%/Rog-goal.lev
-%%HACKDIR%%/Rog-loca.lev
-%%HACKDIR%%/Rog-strt.lev
-%%HACKDIR%%/Sam-fila.lev
-%%HACKDIR%%/Sam-filb.lev
-%%HACKDIR%%/Sam-goal.lev
-%%HACKDIR%%/Sam-loca.lev
-%%HACKDIR%%/Sam-strt.lev
-%%HACKDIR%%/Tou-fila.lev
-%%HACKDIR%%/Tou-filb.lev
-%%HACKDIR%%/Tou-goal.lev
-%%HACKDIR%%/Tou-loca.lev
-%%HACKDIR%%/Tou-strt.lev
-%%HACKDIR%%/Val-fila.lev
-%%HACKDIR%%/Val-filb.lev
-%%HACKDIR%%/Val-goal.lev
-%%HACKDIR%%/Val-loca.lev
-%%HACKDIR%%/Val-strt.lev
-%%HACKDIR%%/Wiz-fila.lev
-%%HACKDIR%%/Wiz-filb.lev
-%%HACKDIR%%/Wiz-goal.lev
-%%HACKDIR%%/Wiz-loca.lev
-%%HACKDIR%%/Wiz-strt.lev
-%%HACKDIR%%/air.lev
-%%HACKDIR%%/asmodeus.lev
-%%HACKDIR%%/astral.lev
-%%HACKDIR%%/baalz.lev
-%%HACKDIR%%/bigrm-1.lev
-%%HACKDIR%%/bigrm-2.lev
-%%HACKDIR%%/bigrm-3.lev
-%%HACKDIR%%/bigrm-4.lev
-%%HACKDIR%%/bigrm-5.lev
-%%HACKDIR%%/castle.lev
-%%HACKDIR%%/data
-%%HACKDIR%%/dungeon
-%%HACKDIR%%/earth.lev
-%%HACKDIR%%/fakewiz1.lev
-%%HACKDIR%%/fakewiz2.lev
-%%HACKDIR%%/fire.lev
-%%HACKDIR%%/jcmdhelp
-%%HACKDIR%%/jhelp
-%%HACKDIR%%/jhh
-%%HACKDIR%%/jhistory
-%%HACKDIR%%/jopthelp
-%%HACKDIR%%/joracles
-%%HACKDIR%%/jrumors
-%%HACKDIR%%/juiblex.lev
-%%HACKDIR%%/jwizhelp
-%%HACKDIR%%/knox.lev
-%%HACKDIR%%/license
-%%HACKDIR%%/mapbg.xpm
-%%HACKDIR%%/medusa-1.lev
-%%HACKDIR%%/medusa-2.lev
-%%HACKDIR%%/minefill.lev
-%%HACKDIR%%/minend-1.lev
-%%HACKDIR%%/minend-2.lev
-%%HACKDIR%%/minend-3.lev
-%%HACKDIR%%/minetn-1.lev
-%%HACKDIR%%/minetn-2.lev
-%%HACKDIR%%/minetn-3.lev
-%%HACKDIR%%/minetn-4.lev
-%%HACKDIR%%/minetn-5.lev
-%%HACKDIR%%/minetn-6.lev
-%%HACKDIR%%/minetn-7.lev
-%%HACKDIR%%/options
-%%HACKDIR%%/oracle.lev
-%%HACKDIR%%/orcus.lev
-%%HACKDIR%%/pet_mark.xbm
-%%HACKDIR%%/quest.dat
-%%HACKDIR%%/recover
-%%HACKDIR%%/rip.xpm
-%%HACKDIR%%/sanctum.lev
-%%HACKDIR%%/soko1-1.lev
-%%HACKDIR%%/soko1-2.lev
-%%HACKDIR%%/soko2-1.lev
-%%HACKDIR%%/soko2-2.lev
-%%HACKDIR%%/soko3-1.lev
-%%HACKDIR%%/soko3-2.lev
-%%HACKDIR%%/soko4-1.lev
-%%HACKDIR%%/soko4-2.lev
-%%HACKDIR%%/tower1.lev
-%%HACKDIR%%/tower2.lev
-%%HACKDIR%%/tower3.lev
-%%HACKDIR%%/valley.lev
-%%HACKDIR%%/water.lev
-%%HACKDIR%%/wizard1.lev
-%%HACKDIR%%/wizard2.lev
-%%HACKDIR%%/wizard3.lev
-%%HACKDIR%%/x11tiles
+@owner games
+@group games
+@mode 02755
+%%DATADIR%%/%%HACKNAME%%
+@mode
+%%DATADIR%%/Arc-fila.lev
+%%DATADIR%%/Arc-filb.lev
+%%DATADIR%%/Arc-goal.lev
+%%DATADIR%%/Arc-loca.lev
+%%DATADIR%%/Arc-strt.lev
+%%DATADIR%%/Bar-fila.lev
+%%DATADIR%%/Bar-filb.lev
+%%DATADIR%%/Bar-goal.lev
+%%DATADIR%%/Bar-loca.lev
+%%DATADIR%%/Bar-strt.lev
+%%DATADIR%%/Cav-fila.lev
+%%DATADIR%%/Cav-filb.lev
+%%DATADIR%%/Cav-goal.lev
+%%DATADIR%%/Cav-loca.lev
+%%DATADIR%%/Cav-strt.lev
+%%DATADIR%%/Hea-fila.lev
+%%DATADIR%%/Hea-filb.lev
+%%DATADIR%%/Hea-goal.lev
+%%DATADIR%%/Hea-loca.lev
+%%DATADIR%%/Hea-strt.lev
+%%DATADIR%%/Kni-fila.lev
+%%DATADIR%%/Kni-filb.lev
+%%DATADIR%%/Kni-goal.lev
+%%DATADIR%%/Kni-loca.lev
+%%DATADIR%%/Kni-strt.lev
+%%DATADIR%%/Mon-fila.lev
+%%DATADIR%%/Mon-filb.lev
+%%DATADIR%%/Mon-goal.lev
+%%DATADIR%%/Mon-loca.lev
+%%DATADIR%%/Mon-strt.lev
+%%DATADIR%%/Pri-fila.lev
+%%DATADIR%%/Pri-filb.lev
+%%DATADIR%%/Pri-goal.lev
+%%DATADIR%%/Pri-loca.lev
+%%DATADIR%%/Pri-strt.lev
+%%DATADIR%%/Ran-fila.lev
+%%DATADIR%%/Ran-filb.lev
+%%DATADIR%%/Ran-goal.lev
+%%DATADIR%%/Ran-loca.lev
+%%DATADIR%%/Ran-strt.lev
+%%DATADIR%%/Rog-fila.lev
+%%DATADIR%%/Rog-filb.lev
+%%DATADIR%%/Rog-goal.lev
+%%DATADIR%%/Rog-loca.lev
+%%DATADIR%%/Rog-strt.lev
+%%DATADIR%%/Sam-fila.lev
+%%DATADIR%%/Sam-filb.lev
+%%DATADIR%%/Sam-goal.lev
+%%DATADIR%%/Sam-loca.lev
+%%DATADIR%%/Sam-strt.lev
+%%DATADIR%%/Tou-fila.lev
+%%DATADIR%%/Tou-filb.lev
+%%DATADIR%%/Tou-goal.lev
+%%DATADIR%%/Tou-loca.lev
+%%DATADIR%%/Tou-strt.lev
+%%DATADIR%%/Val-fila.lev
+%%DATADIR%%/Val-filb.lev
+%%DATADIR%%/Val-goal.lev
+%%DATADIR%%/Val-loca.lev
+%%DATADIR%%/Val-strt.lev
+%%DATADIR%%/Wiz-fila.lev
+%%DATADIR%%/Wiz-filb.lev
+%%DATADIR%%/Wiz-goal.lev
+%%DATADIR%%/Wiz-loca.lev
+%%DATADIR%%/Wiz-strt.lev
+%%DATADIR%%/air.lev
+%%DATADIR%%/asmodeus.lev
+%%DATADIR%%/astral.lev
+%%DATADIR%%/baalz.lev
+%%DATADIR%%/bigrm-1.lev
+%%DATADIR%%/bigrm-2.lev
+%%DATADIR%%/bigrm-3.lev
+%%DATADIR%%/bigrm-4.lev
+%%DATADIR%%/bigrm-5.lev
+%%DATADIR%%/castle.lev
+%%DATADIR%%/data
+%%DATADIR%%/dungeon
+%%DATADIR%%/earth.lev
+%%DATADIR%%/fakewiz1.lev
+%%DATADIR%%/fakewiz2.lev
+%%DATADIR%%/fire.lev
+%%DATADIR%%/jcmdhelp
+%%DATADIR%%/jhelp
+%%DATADIR%%/jhh
+%%DATADIR%%/jhistory
+%%DATADIR%%/jopthelp
+%%DATADIR%%/joracles
+%%DATADIR%%/jrumors
+%%DATADIR%%/juiblex.lev
+%%DATADIR%%/jwizhelp
+%%DATADIR%%/knox.lev
+%%DATADIR%%/license
+@mode 664
+%%DATADIR%%/logfile
+@mode
+%%DATADIR%%/mapbg.xpm
+%%DATADIR%%/medusa-1.lev
+%%DATADIR%%/medusa-2.lev
+%%DATADIR%%/minefill.lev
+%%DATADIR%%/minend-1.lev
+%%DATADIR%%/minend-2.lev
+%%DATADIR%%/minend-3.lev
+%%DATADIR%%/minetn-1.lev
+%%DATADIR%%/minetn-2.lev
+%%DATADIR%%/minetn-3.lev
+%%DATADIR%%/minetn-4.lev
+%%DATADIR%%/minetn-5.lev
+%%DATADIR%%/minetn-6.lev
+%%DATADIR%%/minetn-7.lev
+%%DATADIR%%/options
+%%DATADIR%%/oracle.lev
+%%DATADIR%%/orcus.lev
+%%DATADIR%%/perm
+%%DATADIR%%/pet_mark.xbm
+%%DATADIR%%/quest.dat
 @mode 664
-%%HACKDIR%%/perm
+%%DATADIR%%/record
+@mode
+@mode 02755
+%%DATADIR%%/recover
+@mode
+%%DATADIR%%/rip.xpm
+%%DATADIR%%/sanctum.lev
+%%DATADIR%%/soko1-1.lev
+%%DATADIR%%/soko1-2.lev
+%%DATADIR%%/soko2-1.lev
+%%DATADIR%%/soko2-2.lev
+%%DATADIR%%/soko3-1.lev
+%%DATADIR%%/soko3-2.lev
+%%DATADIR%%/soko4-1.lev
+%%DATADIR%%/soko4-2.lev
+%%DATADIR%%/tower1.lev
+%%DATADIR%%/tower2.lev
+%%DATADIR%%/tower3.lev
+%%DATADIR%%/valley.lev
+%%DATADIR%%/water.lev
+%%DATADIR%%/wizard1.lev
+%%DATADIR%%/wizard2.lev
+%%DATADIR%%/wizard3.lev
+%%DATADIR%%/x11tiles
 @mode
-@unexec [ -s %D/%%HACKDIR%%/logfile ] || rm -f %D/%%HACKDIR%%/logfile
-@exec touch %D/%%HACKDIR%%/logfile && chmod 664 %D/%%HACKDIR%%/logfile
-@unexec [ -s %D/%%HACKDIR%%/record ] || rm -f %D/%%HACKDIR%%/record
-@exec touch %D/%%HACKDIR%%/record && chmod 664 %D/%%HACKDIR%%/record
-@dirrm %%HACKDIR%%
-%%PORTDOCS%%%%HACKDOCSDIR%%/Guidebook.txt
-%%PORTDOCS%%%%HACKDOCSDIR%%/ChangeLog.j
-%%PORTDOCS%%%%HACKDOCSDIR%%/INSTALL.j
-%%PORTDOCS%%%%HACKDOCSDIR%%/README.j
-%%PORTDOCS%%@dirrm %%HACKDOCSDIR%%
+@owner
+@group
+man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
+man/man6/lev_comp.6.gz
+man/man6/%%HACKNAME%%.6.gz
+man/man6/recover.6.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.j
+%%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
+%%PORTDOCS%%%%DOCSDIR%%/README.j
+%%PORTDOCS%%%%DOCSDIR%%/jGuidebook.txt
+@exec chown games:games %D/%%DATADIR%%/save %D/%%DATADIR%% 
+@exec chmod 0775 %D/%%DATADIR%%/save %D/%%DATADIR%% 
+@dirrmtry %%DATADIR%%/save
+@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%