Index: head/games/nethack34/Makefile =================================================================== --- head/games/nethack34/Makefile (revision 89654) +++ head/games/nethack34/Makefile (revision 89655) @@ -1,98 +1,84 @@ # New ports collection makefile for: nethack # Date created: 27 March 1995 # Whom: asami # # $FreeBSD$ # PORTNAME= nethack -PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTVERSION= 3.4.2 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} USE_REINPLACE= yes USE_GMAKE= yes MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKDIR="${HACKDIR}" \ HACKDOCSDIR="${HACKDOCSDIR}" MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 # Configure these variables as you want them to be. HACKNAME?= nethack HACKDIR?= lib/${HACKNAME} HACKDOCSDIR?= share/doc/${HACKNAME} -.if defined(WITH_GNOME_GRAPHICS) +.if !defined(PKGNAMESUFFIX) +USE_XPM= yes +GRAPHICS= X11_GRAPHICS +.else +.if ${PKGNAMESUFFIX} == "-gnome" CATEGORIES= games gnome -PKGNAMESUFFIX= -gnome USE_GETOPT_LONG= yes USE_GNOME= gnomelibs MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" GRAPHICS= GNOME_GRAPHICS -.elif defined(WITH_QT_GRAPHICS) -PKGNAMESUFFIX= -qt +.elif ${PKGNAMESUFFIX} == "-nox11" +GRAPHICS= # none +.elif ${PKGNAMESUFFIX} == "-qt" USE_QT_VER= 3 MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \ QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \ MOC="${MOC}" LIBQT="-lqt-mt" GRAPHICS= QT_GRAPHICS -.elif defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11) -PKGNAMESUFFIX= -nox11 -.else -USE_XPM= yes -GRAPHICS= X11_GRAPHICS .endif +.endif pre-everything:: -.if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \ - || defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11) @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel " @${ECHO_MSG} " But ${PKGBASE} read your prior nethack scores " @${ECHO_MSG} " Don't forget to backup your nethack libdir if it's " @${ECHO_MSG} " important for you " @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" -.else - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO_MSG} " You may use the following build options: " - @${ECHO_MSG} " WITH_GNOME_GRAPHICS=yes build with GNOME GUI " - @${ECHO_MSG} " WITH_QT_GRAPHICS=yes build with Qt GUI " - @${ECHO_MSG} " WITH_TTY_GRAPHICS=yes build with no GUI " - @${ECHO_MSG} " WITHOUT_X11=yes same as above " - @${ECHO_MSG} " " - @${ECHO_MSG} " By default, nethack port is built with X11 GUI. " - @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" -.endif 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} .endfor ${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/src/sounds.c ${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/win/Qt/qt_win.cpp .if defined(WITHOUT_SHELL) @${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h .endif pre-configure: @cd ${WRKSRC}/sys/unix; ${SH} setup.sh post-install: @cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${HACKDOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR} .endif .include Property changes on: head/games/nethack34/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/games/nethack34/distinfo =================================================================== --- head/games/nethack34/distinfo (revision 89654) +++ head/games/nethack34/distinfo (revision 89655) @@ -1 +1 @@ -MD5 (nethack-341.tgz) = aefcbeb20210b2d64511c84bd03c3e4e +MD5 (nethack-342.tgz) = 90e971dbaee2f05f6a2ed3454851903a Property changes on: head/games/nethack34/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/games/nethack34/files/patch-ab =================================================================== --- head/games/nethack34/files/patch-ab (revision 89654) +++ head/games/nethack34/files/patch-ab (revision 89655) @@ -1,22 +1,13 @@ ---- include/system.h.orig Thu Mar 21 08:42:55 2002 -+++ include/system.h Sun Jun 16 15:49:55 2002 +--- 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(RANDOM) +-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) +# if defined(__FreeBSD__) +E void FDECL(srandom, (unsigned long)); -+# elif !defined(SUNOS4) || defined(RANDOM) ++# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) E void FDECL(srandom, (unsigned int)); # else # if !defined(bsdi) && !defined(__FreeBSD__) -@@ -521,7 +523,7 @@ - # endif - # endif - --# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) -+# if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__FreeBSD__) - E time_t FDECL(time, (time_t *)); - # else - E long FDECL(time, (time_t *)); Property changes on: head/games/nethack34/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/games/nethack34/files/patch-ac =================================================================== --- head/games/nethack34/files/patch-ac (revision 89654) +++ head/games/nethack34/files/patch-ac (revision 89655) @@ -1,45 +1,45 @@ ---- include/unixconf.h.orig Sun Feb 23 23:43:23 2003 -+++ include/unixconf.h Sun May 25 10:32:27 2003 +--- 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 BSD */ -+#define BSD 1 /* define for 4.n BSD */ +-/* #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 -@@ -280,7 +280,7 @@ +@@ -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 Property changes on: head/games/nethack34/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/games/nethack34/files/patch-ad =================================================================== --- head/games/nethack34/files/patch-ad (revision 89654) +++ head/games/nethack34/files/patch-ad (revision 89655) @@ -1,127 +1,119 @@ ---- 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 @@ +--- sys/unix/Makefile.src.orig Sat Aug 30 09:08:04 2003 ++++ sys/unix/Makefile.src Mon Sep 1 23:12:45 2003 +@@ -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${X11BASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS} +endif ++ + LFLAGS = --CFLAGS = -O -I../include - LFLAGS = - # The Qt and Be window systems are written in C++, while the rest of - # NetHack is standard C. If using Qt, uncomment the LD line here to get + # 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++ - #LD=g++ - - # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired -@@ -205,7 +214,26 @@ + #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 -@@ -225,19 +253,19 @@ +@@ -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${X11BASE}/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} -lgnuregex # # 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 -@@ -246,6 +274,15 @@ +@@ -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) -@@ -275,7 +312,7 @@ - LIBS = - - # make NetHack --GAME = nethack -+GAME = %%HACKNAME%% - # GAME = nethack.prg - - # if you defined RANDOM in unixconf.h/tosconf.h since your system did not come -@@ -451,13 +488,13 @@ +@@ -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 \ Property changes on: head/games/nethack34/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/games/nethack34/files/patch-ae =================================================================== --- head/games/nethack34/files/patch-ae (revision 89654) +++ head/games/nethack34/files/patch-ae (revision 89655) @@ -1,51 +1,51 @@ ---- sys/unix/Makefile.top.orig Thu Mar 21 08:43:54 2002 -+++ sys/unix/Makefile.top Tue Aug 13 05:45:03 2002 +--- 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 pet_mark.xbm - # VARDATND = x11tiles pet_mark.xbm rip.xpm + # 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) Property changes on: head/games/nethack34/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/games/nethack34-gnome/Makefile =================================================================== --- head/games/nethack34-gnome/Makefile (revision 89654) +++ head/games/nethack34-gnome/Makefile (revision 89655) @@ -1,14 +1,14 @@ # New ports collection makefile for: nethack # Date created: 09 December 2000 # Whom: Jan Stocker # # $FreeBSD$ # MASTERDIR= ${.CURDIR}/../nethack34 MAINTAINER= Jan.Stocker@t-online.de -WITH_GNOME_GRAPHICS= yes +PKGNAMESUFFIX= -gnome .include "${MASTERDIR}/Makefile" Property changes on: head/games/nethack34-gnome/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/games/nethack34-nox11/Makefile =================================================================== --- head/games/nethack34-nox11/Makefile (revision 89654) +++ head/games/nethack34-nox11/Makefile (revision 89655) @@ -1,14 +1,14 @@ # New ports collection makefile for: nethack # Date created: 23 September 2000 # Whom: Jeremy Chadwick # # $FreeBSD$ # MASTERDIR= ${.CURDIR}/../nethack34 MAINTAINER= yoshi@parodius.com -WITH_TTY_GRAPHICS= yes +PKGNAMESUFFIX= -nox11 .include "${MASTERDIR}/Makefile" Property changes on: head/games/nethack34-nox11/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.30 \ No newline at end of property +1.31 \ No newline at end of property Index: head/games/nethack34-qt/Makefile =================================================================== --- head/games/nethack34-qt/Makefile (revision 89654) +++ head/games/nethack34-qt/Makefile (revision 89655) @@ -1,14 +1,14 @@ # New ports collection makefile for: nethack-qt # Date created: So 6 Apr 1997 04:25:57 MET DST # Whom: Andreas Klemm # # $FreeBSD$ # MASTERDIR= ${.CURDIR}/../nethack34 -MAINTAINER= kde@freebsd.org +MAINTAINER= kde@FreeBSD.org -WITH_QT_GRAPHICS= yes +PKGNAMESUFFIX= -qt .include "${MASTERDIR}/Makefile" Property changes on: head/games/nethack34-qt/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property