This is a port of UnNetHack, a new variant of NetHack, based on and

repocopied from the slashem-tty port.

13 files changed, 104 insertions, 137 deletions

diff --git a/games/Makefile b/games/Makefile
index 7f5e794763b7..d5a72c4c85e7 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -885,6 +885,7 @@
     SUBDIR += uhexen2-extras
     SUBDIR += ultimatestunts
     SUBDIR += umark
+    SUBDIR += unnethack
     SUBDIR += untahris
     SUBDIR += uox3
     SUBDIR += uqm
diff --git a/games/unnethack/Makefile b/games/unnethack/Makefile
index 621984674aa6..c69dfdf125de 100644
--- a/games/unnethack/Makefile
+++ b/games/unnethack/Makefile
@@ -1,35 +1,36 @@
-# New ports collection makefile for: Slash'Em (tty interface)
-# Date created:	15th April 2001
-# Whom:	Adam Kranzel (adam@alameda.edu)
+# New ports collection makefile for:	unnethack
+# Date created:		19 January 2010
+# Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	slashem
-PORTVERSION=	0.0.7E.7F.3
+PORTNAME=	unnethack
+PORTVERSION=	3.5.2.20100110
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/0.0.7E7F3
-PKGNAMESUFFIX=	-tty
-DISTNAME=	se${PORTVERSION:S/.//g:L}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 
-MAINTAINER=	glewis@FreeBSD.org
-COMMENT=	A dungeon explorin', slashin', hackin' game
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
+MAINTAINER=	knu@FreeBSD.org
+COMMENT=	A new variant of NetHack
+
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES+=	pkg-deinstall
-MAN6=		dgn_comp.6 dlb.6 lev_comp.6 recover.6 slashem.6
+# This port accually conflicts with other nethack variant ports on
+# these commands that are only significant for those who want to
+# "hack" the game in deep.
+MAN6=		dgn_comp.6 dlb.6 lev_comp.6 recover.6 ${PORTNAME}.6
 MAKE_JOBS_UNSAFE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([A-Z])./\1/g}
 MAKE_ENV+=	DATADIR="${DATADIR}"
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		"s@%%DATADIR%%@${DATADIR}@g" ${WRKSRC}/include/config.h
-
-pre-configure:
-	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
+	${MV} ${WRKSRC}/doc/nethack.6 ${WRKSRC}/doc/${PORTNAME}.6
 
 post-install:
 	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
