Date: Sun, 14 Apr 2013 20:41:07 GMT From: Kevin Zheng <kevinz5000@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177861: [patch] Use NetHack data librarian for games/nethack34 Message-ID: <201304142041.r3EKf7m2008404@red.freebsd.org> Resent-Message-ID: <201304142050.r3EKo0t1045779@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177861
>Category: ports
>Synopsis: [patch] Use NetHack data librarian for games/nethack34
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 14 20:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Kevin Zheng
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD sigma.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243826: Tue Dec 4 06:55:39 UTC 2012 root@obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The NetHack Data Librarian (DLB) helps reduce the clutter of the installed directory by putting various data files into a tar-like archive. The result is less files scattered over your installation directory and a shorter ls output.
This patch changes games/nethack34 to use DLB. In addition:
- Trim Makefile header
- Bump portrevision
- Definitely set CATEGORIES to games
- Take out indefinite article in COMMENT
- Fix order of LICENSE_stuff
- Sort various directives
- Convert to OptionsNG
- Wrap long lines
- Clean out old patches that don't make sense anymore
- Redo `make makepatch` to make patch filenames more sensible.
- Update pkg-descr
>How-To-Repeat:
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN /usr/ports/games/nethack34/Makefile games/nethack34/Makefile
--- /usr/ports/games/nethack34/Makefile 2013-03-01 21:55:25.000000000 -0600
+++ games/nethack34/Makefile 2013-04-14 15:09:09.000000000 -0500
@@ -1,30 +1,27 @@
-# New ports collection makefile for: nethack
-# Date created: 27 March 1995
-# Whom: asami
-#
-# $FreeBSD: games/nethack34/Makefile 313182 2013-03-02 03:55:25Z eadler $
-#
+# Created by: asami
+# $FreeBSD$
PORTNAME= nethack
PORTVERSION= 3.4.3
-PORTREVISION= 8
-CATEGORIES?= games
+PORTREVISION= 9
+CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}-src
EXTRACT_SUFX= .tgz
MAINTAINER= glewis@FreeBSD.org
-COMMENT= A dungeon explorin', slashin', hackin' game
+COMMENT= Dungeon explorin', slashin', hackin' game
LICENSE= nethack
LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE
-LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
LICENSE_FILE= ${WRKSRC}/dat/license
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+MAKE_JOBS_UNSAFE= yes
+PATCH_DIST_STRIP= -p1
+USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_JOBS_SAFE= yes
-USE_GMAKE= yes
MAKE_ENV= GRAPHICS="${GRAPHICS}"
PLIST_SUB= HACKNAME="${HACKNAME}" \
HACKDIR="${HACKDIR}" \
@@ -37,42 +34,45 @@
HACKDIR?= lib/${HACKNAME}
HACKDOCSDIR?= share/doc/${HACKNAME}
+OPTIONS_DEFINE= DOCS MENUCOLORS
+OPTIONS_RADIO= HPBAR
+OPTIONS_RADIO_HPBAR= HPMON STATUSCOLORS
+
+MENUCOLORS_DESC= Allows user to define what color menus are shown in
+HPMON_DESC= Change the color of your HP depending on how much HP you have left
+STATUSCOLORS_DESC= Customizable coloring for the status lines
+
+.include <bsd.port.options.mk>
+
.if !defined(PKGNAMESUFFIX)
USE_XORG= xaw xpm
GRAPHICS= X11_GRAPHICS
.else
.if ${PKGNAMESUFFIX} == "-gnome"
-MAKE_JOBS_UNSAFE= yes
-CATEGORIES= games gnome
+CATEGORIES+= gnome
USE_GNOME= gnomelibs
GRAPHICS= GNOME_GRAPHICS
.elif ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS= # none
-#
+
# Patch notes:
# 1) hpmon and statuscolors conflict with one another
# 2) menucolors patch must be applied before statuscolors
#
-.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
-IGNORE= you cannot enable both HPMON and STATUSCOLORS
-.endif
-.if defined(WITH_MENUCOLORS)
+.if ${PORT_OPTIONS:MMENUCOLORS}
PATCHFILES+= nh343-menucolor.diff
PATCH_SITES+= http://bilious.alt.org/~paxed/nethack/
-PATCH_DIST_STRIP= -p1
CFLAGS+= -DMENU_COLOR_REGEX_POSIX
.endif
-.if defined(WITH_STATUSCOLORS)
+.if ${PORT_OPTIONS:MSTATUSCOLORS}
PATCHFILES+= nh343-statuscolors.fixed.patch
PATCH_SITES+= http://jdc.koitsu.org/nethack/ \
${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
-PATCH_DIST_STRIP= -p1
.endif
-.if defined(WITH_HPMON)
+.if ${PORT_OPTIONS:MHPMON}
PATCHFILES+= hpmon.diff
PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \
${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
-PATCH_DIST_STRIP= -p1
CFLAGS+= -DHPMON
.endif
.elif ${PKGNAMESUFFIX} == "-qt"
@@ -88,32 +88,29 @@
pre-everything::
@if [ "${PKGBASE}" != "nethack" ]; then \
- ${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
- ${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel " ; \
- ${ECHO_MSG} " But ${PKGBASE} reads your prior nethack scores " ; \
- ${ECHO_MSG} " Don't forget to backup your nethack libdir if it's " ; \
- ${ECHO_MSG} " important for you " ; \
- ${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
+ ${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+ ${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel"; \
+ ${ECHO_MSG} " But ${PKGBASE} reads your prior nethack scores "; \
+ ${ECHO_MSG} " Don't forget to backup your nethack libdir if it's "; \
+ ${ECHO_MSG} " important for you. "; \
+ ${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
fi
post-patch:
-.for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
- @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f}
+.for file in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
+ @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
+ -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
+ ${WRKSRC}/${file}
.endfor
- @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
-.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
+ @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
+ ${WRKSRC}/win/Qt/qt_win.cpp
pre-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
post-install:
@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${PREFIX}/${HACKDOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
.endif
diff -ruN /usr/ports/games/nethack34/files/patch-aa games/nethack34/files/patch-aa
--- /usr/ports/games/nethack34/files/patch-aa 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-aa 1969-12-31 18:00:00.000000000 -0600
@@ -1,46 +0,0 @@
---- include/config.h.orig Mon Dec 8 00:39:13 2003
-+++ include/config.h Sun Sep 3 12:17:19 2006
-@@ -85,9 +85,6 @@
- #ifdef QT_GRAPHICS
- # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
- # define USER_SOUNDS /* Use sounds */
--# ifndef __APPLE__
--# define USER_SOUNDS_REGEX
--# endif
- # define USE_XPM /* Use XPM format for images (required) */
- # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
- # ifndef DEFAULT_WINDOW_SYS
-@@ -126,7 +123,7 @@
- * would allow:
- * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
- */
--/* # define USE_XPM */ /* Disable if you do not have the XPM library */
-+# define USE_XPM /* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -169,11 +166,11 @@
-
- #ifdef UNIX
- /* 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
-@@ -204,7 +201,7 @@
- * otherwise it will be the current directory.
- */
- # ifndef HACKDIR
--# define HACKDIR "/usr/games/lib/nethackdir"
-+# define HACKDIR "%%HACKDIR%%"
- # endif
-
- /*
diff -ruN /usr/ports/games/nethack34/files/patch-ab games/nethack34/files/patch-ab
--- /usr/ports/games/nethack34/files/patch-ab 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ab 1969-12-31 18:00:00.000000000 -0600
@@ -1,13 +0,0 @@
---- include/system.h.orig Sat Aug 30 09:07:23 2003
-+++ include/system.h Tue Sep 2 00:39:39 2003
-@@ -79,7 +79,9 @@
- # if !defined(__SC__) && !defined(LINUX)
- E long NDECL(random);
- # endif
--# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
-+# if defined(__FreeBSD__)
-+E void FDECL(srandom, (unsigned long));
-+# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
- # if !defined(bsdi) && !defined(__FreeBSD__)
diff -ruN /usr/ports/games/nethack34/files/patch-ac games/nethack34/files/patch-ac
--- /usr/ports/games/nethack34/files/patch-ac 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ac 1969-12-31 18:00:00.000000000 -0600
@@ -1,45 +0,0 @@
---- include/unixconf.h.orig Mon Sep 1 22:34:19 2003
-+++ include/unixconf.h Mon Sep 1 22:35:16 2003
-@@ -19,13 +19,13 @@
- */
-
- /* define exactly one of the following four choices */
--/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
-+#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
- /* also for relatives like SunOS 4.x, DG/UX, and */
- /* older versions of Linux */
- /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
- /* Use BSD for < v3.0 */
- /* "ULTRIX" not to be confused with "ultrix" */
--#define SYSV /* define for System V, Solaris 2.x, newer versions */
-+/* #define SYSV */ /* define for System V, Solaris 2.x, newer versions */
- /* of Linux */
- /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
- /* use SYSV for < v6.5 */
-@@ -47,7 +47,7 @@
- * job control (note that AIX is SYSV otherwise)
- * Also define this for AIX 3.2 */
-
--#define TERMINFO /* uses terminfo rather than termcap */
-+/* #define TERMINFO */ /* uses terminfo rather than termcap */
- /* Should be defined for most SYSV, SVR4 (including
- * Solaris 2+), HPUX, and Linux systems. In
- * particular, it should NOT be defined for the UNIXPC
-@@ -143,7 +143,7 @@
- * A stat system call is done on the mailbox every MAILCKFREQ moves.
- */
-
--#define MAIL /* Deliver mail during the game */
-+/* #define MAIL */ /* Deliver mail during the game */
-
- /* The Andrew Message System does mail a little differently from normal
- * UNIX. Mail is deposited in the user's own directory in ~/Mailbox
-@@ -284,7 +284,7 @@
- #endif
-
- #if defined(BSD) || defined(ULTRIX)
--# if !defined(DGUX) && !defined(SUNOS4)
-+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
- #define memcpy(d, s, n) bcopy(s, d, n)
- #define memcmp(s1, s2, n) bcmp(s2, s1, n)
- # endif
diff -ruN /usr/ports/games/nethack34/files/patch-ad games/nethack34/files/patch-ad
--- /usr/ports/games/nethack34/files/patch-ad 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ad 1969-12-31 18:00:00.000000000 -0600
@@ -1,124 +0,0 @@
-diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
---- sys.orig/unix/Makefile.src Sun Dec 7 15:39:13 2003
-+++ sys/unix/Makefile.src Wed Jun 30 08:27:32 2004
-@@ -146,19 +146,29 @@
- # directories. The ones given below is the usual spot for linux systems.
- # The paths are for glibconfig.h and gnomesupport.h respectively.
- #
--GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
-+GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
-
- # flags for debugging:
- # CFLAGS = -g -I../include
-
--CFLAGS = -O -I../include
-+CFLAGS += -I../include
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+CFLAGS += -DQT_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
-+endif
-+
- LFLAGS =
-
- # 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 = $(CFLAGS) -I. -I$(QTDIR)/include
--CXX=g++
-+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
-+#CXX=g++
- #LINK=g++
- # For cross-compiling, eg. with gcc on Linux (see also CC further up):
- #CXX=arm-linux-g++
-@@ -215,7 +225,26 @@
- #
- #
- WINSRC = $(WINTTYSRC)
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+WINSRC += $(WINX11SRC)
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+WINSRC += $(WINQTSRC)
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+WINSRC += $(WINGNOMESRC)
-+endif
-+
- WINOBJ = $(WINTTYOBJ)
-+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
-@@ -231,23 +260,23 @@
- # WINTTYLIB = -lcurses
- # WINTTYLIB = -lcurses16
- # WINTTYLIB = -lncurses
- WINTTYLIB = -ltermlib
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
- # 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
- #
- # libraries for Qt
--WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = ${QTCFGLIBS} ${LIBQT}
- #
- # libraries for KDE (with Qt)
- WINKDELIB = -lkdecore -lkdeui -lXext
- #
- # libraries for Gnome
--WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
-+WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
- #
- # libraries for Gem port
- WINGEMLIB = -le_gem -lgem
-@@ -256,6 +285,15 @@
- WINBELIB = -lbe
-
- WINLIB = $(WINTTYLIB)
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+WINLIB += $(WINX11LIB)
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+WINLIB += $(WINQTLIB)
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+WINLIB += $(WINGNOMELIB)
-+endif
-
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)
-@@ -461,13 +499,13 @@
-
- # Qt windowport meta-object-compiler output
- qt_kde0.moc: ../include/qt_kde0.h
-- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
-+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
-
- qt_win.moc: ../include/qt_win.h
-- $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
-+ ${MOC} -o qt_win.moc ../include/qt_win.h
-
- qttableview.moc: ../include/qttableview.h
-- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
-+ ${MOC} -o qttableview.moc ../include/qttableview.h
-
- $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
- ../include/objclass.h ../include/monsym.h \
diff -ruN /usr/ports/games/nethack34/files/patch-ae games/nethack34/files/patch-ae
--- /usr/ports/games/nethack34/files/patch-ae 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ae 1969-12-31 18:00:00.000000000 -0600
@@ -1,51 +0,0 @@
---- sys/unix/Makefile.top.orig Sat Aug 30 09:08:04 2003
-+++ sys/unix/Makefile.top Mon Sep 1 22:38:47 2003
-@@ -14,18 +14,17 @@
- # MAKE = make
-
- # make NetHack
--PREFIX = /usr
--GAME = nethack
-+GAME = %%HACKNAME%%
- # 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
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM = 0755
--DIRPERM = 0755
-+DIRPERM = 0775
-
- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,12 +34,12 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
-+GAMEDIR = %%HACKDIR%%
- VARDIR = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+SHELLDIR = $(PREFIX)/bin
-
- # per discussion in Install.X11 and Install.Qt
--VARDATND =
-+# VARDATND =
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
-@@ -48,7 +47,7 @@
- # for BeOS
- # VARDATND = beostiles
- # for Gnome
--# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
-+VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
-
- VARDATD = data oracles options quest.dat rumors
- VARDAT = $(VARDATD) $(VARDATND)
diff -ruN /usr/ports/games/nethack34/files/patch-af games/nethack34/files/patch-af
--- /usr/ports/games/nethack34/files/patch-af 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-af 1969-12-31 18:00:00.000000000 -0600
@@ -1,41 +0,0 @@
---- sys/unix/Makefile.doc.orig Sat Jan 15 05:49:48 2000
-+++ sys/unix/Makefile.doc Sat Aug 11 11:08:33 2001
-@@ -34,15 +34,15 @@
-
-
- GAME = nethack
--MANDIR = /usr/man/man6
-+MANDIR = ${PREFIX}/man/man
- MANEXT = 6
-
- # manual installation for most BSD-style systems
--GAMEMANCREATE = cp nethack.6
--LEVMANCREATE = cp lev_comp.6
--DGNMANCREATE = cp dgn_comp.6
--RCVRMANCREATE = cp recover.6
--DLBMANCREATE = cp dlb.6
-+GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
-+LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
-+DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
-+RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
-+DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
- # manual installation for most SYSV-style systems
- # GAMEMANCREATE = nroff -man nethack.6 >
- # LEVMANCREATE = nroff -man lev_comp.6 >
-@@ -51,11 +51,11 @@
- # DLBMANCREATE = nroff -man dlb.6 >
-
- manpages:
-- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
-- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
-- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
-- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
-- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
-+ -$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
-+ -$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
-+ -$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
-+ -$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
-+ -$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
-
- # manual creation for distribution
- DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff -ruN /usr/ports/games/nethack34/files/patch-ag games/nethack34/files/patch-ag
--- /usr/ports/games/nethack34/files/patch-ag 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ag 1969-12-31 18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
---- sys/unix/Makefile.utl.orig Mon Apr 17 22:36:44 2000
-+++ sys/unix/Makefile.utl Wed Oct 10 19:48:36 2001
-@@ -89,7 +89,17 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
-
--CFLAGS = -O -I../include
-+CFLAGS += -I../include
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+CFLAGS += -DQT_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+CFLAGS += -DGNOME_GRAPHICS
-+endif
-+
- LFLAGS =
-
- LIBS =
diff -ruN /usr/ports/games/nethack34/files/patch-ah games/nethack34/files/patch-ah
--- /usr/ports/games/nethack34/files/patch-ah 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ah 1969-12-31 18:00:00.000000000 -0600
@@ -1,16 +0,0 @@
-
-$FreeBSD: games/nethack34/files/patch-ah 300896 2012-07-14 13:54:48Z beat $
-
---- win/tty/termcap.c.orig Thu Jun 19 16:12:47 2003
-+++ win/tty/termcap.c Thu Jun 19 16:13:00 2003
-@@ -217,10 +217,6 @@
- error("Terminal must backspace.");
- # else
- if(!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */
--# ifndef MINIMAL_TERM
-- if(!tgetflag("bs"))
-- error("Terminal must backspace.");
--# endif
- BC = tbufptr;
- tbufptr += 2;
- *BC = '\b';
diff -ruN /usr/ports/games/nethack34/files/patch-ai games/nethack34/files/patch-ai
--- /usr/ports/games/nethack34/files/patch-ai 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-ai 1969-12-31 18:00:00.000000000 -0600
@@ -1,10 +0,0 @@
---- src/files.c.orig Sun Feb 23 23:43:26 2003
-+++ src/files.c Thu Jun 19 11:51:59 2003
-@@ -29,6 +29,7 @@
- #endif
-
- #if defined(UNIX) && defined(QT_GRAPHICS)
-+#include <limits.h>
- #include <dirent.h>
- #endif
-
diff -ruN /usr/ports/games/nethack34/files/patch-include__config.h games/nethack34/files/patch-include__config.h
--- /usr/ports/games/nethack34/files/patch-include__config.h 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-include__config.h 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,51 @@
+--- ./include/config.h.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./include/config.h 2013-04-14 14:35:47.000000000 -0500
+@@ -85,9 +85,6 @@
+ #ifdef QT_GRAPHICS
+ # define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
+ # define USER_SOUNDS /* Use sounds */
+-# ifndef __APPLE__
+-# define USER_SOUNDS_REGEX
+-# endif
+ # define USE_XPM /* Use XPM format for images (required) */
+ # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
+ # ifndef DEFAULT_WINDOW_SYS
+@@ -127,6 +124,7 @@
+ * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
+ */
+ /* # define USE_XPM */ /* Disable if you do not have the XPM library */
++#define USE_XPM
+ # ifdef USE_XPM
+ # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
+ # endif
+@@ -169,11 +167,11 @@
+
+ #ifdef UNIX
+ /* path and file name extension for compression program */
+-#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"
++#define COMPRESS_EXTENSION ".gz"
+ #endif
+
+ #ifndef COMPRESS
+@@ -186,6 +184,7 @@
+ * for detailed configuration.
+ */
+ /* #define DLB */ /* not supported on all platforms */
++#define DLB
+
+ /*
+ * Defining INSURANCE slows down level changes, but allows games that
+@@ -204,7 +203,7 @@
+ * otherwise it will be the current directory.
+ */
+ # ifndef HACKDIR
+-# define HACKDIR "/usr/games/lib/nethackdir"
++# define HACKDIR "%%HACKDIR%%"
+ # endif
+
+ /*
diff -ruN /usr/ports/games/nethack34/files/patch-include__system.h games/nethack34/files/patch-include__system.h
--- /usr/ports/games/nethack34/files/patch-include__system.h 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-include__system.h 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,13 @@
+--- ./include/system.h.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./include/system.h 2013-04-14 14:25:16.000000000 -0500
+@@ -79,7 +79,9 @@
+ # if !defined(__SC__) && !defined(LINUX)
+ E long NDECL(random);
+ # endif
+-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
++# if defined(__FreeBSD__)
++E void FDECL(srandom, (unsigned long));
++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
+ E void FDECL(srandom, (unsigned int));
+ # else
+ # if !defined(bsdi) && !defined(__FreeBSD__)
diff -ruN /usr/ports/games/nethack34/files/patch-include__unixconf.h games/nethack34/files/patch-include__unixconf.h
--- /usr/ports/games/nethack34/files/patch-include__unixconf.h 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-include__unixconf.h 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,23 @@
+--- ./include/unixconf.h.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./include/unixconf.h 2013-04-14 14:39:10.000000000 -0500
+@@ -22,11 +22,10 @@
+ /* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
+ /* also for relatives like SunOS 4.x, DG/UX, and */
+ /* older versions of Linux */
++#define BSD 1
+ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
+ /* Use BSD for < v3.0 */
+ /* "ULTRIX" not to be confused with "ultrix" */
+-#define SYSV /* define for System V, Solaris 2.x, newer versions */
+- /* of Linux */
+ /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */
+ /* use SYSV for < v6.5 */
+
+@@ -47,7 +46,6 @@
+ * job control (note that AIX is SYSV otherwise)
+ * Also define this for AIX 3.2 */
+
+-#define TERMINFO /* uses terminfo rather than termcap */
+ /* Should be defined for most SYSV, SVR4 (including
+ * Solaris 2+), HPUX, and Linux systems. In
+ * particular, it should NOT be defined for the UNIXPC
diff -ruN /usr/ports/games/nethack34/files/patch-qt_win.cpp games/nethack34/files/patch-qt_win.cpp
--- /usr/ports/games/nethack34/files/patch-qt_win.cpp 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/files/patch-qt_win.cpp 1969-12-31 18:00:00.000000000 -0600
@@ -1,14 +0,0 @@
---- win/Qt/qt_win.cpp.orig Tue Oct 14 11:29:05 2003
-+++ win/Qt/qt_win.cpp Tue Oct 14 11:29:52 2003
-@@ -75,6 +75,11 @@
- #undef yn
- #endif
-
-+#ifdef Invisible
-+/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
-+#undef Invisible
-+#endif
-+
- #include "qt_win.h"
- #include <qregexp.h>
- #include <qpainter.h>
diff -ruN /usr/ports/games/nethack34/files/patch-src__files.c games/nethack34/files/patch-src__files.c
--- /usr/ports/games/nethack34/files/patch-src__files.c 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-src__files.c 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,10 @@
+--- ./src/files.c.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./src/files.c 2013-04-14 14:25:16.000000000 -0500
+@@ -33,6 +33,7 @@
+ #endif
+
+ #if defined(UNIX) && defined(QT_GRAPHICS)
++#include <limits.h>
+ #include <dirent.h>
+ #endif
+
diff -ruN /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.doc games/nethack34/files/patch-sys__unix__Makefile.doc
--- /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.doc 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-sys__unix__Makefile.doc 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,41 @@
+--- ./sys/unix/Makefile.doc.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./sys/unix/Makefile.doc 2013-04-14 14:25:16.000000000 -0500
+@@ -41,15 +41,15 @@
+
+
+ GAME = nethack
+-MANDIR = /usr/man/man6
++MANDIR = ${PREFIX}/man/man
+ MANEXT = 6
+
+ # manual installation for most BSD-style systems
+-GAMEMANCREATE = cp nethack.6
+-LEVMANCREATE = cp lev_comp.6
+-DGNMANCREATE = cp dgn_comp.6
+-RCVRMANCREATE = cp recover.6
+-DLBMANCREATE = cp dlb.6
++GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
++LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
++DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
++RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
++DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
+ # manual installation for most SYSV-style systems
+ # GAMEMANCREATE = nroff -man nethack.6 >
+ # LEVMANCREATE = nroff -man lev_comp.6 >
+@@ -58,11 +58,11 @@
+ # DLBMANCREATE = nroff -man dlb.6 >
+
+ manpages:
+- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
+- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
++ -$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++ -$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++ -$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++ -$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++ -$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff -ruN /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.src games/nethack34/files/patch-sys__unix__Makefile.src
--- /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.src 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-sys__unix__Makefile.src 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,119 @@
+--- ./sys/unix/Makefile.src.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./sys/unix/Makefile.src 2013-04-14 14:25:16.000000000 -0500
+@@ -146,19 +146,29 @@
+ # directories. The ones given below is the usual spot for linux systems.
+ # The paths are for glibconfig.h and gnomesupport.h respectively.
+ #
+-GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
++GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
+
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
++endif
++
+ LFLAGS =
+
+ # 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 = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LINK=g++
+ # For cross-compiling, eg. with gcc on Linux (see also CC further up):
+ #CXX=arm-linux-g++
+@@ -215,7 +225,26 @@
+ #
+ #
+ WINSRC = $(WINTTYSRC)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINSRC += $(WINX11SRC)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINSRC += $(WINQTSRC)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINSRC += $(WINGNOMESRC)
++endif
++
+ WINOBJ = $(WINTTYOBJ)
++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
+@@ -235,19 +264,19 @@
+ #
+ # libraries for X11
+ # If USE_XPM is defined in config.h, you will also need -lXpm here.
+-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
+ # 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
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+ #
+ # libraries for Gnome
+-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
++WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
+ #
+ # libraries for Gem port
+ WINGEMLIB = -le_gem -lgem
+@@ -256,6 +285,15 @@
+ WINBELIB = -lbe
+
+ WINLIB = $(WINTTYLIB)
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++WINLIB += $(WINX11LIB)
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++WINLIB += $(WINQTLIB)
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++WINLIB += $(WINGNOMELIB)
++endif
+
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -461,13 +499,13 @@
+
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
++ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
+
+ qt_win.moc: ../include/qt_win.h
+- $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
++ ${MOC} -o qt_win.moc ../include/qt_win.h
+
+ qttableview.moc: ../include/qttableview.h
+- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
++ ${MOC} -o qttableview.moc ../include/qttableview.h
+
+ $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
+ ../include/objclass.h ../include/monsym.h \
diff -ruN /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.top games/nethack34/files/patch-sys__unix__Makefile.top
--- /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.top 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-sys__unix__Makefile.top 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,51 @@
+--- ./sys/unix/Makefile.top.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./sys/unix/Makefile.top 2013-04-14 14:25:16.000000000 -0500
+@@ -14,18 +14,17 @@
+ # MAKE = make
+
+ # make NetHack
+-PREFIX = /usr
+-GAME = nethack
++GAME = %%HACKNAME%%
+ # 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
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM = 0755
+-DIRPERM = 0755
++DIRPERM = 0775
+
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,12 +34,12 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR = %%HACKDIR%%
+ VARDIR = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND =
++# VARDATND =
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+ # for Atari/Gem
+@@ -48,7 +47,7 @@
+ # for BeOS
+ # VARDATND = beostiles
+ # for Gnome
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
+
+ VARDATD = data oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
diff -ruN /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.utl games/nethack34/files/patch-sys__unix__Makefile.utl
--- /usr/ports/games/nethack34/files/patch-sys__unix__Makefile.utl 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-sys__unix__Makefile.utl 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,21 @@
+--- ./sys/unix/Makefile.utl.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./sys/unix/Makefile.utl 2013-04-14 14:25:16.000000000 -0500
+@@ -89,7 +89,17 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
++ifeq ("$(GRAPHICS)","X11_GRAPHICS")
++CFLAGS += -DX11_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","QT_GRAPHICS")
++CFLAGS += -DQT_GRAPHICS
++endif
++ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
++CFLAGS += -DGNOME_GRAPHICS
++endif
++
+ LFLAGS =
+
+ LIBS =
diff -ruN /usr/ports/games/nethack34/files/patch-win__Qt__qt_win.cpp games/nethack34/files/patch-win__Qt__qt_win.cpp
--- /usr/ports/games/nethack34/files/patch-win__Qt__qt_win.cpp 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-win__Qt__qt_win.cpp 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,14 @@
+--- ./win/Qt/qt_win.cpp.orig 2003-12-07 17:39:13.000000000 -0600
++++ ./win/Qt/qt_win.cpp 2013-04-14 14:25:16.000000000 -0500
+@@ -74,6 +74,11 @@
+
+ }
+
++#ifdef Invisible
++/* Invisible was added to an enum in Qt 3.2, #defined in youprop.h */
++#undef Invisible
++#endif
++
+ #include "qt_win.h"
+ #include <qregexp.h>
+ #include <qpainter.h>
diff -ruN /usr/ports/games/nethack34/files/patch-win__tty__termcap.c games/nethack34/files/patch-win__tty__termcap.c
--- /usr/ports/games/nethack34/files/patch-win__tty__termcap.c 1969-12-31 18:00:00.000000000 -0600
+++ games/nethack34/files/patch-win__tty__termcap.c 2013-04-14 14:39:16.000000000 -0500
@@ -0,0 +1,13 @@
+--- ./win/tty/termcap.c.orig 2003-12-07 17:39:14.000000000 -0600
++++ ./win/tty/termcap.c 2013-04-14 14:25:16.000000000 -0500
+@@ -217,10 +217,6 @@
+ error("Terminal must backspace.");
+ # else
+ if(!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */
+-# ifndef MINIMAL_TERM
+- if(!tgetflag("bs"))
+- error("Terminal must backspace.");
+-# endif
+ BC = tbufptr;
+ tbufptr += 2;
+ *BC = '\b';
diff -ruN /usr/ports/games/nethack34/pkg-descr games/nethack34/pkg-descr
--- /usr/ports/games/nethack34/pkg-descr 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/pkg-descr 2013-04-14 10:54:16.000000000 -0500
@@ -1,5 +1,10 @@
-This is nethack, a classic hack'n'slash adventure game.
-You and your faithful feline (or commited canine) are on a quest
-to retrieve the lost Amulet of Yendor. Good luck!
+NetHack is a single player dungeon exploration game with a variety of graphical
+and text interfaces all using the same game engine. The emphasis in NetHack is
+on discovering the detail of the dungeon and not simply killing everything in
+sight - in fact, killing everything in sight is a good way to die quickly. Each
+game presents a different landscape - the random number generator provides an
+essentially unlimited number of variations of the dungeon and its denizens to be
+discovered by the player in one of a number of characters: you can pick your
+race, your role, and your gender.
WWW: http://www.nethack.org/
diff -ruN /usr/ports/games/nethack34/pkg-plist games/nethack34/pkg-plist
--- /usr/ports/games/nethack34/pkg-plist 2012-07-14 08:54:48.000000000 -0500
+++ games/nethack34/pkg-plist 2013-04-14 14:47:17.000000000 -0500
@@ -1,140 +1,16 @@
-@comment $FreeBSD: games/nethack34/pkg-plist 300896 2012-07-14 13:54:48Z beat $
+@comment $FreeBSD$
bin/%%HACKNAME%%
%%HACKDIR%%/%%HACKNAME%%
@exec mkdir %D/%%HACKDIR%%/save
@exec chmod -R 775 %D/%%HACKDIR%%
@exec chmod 2755 %D/%%HACKDIR%%/%%HACKNAME%%
@exec chown games:games %D/%%HACKDIR%%/save
-%%HACKDIR%%/Arc-fila.lev
-%%HACKDIR%%/Arc-filb.lev
-%%HACKDIR%%/Arc-goal.lev
-%%HACKDIR%%/Arc-loca.lev
-%%HACKDIR%%/Arc-strt.lev
-%%HACKDIR%%/Bar-fila.lev
-%%HACKDIR%%/Bar-filb.lev
-%%HACKDIR%%/Bar-goal.lev
-%%HACKDIR%%/Bar-loca.lev
-%%HACKDIR%%/Bar-strt.lev
-%%HACKDIR%%/Cav-fila.lev
-%%HACKDIR%%/Cav-filb.lev
-%%HACKDIR%%/Cav-goal.lev
-%%HACKDIR%%/Cav-loca.lev
-%%HACKDIR%%/Cav-strt.lev
-%%HACKDIR%%/Hea-fila.lev
-%%HACKDIR%%/Hea-filb.lev
-%%HACKDIR%%/Hea-goal.lev
-%%HACKDIR%%/Hea-loca.lev
-%%HACKDIR%%/Hea-strt.lev
-%%HACKDIR%%/Kni-fila.lev
-%%HACKDIR%%/Kni-filb.lev
-%%HACKDIR%%/Kni-goal.lev
-%%HACKDIR%%/Kni-loca.lev
-%%HACKDIR%%/Kni-strt.lev
-%%HACKDIR%%/Mon-fila.lev
-%%HACKDIR%%/Mon-filb.lev
-%%HACKDIR%%/Mon-goal.lev
-%%HACKDIR%%/Mon-loca.lev
-%%HACKDIR%%/Mon-strt.lev
-%%HACKDIR%%/Pri-fila.lev
-%%HACKDIR%%/Pri-filb.lev
-%%HACKDIR%%/Pri-goal.lev
-%%HACKDIR%%/Pri-loca.lev
-%%HACKDIR%%/Pri-strt.lev
-%%HACKDIR%%/Ran-fila.lev
-%%HACKDIR%%/Ran-filb.lev
-%%HACKDIR%%/Ran-goal.lev
-%%HACKDIR%%/Ran-loca.lev
-%%HACKDIR%%/Ran-strt.lev
-%%HACKDIR%%/Rog-fila.lev
-%%HACKDIR%%/Rog-filb.lev
-%%HACKDIR%%/Rog-goal.lev
-%%HACKDIR%%/Rog-loca.lev
-%%HACKDIR%%/Rog-strt.lev
-%%HACKDIR%%/Sam-fila.lev
-%%HACKDIR%%/Sam-filb.lev
-%%HACKDIR%%/Sam-goal.lev
-%%HACKDIR%%/Sam-loca.lev
-%%HACKDIR%%/Sam-strt.lev
-%%HACKDIR%%/Tou-fila.lev
-%%HACKDIR%%/Tou-filb.lev
-%%HACKDIR%%/Tou-goal.lev
-%%HACKDIR%%/Tou-loca.lev
-%%HACKDIR%%/Tou-strt.lev
-%%HACKDIR%%/Val-fila.lev
-%%HACKDIR%%/Val-filb.lev
-%%HACKDIR%%/Val-goal.lev
-%%HACKDIR%%/Val-loca.lev
-%%HACKDIR%%/Val-strt.lev
-%%HACKDIR%%/Wiz-fila.lev
-%%HACKDIR%%/Wiz-filb.lev
-%%HACKDIR%%/Wiz-goal.lev
-%%HACKDIR%%/Wiz-loca.lev
-%%HACKDIR%%/Wiz-strt.lev
-%%HACKDIR%%/air.lev
-%%HACKDIR%%/asmodeus.lev
-%%HACKDIR%%/astral.lev
-%%HACKDIR%%/baalz.lev
-%%HACKDIR%%/bigrm-1.lev
-%%HACKDIR%%/bigrm-2.lev
-%%HACKDIR%%/bigrm-3.lev
-%%HACKDIR%%/bigrm-4.lev
-%%HACKDIR%%/bigrm-5.lev
-%%HACKDIR%%/castle.lev
-%%HACKDIR%%/cmdhelp
-%%HACKDIR%%/data
-%%HACKDIR%%/dungeon
-%%HACKDIR%%/earth.lev
-%%HACKDIR%%/fakewiz1.lev
-%%HACKDIR%%/fakewiz2.lev
-%%HACKDIR%%/fire.lev
-%%HACKDIR%%/help
-%%HACKDIR%%/hh
-%%HACKDIR%%/history
-%%HACKDIR%%/juiblex.lev
-%%HACKDIR%%/knox.lev
%%HACKDIR%%/license
%%HACKDIR%%/mapbg.xpm
-%%HACKDIR%%/medusa-1.lev
-%%HACKDIR%%/medusa-2.lev
-%%HACKDIR%%/minefill.lev
-%%HACKDIR%%/minend-1.lev
-%%HACKDIR%%/minend-2.lev
-%%HACKDIR%%/minend-3.lev
-%%HACKDIR%%/minetn-1.lev
-%%HACKDIR%%/minetn-2.lev
-%%HACKDIR%%/minetn-3.lev
-%%HACKDIR%%/minetn-4.lev
-%%HACKDIR%%/minetn-5.lev
-%%HACKDIR%%/minetn-6.lev
-%%HACKDIR%%/minetn-7.lev
-%%HACKDIR%%/opthelp
-%%HACKDIR%%/options
-%%HACKDIR%%/oracle.lev
-%%HACKDIR%%/oracles
-%%HACKDIR%%/orcus.lev
+%%HACKDIR%%/nhdat
%%HACKDIR%%/pet_mark.xbm
-%%HACKDIR%%/quest.dat
-%%HACKDIR%%/rip.xpm
%%HACKDIR%%/recover
-%%HACKDIR%%/rumors
-%%HACKDIR%%/sanctum.lev
-%%HACKDIR%%/soko1-1.lev
-%%HACKDIR%%/soko1-2.lev
-%%HACKDIR%%/soko2-1.lev
-%%HACKDIR%%/soko2-2.lev
-%%HACKDIR%%/soko3-1.lev
-%%HACKDIR%%/soko3-2.lev
-%%HACKDIR%%/soko4-1.lev
-%%HACKDIR%%/soko4-2.lev
-%%HACKDIR%%/tower1.lev
-%%HACKDIR%%/tower2.lev
-%%HACKDIR%%/tower3.lev
-%%HACKDIR%%/valley.lev
-%%HACKDIR%%/water.lev
-%%HACKDIR%%/wizard1.lev
-%%HACKDIR%%/wizard2.lev
-%%HACKDIR%%/wizard3.lev
-%%HACKDIR%%/wizhelp
+%%HACKDIR%%/rip.xpm
%%HACKDIR%%/x11tiles
@mode 664
%%HACKDIR%%/perm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304142041.r3EKf7m2008404>