ports/56279: Update port: games/nethack to 5.4.2
KATO Tsuguru
tkato at prontomail.com
Mon Sep 1 17:00:43 UTC 2003
>Number: 56279
>Category: ports
>Synopsis: Update port: games/nethack to 5.4.2
>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: Mon Sep 01 10:00:33 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 5.4.2
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# games_nethack34-gnome.diff
# games_nethack34-nox11.diff
# games_nethack34-qt.diff
# games_nethack34.diff
#
echo x - games_nethack34-gnome.diff
sed 's/^X//' >games_nethack34-gnome.diff << 'END-of-games_nethack34-gnome.diff'
Xdiff -urN /usr/ports/games/nethack34-gnome/Makefile games/nethack34-gnome/Makefile
X--- /usr/ports/games/nethack34-gnome/Makefile Wed May 15 05:00:22 2002
X+++ games/nethack34-gnome/Makefile Tue Sep 2 00:53:21 2003
X@@ -9,6 +9,6 @@
X
X MAINTAINER= Jan.Stocker at t-online.de
X
X-WITH_GNOME_GRAPHICS= yes
X+PKGNAMESUFFIX= -gnome
X
X .include "${MASTERDIR}/Makefile"
END-of-games_nethack34-gnome.diff
echo x - games_nethack34-nox11.diff
sed 's/^X//' >games_nethack34-nox11.diff << 'END-of-games_nethack34-nox11.diff'
Xdiff -urN /usr/ports/games/nethack34-nox11/Makefile games/nethack34-nox11/Makefile
X--- /usr/ports/games/nethack34-nox11/Makefile Wed May 15 05:00:24 2002
X+++ games/nethack34-nox11/Makefile Tue Sep 2 00:53:06 2003
X@@ -9,6 +9,6 @@
X
X MAINTAINER= yoshi at parodius.com
X
X-WITH_TTY_GRAPHICS= yes
X+PKGNAMESUFFIX= -nox11
X
X .include "${MASTERDIR}/Makefile"
END-of-games_nethack34-nox11.diff
echo x - games_nethack34-qt.diff
sed 's/^X//' >games_nethack34-qt.diff << 'END-of-games_nethack34-qt.diff'
Xdiff -urN /usr/ports/games/nethack34-qt/Makefile games/nethack34-qt/Makefile
X--- /usr/ports/games/nethack34-qt/Makefile Tue Sep 10 20:11:13 2002
X+++ games/nethack34-qt/Makefile Tue Sep 2 00:53:53 2003
X@@ -7,8 +7,8 @@
X
X MASTERDIR= ${.CURDIR}/../nethack34
X
X-MAINTAINER= kde at freebsd.org
X+MAINTAINER= kde at FreeBSD.org
X
X-WITH_QT_GRAPHICS= yes
X+PKGNAMESUFFIX= -qt
X
X .include "${MASTERDIR}/Makefile"
END-of-games_nethack34-qt.diff
echo x - games_nethack34.diff
sed 's/^X//' >games_nethack34.diff << 'END-of-games_nethack34.diff'
Xdiff -urN /usr/ports/games/nethack34/Makefile games/nethack34/Makefile
X--- /usr/ports/games/nethack34/Makefile Fri Jun 20 06:49:39 2003
X+++ games/nethack34/Makefile Tue Sep 2 00:49:24 2003
X@@ -6,8 +6,7 @@
X #
X
X PORTNAME= nethack
X-PORTVERSION= 3.4.1
X-PORTREVISION= 1
X+PORTVERSION= 3.4.2
X CATEGORIES?= games
X MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
X MASTER_SITE_SUBDIR= ${PORTNAME}
X@@ -33,47 +32,34 @@
X HACKDIR?= lib/${HACKNAME}
X HACKDOCSDIR?= share/doc/${HACKNAME}
X
X-.if defined(WITH_GNOME_GRAPHICS)
X+.if !defined(PKGNAMESUFFIX)
X+USE_XPM= yes
X+GRAPHICS= X11_GRAPHICS
X+.else
X+.if ${PKGNAMESUFFIX} == "-gnome"
X CATEGORIES= games gnome
X-PKGNAMESUFFIX= -gnome
X USE_GETOPT_LONG= yes
X USE_GNOME= gnomelibs
X MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
X GRAPHICS= GNOME_GRAPHICS
X-.elif defined(WITH_QT_GRAPHICS)
X-PKGNAMESUFFIX= -qt
X+.elif ${PKGNAMESUFFIX} == "-nox11"
X+GRAPHICS= # none
X+.elif ${PKGNAMESUFFIX} == "-qt"
X USE_QT_VER= 3
X MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
X QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \
X MOC="${MOC}" LIBQT="-lqt-mt"
X GRAPHICS= QT_GRAPHICS
X-.elif defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
X-PKGNAMESUFFIX= -nox11
X-.else
X-USE_XPM= yes
X-GRAPHICS= X11_GRAPHICS
X+.endif
X .endif
X
X pre-everything::
X-.if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \
X- || defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
X @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
X @${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel "
X @${ECHO_MSG} " But ${PKGBASE} read your prior nethack scores "
X @${ECHO_MSG} " Don't forget to backup your nethack libdir if it's "
X @${ECHO_MSG} " important for you "
X @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
X-.else
X- @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
X- @${ECHO_MSG} " You may use the following build options: "
X- @${ECHO_MSG} " WITH_GNOME_GRAPHICS=yes build with GNOME GUI "
X- @${ECHO_MSG} " WITH_QT_GRAPHICS=yes build with Qt GUI "
X- @${ECHO_MSG} " WITH_TTY_GRAPHICS=yes build with no GUI "
X- @${ECHO_MSG} " WITHOUT_X11=yes same as above "
X- @${ECHO_MSG} " "
X- @${ECHO_MSG} " By default, nethack port is built with X11 GUI. "
X- @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
X-.endif
X
X post-patch:
X .for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
Xdiff -urN /usr/ports/games/nethack34/distinfo games/nethack34/distinfo
X--- /usr/ports/games/nethack34/distinfo Fri Jun 6 07:54:25 2003
X+++ games/nethack34/distinfo Mon Sep 1 22:16:39 2003
X@@ -1 +1 @@
X-MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e
X+MD5 (nethack-342.tgz) = 90e971dbaee2f05f6a2ed3454851903a
Xdiff -urN /usr/ports/games/nethack34/files/patch-ab games/nethack34/files/patch-ab
X--- /usr/ports/games/nethack34/files/patch-ab Tue Aug 13 06:06:54 2002
X+++ games/nethack34/files/patch-ab Tue Sep 2 00:39:53 2003
X@@ -1,22 +1,13 @@
X---- include/system.h.orig Thu Mar 21 08:42:55 2002
X-+++ include/system.h Sun Jun 16 15:49:55 2002
X+--- include/system.h.orig Sat Aug 30 09:07:23 2003
X++++ include/system.h Tue Sep 2 00:39:39 2003
X @@ -79,7 +79,9 @@
X # if !defined(__SC__) && !defined(LINUX)
X E long NDECL(random);
X # endif
X--# if !defined(SUNOS4) || defined(RANDOM)
X+-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
X +# if defined(__FreeBSD__)
X +E void FDECL(srandom, (unsigned long));
X-+# elif !defined(SUNOS4) || defined(RANDOM)
X++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
X E void FDECL(srandom, (unsigned int));
X # else
X # if !defined(bsdi) && !defined(__FreeBSD__)
X-@@ -521,7 +523,7 @@
X- # endif
X- # endif
X-
X--# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
X-+# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__FreeBSD__)
X- E time_t FDECL(time, (time_t *));
X- # else
X- E long FDECL(time, (time_t *));
Xdiff -urN /usr/ports/games/nethack34/files/patch-ac games/nethack34/files/patch-ac
X--- /usr/ports/games/nethack34/files/patch-ac Fri Jun 6 07:54:25 2003
X+++ games/nethack34/files/patch-ac Mon Sep 1 22:35:38 2003
X@@ -1,11 +1,11 @@
X---- include/unixconf.h.orig Sun Feb 23 23:43:23 2003
X-+++ include/unixconf.h Sun May 25 10:32:27 2003
X+--- include/unixconf.h.orig Mon Sep 1 22:34:19 2003
X++++ include/unixconf.h Mon Sep 1 22:35:16 2003
X @@ -19,13 +19,13 @@
X */
X
X /* define exactly one of the following four choices */
X--/* #define BSD 1 */ /* define for 4.n BSD */
X-+#define BSD 1 /* define for 4.n BSD */
X+-/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
X++#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
X /* also for relatives like SunOS 4.x, DG/UX, and */
X /* older versions of Linux */
X /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
X@@ -34,7 +34,7 @@
X
X /* The Andrew Message System does mail a little differently from normal
X * UNIX. Mail is deposited in the user's own directory in ~/Mailbox
X-@@ -280,7 +280,7 @@
X+@@ -284,7 +284,7 @@
X #endif
X
X #if defined(BSD) || defined(ULTRIX)
Xdiff -urN /usr/ports/games/nethack34/files/patch-ad games/nethack34/files/patch-ad
X--- /usr/ports/games/nethack34/files/patch-ad Fri Jun 6 07:54:26 2003
X+++ games/nethack34/files/patch-ad Mon Sep 1 23:13:58 2003
X@@ -1,6 +1,6 @@
X---- sys/unix/Makefile.src.orig Sun May 25 10:20:20 2003
X-+++ sys/unix/Makefile.src Sun May 25 10:30:45 2003
X-@@ -139,19 +139,28 @@
X+--- sys/unix/Makefile.src.orig Sat Aug 30 09:08:04 2003
X++++ sys/unix/Makefile.src Mon Sep 1 23:12:45 2003
X+@@ -146,19 +146,29 @@
X # directories. The ones given below is the usual spot for linux systems.
X # The paths are for glibconfig.h and gnomesupport.h respectively.
X #
X@@ -9,6 +9,8 @@
X
X # flags for debugging:
X # CFLAGS = -g -I../include
X+
X+-CFLAGS = -O -I../include
X +CFLAGS += -I../include
X +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
X +CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
X@@ -19,21 +21,20 @@
X +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
X +CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
X +endif
X-
X--CFLAGS = -O -I../include
X- LFLAGS =
X++
X+ LFLAGS =
X
X # The Qt and Be window systems are written in C++, while the rest of
X- # NetHack is standard C. If using Qt, uncomment the LD line here to get
X+ # NetHack is standard C. If using Qt, uncomment the LINK line here to get
X # the C++ libraries linked in.
X -CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
X -CXX=g++
X +CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
X +#CXX=g++
X- #LD=g++
X-
X- # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
X-@@ -205,7 +214,26 @@
X+ #LINK=g++
X+ # For cross-compiling, eg. with gcc on Linux (see also CC further up):
X+ #CXX=arm-linux-g++
X+@@ -215,7 +225,26 @@
X #
X #
X WINSRC = $(WINTTYSRC)
X@@ -60,7 +61,7 @@
X
X # on some systems the termcap library is in -ltermcap or -lcurses
X # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
X-@@ -225,19 +253,19 @@
X+@@ -235,19 +264,19 @@
X #
X # libraries for X11
X # If USE_XPM is defined in config.h, you will also need -lXpm here.
X@@ -83,7 +84,7 @@
X #
X # libraries for Gem port
X WINGEMLIB = -le_gem -lgem
X-@@ -246,6 +274,15 @@
X+@@ -256,6 +285,15 @@
X WINBELIB = -lbe
X
X WINLIB = $(WINTTYLIB)
X@@ -99,16 +100,7 @@
X
X # any other strange libraries your system needs (for Sysunix only -- the more
X # specialized targets should already be right)
X-@@ -275,7 +312,7 @@
X- LIBS =
X-
X- # make NetHack
X--GAME = nethack
X-+GAME = %%HACKNAME%%
X- # GAME = nethack.prg
X-
X- # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
X-@@ -451,13 +488,13 @@
X+@@ -461,13 +499,13 @@
X
X # Qt windowport meta-object-compiler output
X qt_kde0.moc: ../include/qt_kde0.h
Xdiff -urN /usr/ports/games/nethack34/files/patch-ae games/nethack34/files/patch-ae
X--- /usr/ports/games/nethack34/files/patch-ae Tue Sep 10 20:11:12 2002
X+++ games/nethack34/files/patch-ae Mon Sep 1 22:39:05 2003
X@@ -1,5 +1,5 @@
X---- sys/unix/Makefile.top.orig Thu Mar 21 08:43:54 2002
X-+++ sys/unix/Makefile.top Tue Aug 13 05:45:03 2002
X+--- sys/unix/Makefile.top.orig Sat Aug 30 09:08:04 2003
X++++ sys/unix/Makefile.top Mon Sep 1 22:38:47 2003
X @@ -14,18 +14,17 @@
X # MAKE = make
X
X@@ -37,8 +37,8 @@
X # per discussion in Install.X11 and Install.Qt
X -VARDATND =
X +# VARDATND =
X- # VARDATND = x11tiles pet_mark.xbm
X- # VARDATND = x11tiles pet_mark.xbm rip.xpm
X+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
X+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
X # for Atari/Gem
X @@ -48,7 +47,7 @@
X # for BeOS
END-of-games_nethack34.diff
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list