diff --git a/games/xnethack/Makefile b/games/xnethack/Makefile index b342ec0f71d5..b5665934f18e 100644 --- a/games/xnethack/Makefile +++ b/games/xnethack/Makefile @@ -1,99 +1,90 @@ PORTNAME= xNetHack DISTVERSIONPREFIX= xnh -DISTVERSION= 7.0 +DISTVERSION= 7.1 CATEGORIES= games MAINTAINER= fuz@fuz.su COMMENT= Experimental features and improvements applied to NetHack 3.7-dev LICENSE= nethack LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE LICENSE_FILE= ${WRKSRC}/dat/license LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept FLAVORS= x11 nox11 qt FLAVOR?= ${FLAVORS:[1]} nox11_PKGNAMESUFFIX= -nox11 qt_PKGNAMESUFFIX= -qt USES= alias compiler:c11 gmake ncurses tar:tgz lua:54 USE_GITHUB= yes GH_ACCOUNT= copperwater MAKE_ENV= GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" # Configure these variables as you want them to be. HACKNAME?= ${PORTNAME:tl} HACKDIR?= share/${HACKNAME} DATADIR= ${PREFIX}/${HACKDIR} DOCSDIR= ${PREFIX}/share/doc/${HACKNAME} .if ${FLAVOR} == "x11" USES+= xorg USE_XORG= xaw xpm xmu xext xt x11 sm ice CFLAGS+= -DUSE_TILES GRAPHICS= X11_GRAPHICS .elif ${FLAVOR} == "nox11" GRAPHICS= # none .elif ${FLAVOR} == "qt" USES+= localbase pkgconfig qt:5 USE_QT= buildtools_build core gui multimedia network widgets MAKE_ENV+= MOCPATH=${MOC} LINK="${CXX} -pie" # Qt wants PIC for some reason. For C code, PIE should be enough. CFLAGS+= -I${QT_INCDIR} -fpie CXXFLAGS+= -I${QT_INCDIR} -fpic GRAPHICS= QT_GRAPHICS .endif CFLAGS+= -DNOMAIL -DCURSES_GRAPHICS OPTIONS_DEFINE= DOCS .include post-patch: .for f in include/config.h sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top - @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \ - -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ + @${REINPLACE_CMD} -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ ${WRKSRC}/${f} .endfor .for f in dlb.6 nethack.6 recover.6 - @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \ - -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ + @${REINPLACE_CMD} -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ ${WRKSRC}/doc/${f} .endfor .if defined(WITHOUT_SHELL) @${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h .endif .if defined(WITH_MAIL) @${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h .endif do-configure: ${TOUCH} ${WRKSRC}/dat/gitinfo.txt @cd ${WRKSRC}/sys/unix; ${SH} setup.sh - # work around a race condition - cd ${WRKSRC}/util; ${MAKE_CMD} tiletxt.c post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover ${STRIP_CMD} ${STAGEDIR}${DATADIR}/${HACKNAME} @cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages - @${MKDIR} ${STAGEDIR}${DATADIR}/save - @${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf - # Make sysconf a sample to prevent it being removed if altered - @${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample - # Make "sample" files from records to prevent them being removed - # if they have been altered - @${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/livelog.sample - @${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample - @${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample - @${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample + ${MKDIR} ${STAGEDIR}${DATADIR}/save + ${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf +.for f in livelog logfile record sysconf xlogfile + ${CP} ${STAGEDIR}/${DATADIR}/${f} ${STAGEDIR}/${DATADIR}/${f}.sample +.endfor .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR} .endif .include diff --git a/games/xnethack/distinfo b/games/xnethack/distinfo index 311196d7ea1d..50f48252cd24 100644 --- a/games/xnethack/distinfo +++ b/games/xnethack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646737487 -SHA256 (copperwater-xNetHack-xnh7.0_GH0.tar.gz) = d2f9ed47a2dde9d1dfeba073f4f2cbb6c226f8d98457a860b56ec00551429725 -SIZE (copperwater-xNetHack-xnh7.0_GH0.tar.gz) = 5985717 +TIMESTAMP = 1653608416 +SHA256 (copperwater-xNetHack-xnh7.1_GH0.tar.gz) = 086c12275463c5c008e594713a6a5ee26dd075ce8740c956e19485771f2d46f6 +SIZE (copperwater-xNetHack-xnh7.1_GH0.tar.gz) = 6102486 diff --git a/games/xnethack/files/patch-include-config.h b/games/xnethack/files/patch-include-config.h index cd282cbf1737..26f78d8821aa 100644 --- a/games/xnethack/files/patch-include-config.h +++ b/games/xnethack/files/patch-include-config.h @@ -1,36 +1,36 @@ ---- include/config.h.orig 2022-03-07 23:57:15 UTC +--- include/config.h.orig 2022-05-26 12:31:08 UTC +++ include/config.h -@@ -303,11 +303,11 @@ +@@ -312,11 +312,11 @@ #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS) /* path and file name extension for compression program */ -#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -#define COMPRESS_EXTENSION ".Z" /* compress's extension */ +/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */ +/* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ -/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ -/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ +#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS -@@ -392,7 +392,7 @@ +@@ -401,7 +401,7 @@ * otherwise it will be the current directory. */ #ifndef HACKDIR -#define HACKDIR "/usr/games/lib/xnethackdir" +#define HACKDIR "%%HACKDIR%%" #endif /* -@@ -653,7 +653,7 @@ typedef unsigned char uchar; +@@ -662,7 +662,7 @@ typedef unsigned char uchar; #ifdef DUMPLOG #ifndef DUMPLOG_FILE -#define DUMPLOG_FILE "/tmp/xnethack.%n.%d.log" +#define DUMPLOG_FILE "/tmp/xnethack.%v.%u.%n.%D.log" /* DUMPLOG_FILE allows following placeholders: %% literal '%' %v version (eg. "3.6.3-0") diff --git a/games/xnethack/files/patch-sys-unix-Makefile.src b/games/xnethack/files/patch-sys-unix-Makefile.src index d9073ce22b96..6e56fc3af367 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.src +++ b/games/xnethack/files/patch-sys-unix-Makefile.src @@ -1,166 +1,166 @@ ---- sys/unix/Makefile.src.orig 2022-03-07 23:57:15 UTC +--- sys/unix/Makefile.src.orig 2022-05-26 12:31:08 UTC +++ sys/unix/Makefile.src @@ -169,14 +169,22 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $( # flags for debugging: # CFLAGS = -g -I../include +CFLAGS += -I../include -I${LUA_INCDIR} +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS +endif #CFLAGS = -O -I../include -#LFLAGS = +LFLAGS += -L${LUA_LIBDIR} +LINK ?= $(CC) # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LINK line here to get # the C++ libraries linked in. -CXXFLAGS = $(CCXXFLAGS) -I. -I$(QTDIR)/include $(QTCXXFLAGS) +CXXFLAGS += -I. -I../include -I${LUA_INCDIR} CXX ?= g++ MOC ?= moc MOCPATH ?= $(QTDIR)/bin/$(MOC) @@ -305,6 +313,29 @@ WINBEOBJ = # Curses - Karl Garrison, Tangles #WINSRC = $(WINCURSESSRC) #WINOBJ = $(WINCURSESOBJ) + +WINSRC = $(WINTTYSRC) $(WINCURSESSRC) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINSRC += $(WINX11SRC) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINSRC += $(WINQTSRC) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINSRC += $(WINGNOMESRC) +endif + +WINOBJ = $(WINTTYOBJ) $(WINCURSESOBJ) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINOBJ += $(WINX11OBJ) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINOBJ += $(WINQTOBJ) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINOBJ += $(WINGNOMEOBJ) +endif + # # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead @@ -321,6 +352,7 @@ WINBEOBJ = # WINTTYLIB = -lcurses16 # WINTTYLIB = -lncurses #WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses -L${LOCALBASE}/lib # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -328,16 +360,19 @@ WINBEOBJ = # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 +WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # # # libraries for Qt 3 -WINQT3LIB = -L$(QTDIR)/lib -lqt +#WINQTLIB = -L$(QTDIR)/lib -lqt +#WINQT3LIB = ${QTCFGLIBS} ${LIBQT} +#WINQTLIB = ${QTCFGLIBS} ${LIBQT} # # libraries for Qt 4 WINQT4LIB = `pkg-config QtGui --libs` # # libraries for Qt 5 (use with WINQTSRC and WINQTOBJ) -WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs` +WINQTLIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs` # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext @@ -347,7 +382,7 @@ WINBELIB = -lbe # # libraries for curses port # link with ncurses -WINCURSESLIB = -lncurses +WINCURSESLIB = -lncurses -L${LOCALBASE}/lib # link with pdcurses for SDL, installed in a separate directory #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL # same as above, for XCurses @@ -357,6 +392,18 @@ WINCURSESLIB = -lncurses # # For Curses #WINLIB = $(WINCURSESLIB) + +WINLIB = $(WINTTYLIB) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINLIB += $(WINX11LIB) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINLIB += $(WINQTLIB) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINLIB += $(WINGNOMELIB) +endif + # # some platforms need to build the support libraries # BUILDMORE = $(TARGETPFX)pdcurses.a @@ -412,7 +459,7 @@ AWK = awk # skip it--if nethack's sources don't reside in a git repository than # the script which creates that file will fail benignly and 'makedefs -v' # will proceed without it -GITINFO=1 +GITINFO=0 # if you change this to 1, feedback while building will omit -Dthis -Wthat # -Isomewhere so that each file being compiled is listed on one short line; @@ -420,7 +467,7 @@ GITINFO=1 # (rather than just in suffix default rule), such as is implemented by # gnu make and others which have picked up its extensions; # allowed values are 0, 1, and empty (which behaves like 0) -QUIETCC=1 +QUIETCC=0 # ---------------------------------------- # -@@ -473,7 +520,7 @@ PACKAGE=@true - MAKEDEFS = ../util/makedefs - - # -lm required by lua --LUALIB = ../lib/lua/liblua.a -lm $(DLLIB) -+LUALIB = -llua-${LUA_VER} -lm $(DLLIB) +@@ -476,7 +523,7 @@ MAKEDEFS = ../util/makedefs + LUA_VERSION ?=5.4.4 + LUABASE = liblua-$(LUA_VERSION).a + LUALIB = ../lib/lua/$(LUABASE) +-LUALIBS = $(LUALIB) -lm $(DLLIB) ++LUALIBS = -llua-${LUA_VER} -lm $(DLLIB) # timestamp files to reduce `make' overhead and shorten .o dependency lists CONFIG_H = ../src/config.h-t -@@ -668,7 +715,7 @@ DUMB.Setup: ../include/extern.h - cp ../include/extern.DUMB ../include/extern.h - @touch DUMB.Setup +@@ -610,7 +657,7 @@ all: $(GAME) + pregame: + $(PREGAME) --../lib/lua/liblua.a ../include/nhlua.h: -+../include/nhlua.h: - @( cd .. ; $(MAKE) lua_support ) +-$(GAME): pregame $(MAKEDEFS) $(LUALIB) $(SYSTEM) ++$(GAME): pregame $(MAKEDEFS) $(SYSTEM) + @echo "$(GAME) is up to date." - # dependencies for makedefs and its outputs, which the util -@@ -687,11 +734,11 @@ objects.o: + Sysunix: $(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile +@@ -690,11 +737,11 @@ objects.o: # outdated Qt 3 windowport meta-object-compiler output qt3_kde0.moc: ../win/Qt3/qt3_kde0.h - $(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h + ${MOC} -o qt3kde0.moc ../win/Qt3/qt3_kde0.h qt3_win.moc: ../win/Qt3/qt3_win.h - $(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h + ${MOC} -o qt3win.moc ../win/Qt3/qt3_win.h qt3tableview.moc: ../win/Qt3/qt3tableview.h - $(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt3/qt3tableview.h + ${MOC} -o qt3tableview.moc ../win/Qt3/qt3tableview.h # build monst.o and objects.o before executing '$(MAKE) makedefs' $(MAKEDEFS): $(FIRSTOBJ) \ diff --git a/games/xnethack/files/patch-sys-unix-Makefile.top b/games/xnethack/files/patch-sys-unix-Makefile.top index feff1aaed068..3df0cc17c07a 100644 --- a/games/xnethack/files/patch-sys-unix-Makefile.top +++ b/games/xnethack/files/patch-sys-unix-Makefile.top @@ -1,152 +1,143 @@ ---- sys/unix/Makefile.top.orig 2022-03-07 23:57:15 UTC +--- sys/unix/Makefile.top.orig 2022-05-26 12:31:08 UTC +++ sys/unix/Makefile.top @@ -25,15 +25,15 @@ NHSROOT=. GAME = xnethack # GAME = nethack.prg #GAMEUID = games -#GAMEGRP = bin +GAMEGRP = games # Permissions - some places use setgid instead of setuid, for instance. # See also the option "SECURE" in include/config.h. -#GAMEPERM = 04755 +GAMEPERM = 02755 FILEPERM = 0644 # VARFILEPERM = 0644 EXEPERM = 0755 -DIRPERM = 0755 +DIRPERM = 0775 # VARDIRPERM = 0755 # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR @@ -44,10 +44,12 @@ DIRPERM = 0755 # keep (if there is, you'll have to do the installation by hand or # modify the install commands below). #HACKDIR = $(PREFIX)/games/lib/$(GAME)dir -#VARDIR = $(HACKDIR) +HACKDIR = %%HACKDIR%% +INSTDIR = ${HACKDIR} +VARDIR = $(HACKDIR) # Where nethack.sh is installed (as 'nethack'). # If this is not defined, the shell wrapper script is not used. -#SHELLDIR = $(PREFIX)/games +SHELLDIR = $(PREFIX)/bin # Extra data files depending upon the interface(s) built into nethack. # per discussion in Install.X11 and Install.Qt @@ -62,7 +64,7 @@ DIRPERM = 0755 # X11 with GRAPHIC_TOMBSTONE (requires 'xpm'): # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm # both X11 and Qt: -# VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm +VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm # Qt without X11; assumes GRAPHIC_TOMBSTONE: # VARDATND = nhtiles.bmp pet_mark.xbm pilemark.xbm rip.xpm -@@ -123,7 +125,7 @@ all: $(ALLDEP) - $(GAME): lua_support - ( cd src ; $(MAKE) $(GAME) ) - --lua_support: $(TOPLUALIB) include/nhlua.h -+lua_support: include/nhlua.h - @true - $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h - ( cd $(LUATOP) \ -@@ -131,13 +133,11 @@ $(LUATOP)/liblua.a: $(LUAHEADERS)/lua.h - lib/lua/liblua.a: $(LUATOP)/liblua.a +@@ -134,13 +136,11 @@ $(TOPLUALIB): $(LUATOP)/liblua.a @( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi ) cp $(LUATOP)/liblua.a $@ + -include/nhlua.h: $(TOPLUALIB) +include/nhlua.h: echo '/* nhlua.h - generated by top Makefile */' > $@ - @echo '#include "../$(LUAHEADERS)/lua.h"' >> $@ - @sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \ - < $(LUAHEADERS)/lua.h >> $@ - @echo '#include "../$(LUAHEADERS)/lualib.h"' >> $@ - @echo '#include "../$(LUAHEADERS)/lauxlib.h"' >> $@ + @echo '#include ' >> $@ + @echo '#include ' >> $@ + @echo '#include ' >> $@ @echo '/*nhlua.h*/' >> $@ # LUATESTTARGET is this by default lib/lua-$(LUA_VERSION)/src/lua.h: -@@ -258,39 +258,22 @@ dofiles: +@@ -261,39 +261,22 @@ dofiles: -e '}' \ -e '$$s/.*/nodlb/p' < dat/options` ; \ $(MAKE) dofiles-$${target-nodlb} - cp src/$(GAME) $(INSTDIR) - cp util/recover $(INSTDIR) - -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi - if test -n '$(SHELLDIR)'; then \ + cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME) + cp util/recover ${DESTDIR}$(INSTDIR) + -if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi + if test -n '${DESTDIR}$(SHELLDIR)'; then \ sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ < sys/unix/nethack.sh \ - > $(SHELLDIR)/$(GAME) ; fi -# set up their permissions - -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \ - $(CHGRP) $(GAMEGRP) $(GAME) recover ) - chmod $(GAMEPERM) $(INSTDIR)/$(GAME) - chmod $(EXEPERM) $(INSTDIR)/recover - -if test -n '$(SHELLDIR)'; then \ - $(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi - if test -n '$(SHELLDIR)'; then \ - $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \ - chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi + > ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi dofiles-dlb: check-dlb - ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) ) -# set up their permissions - -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \ - $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \ - chmod $(FILEPERM) nhdat $(DATNODLB) ) + ( cd dat ; cp nhdat $(DATNODLB) ${DESTDIR}$(INSTDIR) ) dofiles-nodlb: # copy over the game files - ( cd dat ; cp $(DAT) $(INSTDIR) ) -# set up their permissions - -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \ - $(CHGRP) $(GAMEGRP) $(DAT) ; \ - chmod $(FILEPERM) $(DAT) ) + ( cd dat ; cp $(DAT) ${DESTDIR}$(INSTDIR) ) + # # This is not part of the dependency build hierarchy. # It requires an explicit "make fetch-Lua". -@@ -327,25 +310,17 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs +@@ -330,25 +313,17 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs true; $(PREINSTALL) # set up the directories # not all mkdirs have -p; those that don't will create a -p directory - -if test -n '$(SHELLDIR)'; then \ - mkdir -p $(SHELLDIR); fi - rm -rf $(INSTDIR) $(VARDIR) - -mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis + -if test -n '${DESTDIR}$(SHELLDIR)'; then \ + mkdir -p ${DESTDIR}$(SHELLDIR); fi + rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR) + -mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)/save ${DESTDIR}$(VARDIR)/whereis if test -d ./-p; then rmdir ./-p; fi - -$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis - $(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis # order counts here: - chmod $(DIRPERM) $(INSTDIR) - chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis # set up the game files ( $(MAKE) dofiles ) # set up some additional files - touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile \ - $(VARDIR)/livelog - -( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile livelog ; \ - $(CHGRP) $(GAMEGRP) perm record logfile xlogfile livelog ; \ - chmod $(VARFILEPERM) perm record logfile xlogfile livelog ) - true; $(POSTINSTALL) + touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record \ + ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile ${DESTDIR}$(VARDIR)/livelog # and a reminder @echo You may also want to reinstall the man pages via the doc Makefile. diff --git a/games/xnethack/pkg-plist b/games/xnethack/pkg-plist index 28cdcc50fcee..5ceb07d02b61 100644 --- a/games/xnethack/pkg-plist +++ b/games/xnethack/pkg-plist @@ -1,187 +1,188 @@ @mode 555 bin/%%HACKNAME%% @owner games @group games @mode 02755 %%DATADIR%%/%%HACKNAME%% @mode %%DATADIR%%/Arc-fila.lua %%DATADIR%%/Arc-filb.lua %%DATADIR%%/Arc-goal.lua %%DATADIR%%/Arc-loca.lua %%DATADIR%%/Arc-strt.lua %%DATADIR%%/Bar-fila.lua %%DATADIR%%/Bar-filb.lua %%DATADIR%%/Bar-goal.lua %%DATADIR%%/Bar-loca.lua %%DATADIR%%/Bar-strt.lua %%DATADIR%%/Cav-fila.lua %%DATADIR%%/Cav-filb.lua %%DATADIR%%/Cav-goal.lua %%DATADIR%%/Cav-loca.lua %%DATADIR%%/Cav-strt.lua %%DATADIR%%/Hea-fila.lua %%DATADIR%%/Hea-filb.lua %%DATADIR%%/Hea-goal.lua %%DATADIR%%/Hea-loca.lua %%DATADIR%%/Hea-strt.lua %%DATADIR%%/Kni-fila.lua %%DATADIR%%/Kni-filb.lua %%DATADIR%%/Kni-goal.lua %%DATADIR%%/Kni-loca.lua %%DATADIR%%/Kni-strt.lua %%DATADIR%%/Mon-fila.lua %%DATADIR%%/Mon-filb.lua %%DATADIR%%/Mon-goal.lua %%DATADIR%%/Mon-loca.lua %%DATADIR%%/Mon-strt.lua %%DATADIR%%/NHdump.css %%DATADIR%%/NetHack.ad %%DATADIR%%/Pri-fila.lua %%DATADIR%%/Pri-filb.lua %%DATADIR%%/Pri-goal.lua %%DATADIR%%/Pri-loca.lua %%DATADIR%%/Pri-strt.lua %%DATADIR%%/Ran-fila.lua %%DATADIR%%/Ran-filb.lua %%DATADIR%%/Ran-goal.lua %%DATADIR%%/Ran-loca.lua %%DATADIR%%/Ran-strt.lua %%DATADIR%%/Rog-fila.lua %%DATADIR%%/Rog-filb.lua %%DATADIR%%/Rog-goal.lua %%DATADIR%%/Rog-loca.lua %%DATADIR%%/Rog-strt.lua %%DATADIR%%/Sam-fila.lua %%DATADIR%%/Sam-filb.lua %%DATADIR%%/Sam-goal.lua %%DATADIR%%/Sam-loca.lua %%DATADIR%%/Sam-strt.lua %%DATADIR%%/Tou-fila.lua %%DATADIR%%/Tou-filb.lua %%DATADIR%%/Tou-goal.lua %%DATADIR%%/Tou-loca.lua %%DATADIR%%/Tou-strt.lua %%DATADIR%%/Val-fila.lua %%DATADIR%%/Val-filb.lua %%DATADIR%%/Val-goal.lua %%DATADIR%%/Val-loca.lua %%DATADIR%%/Val-strt.lua %%DATADIR%%/Wiz-fila.lua %%DATADIR%%/Wiz-filb.lua %%DATADIR%%/Wiz-goal.lua %%DATADIR%%/Wiz-loca.lua %%DATADIR%%/Wiz-strt.lua %%DATADIR%%/air.lua %%DATADIR%%/asmodeus.lua %%DATADIR%%/astral.lua %%DATADIR%%/baalz.lua %%DATADIR%%/bigrm-1.lua %%DATADIR%%/bigrm-10.lua %%DATADIR%%/bigrm-11.lua %%DATADIR%%/bigrm-12.lua %%DATADIR%%/bigrm-2.lua %%DATADIR%%/bigrm-3.lua %%DATADIR%%/bigrm-4.lua %%DATADIR%%/bigrm-5.lua %%DATADIR%%/bigrm-6.lua %%DATADIR%%/bigrm-7.lua %%DATADIR%%/bigrm-8.lua %%DATADIR%%/bigrm-9.lua %%DATADIR%%/bogusmon %%DATADIR%%/castle.lua %%DATADIR%%/cmdhelp %%DATADIR%%/data %%DATADIR%%/dungeon.lua %%DATADIR%%/earth.lua %%DATADIR%%/engrave %%DATADIR%%/epitaph %%DATADIR%%/fakewiz1.lua %%DATADIR%%/fakewiz2.lua %%DATADIR%%/fire.lua %%DATADIR%%/help %%DATADIR%%/hh %%DATADIR%%/history %%DATADIR%%/invocation.lua %%DATADIR%%/juiblex.lua %%DATADIR%%/keyhelp %%DATADIR%%/knox.lua %%DATADIR%%/license @sample(games,games,664) %%DATADIR%%/livelog.sample @sample(games,games,664) %%DATADIR%%/logfile.sample %%DATADIR%%/medusa-1.lua %%DATADIR%%/medusa-2.lua %%DATADIR%%/medusa-3.lua %%DATADIR%%/medusa-4.lua %%DATADIR%%/minefill.lua %%DATADIR%%/minend-1.lua %%DATADIR%%/minend-2.lua %%DATADIR%%/minend-3.lua %%DATADIR%%/minend-4.lua %%DATADIR%%/minetn-1.lua %%DATADIR%%/minetn-2.lua %%DATADIR%%/minetn-3.lua %%DATADIR%%/minetn-4.lua %%DATADIR%%/minetn-5.lua %%DATADIR%%/minetn-6.lua %%DATADIR%%/minetn-7.lua %%DATADIR%%/minetn-8.lua %%DATADIR%%/nhcore.lua %%DATADIR%%/nhlib.lua %%DATADIR%%/nhtiles.bmp %%DATADIR%%/opthelp %%DATADIR%%/options %%DATADIR%%/optmenu %%DATADIR%%/oracle-1.lua %%DATADIR%%/oracle-2.lua %%DATADIR%%/oracle-3.lua %%DATADIR%%/oracles %%DATADIR%%/orcus.lua @mode 664 %%DATADIR%%/perm @mode %%DATADIR%%/pet_mark.xbm %%DATADIR%%/pilemark.xbm %%DATADIR%%/quest.lua @sample(games,games,664) %%DATADIR%%/record.sample @mode 02755 %%DATADIR%%/recover @mode +%%DATADIR%%/repair-Val-loca.lua %%DATADIR%%/rip.xpm %%DATADIR%%/rumors %%DATADIR%%/sanctum.lua %%DATADIR%%/shirts %%DATADIR%%/soko1-1.lua %%DATADIR%%/soko1-2.lua %%DATADIR%%/soko2-1.lua %%DATADIR%%/soko2-2.lua %%DATADIR%%/soko3-1.lua %%DATADIR%%/soko3-2.lua %%DATADIR%%/soko4-1.lua %%DATADIR%%/soko4-2.lua %%DATADIR%%/symbols @sample(games,games,) %%DATADIR%%/sysconf.sample %%DATADIR%%/themerms.lua %%DATADIR%%/tower1.lua %%DATADIR%%/tower2.lua %%DATADIR%%/tower3.lua %%DATADIR%%/tower4.lua %%DATADIR%%/tribute %%DATADIR%%/valley.lua %%DATADIR%%/water.lua %%DATADIR%%/wizard1.lua %%DATADIR%%/wizard2.lua %%DATADIR%%/wizard3.lua %%DATADIR%%/wizhelp %%DATADIR%%/x11tiles @sample(games,games,664) %%DATADIR%%/xlogfile.sample @owner @group man/man6/dlb.6.gz man/man6/makedefs.6.gz man/man6/recover.6.gz man/man6/%%HACKNAME%%.6.gz %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt @dir(games,games,0775) %%DATADIR%%/save @dir(games,games,0775) %%DATADIR%%/whereis @dir(games,games,0775) %%DATADIR%%