Wed Jan 29 20:23:16 2020 UTC ()
games/nethack*: correct some COMMENTs.


(rhialto)
diff -r1.28 -r1.29 pkgsrc/games/nethack/Makefile
diff -r1.41 -r1.42 pkgsrc/games/nethack-x11/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/games/nethack/Makefile (switch to unified diff)

--- pkgsrc/games/nethack/Makefile 2019/10/24 11:52:44 1.28
+++ pkgsrc/games/nethack/Makefile 2020/01/29 20:23:16 1.29
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile,v 1.28 2019/10/24 11:52:44 pho Exp $ 1# $NetBSD: Makefile,v 1.29 2020/01/29 20:23:16 rhialto Exp $
2 2
3META_PACKAGE= yes 3META_PACKAGE= yes
4 4
5.include "../../games/nethack-lib/Makefile.common" 5.include "../../games/nethack-lib/Makefile.common"
6 6
7DISTNAME= nethack-all-${NETHACK_VERSION} 7DISTNAME= nethack-all-${NETHACK_VERSION}
8CATEGORIES+= x11 8CATEGORIES+= x11
9 9
10COMMENT= Meta-package for NetHack with x11, Qt, and tty versions 10COMMENT= Meta-package for NetHack with x11 and tty versions
11 11
12DEPENDS+= nethack-tty-${NETHACK_VERSION}{,nb*}:../../games/nethack-tty 12DEPENDS+= nethack-tty-${NETHACK_VERSION}{,nb*}:../../games/nethack-tty
13DEPENDS+= nethack-x11-${NETHACK_VERSION}{,nb*}:../../games/nethack-x11 13DEPENDS+= nethack-x11-${NETHACK_VERSION}{,nb*}:../../games/nethack-x11
14 14
15.include "../../mk/bsd.pkg.mk" 15.include "../../mk/bsd.pkg.mk"
cvs diff -r1.41 -r1.42 pkgsrc/games/nethack-x11/Makefile (switch to unified diff)

--- pkgsrc/games/nethack-x11/Makefile 2020/01/28 21:11:30 1.41
+++ pkgsrc/games/nethack-x11/Makefile 2020/01/29 20:23:16 1.42
@@ -1,53 +1,53 @@ @@ -1,53 +1,53 @@
1# $NetBSD: Makefile,v 1.41 2020/01/28 21:11:30 rhialto Exp $ 1# $NetBSD: Makefile,v 1.42 2020/01/29 20:23:16 rhialto Exp $
2 2
3.include "../../games/nethack-lib/Makefile.common" 3.include "../../games/nethack-lib/Makefile.common"
4 4
5PKGNAME= nethack-x11-${NETHACK_VERSION} 5PKGNAME= nethack-x11-${NETHACK_VERSION}
6COMMENT= The X11+tty version of NetHack 6COMMENT= The X11 version of NetHack
7 7
8CATEGORIES+= x11 8CATEGORIES+= x11
9 9
10DEPENDS+= nethack-lib-${NETHACK_VERSION}{,nb*}:../../games/nethack-lib 10DEPENDS+= nethack-lib-${NETHACK_VERSION}{,nb*}:../../games/nethack-lib
11 11
12BUILD_TARGET= nethack ${VARDATND} 12BUILD_TARGET= nethack ${VARDATND}
13MAKE_ENV+= GAME=nethack 13MAKE_ENV+= GAME=nethack
14MAKE_ENV+= GTYPE=-x11 14MAKE_ENV+= GTYPE=-x11
15 15
16VARDATND= x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm 16VARDATND= x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
17MAKE_ENV+= VARDATND=${VARDATND:Q} 17MAKE_ENV+= VARDATND=${VARDATND:Q}
18 18
19FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc 19FONTS_DIRS.x11+= ${PREFIX}/share/fonts/X11/misc
20 20
21INSTALLATION_DIRS= bin lib/X11/app-defaults share/fonts/X11/misc ${HACKDIR} 21INSTALLATION_DIRS= bin lib/X11/app-defaults share/fonts/X11/misc ${HACKDIR}
22 22
23DISTINFO_FILE?= ${.CURDIR}/../../games/nethack-lib/distinfo 23DISTINFO_FILE?= ${.CURDIR}/../../games/nethack-lib/distinfo
24PATCHDIR= ${.CURDIR}/../../games/nethack-lib/patches 24PATCHDIR= ${.CURDIR}/../../games/nethack-lib/patches
25 25
26SPECIAL_PERMS+= ${PREFIX}/bin/nethack-x11 \ 26SPECIAL_PERMS+= ${PREFIX}/bin/nethack-x11 \
27 ${GAMEPERM} 27 ${GAMEPERM}
28do-install: 28do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/src/nethack \ 29 ${INSTALL_PROGRAM} ${WRKSRC}/src/nethack \
30 ${DESTDIR}${PREFIX}/bin/nethack-x11 30 ${DESTDIR}${PREFIX}/bin/nethack-x11
31 ${INSTALL_DATA} ${WRKSRC}/dat/x11tiles \ 31 ${INSTALL_DATA} ${WRKSRC}/dat/x11tiles \
32 ${DESTDIR}${HACKDIR} 32 ${DESTDIR}${HACKDIR}
33 ${INSTALL_DATA} ${WRKSRC}/dat/NetHack.ad \ 33 ${INSTALL_DATA} ${WRKSRC}/dat/NetHack.ad \
34 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/NetHack 34 ${DESTDIR}${PREFIX}/lib/X11/app-defaults/NetHack
35 ${INSTALL_DATA} ${WRKSRC}/dat/pet_mark.xbm \ 35 ${INSTALL_DATA} ${WRKSRC}/dat/pet_mark.xbm \
36 ${DESTDIR}${HACKDIR} 36 ${DESTDIR}${HACKDIR}
37 ${INSTALL_DATA} ${WRKSRC}/dat/pilemark.xbm \ 37 ${INSTALL_DATA} ${WRKSRC}/dat/pilemark.xbm \
38 ${DESTDIR}${HACKDIR} 38 ${DESTDIR}${HACKDIR}
39 ${INSTALL_DATA} ${WRKSRC}/dat/rip.xpm \ 39 ${INSTALL_DATA} ${WRKSRC}/dat/rip.xpm \
40 ${DESTDIR}${HACKDIR} 40 ${DESTDIR}${HACKDIR}
41 41
42post-install: 42post-install:
43 ${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf \ 43 ${INSTALL_DATA} ${WRKSRC}/win/X11/nh10.bdf \
44 ${DESTDIR}${PREFIX}/share/fonts/X11/misc 44 ${DESTDIR}${PREFIX}/share/fonts/X11/misc
45 ${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.bdf \ 45 ${INSTALL_DATA} ${WRKSRC}/win/X11/ibm.bdf \
46 ${DESTDIR}${PREFIX}/share/fonts/X11/misc 46 ${DESTDIR}${PREFIX}/share/fonts/X11/misc
47 ${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \ 47 ${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
48 ${DESTDIR}${HACKDIR}/nethack.x11.rc 48 ${DESTDIR}${HACKDIR}/nethack.x11.rc
49 49
50.include "../../x11/libXaw/buildlink3.mk" 50.include "../../x11/libXaw/buildlink3.mk"
51.include "../../x11/libXpm/buildlink3.mk" 51.include "../../x11/libXpm/buildlink3.mk"
52.include "../../x11/libXt/buildlink3.mk" 52.include "../../x11/libXt/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"