Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/games/nethack-x11/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/games/nethack-x11/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- pkgsrc/games/nethack-x11/Makefile 2014/06/01 16:52:08 1.39 +++ pkgsrc/games/nethack-x11/Makefile 2019/10/24 11:52:08 1.40 @@ -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"