Attachment #31666 for bug #52664

View | Details | Raw Unified | Return to bug 52664
Collapse All | Expand All




#

PORTNAME=	nethack
PORTVERSION=	3.4.1
PORTREVISION=	1
CATEGORIES?=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
EXTRACT_SUFX=	.tgz

MAINTAINER?=	ports@FreeBSD.org
COMMENT?=	A dungeon explorin', slashin', hackin' game

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

HACKDIR?=	lib/${HACKNAME}
HACKDOCSDIR?=	share/doc/${HACKNAME}

.include <bsd.port.pre.mk>

.if defined(WITH_GNOME_GRAPHICS)
CATEGORIES=	games gnome
PKGNAMESUFFIX=	-gnome

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}" \

	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)games/nethack34/distinfo (-1 / +1 lines)
1	MD5 (nethack-340.tgz) = 0093f14fbbe449d5b188bfb6aa4eae4f	1	MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e




--- 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 @@
  */
 

 
 /* 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




--- 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.

 #LD=g++
 
 # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
@@ -205,7 +214,26 @@
 #
 #
 WINSRC = $(WINTTYSRC)

 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -225,19 +253,19 @@
 #
 # libraries for X11
 # If USE_XPM is defined in config.h, you will also need -lXpm here.

 #
 # libraries for Gem port
 WINGEMLIB = -le_gem -lgem
@@ -246,6 +274,15 @@
 WINBELIB = -lbe
 
 WINLIB = $(WINTTYLIB)

 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)
@@ -275,7 +312,7 @@
 LIBS =
 
 # make NetHack

 # GAME     = nethack.prg
 
 # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
@@ -451,13 +488,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 \




--- 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)

Lines 115-120 Link Here

(-)games/nethack34/pkg-plist (+1 lines)
115	%%HACKDIR%%/pet_mark.xbm	115	%%HACKDIR%%/pet_mark.xbm
116	%%HACKDIR%%/quest.dat	116	%%HACKDIR%%/quest.dat
117	%%HACKDIR%%/rip.xpm	117	%%HACKDIR%%/rip.xpm
		118	%%HACKDIR%%/recover
118	%%HACKDIR%%/rumors	119	%%HACKDIR%%/rumors
119	%%HACKDIR%%/sanctum.lev	120	%%HACKDIR%%/sanctum.lev
120	%%HACKDIR%%/soko1-1.lev	121	%%HACKDIR%%/soko1-1.lev

Return to bug 52664

Lines 6-20 Link Here

(-)games/nethack34/Makefile (-10 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= nethack	8	PORTNAME= nethack
9	PORTVERSION= 3.4.0	9	PORTVERSION= 3.4.1
10	PORTREVISION= 1
11	CATEGORIES?= games	10	CATEGORIES?= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= nethack	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}	13	DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
15	EXTRACT_SUFX= .tgz	14	EXTRACT_SUFX= .tgz
16		15
17	MAINTAINER?= ports@freebsd.org	16	MAINTAINER?= ports@FreeBSD.org
18	COMMENT?= A dungeon explorin', slashin', hackin' game	17	COMMENT?= A dungeon explorin', slashin', hackin' game
19		18
20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	19	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
Lines 33-40 Link Here
33	HACKDIR?= lib/${HACKNAME}	32	HACKDIR?= lib/${HACKNAME}
34	HACKDOCSDIR?= share/doc/${HACKNAME}	33	HACKDOCSDIR?= share/doc/${HACKNAME}
35		34
36	.include <bsd.port.pre.mk>
37
38	.if defined(WITH_GNOME_GRAPHICS)	35	.if defined(WITH_GNOME_GRAPHICS)
39	CATEGORIES= games gnome	36	CATEGORIES= games gnome
40	PKGNAMESUFFIX= -gnome	37	PKGNAMESUFFIX= -gnome
Lines 43-51 Link Here
43	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	40	MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
44	GRAPHICS= GNOME_GRAPHICS	41	GRAPHICS= GNOME_GRAPHICS
45	.elif defined(WITH_QT_GRAPHICS)	42	.elif defined(WITH_QT_GRAPHICS)
46	.if ${OSVERSION} >= 500113
47	BROKEN= "Does not compile (bad C++ code)"
48	.endif
49	PKGNAMESUFFIX= -qt	43	PKGNAMESUFFIX= -qt
50	USE_QT_VER= 3	44	USE_QT_VER= 3
51	MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \	45	MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
Lines 100-103 Link Here
100	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}	94	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
101	.endif	95	.endif
102		96
103	.include <bsd.port.post.mk>	97	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)games/nethack34/files/patch-ac (-2 / +11 lines)
1	--- include/unixconf.h.orig Thu Mar 21 08:42:56 2002	1	--- include/unixconf.h.orig Sun Feb 23 23:43:23 2003
2	+++ include/unixconf.h Sun Jun 16 15:05:24 2002	2	+++ include/unixconf.h Sun May 25 10:32:27 2003
3	@@ -19,13 +19,13 @@	3	@@ -19,13 +19,13 @@
4	*/	4	*/
5		5
Lines 34-36 Link Here
34		34
35	/* The Andrew Message System does mail a little differently from normal	35	/* The Andrew Message System does mail a little differently from normal
36	* UNIX. Mail is deposited in the user's own directory in ~/Mailbox	36	* UNIX. Mail is deposited in the user's own directory in ~/Mailbox
		37	@@ -280,7 +280,7 @@
		38	#endif
		39
		40	#if defined(BSD) \|\| defined(ULTRIX)
		41	-# if !defined(DGUX) && !defined(SUNOS4)
		42	+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
		43	#define memcpy(d, s, n) bcopy(s, d, n)
		44	#define memcmp(s1, s2, n) bcmp(s2, s1, n)
		45	# endif

Lines 1-5 Link Here

(-)games/nethack34/files/patch-ad (-13 / +13 lines)
1	--- sys/unix/Makefile.src.orig Thu Mar 21 08:43:54 2002	1	--- sys/unix/Makefile.src.orig Sun May 25 10:20:20 2003
2	+++ sys/unix/Makefile.src Tue Aug 13 05:44:28 2002	2	+++ sys/unix/Makefile.src Sun May 25 10:30:45 2003
3	@@ -139,19 +139,28 @@	3	@@ -139,19 +139,28 @@
4	# directories. The ones given below is the usual spot for linux systems.	4	# directories. The ones given below is the usual spot for linux systems.
5	# The paths are for glibconfig.h and gnomesupport.h respectively.	5	# The paths are for glibconfig.h and gnomesupport.h respectively.
Lines 33-39 Link Here
33	#LD=g++	33	#LD=g++
34		34
35	# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired	35	# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
36	@@ -204,7 +213,26 @@	36	@@ -205,7 +214,26 @@
37	#	37	#
38	#	38	#
39	WINSRC = $(WINTTYSRC)	39	WINSRC = $(WINTTYSRC)
Lines 60-66 Link Here
60		60
61	# on some systems the termcap library is in -ltermcap or -lcurses	61	# on some systems the termcap library is in -ltermcap or -lcurses
62	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead	62	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
63	@@ -224,19 +252,19 @@	63	@@ -225,19 +253,19 @@
64	#	64	#
65	# libraries for X11	65	# libraries for X11
66	# If USE_XPM is defined in config.h, you will also need -lXpm here.	66	# If USE_XPM is defined in config.h, you will also need -lXpm here.
Lines 83-89 Link Here
83	#	83	#
84	# libraries for Gem port	84	# libraries for Gem port
85	WINGEMLIB = -le_gem -lgem	85	WINGEMLIB = -le_gem -lgem
86	@@ -245,6 +273,15 @@	86	@@ -246,6 +274,15 @@
87	WINBELIB = -lbe	87	WINBELIB = -lbe
88		88
89	WINLIB = $(WINTTYLIB)	89	WINLIB = $(WINTTYLIB)
Lines 99-105 Link Here
99		99
100	# any other strange libraries your system needs (for Sysunix only -- the more	100	# any other strange libraries your system needs (for Sysunix only -- the more
101	# specialized targets should already be right)	101	# specialized targets should already be right)
102	@@ -274,7 +311,7 @@	102	@@ -275,7 +312,7 @@
103	LIBS =	103	LIBS =
104		104
105	# make NetHack	105	# make NetHack
Lines 108-127 Link Here
108	# GAME = nethack.prg	108	# GAME = nethack.prg
109		109
110	# if you defined RANDOM in unixconf.h/tosconf.h since your system did not come	110	# if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
111	@@ -450,13 +487,13 @@	111	@@ -451,13 +488,13 @@
112		112
113	# Qt windowport meta-object-compiler output	113	# Qt windowport meta-object-compiler output
114	qt_kde0.moc: ../include/qt_kde0.h	114	qt_kde0.moc: ../include/qt_kde0.h
115	- $(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc	115	- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
116	+ ${MOC} ../include/qt_kde0.h > qt_kde0.moc	116	+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
117		117
118	qt_win.moc: ../include/qt_win.h	118	qt_win.moc: ../include/qt_win.h
119	- $(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc	119	- $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
120	+ ${MOC} ../include/qt_win.h > qt_win.moc	120	+ ${MOC} -o qt_win.moc ../include/qt_win.h
121		121
122	qttableview.moc: ../include/qttableview.h	122	qttableview.moc: ../include/qttableview.h
123	- $(QTDIR)/bin/moc ../include/qttableview.h > qttableview.moc	123	- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
124	+ ${MOC} ../include/qttableview.h > qttableview.moc	124	+ ${MOC} -o qttableview.moc ../include/qttableview.h
125		125
126	$(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \	126	$(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
127	../include/objclass.h ../include/monsym.h \	127	../include/objclass.h ../include/monsym.h \

Lines 1-20 Link Here

(-)games/nethack34/files/patch-ah (-20 lines)
1	--- src/topten.c Thu Mar 21 01:43:19 2002
2	+++ src/topten.c Tue Feb 11 15:36:23 2003
3	@@ -855,8 +855,15 @@
4	if (playerct < 1) Strcat(pbuf, "you.");
5	else {
6	if (playerct > 1) Strcat(pbuf, "any of ");
7	- for (i = 0; i < playerct; i++) {
8	- Strcat(pbuf, players[i]);
9	+ for (i = 0; i < playerct && strlen(pbuf) < sizeof(pbuf) - 2;
10	+ i++) {
11	+ size_t len = strlen(pbuf), rest;
12	+ if (strlen(players[i]) > sizeof(pbuf) - len - 2) {
13	+ rest = sizeof(pbuf) - strlen(pbuf) - 2;
14	+ memcpy(pbuf + len, players[i], rest);
15	+ pbuf[len + rest] = '\0';
16	+ } else
17	+ Strcat(pbuf, players[i]);
18	if (i < playerct-1) {
19	if (players[i][0] == '-' &&
20	index("pr", players[i][1]) && players[i][2] == 0)