Simple diff to remove qt3 support in nethack.
Comments, Ok?
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/nethack/Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 Makefile
--- Makefile 10 May 2018 15:26:16 -0000 1.70
+++ Makefile 27 Aug 2020 15:58:04 -0000
@@ -2,9 +2,7 @@
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>
Index: 3.4/Makefile
===================================================================
RCS file: /cvs/ports/games/nethack/3.4/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- 3.4/Makefile 12 Jul 2019 20:46:21 -0000 1.5
+++ 3.4/Makefile 27 Aug 2020 15:58:04 -0000
@@ -4,7 +4,7 @@ COMMENT = dungeon explorin', hackin', ga
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=
Index: 3.4/pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/nethack/3.4/pkg/PFRAG.no-no_x11,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PFRAG.no-no_x11
--- 3.4/pkg/PFRAG.no-no_x11 25 Apr 2018 09:48:15 -0000 1.1.1.1
+++ 3.4/pkg/PFRAG.no-no_x11 27 Aug 2020 15:58:04 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2018/04/25 09:48:15 espie Exp $
-!%%qt%%
${GAMEDIR}/pet_mark.xbm
${GAMEDIR}/rip.xpm
${GAMEDIR}/x11tiles
Index: 3.4/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/nethack/3.4/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- 3.4/pkg/PLIST 25 Apr 2018 14:30:36 -0000 1.3
+++ 3.4/pkg/PLIST 27 Aug 2020 15:58:04 -0000
@@ -1,14 +1,17 @@
@comment $OpenBSD: PLIST,v 1.3 2018/04/25 14:30:36 espie 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
Index: 3.6/Makefile
===================================================================
RCS file: /cvs/ports/games/nethack/3.6/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- 3.6/Makefile 12 Jul 2019 20:46:21 -0000 1.5
+++ 3.6/Makefile 27 Aug 2020 15:58:04 -0000
@@ -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
Index: 3.6/pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/nethack/3.6/pkg/PFRAG.no-no_x11,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PFRAG.no-no_x11
--- 3.6/pkg/PFRAG.no-no_x11 25 Apr 2018 16:56:32 -0000 1.1.1.1
+++ 3.6/pkg/PFRAG.no-no_x11 27 Aug 2020 15:58:04 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2018/04/25 16:56:32 espie Exp $
-!%%qt%%
${GAMEDIR}/pet_mark.xbm
${GAMEDIR}/pilemark.xbm
${GAMEDIR}/rip.xpm
Index: 3.6/pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/nethack/3.6/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- 3.6/pkg/PLIST 18 May 2019 15:00:41 -0000 1.2
+++ 3.6/pkg/PLIST 27 Aug 2020 15:58:04 -0000
@@ -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 0664
+@comment no checksum
+${GAMEDIR}/logfile
@mode 2555
@bin ${GAMEDIR}/nethack
-@bin ${GAMEDIR}/recover
@mode
${GAMEDIR}/nhdat
@mode 0664
-@comment no checksum
-${GAMEDIR}/logfile
${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
