CVS commit: pkgsrc/games/nethack-x11

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Oct 24 11:52:08 UTC 2019

Modified Files:
        pkgsrc/games/nethack-x11: Makefile PLIST

Log Message:
Update to NetHack 3.6.2

See release notes for the changes from 3.4.3:
* http://nethack.org/v360/release.html
* http://nethack.org/v361/release.html
* http://nethack.org/v362/release.html

IMPORTANT NOTICE:
  Old 3.4.x save files are *incompatible* with this version (which
  isn't my fault). Files are now saved in /var/games/nethack360.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/games/nethack-x11/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/nethack-x11/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/nethack-x11/Makefile
diff -u pkgsrc/games/nethack-x11/Makefile:1.39 pkgsrc/games/nethack-x11/Makefile:1.40
--- pkgsrc/games/nethack-x11/Makefile:1.39      Sun Jun  1 16:52:08 2014
+++ pkgsrc/games/nethack-x11/Makefile   Thu Oct 24 11:52:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2014/06/01 16:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/10/24 11:52:08 pho Exp $
 
 .include "../../games/nethack-lib/Makefile.common"
 
@@ -10,30 +10,43 @@ CATEGORIES+=                x11
 
 DEPENDS+=              nethack-lib-${NETHACK_VERSION}{,nb*}:../../games/nethack-lib
 
-BUILD_TARGET=          nethack x11tiles rip.xpm
-INSTALL_TARGET=                binfiles
+BUILD_TARGET=          nethack ${VARDATND}
+MAKE_ENV+=             GAME=nethack
 MAKE_ENV+=             GTYPE=-x11
 
+VARDATND=              x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
+MAKE_ENV+=             VARDATND=${VARDATND:Q}
+
 FONTS_DIRS.x11+=       ${PREFIX}/share/fonts/X11/misc
 
-INSTALLATION_DIRS=     lib/X11/app-defaults share/fonts/X11/misc
+INSTALLATION_DIRS=     bin lib/X11/app-defaults share/fonts/X11/misc ${HACKDIR}
 
-DISTINFO_FILE?=                ${.CURDIR}/../nethack-lib/distinfo
-PATCHDIR=              ${.CURDIR}/../nethack-lib/patches
+DISTINFO_FILE?=                ${.CURDIR}/../../games/nethack-lib/distinfo
+PATCHDIR=              ${.CURDIR}/../../games/nethack-lib/patches
 
 SPECIAL_PERMS+=                ${PREFIX}/bin/nethack-x11                       \
                            ${GAMEPERM}
-post-install:
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/nethack \
+           ${DESTDIR}${PREFIX}/bin/nethack-x11
        ${INSTALL_DATA} ${WRKSRC}/dat/x11tiles \
-           ${DESTDIR}${GAMEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/win/X11/NetHack.ad \
+           ${DESTDIR}${HACKDIR}
+       ${INSTALL_DATA} ${WRKSRC}/dat/NetHack.ad \
            ${DESTDIR}${PREFIX}/lib/X11/app-defaults/NetHack
+       ${INSTALL_DATA} ${WRKSRC}/dat/pet_mark.xbm \
+           ${DESTDIR}${HACKDIR}
+       ${INSTALL_DATA} ${WRKSRC}/dat/pilemark.xbm \
+           ${DESTDIR}${HACKDIR}
+       ${INSTALL_DATA} ${WRKSRC}/dat/rip.xpm \
+           ${DESTDIR}${HACKDIR}
+
+post-install:
        ${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf \
            ${DESTDIR}${PREFIX}/share/fonts/X11/misc
        ${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.bdf \
            ${DESTDIR}${PREFIX}/share/fonts/X11/misc
        ${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
-           ${DESTDIR}${GAMEDIR}/nethack.x11.rc
+           ${DESTDIR}${HACKDIR}/nethack.x11.rc
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"

Index: pkgsrc/games/nethack-x11/PLIST
diff -u pkgsrc/games/nethack-x11/PLIST:1.5 pkgsrc/games/nethack-x11/PLIST:1.6
--- pkgsrc/games/nethack-x11/PLIST:1.5  Sun Jun  1 16:52:08 2014
+++ pkgsrc/games/nethack-x11/PLIST      Thu Oct 24 11:52:08 2019
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2014/06/01 16:52:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/10/24 11:52:08 pho Exp $
 bin/nethack-x11
 lib/X11/app-defaults/NetHack
 share/fonts/X11/misc/ibm.bdf
 share/fonts/X11/misc/nh10.bdf
-share/nethackdir340/nethack.x11.rc
-share/nethackdir340/x11tiles
+share/${NETHACK_DIR}/nethack.x11.rc
+share/${NETHACK_DIR}/pet_mark.xbm
+share/${NETHACK_DIR}/pilemark.xbm
+share/${NETHACK_DIR}/rip.xpm
+share/${NETHACK_DIR}/x11tiles