Synchronize with games/nethack34.

- Don't pretend we are SysV.  We are BSD.

- Make the install directory and the program name configurable.
  We'll change the defaults in future so one can install
  multiple versions of nethack at a time.

- Do not mercilessly remove non-empty logfile and record on
  deinstallation.

7 files changed, 200 insertions, 172 deletions

diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 3c178c0915d8..df69f32576b1 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -26,13 +26,16 @@ PATCH_DIST_STRIP=	-p1
 
 USE_BISON=	yes
 
+HACKNAME?=	jnethack
+HACKDOCSDIR?=	share/doc/ja/nethack
+
 post-install: jnethack-post-install
 
 jnethack-post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ja/nethack
+	${MKDIR} ${PREFIX}/${HACKDOCSDIR}
 .for i in README.j ChangeLog.j INSTALL.j
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ja/nethack
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${HACKDOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/nethack34/files/patch-aa b/japanese/nethack34/files/patch-aa
index eabd3c3d987d..142f050fe5f4 100644
--- a/japanese/nethack34/files/patch-aa
+++ b/japanese/nethack34/files/patch-aa
@@ -1,5 +1,5 @@
---- include/config.h.orig	Sun Jun 16 03:02:11 2002
-+++ include/config.h	Sun Jun 16 03:05:19 2002
+--- include/config.h.orig	Tue Aug 13 06:38:29 2002
++++ include/config.h	Tue Aug 13 06:39:09 2002
 @@ -216,7 +216,7 @@
  /* #define COMPRESS "/usr/bin/compress"	*/ /* Lempel-Ziv compression */
  /* #define COMPRESS_EXTENSION ".Z" */		/* compress's extension */
@@ -14,7 +14,7 @@
  #    define HACKDIR "jnethackdir"	/* nethack directory */
  #  else
 -#    define HACKDIR "/usr/games/lib/jnethackdir"
-+#    define HACKDIR "%%PREFIX%%/lib/jnethack"
++#    define HACKDIR "%%HACKDIR%%"
  #  endif
  # endif
  
diff --git a/japanese/nethack34/files/patch-ab b/japanese/nethack34/files/patch-ab
new file mode 100644
index 000000000000..25b70bd93dc0
--- /dev/null
+++ b/japanese/nethack34/files/patch-ab
@@ -0,0 +1,22 @@
+--- include/system.h.orig	Thu Mar 21 08:42:55 2002
++++ include/system.h	Sun Jun 16 15:49:55 2002
+@@ -79,7 +79,9 @@
+ # if !defined(__SC__) && !defined(LINUX)
+ E  long NDECL(random);
+ # endif
+-# if !defined(SUNOS4) || defined(RANDOM)
++# if defined(__FreeBSD__)
++E void FDECL(srandom, (unsigned long));
++# elif !defined(SUNOS4) || defined(RANDOM)
+ E void FDECL(srandom, (unsigned int));
+ # else
+ #  if !defined(bsdi) && !defined(__FreeBSD__)
+@@ -521,7 +523,7 @@
+ #  endif
+ # endif
+ 
+-# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
++# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__FreeBSD__)
+ E time_t FDECL(time, (time_t *));
+ # else
+ E long FDECL(time, (time_t *));
diff --git a/japanese/nethack34/files/patch-ac b/japanese/nethack34/files/patch-ac
index 2d5897d43a29..8b7cc3c207ea 100644
--- a/japanese/nethack34/files/patch-ac
+++ b/japanese/nethack34/files/patch-ac
@@ -1,14 +1,5 @@
---- 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 */
+--- include/unixconf.h.orig	Tue Aug 13 06:38:29 2002
++++ include/unixconf.h	Tue Aug 13 06:43:03 2002
 @@ -143,7 +143,7 @@
   * A stat system call is done on the mailbox every MAILCKFREQ moves.
   */
diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad
index 79dd127afa1c..b0a60094a6b9 100644
--- a/japanese/nethack34/files/patch-ad
+++ b/japanese/nethack34/files/patch-ad
@@ -1,5 +1,5 @@
---- sys/unix/Makefile.src.orig	Sun Jun 16 03:02:10 2002
-+++ sys/unix/Makefile.src	Sun Jun 16 03:09:37 2002
+--- sys/unix/Makefile.src.orig	Tue Aug 13 06:38:30 2002
++++ sys/unix/Makefile.src	Tue Aug 13 06:39:58 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.
@@ -99,6 +99,15 @@
  
  # any other strange libraries your system needs (for Sysunix only -- the more
  # specialized targets should already be right)
+@@ -296,7 +333,7 @@
+ 
+ # make NetHack
+ #JP by issei(96/5/27)
+-GAME     = jnethack
++GAME     = %%HACKNAME%%
+ # GAME     = nethack.prg
+ 
+ # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
 @@ -472,13 +509,13 @@
  
  # Qt windowport meta-object-compiler output
diff --git a/japanese/nethack34/files/patch-ae b/japanese/nethack34/files/patch-ae
index b8b059dd1fa5..692ad4f400d0 100644
--- a/japanese/nethack34/files/patch-ae
+++ b/japanese/nethack34/files/patch-ae
@@ -1,11 +1,12 @@
---- sys/unix/Makefile.top.orig	Sun Jun 16 03:02:10 2002
-+++ sys/unix/Makefile.top	Sun Jun 16 03:11:41 2002
+--- sys/unix/Makefile.top.orig	Tue Aug 13 06:38:30 2002
++++ sys/unix/Makefile.top	Tue Aug 13 06:40:41 2002
 @@ -14,18 +14,17 @@
  # MAKE = make
  
  # make NetHack
 -PREFIX	 = /usr
- GAME     = jnethack
+-GAME     = jnethack
++GAME     = %%HACKNAME%%
  # GAME     = nethack.prg
  GAMEUID  = games
 -GAMEGRP  = bin
@@ -28,7 +29,7 @@
  # (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)
++GAMEDIR  = %%HACKDIR%%
  VARDIR  = $(GAMEDIR)
 -SHELLDIR = $(PREFIX)/games
 +SHELLDIR = $(PREFIX)/bin
diff --git a/japanese/nethack34/pkg-plist b/japanese/nethack34/pkg-plist
index 8c6179bf6361..2bfa0b8affe2 100644
--- a/japanese/nethack34/pkg-plist
+++ b/japanese/nethack34/pkg-plist
@@ -1,152 +1,154 @@
-bin/jnethack
-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
+bin/%%HACKNAME%%
+%%HACKDIR%%/%%HACKNAME%%
+@exec mkdir %D/%%HACKDIR%%/save
+@exec chmod -R 775 %D/%%HACKDIR%%
+@exec chmod 2755 %D/%%HACKDIR%%/nethack
+@exec chown games:games %D/%%HACKDIR%%/save
+@unexec rm -rf %D/%%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%%/credit.xpm
+%%HACKDIR%%/data
+%%HACKDIR%%/dungeon
+%%HACKDIR%%/earth.lev
+%%HACKDIR%%/fakewiz1.lev
+%%HACKDIR%%/fakewiz2.lev
+%%HACKDIR%%/fire.lev
+%%HACKDIR%%/floor.xpm
+%%HACKDIR%%/jcmdhelp
+%%HACKDIR%%/jhelp
+%%HACKDIR%%/jhh
+%%HACKDIR%%/jhistory
+%%HACKDIR%%/jjj
+%%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%%/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%%/t32-1024.xpm
+%%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
 @mode 664
-lib/jnethack/logfile
-lib/jnethack/record
-lib/jnethack/perm
+%%HACKDIR%%/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
+@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%%