pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games Update to NetHack 3.6.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/917145648a72
branches: trunk
changeset: 342693:917145648a72
user: pho <pho%pkgsrc.org@localhost>
date: Thu Oct 24 11:51:23 2019 +0000
description:
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.
diffstat:
games/nethack-lib/Makefile | 15 +-
games/nethack-lib/Makefile.common | 49 ++-
games/nethack-lib/PLIST | 270 +++++++++--------
games/nethack-lib/distinfo | 29 +-
games/nethack-lib/patches/patch-aa | 75 -----
games/nethack-lib/patches/patch-ab | 242 ----------------
games/nethack-lib/patches/patch-ad | 40 --
games/nethack-lib/patches/patch-ae | 32 --
games/nethack-lib/patches/patch-af | 67 ----
games/nethack-lib/patches/patch-ag | 15 -
games/nethack-lib/patches/patch-include_config.h | 64 ++++
games/nethack-lib/patches/patch-include_system.h | 89 +++--
games/nethack-lib/patches/patch-include_unixconf.h | 66 ++++
games/nethack-lib/patches/patch-src_mail.c | 15 +
games/nethack-lib/patches/patch-sys_unix_Makefile.doc | 35 ++
games/nethack-lib/patches/patch-sys_unix_Makefile.src | 74 ++--
games/nethack-lib/patches/patch-sys_unix_Makefile.top | 64 ++++
games/nethack-lib/patches/patch-sys_unix_Makefile.utl | 17 +-
games/nethack-lib/patches/patch-sys_unix_nethack.sh | 44 ++
games/nethack-lib/patches/patch-util_makedefs.c | 39 --
games/nethack-tty/Makefile | 15 +-
games/nethack-x11/Makefile | 33 +-
games/nethack-x11/PLIST | 9 +-
23 files changed, 620 insertions(+), 778 deletions(-)
diffs (truncated from 1683 to 300 lines):
diff -r 1b7264084b28 -r 917145648a72 games/nethack-lib/Makefile
--- a/games/nethack-lib/Makefile Thu Oct 24 11:40:00 2019 +0000
+++ b/games/nethack-lib/Makefile Thu Oct 24 11:51:23 2019 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.31 2017/12/25 22:22:11 he Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/24 11:51:23 pho Exp $
#
.include "../../games/nethack-lib/Makefile.common"
PKGNAME= nethack-lib-${NETHACK_VERSION}
-PKGREVISION= 5
COMMENT= Data files for Nethack
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./sys/unix/setup.sh
-BUILD_TARGET= datastuff
-INSTALL_TARGET= manpages install-dat
-INSTALLATION_DIRS= ${PKGMANDIR}/man6
+INSTALL_TARGET= manpages dofiles
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 ${HACKDIR} share/doc/nethack
# Using 'nroff -Tascii' works better with groff and we don't want to use col
# on linux as it removes the escape the the ansi color sequences.
@@ -34,6 +32,9 @@
${NETHACK_USER} ${NETHACK_GROUP} 664
CONF_FILES_PERMS+= /dev/null ${VARDIR}/record \
${NETHACK_USER} ${NETHACK_GROUP} 664
+CONF_FILES_PERMS+= /dev/null ${VARDIR}/xlogfile \
+ ${NETHACK_USER} ${NETHACK_GROUP} 664
+CONF_FILES+= /dev/null ${HACKDIR}/sysconf
REQD_DIRS_PERMS+= ${VARDIR} \
${NETHACK_USER} ${NETHACK_GROUP} 775
@@ -42,6 +43,8 @@
CHECK_FILES_SKIP+= ${VARDIR}/logfile \
${VARDIR}/perm \
- ${VARDIR}/record
+ ${VARDIR}/record \
+ ${VARDIR}/xlogfile \
+ ${HACKDIR}/sysconf
.include "../../mk/bsd.pkg.mk"
diff -r 1b7264084b28 -r 917145648a72 games/nethack-lib/Makefile.common
--- a/games/nethack-lib/Makefile.common Thu Oct 24 11:40:00 2019 +0000
+++ b/games/nethack-lib/Makefile.common Thu Oct 24 11:51:23 2019 +0000
@@ -1,14 +1,23 @@
-# $NetBSD: Makefile.common,v 1.35 2018/04/02 09:44:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2019/10/24 11:51:23 pho Exp $
#
# used by games/nethack/Makefile
# used by games/nethack-lib/Makefile
# used by games/nethack-x11/Makefile
# used by games/nethack-tty/Makefile
+#
+# System-provided variables:
+#
+# GAMEPERM
+# The desired owner and the file mode of game executables.
+#
-NETHACK_BASEVER= 3.4.3
+NETHACK_BASEVER= 3.6.2
NETHACK_VERSION= ${NETHACK_BASEVER}
NETHACK_DISTVER= ${NETHACK_BASEVER:S/.//g}
-NETHACK_DIR= nethackdir340
+NETHACK_DIR= nethackdir${NETHACK_SAVEVER:S/.//g}
+
+# The last compatible version of save files.
+NETHACK_SAVEVER= 3.6.0
DISTNAME= nethack-${NETHACK_DISTVER}-src
CATEGORIES= games
@@ -31,12 +40,6 @@
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
-SUBST_CLASSES+= ttylib
-SUBST_MESSAGE.ttylib= Configuring to use correct termcap library
-SUBST_STAGE.ttylib= pre-configure
-SUBST_FILES.ttylib= sys/unix/Makefile.src
-SUBST_SED.ttylib= -e 's!^WINTTYLIB = -ltermlib!WINTTYLIB = -L${BUILDLINK_PREFIX.termcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.termcap}/lib -l${BUILDLINK_LIBNAME.termcap}!'
-
OPSYSVARS+= NETHACK_OS
NETHACK_OS.Linux= SYSV
NETHACK_OS.*= BSD
@@ -45,12 +48,12 @@
SUBST_MESSAGE.os= Configuring for ${NETHACK_OS}
SUBST_STAGE.os= pre-configure
SUBST_FILES.os= include/unixconf.h
-SUBST_SED.os= -e 's,__NETHACK_OS__,${NETHACK_OS},'
+SUBST_VARS.os= VARDIR NETHACK_OS
SUBST_CLASSES+= configh
SUBST_STAGE.configh= pre-configure
SUBST_FILES.configh= include/config.h
-SUBST_VARS.configh= PREFIX
+SUBST_VARS.configh= HACKDIR
SUBST_SED.configh= -e "s|@GZIP_PROGRAM@|${GZIP_CMD:[1]}|g"
USE_GAMESGROUP= yes
@@ -59,12 +62,26 @@
BUILD_DEFS+= GAMES_USER GAMES_GROUP
GAMEPERM= ${NETHACK_USER} ${NETHACK_GROUP} 2555
-GAMEDIR= ${PREFIX}/share/${NETHACK_DIR}
-VARDIR= /var/games/nethack340
-MAKE_ENV+= GAMEDIR=${GAMEDIR}
+BUILD_DEFS+= VARBASE
+HACKDIR= ${PREFIX}/share/${NETHACK_DIR}
+VARDIR= ${VARBASE}/games/nethack${NETHACK_SAVEVER:S/.//g}
+
+MAKE_ENV+= HACKDIR=${HACKDIR}
MAKE_ENV+= VARDIR=${VARDIR}
+MAKE_ENV+= INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKE_ENV+= INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+
+WINTTYLIB= -L${BUILDLINK_PREFIX.termcap}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.termcap}/lib \
+ -l${BUILDLINK_LIBNAME.termcap}
+MAKE_ENV+= WINTTYLIB=${WINTTYLIB:Q}
pre-configure:
- @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
+ ${RUN}${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
-.endif # !NO_BUILD
+# Substitute NETHACK_DIR in PLIST.
+PLIST_SUBST+= NETHACK_DIR=${NETHACK_DIR}
+PRINT_PLIST_AWK+= { gsub(/${NETHACK_DIR}/, "$${NETHACK_DIR}"); }
+
+.endif # !defined(META_PACKAGE)
diff -r 1b7264084b28 -r 917145648a72 games/nethack-lib/PLIST
--- a/games/nethack-lib/PLIST Thu Oct 24 11:40:00 2019 +0000
+++ b/games/nethack-lib/PLIST Thu Oct 24 11:51:23 2019 +0000
@@ -1,137 +1,149 @@
-@comment $NetBSD: PLIST,v 1.8 2011/06/01 11:20:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/10/24 11:51:23 pho Exp $
bin/nethack
bin/recover
man/man6/dgn_comp.6
man/man6/dlb.6
man/man6/lev_comp.6
+man/man6/makedefs.6
man/man6/nethack.6
man/man6/recover.6
share/doc/nethack/Guidebook
-share/nethackdir340/Arc-fila.lev
-share/nethackdir340/Arc-filb.lev
-share/nethackdir340/Arc-goal.lev
-share/nethackdir340/Arc-loca.lev
-share/nethackdir340/Arc-strt.lev
-share/nethackdir340/Bar-fila.lev
-share/nethackdir340/Bar-filb.lev
-share/nethackdir340/Bar-goal.lev
-share/nethackdir340/Bar-loca.lev
-share/nethackdir340/Bar-strt.lev
-share/nethackdir340/Cav-fila.lev
-share/nethackdir340/Cav-filb.lev
-share/nethackdir340/Cav-goal.lev
-share/nethackdir340/Cav-loca.lev
-share/nethackdir340/Cav-strt.lev
-share/nethackdir340/Hea-fila.lev
-share/nethackdir340/Hea-filb.lev
-share/nethackdir340/Hea-goal.lev
-share/nethackdir340/Hea-loca.lev
-share/nethackdir340/Hea-strt.lev
-share/nethackdir340/Kni-fila.lev
-share/nethackdir340/Kni-filb.lev
-share/nethackdir340/Kni-goal.lev
-share/nethackdir340/Kni-loca.lev
-share/nethackdir340/Kni-strt.lev
-share/nethackdir340/Mon-fila.lev
-share/nethackdir340/Mon-filb.lev
-share/nethackdir340/Mon-goal.lev
-share/nethackdir340/Mon-loca.lev
-share/nethackdir340/Mon-strt.lev
-share/nethackdir340/Pri-fila.lev
-share/nethackdir340/Pri-filb.lev
-share/nethackdir340/Pri-goal.lev
-share/nethackdir340/Pri-loca.lev
-share/nethackdir340/Pri-strt.lev
-share/nethackdir340/Ran-fila.lev
-share/nethackdir340/Ran-filb.lev
-share/nethackdir340/Ran-goal.lev
-share/nethackdir340/Ran-loca.lev
-share/nethackdir340/Ran-strt.lev
-share/nethackdir340/Rog-fila.lev
-share/nethackdir340/Rog-filb.lev
-share/nethackdir340/Rog-goal.lev
-share/nethackdir340/Rog-loca.lev
-share/nethackdir340/Rog-strt.lev
-share/nethackdir340/Sam-fila.lev
-share/nethackdir340/Sam-filb.lev
-share/nethackdir340/Sam-goal.lev
-share/nethackdir340/Sam-loca.lev
-share/nethackdir340/Sam-strt.lev
-share/nethackdir340/Tou-fila.lev
-share/nethackdir340/Tou-filb.lev
-share/nethackdir340/Tou-goal.lev
-share/nethackdir340/Tou-loca.lev
-share/nethackdir340/Tou-strt.lev
-share/nethackdir340/Val-fila.lev
-share/nethackdir340/Val-filb.lev
-share/nethackdir340/Val-goal.lev
-share/nethackdir340/Val-loca.lev
-share/nethackdir340/Val-strt.lev
-share/nethackdir340/Wiz-fila.lev
-share/nethackdir340/Wiz-filb.lev
-share/nethackdir340/Wiz-goal.lev
-share/nethackdir340/Wiz-loca.lev
-share/nethackdir340/Wiz-strt.lev
-share/nethackdir340/air.lev
-share/nethackdir340/asmodeus.lev
-share/nethackdir340/astral.lev
-share/nethackdir340/baalz.lev
-share/nethackdir340/bigrm-1.lev
-share/nethackdir340/bigrm-2.lev
-share/nethackdir340/bigrm-3.lev
-share/nethackdir340/bigrm-4.lev
-share/nethackdir340/bigrm-5.lev
-share/nethackdir340/castle.lev
-share/nethackdir340/cmdhelp
-share/nethackdir340/data
-share/nethackdir340/dungeon
-share/nethackdir340/earth.lev
-share/nethackdir340/fakewiz1.lev
-share/nethackdir340/fakewiz2.lev
-share/nethackdir340/fire.lev
-share/nethackdir340/help
-share/nethackdir340/hh
-share/nethackdir340/history
-share/nethackdir340/juiblex.lev
-share/nethackdir340/knox.lev
-share/nethackdir340/license
-share/nethackdir340/medusa-1.lev
-share/nethackdir340/medusa-2.lev
-share/nethackdir340/minefill.lev
-share/nethackdir340/minend-1.lev
-share/nethackdir340/minend-2.lev
-share/nethackdir340/minend-3.lev
-share/nethackdir340/minetn-1.lev
-share/nethackdir340/minetn-2.lev
-share/nethackdir340/minetn-3.lev
-share/nethackdir340/minetn-4.lev
-share/nethackdir340/minetn-5.lev
-share/nethackdir340/minetn-6.lev
-share/nethackdir340/minetn-7.lev
-share/nethackdir340/opthelp
-share/nethackdir340/options
-share/nethackdir340/oracle.lev
-share/nethackdir340/oracles
-share/nethackdir340/orcus.lev
-share/nethackdir340/pet_mark.xbm
-share/nethackdir340/quest.dat
-share/nethackdir340/rip.xpm
-share/nethackdir340/rumors
-share/nethackdir340/sanctum.lev
-share/nethackdir340/soko1-1.lev
-share/nethackdir340/soko1-2.lev
-share/nethackdir340/soko2-1.lev
-share/nethackdir340/soko2-2.lev
-share/nethackdir340/soko3-1.lev
-share/nethackdir340/soko3-2.lev
-share/nethackdir340/soko4-1.lev
-share/nethackdir340/soko4-2.lev
-share/nethackdir340/tower1.lev
-share/nethackdir340/tower2.lev
-share/nethackdir340/tower3.lev
-share/nethackdir340/valley.lev
-share/nethackdir340/water.lev
-share/nethackdir340/wizard1.lev
-share/nethackdir340/wizard2.lev
-share/nethackdir340/wizard3.lev
-share/nethackdir340/wizhelp
+share/${NETHACK_DIR}/Arc-fila.lev
+share/${NETHACK_DIR}/Arc-filb.lev
+share/${NETHACK_DIR}/Arc-goal.lev
+share/${NETHACK_DIR}/Arc-loca.lev
+share/${NETHACK_DIR}/Arc-strt.lev
+share/${NETHACK_DIR}/Bar-fila.lev
+share/${NETHACK_DIR}/Bar-filb.lev
+share/${NETHACK_DIR}/Bar-goal.lev
+share/${NETHACK_DIR}/Bar-loca.lev
+share/${NETHACK_DIR}/Bar-strt.lev
+share/${NETHACK_DIR}/Cav-fila.lev
+share/${NETHACK_DIR}/Cav-filb.lev
+share/${NETHACK_DIR}/Cav-goal.lev
+share/${NETHACK_DIR}/Cav-loca.lev
+share/${NETHACK_DIR}/Cav-strt.lev
+share/${NETHACK_DIR}/Hea-fila.lev
+share/${NETHACK_DIR}/Hea-filb.lev
+share/${NETHACK_DIR}/Hea-goal.lev
+share/${NETHACK_DIR}/Hea-loca.lev
+share/${NETHACK_DIR}/Hea-strt.lev
+share/${NETHACK_DIR}/Kni-fila.lev
+share/${NETHACK_DIR}/Kni-filb.lev
Home |
Main Index |
Thread Index |
Old Index