explicit version marker. Installing a new nethack won't mean you have to

remove the old one.
This commit is contained in:
espie 2004-08-10 11:23:24 +00:00
parent c16eccfafe
commit 3ab9b376fc
4 changed files with 28 additions and 24 deletions

View File

@ -1,15 +1,16 @@
# $OpenBSD: Makefile,v 1.34 2004/08/10 10:36:36 xsa Exp $
# $OpenBSD: Makefile,v 1.35 2004/08/10 11:23:24 espie Exp $
# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
COMMENT= "dungeon explorin', hackin', game. Piece of cake"
DISTNAME= nethack-3.4.1
V=3.4.1
DISTNAME= nethack-$V
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nethack/} \
ftp://ftp.nethack.org/pub/nethack/nh341/src/ \
ftp://ftp.uu.net/pub/games/nethack/sources/ \
${MASTER_SITE_GNU:=nethack/}
DISTFILES= nethack-341.tgz
DISTFILES= nethack-${V:S/.//g}.tgz
HOMEPAGE= http://nethack.org/
@ -23,8 +24,8 @@ PERMIT_DISTFILES_FTP= Yes
FAKE_FLAGS=PREFIX=${PREFIX} DESTDIR=${WRKINST}
GAMEDIR=lib/nethackdir
NHDIR= ${PREFIX}/${GAMEDIR}
GAMEDIR=lib/nethackdir-$V
NHDIR= ${TRUEPREFIX}/${GAMEDIR}
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
FLAVORS=no_x11 qt
@ -45,7 +46,7 @@ USE_X11= Yes
RUN_DEPENDS=:hackdata-*:games/hackdata
NO_REGRESS= Yes
SUBST_VARS=GAMEDIR
SUBST_VARS=GAMEDIR V
do-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh symlinks
@ -54,16 +55,14 @@ post-build:
@cd ${WRKSRC}/util && ${MAKE_ENV} make recover
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/util/recover ${PREFIX}/bin
@cd ${WRKSRC}/doc && \
${INSTALL_MAN} nethack.6 recover.6 ${PREFIX}/man/man6
${INSTALL_PROGRAM} ${WRKBUILD}/util/recover ${PREFIX}/bin/recover-$V
${INSTALL_MAN} ${WRKSRC}/doc/nethack.6 ${PREFIX}/man/man6/nethack-$V.6
${INSTALL_MAN} ${WRKSRC}/doc/recover.6 ${PREFIX}/man/man6/recover-$V.6
${INSTALL_PROGRAM} ${PREFIX}/bin/nethack ${PREFIX}/bin/nethack-$V
.if ${FLAVOR:L} == ""
${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && cp NetHack.ad NetHack && \
${INSTALL_DATA} NetHack ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && cp NetHack.ad NetHack-$V && \
${INSTALL_DATA} NetHack-$V ${PREFIX}/lib/X11/app-defaults
.endif
# @install -g games -m 0664 /dev/null ${NHDIR}/logfile
# @install -g games -m 0664 /dev/null ${NHDIR}/perm
# @install -g games -m 0664 /dev/null ${NHDIR}/record
.include <bsd.port.mk>

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_unix_Makefile_top,v 1.4 2003/02/25 00:05:07 espie Exp $
$OpenBSD: patch-sys_unix_Makefile_top,v 1.5 2004/08/10 11:23:24 espie Exp $
--- sys/unix/Makefile.top.orig Sun Feb 23 15:43:39 2003
+++ sys/unix/Makefile.top Tue Feb 25 00:47:43 2003
+++ sys/unix/Makefile.top Tue Aug 10 12:24:23 2004
@@ -13,19 +13,19 @@
# execute things like 'data' and 'rumors')
# MAKE = make
@ -33,7 +33,7 @@ $OpenBSD: patch-sys_unix_Makefile_top,v 1.4 2003/02/25 00:05:07 espie Exp $
# (if there is, you'll have to do the installation by hand or modify the
# instructions)
-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
+REALGAMEDIR = $(PREFIX)/lib/$(GAME)dir
+REALGAMEDIR = $(NHDIR)
+GAMEDIR = $(DESTDIR)${REALGAMEDIR}
VARDIR = $(GAMEDIR)
-SHELLDIR = $(PREFIX)/games

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2004/08/10 09:36:45 espie Exp $
lib/X11/app-defaults/NetHack
@comment $OpenBSD: PFRAG.no-no_x11,v 1.4 2004/08/10 11:23:24 espie Exp $
lib/X11/app-defaults/NetHack-${V}
@exec ln -sf %F %B/NetHack
${GAMEDIR}/pet_mark.xbm
${GAMEDIR}/x11tiles
${GAMEDIR}/rip.xpm

View File

@ -1,7 +1,11 @@
@comment $OpenBSD: PLIST,v 1.7 2004/08/10 09:34:00 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2004/08/10 11:23:24 espie Exp $
@option no-default-conflict
@pkgcfl nethack-${V}
@pkgcfl nethack-${V}-no_x11
@pkgcfl nethack-${V}-qt
@group games
bin/nethack
bin/recover
bin/nethack-${V}
bin/recover-${V}
!%%no_x11%%
%%qt%%
@mode 0775
@ -144,6 +148,6 @@ ${GAMEDIR}/wizard1.lev
${GAMEDIR}/wizard2.lev
${GAMEDIR}/wizard3.lev
${GAMEDIR}/wizhelp
@man man/man6/nethack.6
@man man/man6/recover.6
@man man/man6/nethack-${V}.6
@man man/man6/recover-${V}.6
@unexec rm -rf ${GAMEDIR}/save/*