Remove qt3 support in games/nethack

OK kn@, espie@ timeout
This commit is contained in:
rsadowski 2020-09-11 12:39:17 +00:00
parent 950b10440a
commit 414107e2b2
8 changed files with 32 additions and 36 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2019/07/12 20:46:21 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2020/09/11 12:39:17 rsadowski Exp $
COMMENT = dungeon explorin', hackin', game. Piece of cake
V = 3.4.3
DISTNAME = nethack-$V
PKGNAME = ${DISTNAME}
REVISION = 15
REVISION = 16
CATEGORIES = games
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nethack/}
@ -27,17 +27,12 @@ GAMEDIR = lib/nethackdir-$V
NHDIR = ${TRUEPREFIX}/${GAMEDIR}
MAKE_ENV += NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
FLAVORS = no_x11 qt
FLAVORS = no_x11
FLAVOR ?=
.if ${FLAVOR} == "no_x11"
NETHACKCONFIG = ${FILESDIR}/simple-config
EXT=,no_x11
.elif ${FLAVOR} == "qt"
NETHACKCONFIG = ${FILESDIR}/qt-config
EXT=,qt
MODULES = x11/qt3
WANTLIB += SM m pthread ${COMPILER_LIBCXX}
.else
NETHACKCONFIG = ${FILESDIR}/x-config
EXT=

View File

@ -14,8 +14,6 @@ termcap entry, for instance xterm-color.
Flavors:
no_x11
runs without X11.
qt
qt2 interface
P.S. This is a very addictive game, with its whole wacky culture. And even
a newsgroup dedicated to it (rec.games.roguelike.nethack). Don't say we

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2018/04/25 09:48:15 espie Exp $
!%%qt%%
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2020/09/11 12:39:17 rsadowski Exp $
${GAMEDIR}/pet_mark.xbm
${GAMEDIR}/rip.xpm
${GAMEDIR}/x11tiles

View File

@ -1,14 +1,17 @@
@comment $OpenBSD: PLIST,v 1.3 2018/04/25 14:30:36 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2020/09/11 12:39:17 rsadowski Exp $
@option no-default-conflict
@option is-branch
@pkgpath games/nethack${EXT}
@conflict nethack-${V}
@pkgpath games/nethack${EXT}
@unexec rm -rf ${GAMEDIR}/save/*
@comment bin/nethack
@group games
bin/nethack-${V}
bin/recover-${V}
@bin bin/recover-${V}
@group
lib/X11/app-defaults/NetHack-${V}
@mode 0775
@group games
${GAMEDIR}/
@mode
${GAMEDIR}/Arc-fila.lev
@ -117,7 +120,7 @@ ${GAMEDIR}/minetn-5.lev
${GAMEDIR}/minetn-6.lev
${GAMEDIR}/minetn-7.lev
@mode 2555
${GAMEDIR}/nethack
@bin ${GAMEDIR}/nethack
@mode
${GAMEDIR}/opthelp
${GAMEDIR}/options

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2019/07/12 20:46:21 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2020/09/11 12:39:17 rsadowski Exp $
COMMENT = dungeon explorin', hackin', game. Piece of cake
V = 3.6.2
@ -9,6 +9,7 @@ PKGNAME = ${DISTNAME}
CATEGORIES = games
MASTER_SITES = https://www.nethack.org/download/3.6.2/
DISTFILES = nethack-${V:S/.//g}-src.tgz
REVISION = 0
HOMEPAGE = http://nethack.org/
@ -17,15 +18,11 @@ WANTLIB += c curses
COMPILER = base-clang ports-gcc base-gcc
FLAVORS = no_x11 qt
FLAVORS = no_x11
FLAVOR ?=
.if ${FLAVOR} == "no_x11"
CONFIG = simple-config
.elif ${FLAVOR} == "qt"
CONFIG = qt-config
MODULES += x11/qt3
WANTLIB += ${COMPILER_LIBCXX} SM m
.else
CONFIG = x-config
WANTLIB += X11 Xaw Xext Xmu Xt

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2018/04/25 16:56:32 espie Exp $
!%%qt%%
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2020/09/11 12:39:17 rsadowski Exp $
${GAMEDIR}/pet_mark.xbm
${GAMEDIR}/pilemark.xbm
${GAMEDIR}/rip.xpm

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2019/05/18 15:00:41 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2020/09/11 12:39:17 rsadowski Exp $
@option no-default-conflict
@option is-branch
@conflict nethack->=${BASEV}
@ -7,30 +7,37 @@
@comment bin/nethack
bin/nethack-${V}
bin/recover-${V}
lib/X11/app-defaults/NetHack-${V}
@mode 0775
@group ${GAMEGRP}
${GAMEDIR}/
@mode
${GAMEDIR}/license
@mode 2555
@bin ${GAMEDIR}/nethack
@bin ${GAMEDIR}/recover
@mode
${GAMEDIR}/nhdat
@mode 0664
@comment no checksum
${GAMEDIR}/logfile
@mode 2555
@bin ${GAMEDIR}/nethack
@mode
${GAMEDIR}/nhdat
@mode 0664
${GAMEDIR}/perm
@comment no checksum
${GAMEDIR}/record
@mode 0664
@comment no checksum
${GAMEDIR}/xlogfile
@mode 2555
@bin ${GAMEDIR}/recover
@mode 0774
${GAMEDIR}/save/
@mode
${GAMEDIR}/symbols
${GAMEDIR}/sysconf
@mode 0664
@comment no checksum
${GAMEDIR}/xlogfile
@mode
@man man/man6/nethack-${V}.6
@man man/man6/recover-${V}.6
!%%no_x11%%
@group
share/doc/nethack-${V}/
share/doc/nethack-${V}/Guidebook.txt

View File

@ -1,10 +1,8 @@
# $OpenBSD: Makefile,v 1.70 2018/05/10 15:26:16 espie Exp $
# $OpenBSD: Makefile,v 1.71 2020/09/11 12:39:17 rsadowski Exp $
SUBDIR =
SUBDIR += 3.4
SUBDIR += 3.4,no_x11
SUBDIR += 3.4,qt
SUBDIR += 3.6
SUBDIR += 3.6,no_x11
SUBDIR += 3.6,qt
.include <bsd.port.subdir.mk>