ports/52664: Update port: games/nethack34 to 3.4.1
KATO Tsuguru
tkato at prontomail.com
Sun May 25 04:10:24 UTC 2003
>Number: 52664
>Category: ports
>Synopsis: Update port: games/nethack34 to 3.4.1
>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: Sat May 24 21:10:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 3.4.1
Remove file:
files/patch-ah
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/nethack34/Makefile games/nethack34/Makefile
--- /usr/ports/games/nethack34/Makefile Sun May 18 22:34:49 2003
+++ games/nethack34/Makefile Sun May 25 02:38:04 2003
@@ -6,15 +6,14 @@
#
PORTNAME= nethack
-PORTVERSION= 3.4.0
-PORTREVISION= 1
+PORTVERSION= 3.4.1
CATEGORIES?= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= nethack
+MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
-MAINTAINER?= ports at freebsd.org
+MAINTAINER?= ports at FreeBSD.org
COMMENT?= A dungeon explorin', slashin', hackin' game
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -33,8 +32,6 @@
HACKDIR?= lib/${HACKNAME}
HACKDOCSDIR?= share/doc/${HACKNAME}
-.include <bsd.port.pre.mk>
-
.if defined(WITH_GNOME_GRAPHICS)
CATEGORIES= games gnome
PKGNAMESUFFIX= -gnome
@@ -43,9 +40,6 @@
MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GRAPHICS= GNOME_GRAPHICS
.elif defined(WITH_QT_GRAPHICS)
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile (bad C++ code)"
-.endif
PKGNAMESUFFIX= -qt
USE_QT_VER= 3
MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
@@ -100,4 +94,4 @@
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/nethack34/distinfo games/nethack34/distinfo
--- /usr/ports/games/nethack34/distinfo Wed May 15 05:00:21 2002
+++ games/nethack34/distinfo Sun May 25 10:19:50 2003
@@ -1 +1 @@
-MD5 (nethack-340.tgz) = 0093f14fbbe449d5b188bfb6aa4eae4f
+MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e
diff -urN /usr/ports/games/nethack34/files/patch-ac games/nethack34/files/patch-ac
--- /usr/ports/games/nethack34/files/patch-ac Tue Sep 10 20:11:12 2002
+++ games/nethack34/files/patch-ac Sun May 25 10:36:39 2003
@@ -1,5 +1,5 @@
---- include/unixconf.h.orig Thu Mar 21 08:42:56 2002
-+++ include/unixconf.h Sun Jun 16 15:05:24 2002
+--- include/unixconf.h.orig Sun Feb 23 23:43:23 2003
++++ include/unixconf.h Sun May 25 10:32:27 2003
@@ -19,13 +19,13 @@
*/
@@ -34,3 +34,12 @@
/* The Andrew Message System does mail a little differently from normal
* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
+@@ -280,7 +280,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 -urN /usr/ports/games/nethack34/files/patch-ad games/nethack34/files/patch-ad
--- /usr/ports/games/nethack34/files/patch-ad Thu May 8 00:43:54 2003
+++ games/nethack34/files/patch-ad Sun May 25 10:30:59 2003
@@ -1,5 +1,5 @@
---- sys/unix/Makefile.src.orig Thu Mar 21 08:43:54 2002
-+++ sys/unix/Makefile.src Tue Aug 13 05:44:28 2002
+--- sys/unix/Makefile.src.orig Sun May 25 10:20:20 2003
++++ sys/unix/Makefile.src Sun May 25 10:30:45 2003
@@ -139,19 +139,28 @@
# directories. The ones given below is the usual spot for linux systems.
# The paths are for glibconfig.h and gnomesupport.h respectively.
@@ -33,7 +33,7 @@
#LD=g++
# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
-@@ -204,7 +213,26 @@
+@@ -205,7 +214,26 @@
#
#
WINSRC = $(WINTTYSRC)
@@ -60,7 +60,7 @@
# on some systems the termcap library is in -ltermcap or -lcurses
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -224,19 +252,19 @@
+@@ -225,19 +253,19 @@
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
@@ -83,7 +83,7 @@
#
# libraries for Gem port
WINGEMLIB = -le_gem -lgem
-@@ -245,6 +273,15 @@
+@@ -246,6 +274,15 @@
WINBELIB = -lbe
WINLIB = $(WINTTYLIB)
@@ -99,7 +99,7 @@
# any other strange libraries your system needs (for Sysunix only -- the more
# specialized targets should already be right)
-@@ -274,7 +311,7 @@
+@@ -275,7 +312,7 @@
LIBS =
# make NetHack
@@ -108,20 +108,20 @@
# GAME = nethack.prg
# if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
-@@ -450,13 +487,13 @@
+@@ -451,13 +488,13 @@
# Qt windowport meta-object-compiler output
qt_kde0.moc: ../include/qt_kde0.h
-- $(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
-+ ${MOC} ../include/qt_kde0.h > qt_kde0.moc
+- $(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 ../include/qt_win.h > qt_win.moc
-+ ${MOC} ../include/qt_win.h > qt_win.moc
+- $(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 ../include/qttableview.h > qttableview.moc
-+ ${MOC} ../include/qttableview.h > qttableview.moc
+- $(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 -urN /usr/ports/games/nethack34/files/patch-ah games/nethack34/files/patch-ah
--- /usr/ports/games/nethack34/files/patch-ah Tue Feb 11 22:55:38 2003
+++ games/nethack34/files/patch-ah Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- src/topten.c Thu Mar 21 01:43:19 2002
-+++ src/topten.c Tue Feb 11 15:36:23 2003
-@@ -855,8 +855,15 @@
- if (playerct < 1) Strcat(pbuf, "you.");
- else {
- if (playerct > 1) Strcat(pbuf, "any of ");
-- for (i = 0; i < playerct; i++) {
-- Strcat(pbuf, players[i]);
-+ for (i = 0; i < playerct && strlen(pbuf) < sizeof(pbuf) - 2;
-+ i++) {
-+ size_t len = strlen(pbuf), rest;
-+ if (strlen(players[i]) > sizeof(pbuf) - len - 2) {
-+ rest = sizeof(pbuf) - strlen(pbuf) - 2;
-+ memcpy(pbuf + len, players[i], rest);
-+ pbuf[len + rest] = '\0';
-+ } else
-+ Strcat(pbuf, players[i]);
- if (i < playerct-1) {
- if (players[i][0] == '-' &&
- index("pr", players[i][1]) && players[i][2] == 0)
diff -urN /usr/ports/games/nethack34/pkg-plist games/nethack34/pkg-plist
--- /usr/ports/games/nethack34/pkg-plist Tue Sep 10 20:11:13 2002
+++ games/nethack34/pkg-plist Sun May 25 11:57:32 2003
@@ -115,6 +115,7 @@
%%HACKDIR%%/pet_mark.xbm
%%HACKDIR%%/quest.dat
%%HACKDIR%%/rip.xpm
+%%HACKDIR%%/recover
%%HACKDIR%%/rumors
%%HACKDIR%%/sanctum.lev
%%HACKDIR%%/soko1-1.lev
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list