Update to JNetHack 3.4.1-0.4 and bump PORTREVISION.

Since games/nethack34 is now at 3.4.2, make this port a non-slave,
independent port.

2 files changed, 59 insertions, 16 deletions

diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 4de7fd709888..8c1223efc90a 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -5,36 +5,74 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
-
+PORTNAME=	nethack
+PORTVERSION=	3.4.1
+PORTREVISION=	1
 CATEGORIES=	japanese games
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Japanized NetHack
 
-MASTERDIR=	${.CURDIR}/../../games/nethack34
-
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
-MD5_FILE=	${.CURDIR}/distinfo
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-PATCH_SITE_SUBDIR=	jnethack/4546
-PATCHFILES=	jnethack-${PORTVERSION}-0.2.diff.gz
+PATCH_SITE_SUBDIR=	jnethack/5795
+PATCHFILES=	jnethack-${PORTVERSION}-0.4.diff.gz
 PATCH_DIST_STRIP=	-p1
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 USE_BISON=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" GRAPHICS="${GRAPHICS}"
+PLIST_SUB=	HACKNAME="${HACKNAME}" \
+		HACKDIR="${HACKDIR}" \
+		HACKDOCSDIR="${HACKDOCSDIR}"
 
+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
 
-post-install: jnethack-post-install
+.if !defined(PKGNAMESUFFIX)
+USE_XPM=	yes
+GRAPHICS=	X11_GRAPHICS
+.else
+.if ${PKGNAMESUFFIX} == "-gnome"
+CATEGORIES=	games gnome
+USE_GETOPT_LONG=	yes
+USE_GNOME=	gnomelibs
+MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+GRAPHICS=	GNOME_GRAPHICS
+.elif ${PKGNAMESUFFIX} == "-nox11"
+GRAPHICS=	# none
+.elif ${PKGNAMESUFFIX} == "-qt"
+USE_QT_VER=	3
+MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
+		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \
+		MOC="${MOC}" LIBQT="-lqt-mt"
+GRAPHICS=	QT_GRAPHICS
+.endif
+.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
+.endif
+
+pre-configure:
+	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
-jnethack-post-install:
+post-install:
 # Makefile.top digs bin/lib somehow
 	${RMDIR} ${PREFIX}/bin/lib
 .if !defined(NOPORTDOCS)
@@ -43,5 +81,10 @@ jnethack-post-install:
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${HACKDOCSDIR}
 .endfor
 .endif
+	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/${HACKDOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
+.endif
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/japanese/nethack34/distinfo b/japanese/nethack34/distinfo
index 61efdafbdfec..ed9ca79119af 100644
--- a/japanese/nethack34/distinfo
+++ b/japanese/nethack34/distinfo
@@ -1,2 +1,2 @@
 MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e
-MD5 (jnethack-3.4.1-0.2.diff.gz) = d52566b703f1b6e86bc3992593242a05
+MD5 (jnethack-3.4.1-0.4.diff.gz) = 14affaa217d4aac60098c7321018ad8a