1 files changed, 41 insertions, 42 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>