@@ -38,8 +39,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/slamfaq.txt ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/sample.slashemrc ${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/sample.unnethackrc ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/unnethack/distinfo b/games/unnethack/distinfo
index 3c28a0229fe4..9f9b834b0226 100644
--- a/games/unnethack/distinfo
+++ b/games/unnethack/distinfo
@@ -1,3 +1,3 @@
-MD5 (se007e7f3.tar.gz) = 54b4534fe85f08722e8b6b38d52c2e9a
-SHA256 (se007e7f3.tar.gz) = 3b55b7fa6f4a8b703382cdcfb0af6dd25e65fb55a723298b02624af566e36df9
-SIZE (se007e7f3.tar.gz) = 5288791
+MD5 (unnethack-3.5.2-20100110.tar.gz) = cac6c3a87b0ffcc03c4b2bad11a4d1f1
+SHA256 (unnethack-3.5.2-20100110.tar.gz) = e28f4bf014569d63425550a00dd377b364aeb9b05ad020789de8d616df0579a9
+SIZE (unnethack-3.5.2-20100110.tar.gz) = 3723598
diff --git a/games/unnethack/files/patch-config.h b/games/unnethack/files/patch-config.h
index aeae766ed175..47a59fd2d247 100644
--- a/games/unnethack/files/patch-config.h
+++ b/games/unnethack/files/patch-config.h
@@ -1,39 +1,38 @@
 $FreeBSD$
 
---- include/config.h.orig	Sat Dec 30 05:08:31 2006
-+++ include/config.h	Fri Aug 17 23:09:31 2007
-@@ -230,12 +230,12 @@
- 
+--- include/config.h.orig	2010-01-10 23:51:18.000000000 +0900
++++ include/config.h	2010-01-19 13:36:18.734207870 +0900
+@@ -178,11 +178,11 @@
+ #ifndef AUTOCONF
  #ifdef UNIX
  /* path and file name extension for compression program */
--# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
-+/* # define COMPRESS_EXTENSION ".Z"	 */    /* compress's extension */
- 
+-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
++/* #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_EXTENSION ".gz" */	     /* normal gzip extension */
-+# define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
-+# define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
+-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
++#define COMPRESS "/usr/bin/gzip"	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz"		/* normal gzip extension */
+ #endif
  
- /* # define COMPRESS "/usr/bin/bzip2"	*//* bzip2 compression */
- /* # define COMPRESS_EXTENSION ".bz2"	*//* bzip2 extension */
-@@ -249,7 +249,7 @@
+ #ifndef COMPRESS
+@@ -195,7 +195,7 @@
   *	a tar-like file, thus making a neater installation.  See *conf.h
   *	for detailed configuration.
   */
--/* #define DLB */             /* not supported on all platforms */
-+#define DLB             /* not supported on all platforms */
+-/* #define DLB */	/* not supported on all platforms */
++#define DLB	/* not supported on all platforms */
  
  /*
   *	Defining INSURANCE slows down level changes, but allows games that
-@@ -271,7 +271,7 @@
- #  ifdef __APPLE__
- #    define HACKDIR "nethackdir"      /* nethack directory */
- #  else
--#    define HACKDIR "."
-+#    define HACKDIR "%%DATADIR%%"	/* nethack directory */
- #  endif
+@@ -214,7 +214,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/unnethackdir"
++#  define HACKDIR "%%DATADIR%%"
  # endif
  
+ /*
diff --git a/games/unnethack/files/patch-makefile.doc b/games/unnethack/files/patch-makefile.doc
index 525d27847fee..e6b4e04d940c 100644
--- a/games/unnethack/files/patch-makefile.doc
+++ b/games/unnethack/files/patch-makefile.doc
@@ -1,15 +1,12 @@
-$FreeBSD$
-
---- sys/unix/Makefile.doc.orig	Sat Dec 30 05:08:31 2006
-+++ sys/unix/Makefile.doc	Fri Aug 17 23:19:06 2007
-@@ -53,16 +53,16 @@
+--- sys/autoconf/Makefile.doc.orig	2010-01-10 23:51:59.000000000 +0900
++++ sys/autoconf/Makefile.doc	2010-01-19 14:56:00.437356006 +0900
+@@ -49,15 +49,15 @@
  #	tbl tmac.n Guidebook.mn | groff -Wall -Tdvi > Guidebook.dvi
  
- GAME    = slashem
+ GAME    = unnethack
 -MANDIR	= /usr/man/man6
-+MANDIR	= ${MANPREFIX}/man/man6
++MANDIR	= $(MANPREFIX)/man/man6
  MANEXT	= 6
- FRMANDIR= $(MANDIR:man6=fr/man6)
  
  # manual installation for most BSD-style systems
 -GAMEMANCREATE = cp $(GAME).6
@@ -17,19 +14,11 @@ $FreeBSD$
 -DGNMANCREATE = cp dgn_comp.6
 -RCVRMANCREATE = cp recover.6
 -DLBMANCREATE = cp dlb.6
-+GAMEMANCREATE = ${BSD_INSTALL_MAN} $(GAME).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
- FRGAMEMANCREATE = cp fr/$(GAME).6
++GAMEMANCREATE = $(BSD_INSTALL_MAN) $(GAME).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
  # and for man files readable in less (eg dos DJGPP+GNU)
-@@ -79,7 +79,6 @@
- 	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
- 	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
- 	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
--	-$(FRGAMEMANCREATE) $(FRMANDIR)/$(GAME).$(MANEXT)
- 
- # manual creation for distribution
- DISTRIB = Guidebook.txt $(GAME).txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
+ # GAMEMANCREATE = groff -Wall -mtty-char -Tascii -man $(GAME).6 >
diff --git a/games/unnethack/files/patch-makefile.src b/games/unnethack/files/patch-makefile.src
index f03d7ab4c350..e8c61554a84b 100644
--- a/games/unnethack/files/patch-makefile.src
+++ b/games/unnethack/files/patch-makefile.src
@@ -1,15 +1,15 @@
 $FreeBSD$
 
---- sys/unix/Makefile.src.good	Thu Nov 23 00:24:58 2000
-+++ sys/unix/Makefile.src	Thu Nov 23 00:26:13 2000
-@@ -144,8 +144,8 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
+--- sys/autoconf/Makefile.src.orig	2010-01-10 23:51:59.000000000 +0900
++++ sys/autoconf/Makefile.src	2010-01-19 14:57:58.042797577 +0900
+@@ -30,8 +30,8 @@
+ CC = @CC@ -DAUTOCONF
+ WINDRES = @WINDRES@
  
--CFLAGS = -O -I../include
--LFLAGS =
-+CFLAGS += -O -I../include -I${PREFIX}/include 
-+LFLAGS = -L${PREFIX}/lib
+-CFLAGS = -Wall -I../include -I$(srcdir)/../include @CFLAGS@ #-fbounds-check #-fprofile-arcs -ftest-coverage
+-LFLAGS = @LFLAGS@ #-fbounds-check
++CFLAGS = -Wall -I../include -I$(srcdir)/../include -I$(LOCALBASE)/include @CFLAGS@ #-fbounds-check #-fprofile-arcs -ftest-coverage
++LFLAGS = -L$(LOCALBASE)/lib @LFLAGS@ #-fbounds-check
  
- # QT windowing system
- # SuSE 6.1
+ # Only used for the Gnome interface.
+ GNOMEINC=`gnome-config gnome --cflags` -I$(srcdir)/../win/gnome
diff --git a/games/unnethack/files/patch-makefile.top b/games/unnethack/files/patch-makefile.top
index 1e365b96c6c0..c92a8e568abc 100644
--- a/games/unnethack/files/patch-makefile.top
+++ b/games/unnethack/files/patch-makefile.top
@@ -1,18 +1,17 @@
 $FreeBSD$
 
---- sys/unix/Makefile.top.orig	Sat Dec 30 05:08:31 2006
-+++ sys/unix/Makefile.top	Sun Aug 19 01:18:58 2007
-@@ -14,20 +14,19 @@
+--- sys/autoconf/Makefile.top.orig	2010-01-10 23:51:59.000000000 +0900
++++ sys/autoconf/Makefile.top	2010-01-19 15:01:04.766385340 +0900
+@@ -18,7 +18,7 @@
  # MAKE = make
  
- # make NetHack
--PREFIX   = /usr
- GAME     = slashem
- # GAME     = slashem.prg
- GAMEUID  = games
--GAMEGRP  = bin
-+GAMEGRP  = games
- 
+ # make UnNetHack
+-PREFIX   = @prefix@
++#PREFIX   = @prefix@
+ EXEEXT	 = @EXEEXT@
+ SCRIPT   = unnethack
+ GAME     = unnethack$(EXEEXT)
+@@ -28,11 +28,11 @@
  # Permissions - some places use setgid instead of setuid, for instance
  # See also the option "SECURE" in include/config.h
  GAMEPERM = 04755
@@ -27,30 +26,12 @@ $FreeBSD$
  
  # GAMEDIR also appears in config.h as "HACKDIR".
  # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -40,7 +39,7 @@
+@@ -45,7 +45,7 @@
  # These must agree with the definitions in unixconf.h
  
  # Defs. for non file areas support.
--GAMEDIR  = $(PREFIX)/local/slashemdir
+-GAMEDIR  = $(PREFIX)/unnethackdir
 +GAMEDIR  = $(DATADIR)
  VARDIR = $(GAMEDIR)
  FILE_AREA_VAR = $(VARDIR)
  FILE_AREA_SAVE = $(VARDIR)/save
-@@ -49,7 +48,7 @@
- FILE_AREA_DOC = $(GAMEDIR)
- FILE_AREA_BONES = $(FILE_AREA_VAR)
- FILE_AREA_LEVL = $(FILE_AREA_VAR)
--SHELLDIR = $(PREFIX)/local/bin
-+SHELLDIR = $(PREFIX)/bin
- 
- # Defs. compatible with Linux's FSSTND 1.2
- # FILE_AREA_VAR = /var/lib/games/slashem
-@@ -290,7 +289,7 @@
- 	$(MAKE) dofiles-$${target-nodlb}
- 	cp src/$(GAME) $(FILE_AREA_UNSHARE)
- 	cp util/recover $(FILE_AREA_UNSHARE)
--	cp dat/license doc/Guidebook.txt $(FILE_AREA_DOC)
-+	cp dat/license $(FILE_AREA_DOC)
- #	cp win/Qt/KDE/kslashem.kdelnk $(KDEDIR)/share/applnk/Games
- 	-rm -f $(SHELLDIR)/$(GAME)
- 	sed -e 's;/usr/games/lib/nethackdir;$(FILE_AREA_UNSHARE);' \
diff --git a/games/unnethack/files/patch-makefile.utl b/games/unnethack/files/patch-makefile.utl
index 04060f4535c0..aa6c3f37bc88 100644
--- a/games/unnethack/files/patch-makefile.utl
+++ b/games/unnethack/files/patch-makefile.utl
@@ -1,15 +1,15 @@
 $FreeBSD$
 
---- sys/unix/Makefile.utl.good	Thu Nov 23 13:55:38 2000
-+++ sys/unix/Makefile.utl	Thu Nov 23 13:56:54 2000
-@@ -89,8 +89,8 @@
+--- sys/autoconf/Makefile.utl.orig	2010-01-10 23:51:59.000000000 +0900
++++ sys/autoconf/Makefile.utl	2010-01-19 15:02:33.718921184 +0900
+@@ -96,8 +96,8 @@
  # flags for debugging:
- # CFLAGS = -g -I../include
+ # CFLAGS = -g -I../include -I$(srcdir)/../include
  
--CFLAGS = -O -I../include
--LFLAGS =
-+CFLAGS += -O -I../include -I${PREFIX}/include
-+LFLAGS = -L${PREFIX}/lib
+-CFLAGS = -O -I../include -I$(srcdir)/../include @CFLAGS@
+-LFLAGS = @LFLAGS@
++CFLAGS = -O -I../include -I$(srcdir)/../include -I$(LOCALBASE)/include @CFLAGS@
++LFLAGS = -L$(LOCALBASE)/lib @LFLAGS@
  
  LIBS =
   
diff --git a/games/unnethack/files/pkg-deinstall.in b/games/unnethack/files/pkg-deinstall.in
index 8a0725bf3dc9..5e090e6da95f 100644
--- a/games/unnethack/files/pkg-deinstall.in
+++ b/games/unnethack/files/pkg-deinstall.in
@@ -3,7 +3,7 @@
 
 if [ "$2" = "POST-DEINSTALL" -a -d "%%DATADIR%%" ]; then
 	echo ""
-	echo "    If slashem is being removed permanently, please remove"
+	echo "    If unnethack is being removed permanently, please remove"
 	echo ""
         echo "        %%DATADIR%%"
 	echo ""
diff --git a/games/unnethack/files/sample.slashemrc b/games/unnethack/files/sample.unnethackrc
index 7bad046d0e30..06b9cd46dad2 100644
--- a/games/unnethack/files/sample.slashemrc
+++ b/games/unnethack/files/sample.unnethackrc
@@ -1,4 +1,4 @@
-# Sample .slashemrc file
+# Sample .unnethackrc file
 # 
 
 # Window systems
diff --git a/games/unnethack/pkg-descr b/games/unnethack/pkg-descr
index 2aa62a3c4f66..0dba64b10b04 100644
--- a/games/unnethack/pkg-descr
+++ b/games/unnethack/pkg-descr
@@ -1,9 +1,8 @@
-This is Slash'Em (super lotsa added stuff hack - extended magic), 
-the only actively maintained variant of NetHack (based on NetHack v 3.3.1).
-A good old-fashioned dungeon-crawl with big nasties in the way, treasure
-galore, and immortality if you succeed.
+UnNetHack is a new variant of NetHack which development started in
+2009.  According to the author, the main intent of this fork is to put
+more randomness, challenges and fun into NetHack.  It features more
+levels, several UI changes like automatically opened doors and the
+pickup thrown patch and a lot of game play related changes.
 
-WWW: http://slashem.sourceforge.net/
-
-- Adam
- adam-ports@blacktabby.org
+Author:	Patric Mueller
+WWW:	http://unnethack.sourceforge.net/
diff --git a/games/unnethack/pkg-message b/games/unnethack/pkg-message
index fbd370e5583b..cc65a4cd65a4 100644
--- a/games/unnethack/pkg-message
+++ b/games/unnethack/pkg-message
@@ -1,8 +1,8 @@
 ====================================================
-A sample .slashemrc file has been copied to 
-${PREFIX}/share/doc/slashem as sample.slashemrc.
-Copy it to your home directory as .slashemrc and 
+A sample .unnethackrc file has been copied to 
+${PREFIX}/share/doc/unnethack as sample.unnethackrc.
+Copy it to your home directory as .unnethackrc and 
 edit it to taste.
 The options for it are described in 
-${PREFIX}/share/doc/slashem/Guidebook.txt.
+${PREFIX}/share/doc/unnethack/Guidebook.txt.
 ====================================================
diff --git a/games/unnethack/pkg-plist b/games/unnethack/pkg-plist
index d01452631b0d..85cce509eaee 100644
--- a/games/unnethack/pkg-plist
+++ b/games/unnethack/pkg-plist
@@ -1,15 +1,13 @@
-bin/slashem
+bin/unnethack
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
-%%PORTDOCS%%%%DOCSDIR%%/sample.slashemrc
-%%PORTDOCS%%%%DOCSDIR%%/slamfaq.txt
+%%PORTDOCS%%%%DOCSDIR%%/sample.unnethackrc
 %%DATADIR%%/license
 %%DATADIR%%/logfile
-%%DATADIR%%/nhshare
-%%DATADIR%%/nhushare
+%%DATADIR%%/nhdat
 %%DATADIR%%/perm
 %%DATADIR%%/record
 %%DATADIR%%/recover
-%%DATADIR%%/slashem
+%%DATADIR%%/unnethack
 @exec mkdir %D/%%DATADIR%%/save
 @exec chmod -R 775 %D/%%DATADIR%%
 @exec chmod 2755 %D/%%DATADIR%%/save