svn commit: r366775 - head/games/nethack32

[Adam Weinberger]

Author: adamw
Date: Sun Aug 31 15:08:01 2014
New Revision: 366775
URL: http://svnweb.freebsd.org/changeset/ports/366775
QAT: https://qat.redports.org/buildarchive/r366775/

Log:
  Somehow in r363374 I added USES=gmake, which broke the port. Remove it to
  re-fix the build.
  
  While here, small tweaks to plist to pass sanity checks, and wrap compound
  statements in the Makefile.

Modified:
  head/games/nethack32/Makefile
  head/games/nethack32/pkg-plist

Modified: head/games/nethack32/Makefile
==============================================================================
--- head/games/nethack32/Makefile	Sun Aug 31 15:06:02 2014	(r366774)
+++ head/games/nethack32/Makefile	Sun Aug 31 15:08:01 2014	(r366775)
@@ -16,7 +16,7 @@ COMMENT=	Dungeon explorin', slashin', ha
 
 WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-3.2.2
 
-USES=		gmake tar:tgz
+USES=		tar:tgz
 USE_XORG=	xaw xpm
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
@@ -57,20 +57,20 @@ post-patch:
 .endfor
 
 do-configure:
-	@cd ${WRKSRC}/sys/unix && ${SH} setup.sh
+	@(cd ${WRKSRC}/sys/unix && ${SH} setup.sh)
 
 pre-install:
 	@${CAT} ${FILESDIR}/pkg-deinstall.in | ${SED} \
 		-e 's|%%HACKDIR%%|${HACKDIR}|g' > ${PKGDEINSTALL}
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/save
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
-	@${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}
+	@${LN} -s -f ${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}
 .endif
-	@cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
-.if ${PORT_OPTIONS:MDOCS}
+	${DO_MAKE_BUILD} -C ${WRKSRC}/doc ${MAKE_ARGS} manpages
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/games/nethack32/pkg-plist
==============================================================================
--- head/games/nethack32/pkg-plist	Sun Aug 31 15:06:02 2014	(r366774)
+++ head/games/nethack32/pkg-plist	Sun Aug 31 15:08:01 2014	(r366775)
@@ -135,9 +135,12 @@ man/man6/lev_comp%%HACKEXT%%.6.gz
 man/man6/%%HACKNAME%%.6.gz
 man/man6/recover%%HACKEXT%%.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
- at exec mkdir %D/%%DATADIR%%/save
- at exec chown games:games %D/%%DATADIR%%/save
- at exec chmod 0775 %D/%%DATADIR%%/save
- at unexec rmdir %D/%%DATADIR%%/save
+ at mode 0775
+ at owner games
+ at group games
+ at dirrmtry %%DATADIR%%/save
+ at group
+ at owner
+ at mode
 @dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%