diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-05-14 20:00:25 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-05-14 20:00:25 +0000 |
| commit | cbc10a11c137d58b1b8e169bef88084fcd4a67b4 (patch) | |
| tree | db55c075dd286ff148e5d01e1607560b85391c05 /games | |
| parent | Rename nethack ports and put version numbers in the port names. (diff) | |
Update to nethack 3.4.0 after repocopying from nethack33{,-*}.
Unify the variant ports and make them slave ports of the master port,
nethack34.
Unbreak nethack34-gnome.
PR: ports/36576, ports/36880
Submitted by: KATO Tsuguru <tkato@prontomail.com>,
Jan Stocker <Jan.Stocker@t-online.de> (MAINTAINER of -gnome)
Notes
Notes:
svn path=/head/; revision=59098
Diffstat (limited to 'games')
41 files changed, 373 insertions, 1507 deletions
diff --git a/games/nethack34-gnome/Makefile b/games/nethack34-gnome/Makefile index 731783f915f2..0ac31a0a5a3a 100644 --- a/games/nethack34-gnome/Makefile +++ b/games/nethack34-gnome/Makefile @@ -5,32 +5,10 @@ # $FreeBSD$ # -PORTNAME= nethack -PORTVERSION= 3.3.1 -CATEGORIES= games gnome -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ -MASTER_SITE_SUBDIR= ${PORTNAME} -PKGNAMESUFFIX= -gnome -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} -EXTRACT_SUFX= .tgz +MASTERDIR= ${.CURDIR}/../nethack34 MAINTAINER= Jan.Stocker@t-online.de -USE_GNOME= yes -USE_GMAKE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WITH_GNOME_GRAPHICS= yes -MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 - -pre-configure: - @cd ${WRKSRC}/sys/unix; ${SH} setup.sh - -post-install: - @cd ${WRKSRC}/doc; ${CHMOD} 644 *.6 - @cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/nethack - ${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack -.endif - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/games/nethack34-gnome/distinfo b/games/nethack34-gnome/distinfo deleted file mode 100644 index 24595f9d9a12..000000000000 --- a/games/nethack34-gnome/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 diff --git a/games/nethack34-gnome/files/patch-include::config.h b/games/nethack34-gnome/files/patch-include::config.h deleted file mode 100644 index bf63b68aaa57..000000000000 --- a/games/nethack34-gnome/files/patch-include::config.h +++ /dev/null @@ -1,61 +0,0 @@ -*** include/config.h.orig Sat Jul 22 03:13:51 2000 ---- include/config.h Sat Dec 9 13:31:34 2000 -*************** -*** 45,51 **** - #define TTY_GRAPHICS /* good old tty based graphics */ - /* #define X11_GRAPHICS */ /* X11 interface */ - /* #define QT_GRAPHICS */ /* Qt interface */ -! /* #define GNOME_GRAPHICS */ /* Gnome interface */ - - /* - * Define the default window system. This should be one that is compiled ---- 45,51 ---- - #define TTY_GRAPHICS /* good old tty based graphics */ - /* #define X11_GRAPHICS */ /* X11 interface */ - /* #define QT_GRAPHICS */ /* Qt interface */ -! #define GNOME_GRAPHICS /* Gnome interface */ - - /* - * Define the default window system. This should be one that is compiled -*************** -*** 151,161 **** - - #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 */ - #endif - - #ifndef COMPRESS ---- 151,161 ---- - - #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/bin/gzip" /* FSF gzip compression */ -! #define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ - #endif - - #ifndef COMPRESS -*************** -*** 186,192 **** - * otherwise it will be the current directory. - */ - # ifndef HACKDIR -! # define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ - # endif - - /* ---- 186,192 ---- - * otherwise it will be the current directory. - */ - # ifndef HACKDIR -! # define HACKDIR "/usr/local/share/nethack" /* nethack directory */ - # endif - - /* diff --git a/games/nethack34-gnome/files/patch-include::system.h b/games/nethack34-gnome/files/patch-include::system.h deleted file mode 100644 index fa0a14fb6988..000000000000 --- a/games/nethack34-gnome/files/patch-include::system.h +++ /dev/null @@ -1,19 +0,0 @@ -*** include/system.h.orig Thu Jan 6 11:20:08 2000 ---- include/system.h Sat Sep 23 01:08:09 2000 -*************** -*** 516,522 **** - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) - E time_t FDECL(time, (time_t *)); - # else -! E long FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS ---- 516,522 ---- - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) - E time_t FDECL(time, (time_t *)); - # else -! E time_t FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS diff --git a/games/nethack34-gnome/files/patch-include::unixconf.h b/games/nethack34-gnome/files/patch-include::unixconf.h deleted file mode 100644 index 8268fa5fd83f..000000000000 --- a/games/nethack34-gnome/files/patch-include::unixconf.h +++ /dev/null @@ -1,36 +0,0 @@ -*** include/unixconf.h.orig Sun Jul 16 18:03:51 2000 ---- include/unixconf.h Sat Sep 23 01:09:25 2000 -*************** -*** 47,53 **** - * 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 ---- 47,53 ---- - * 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 -*************** -*** 143,149 **** - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ - -! #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 ---- 143,149 ---- - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ - -! /* #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 diff --git a/games/nethack34-gnome/files/patch-sys::unix::Makefile.doc b/games/nethack34-gnome/files/patch-sys::unix::Makefile.doc deleted file mode 100644 index 89653b31a76f..000000000000 --- a/games/nethack34-gnome/files/patch-sys::unix::Makefile.doc +++ /dev/null @@ -1,44 +0,0 @@ -*** sys/unix/Makefile.doc.orig Fri Jan 14 12:49:48 2000 ---- sys/unix/Makefile.doc Sat Sep 23 01:16:22 2000 -*************** -*** 34,40 **** - - - GAME = nethack -! MANDIR = /usr/man/man6 - MANEXT = 6 - - # manual installation for most BSD-style systems ---- 34,40 ---- - - - GAME = nethack -! MANDIR = ${PREFIX}/man/man - MANEXT = 6 - - # manual installation for most BSD-style systems -*************** -*** 51,61 **** - # 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) - - # manual creation for distribution - DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt ---- 51,61 ---- - # DLBMANCREATE = nroff -man dlb.6 > - - manpages: -! -$(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 --git a/games/nethack34-gnome/files/patch-sys::unix::Makefile.src b/games/nethack34-gnome/files/patch-sys::unix::Makefile.src deleted file mode 100644 index 8e54460116a0..000000000000 --- a/games/nethack34-gnome/files/patch-sys::unix::Makefile.src +++ /dev/null @@ -1,72 +0,0 @@ -*** sys/unix/Makefile.src.orig Sat Aug 5 12:52:57 2000 ---- sys/unix/Makefile.src Sat Dec 9 13:09:44 2000 -*************** -*** 139,145 **** - # 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 - - # flags for debugging: - # CFLAGS = -g -I../include ---- 139,145 ---- - # 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/X11R6/include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I/usr/local/include/kpathsea -I../win/gnome - - # flags for debugging: - # CFLAGS = -g -I../include -*************** -*** 203,210 **** - - # - # -! WINSRC = $(WINTTYSRC) -! WINOBJ = $(WINTTYOBJ) - - # on some systems the termcap library is in -ltermcap or -lcurses - # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead ---- 203,210 ---- - - # - # -! WINSRC = $(WINTTYSRC) $(WINGNOMESRC) -! WINOBJ = $(WINTTYOBJ) $(WINGNOMEOBJ) - - # on some systems the termcap library is in -ltermcap or -lcurses - # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -*************** -*** 236,242 **** - WINKDELIB = -lkdecore -lkdeui -lXext - # - # libraries for Gnome -! WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt - # - # libraries for Gem port - WINGEMLIB = -le_gem -lgem ---- 236,242 ---- - WINKDELIB = -lkdecore -lkdeui -lXext - # - # libraries for Gnome -! WINGNOMELIB = -L/usr/local/lib -L/usr/X11R6/lib -lgnomeui -lgnome -lart_lgpl -lgtk12 -lgdk12 -lglib12 -lpopt -lkpathsea - # - # libraries for Gem port - WINGEMLIB = -le_gem -lgem -*************** -*** 244,250 **** - # libraries for BeOS - WINBELIB = -lbe - -! WINLIB = $(WINTTYLIB) - - # any other strange libraries your system needs (for Sysunix only -- the more - # specialized targets should already be right) ---- 244,250 ---- - # libraries for BeOS - WINBELIB = -lbe - -! WINLIB = $(WINTTYLIB) $(WINGNOMELIB) - - # any other strange libraries your system needs (for Sysunix only -- the more - # specialized targets should already be right) diff --git a/games/nethack34-gnome/files/patch-sys::unix::Makefile.top b/games/nethack34-gnome/files/patch-sys::unix::Makefile.top deleted file mode 100644 index 573201864474..000000000000 --- a/games/nethack34-gnome/files/patch-sys::unix::Makefile.top +++ /dev/null @@ -1,125 +0,0 @@ -*** sys/unix/Makefile.top.orig Tue Jul 4 02:42:05 2000 ---- sys/unix/Makefile.top Wed Dec 26 13:46:52 2001 -*************** -*** 14,31 **** - # MAKE = make - - # make NetHack -- PREFIX = /usr - GAME = nethack - # GAME = nethack.prg - GAMEUID = games -! GAMEGRP = bin - - # Permissions - some places use setgid instead of setuid, for instance - # See also the option "SECURE" in include/config.h -! GAMEPERM = 04755 -! FILEPERM = 0644 -! EXEPERM = 0755 -! DIRPERM = 0755 - - # GAMEDIR also appears in config.h as "HACKDIR". - # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR ---- 14,30 ---- - # MAKE = make - - # make NetHack - GAME = nethack - # GAME = nethack.prg - GAMEUID = games -! GAMEGRP = games - - # Permissions - some places use setgid instead of setuid, for instance - # See also the option "SECURE" in include/config.h -! GAMEPERM = 0755 -! FILEPERM = 0664 -! EXEPERM = 02755 -! DIRPERM = 0775 - - # GAMEDIR also appears in config.h as "HACKDIR". - # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR -*************** -*** 35,43 **** - # 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 - VARDIR = $(GAMEDIR) -! SHELLDIR = $(PREFIX)/games - - # per discussion in Install.X11 and Install.Qt - VARDATND = ---- 34,42 ---- - # 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)/share/$(GAME) - VARDIR = $(GAMEDIR) -! SHELLDIR = $(PREFIX)/bin - - # per discussion in Install.X11 and Install.Qt - VARDATND = -*************** -*** 48,54 **** - # for BeOS - # VARDATND = beostiles - # for Gnome -! # VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm - - VARDATD = data oracles options quest.dat rumors - VARDAT = $(VARDATD) $(VARDATND) ---- 47,53 ---- - # for BeOS - # VARDATND = beostiles - # for Gnome -! VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm - - VARDATD = data oracles options quest.dat rumors - VARDAT = $(VARDATD) $(VARDATND) -*************** -*** 170,182 **** - sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ - -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ - < sys/unix/nethack.sh \ -! > $(SHELLDIR)/$(GAME) - # set up their permissions - -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \ - $(CHGRP) $(GAMEGRP) $(GAME) ) - chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) - -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) - $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) - chmod $(EXEPERM) $(SHELLDIR)/$(GAME) - - dofiles-dlb: check-dlb ---- 169,189 ---- - sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ - -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ - < sys/unix/nethack.sh \ -! > $(GAMEDIR)/$(GAME)-start.sh -! @echo "#include <unistd.h>" > nethack-wrapper.c -! @echo "int main(int argc, char *argv[]) {" >> nethack-wrapper.c -! @echo " execv(\"$(GAMEDIR)/$(GAME)-start.sh\", argv);}" >> nethack-wrapper.c -! $(CC) $(CFLAGS) -o nethack-wrapper nethack-wrapper.c -! cp nethack-wrapper $(SHELLDIR)/$(GAME) - # set up their permissions - -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) ; \ - $(CHGRP) $(GAMEGRP) $(GAME) ) - chmod $(GAMEPERM) $(GAMEDIR)/$(GAME) - -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME) - $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME) -+ chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)-start.sh -+ -$(CHOWN) $(GAMEUID) $(GAMEDIR)/$(GAME)-start.sh -+ $(CHGRP) $(GAMEGRP) $(GAMEDIR)/$(GAME)-start.sh - chmod $(EXEPERM) $(SHELLDIR)/$(GAME) - - dofiles-dlb: check-dlb -*************** -*** 236,241 **** ---- 243,249 ---- - clean: - ( cd src ; $(MAKE) clean ) - ( cd util ; $(MAKE) clean ) -+ rm -f nethack-wrapper.c nethack-wrapper - - # 'make spotless' returns the source tree to near-distribution condition. - # it removes .o files, executables, and compiled data files diff --git a/games/nethack34-gnome/pkg-comment b/games/nethack34-gnome/pkg-comment deleted file mode 100644 index 70ca7a893988..000000000000 --- a/games/nethack34-gnome/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A dungeon explorin', slashin', hackin' game diff --git a/games/nethack34-gnome/pkg-descr b/games/nethack34-gnome/pkg-descr deleted file mode 100644 index 77686840b6a4..000000000000 --- a/games/nethack34-gnome/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is version 3.3.1 of nethack, a clasic ASCII-based adventure game -with graphics support for Gnome. -You and your faithful pet are on a quest to retrieve the lost Amulet -of Yendor. - -WWW: http://www.nethack.org/ - -Jan.Stocker@t-online.de diff --git a/games/nethack34-gnome/pkg-plist b/games/nethack34-gnome/pkg-plist deleted file mode 100644 index 5d57f2a6dcc1..000000000000 --- a/games/nethack34-gnome/pkg-plist +++ /dev/null @@ -1,143 +0,0 @@ -bin/nethack -@exec chmod 2755 %D/bin/nethack -@exec chown games:games %D/bin/nethack -share/nethack/nethack -share/nethack/nethack-start.sh -@exec mkdir %D/share/nethack/save -@exec mkdir %D/share/nethack/save -@exec chmod -R 775 %D/share/nethack -@exec chmod 755 %D/share/nethack/nethack -@exec chmod 755 %D/share/nethack/nethack-start.sh -@exec chown games:games %D/share/nethack/save -@unexec rm -rf %D/share/nethack/save -share/doc/nethack/Guidebook.txt -share/nethack/Arc-fila.lev -share/nethack/Arc-filb.lev -share/nethack/Arc-goal.lev -share/nethack/Arc-loca.lev -share/nethack/Arc-strt.lev -share/nethack/Bar-fila.lev -share/nethack/Bar-filb.lev -share/nethack/Bar-goal.lev -share/nethack/Bar-loca.lev -share/nethack/Bar-strt.lev -share/nethack/Cav-fila.lev -share/nethack/Cav-filb.lev -share/nethack/Cav-goal.lev -share/nethack/Cav-loca.lev -share/nethack/Cav-strt.lev -share/nethack/Hea-fila.lev -share/nethack/Hea-filb.lev -share/nethack/Hea-goal.lev -share/nethack/Hea-loca.lev -share/nethack/Hea-strt.lev -share/nethack/Kni-fila.lev -share/nethack/Kni-filb.lev -share/nethack/Kni-goal.lev -share/nethack/Kni-loca.lev -share/nethack/Kni-strt.lev -share/nethack/Mon-fila.lev -share/nethack/Mon-filb.lev -share/nethack/Mon-goal.lev -share/nethack/Mon-loca.lev -share/nethack/Mon-strt.lev -share/nethack/Pri-fila.lev -share/nethack/Pri-filb.lev -share/nethack/Pri-goal.lev -share/nethack/Pri-loca.lev -share/nethack/Pri-strt.lev -share/nethack/Ran-fila.lev -share/nethack/Ran-filb.lev -share/nethack/Ran-goal.lev -share/nethack/Ran-loca.lev -share/nethack/Ran-strt.lev -share/nethack/Rog-fila.lev -share/nethack/Rog-filb.lev -share/nethack/Rog-goal.lev -share/nethack/Rog-loca.lev -share/nethack/Rog-strt.lev -share/nethack/Sam-fila.lev -share/nethack/Sam-filb.lev -share/nethack/Sam-goal.lev -share/nethack/Sam-loca.lev -share/nethack/Sam-strt.lev -share/nethack/Tou-fila.lev -share/nethack/Tou-filb.lev -share/nethack/Tou-goal.lev -share/nethack/Tou-loca.lev -share/nethack/Tou-strt.lev -share/nethack/Val-fila.lev -share/nethack/Val-filb.lev -share/nethack/Val-goal.lev -share/nethack/Val-loca.lev -share/nethack/Val-strt.lev -share/nethack/Wiz-fila.lev -share/nethack/Wiz-filb.lev -share/nethack/Wiz-goal.lev -share/nethack/Wiz-loca.lev -share/nethack/Wiz-strt.lev -share/nethack/air.lev -share/nethack/asmodeus.lev -share/nethack/astral.lev -share/nethack/baalz.lev -share/nethack/bigrm-1.lev -share/nethack/bigrm-2.lev -share/nethack/bigrm-3.lev -share/nethack/bigrm-4.lev -share/nethack/bigrm-5.lev -share/nethack/castle.lev -share/nethack/cmdhelp -share/nethack/data -share/nethack/dungeon -share/nethack/earth.lev -share/nethack/fakewiz1.lev -share/nethack/fakewiz2.lev -share/nethack/fire.lev -share/nethack/help -share/nethack/hh -share/nethack/history -share/nethack/juiblex.lev -share/nethack/knox.lev -share/nethack/license -share/nethack/mapbg.xpm -share/nethack/medusa-1.lev -share/nethack/medusa-2.lev -share/nethack/minefill.lev -share/nethack/minend-1.lev -share/nethack/minend-2.lev -share/nethack/minetn-1.lev -share/nethack/minetn-2.lev -share/nethack/opthelp -share/nethack/options -share/nethack/oracle.lev -share/nethack/oracles -share/nethack/orcus.lev -share/nethack/pet_mark.xbm -share/nethack/quest.dat -share/nethack/rumors -share/nethack/sanctum.lev -share/nethack/soko1-1.lev -share/nethack/soko1-2.lev -share/nethack/soko2-1.lev -share/nethack/soko2-2.lev -share/nethack/soko3-1.lev -share/nethack/soko3-2.lev -share/nethack/soko4-1.lev -share/nethack/soko4-2.lev -share/nethack/tower1.lev -share/nethack/tower2.lev -share/nethack/tower3.lev -share/nethack/valley.lev -share/nethack/water.lev -share/nethack/wizard1.lev -share/nethack/wizard2.lev -share/nethack/wizard3.lev -share/nethack/wizhelp -share/nethack/rip.xpm -share/nethack/x11tiles -@mode 664 -share/nethack/logfile -share/nethack/record -share/nethack/perm -@dirrm share/nethack -@dirrm share/doc/nethack diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile index 3d09d946452c..65974a011a4f 100644 --- a/games/nethack34-nox11/Makefile +++ b/games/nethack34-nox11/Makefile @@ -5,29 +5,10 @@ # $FreeBSD$ # -PORTNAME= nethack -PKGNAMESUFFIX= -tty -PORTVERSION= 3.3.1 -CATEGORIES= games -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ -MASTER_SITE_SUBDIR= nethack -DISTFILES= ${PORTNAME}-331.${EXTRACT_SUFIX} +MASTERDIR= ${.CURDIR}/../nethack34 MAINTAINER= yoshi@parodius.com -EXTRACT_SUFIX= tgz -USE_GMAKE= yes -MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 +WITH_TTY_GRAPHICS= yes -pre-configure: - @cd ${WRKSRC}/sys/unix; ${SH} setup.sh - -post-install: - @cd ${WRKSRC}/doc; ${CHMOD} 644 *.6 - @cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/nethack - ${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack -.endif - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/games/nethack34-nox11/distinfo b/games/nethack34-nox11/distinfo deleted file mode 100644 index 24595f9d9a12..000000000000 --- a/games/nethack34-nox11/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 diff --git a/games/nethack34-nox11/files/patch-aa b/games/nethack34-nox11/files/patch-aa deleted file mode 100644 index f57ae58fdb6a..000000000000 --- a/games/nethack34-nox11/files/patch-aa +++ /dev/null @@ -1,44 +0,0 @@ -*** include/config.h.orig Fri Jul 21 18:13:51 2000 ---- include/config.h Sat Sep 23 01:03:48 2000 -*************** -*** 151,161 **** - - #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 */ - #endif - - #ifndef COMPRESS ---- 151,161 ---- - - #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/bin/gzip" /* FSF gzip compression */ -! #define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ - #endif - - #ifndef COMPRESS -*************** -*** 186,192 **** - * otherwise it will be the current directory. - */ - # ifndef HACKDIR -! # define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ - # endif - - /* ---- 186,192 ---- - * otherwise it will be the current directory. - */ - # ifndef HACKDIR -! # define HACKDIR "/usr/local/share/nethack" /* nethack directory */ - # endif - - /* diff --git a/games/nethack34-nox11/files/patch-ab b/games/nethack34-nox11/files/patch-ab deleted file mode 100644 index fa0a14fb6988..000000000000 --- a/games/nethack34-nox11/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -*** include/system.h.orig Thu Jan 6 11:20:08 2000 ---- include/system.h Sat Sep 23 01:08:09 2000 -*************** -*** 516,522 **** - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) - E time_t FDECL(time, (time_t *)); - # else -! E long FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS ---- 516,522 ---- - # if defined(ULTRIX) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) - E time_t FDECL(time, (time_t *)); - # else -! E time_t FDECL(time, (time_t *)); - # endif /* ULTRIX */ - - #ifdef VMS diff --git a/games/nethack34-nox11/files/patch-ac b/games/nethack34-nox11/files/patch-ac deleted file mode 100644 index 8268fa5fd83f..000000000000 --- a/games/nethack34-nox11/files/patch-ac +++ /dev/null @@ -1,36 +0,0 @@ -*** include/unixconf.h.orig Sun Jul 16 18:03:51 2000 ---- include/unixconf.h Sat Sep 23 01:09:25 2000 -*************** -*** 47,53 **** - * 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 ---- 47,53 ---- - * 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 -*************** -*** 143,149 **** - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ - -! #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 ---- 143,149 ---- - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ - -! /* #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 diff --git a/games/nethack34-nox11/files/patch-ad b/games/nethack34-nox11/files/patch-ad deleted file mode 100644 index 3eb00f18986c..000000000000 --- a/games/nethack34-nox11/files/patch-ad +++ /dev/null @@ -1,61 +0,0 @@ -*** sys/unix/Makefile.top.orig Mon Jul 3 17:42:05 2000 ---- sys/unix/Makefile.top Sat Sep 23 01:14:48 2000 -*************** -*** 14,31 **** - # MAKE = make - - # make NetHack -- PREFIX = /usr - GAME = nethack - # GAME = nethack.prg - GAMEUID = games -! GAMEGRP = bin - - # Permissions - some places use setgid instead of setuid, for instance - # See also the option "SECURE" in include/config.h -! GAMEPERM = 04755 -! FILEPERM = 0644 - EXEPERM = 0755 -! DIRPERM = 0755 - - # GAMEDIR also appears in config.h as "HACKDIR". - # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR ---- 14,30 ---- - # MAKE = make - - # make NetHack - GAME = nethack - # GAME = nethack.prg - GAMEUID = games -! GAMEGRP = games - - # Permissions - some places use setgid instead of setuid, for instance - # See also the option "SECURE" in include/config.h -! GAMEPERM = 02755 -! FILEPERM = 0664 - EXEPERM = 0755 -! DIRPERM = 0775 - - # GAMEDIR also appears in config.h as "HACKDIR". - # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR -*************** -*** 35,43 **** - # 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 - VARDIR = $(GAMEDIR) -! SHELLDIR = $(PREFIX)/games - - # per discussion in Install.X11 and Install.Qt - VARDATND = ---- 34,42 ---- - # 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)/share/$(GAME) - VARDIR = $(GAMEDIR) -! SHELLDIR = $(PREFIX)/bin - - # per discussion in Install.X11 and Install.Qt - VARDATND = diff --git a/games/nethack34-nox11/files/patch-ae b/games/nethack34-nox11/files/patch-ae deleted file mode 100644 index 89653b31a76f..000000000000 --- a/games/nethack34-nox11/files/patch-ae +++ /dev/null @@ -1,44 +0,0 @@ -*** sys/unix/Makefile.doc.orig Fri Jan 14 12:49:48 2000 ---- sys/unix/Makefile.doc Sat Sep 23 01:16:22 2000 -*************** -*** 34,40 **** - - - GAME = nethack -! MANDIR = /usr/man/man6 - MANEXT = 6 - - # manual installation for most BSD-style systems ---- 34,40 ---- - - - GAME = nethack -! MANDIR = ${PREFIX}/man/man - MANEXT = 6 - - # manual installation for most BSD-style systems -*************** -*** 51,61 **** - # 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) - - # manual creation for distribution - DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt ---- 51,61 ---- - # DLBMANCREATE = nroff -man dlb.6 > - - manpages: -! -$(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 --git a/games/nethack34-nox11/pkg-comment b/games/nethack34-nox11/pkg-comment deleted file mode 100644 index 70ca7a893988..000000000000 --- a/games/nethack34-nox11/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A dungeon explorin', slashin', hackin' game diff --git a/games/nethack34-nox11/pkg-descr b/games/nethack34-nox11/pkg-descr deleted file mode 100644 index 4a45d7df171a..000000000000 --- a/games/nethack34-nox11/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This is version 3.3.1 of nethack, a clasic ASCII-based adventure game. -You and your faithful pet are on a quest to retrieve the lost Amulet -of Yendor. - -WWW: http://www.nethack.org/ - -yoshi@parodius.com diff --git a/games/nethack34-nox11/pkg-plist b/games/nethack34-nox11/pkg-plist deleted file mode 100644 index f5efba70be15..000000000000 --- a/games/nethack34-nox11/pkg-plist +++ /dev/null @@ -1,134 +0,0 @@ -bin/nethack -share/nethack/nethack -@exec mkdir %D/share/nethack/save -@exec chmod -R 775 %D/share/nethack -@exec chmod 2755 %D/share/nethack/nethack -@exec chown games:games %D/share/nethack/save -@unexec rm -rf %D/share/nethack/save -share/doc/nethack/Guidebook.txt -share/nethack/Arc-fila.lev -share/nethack/Arc-filb.lev -share/nethack/Arc-goal.lev -share/nethack/Arc-loca.lev -share/nethack/Arc-strt.lev -share/nethack/Bar-fila.lev -share/nethack/Bar-filb.lev -share/nethack/Bar-goal.lev -share/nethack/Bar-loca.lev -share/nethack/Bar-strt.lev -share/nethack/Cav-fila.lev -share/nethack/Cav-filb.lev -share/nethack/Cav-goal.lev -share/nethack/Cav-loca.lev -share/nethack/Cav-strt.lev -share/nethack/Hea-fila.lev -share/nethack/Hea-filb.lev -share/nethack/Hea-goal.lev -share/nethack/Hea-loca.lev -share/nethack/Hea-strt.lev -share/nethack/Kni-fila.lev -share/nethack/Kni-filb.lev -share/nethack/Kni-goal.lev -share/nethack/Kni-loca.lev -share/nethack/Kni-strt.lev -share/nethack/Mon-fila.lev -share/nethack/Mon-filb.lev -share/nethack/Mon-goal.lev -share/nethack/Mon-loca.lev -share/nethack/Mon-strt.lev -share/nethack/Pri-fila.lev -share/nethack/Pri-filb.lev -share/nethack/Pri-goal.lev -share/nethack/Pri-loca.lev -share/nethack/Pri-strt.lev -share/nethack/Ran-fila.lev -share/nethack/Ran-filb.lev -share/nethack/Ran-goal.lev -share/nethack/Ran-loca.lev -share/nethack/Ran-strt.lev -share/nethack/Rog-fila.lev -share/nethack/Rog-filb.lev -share/nethack/Rog-goal.lev -share/nethack/Rog-loca.lev -share/nethack/Rog-strt.lev -share/nethack/Sam-fila.lev -share/nethack/Sam-filb.lev -share/nethack/Sam-goal.lev -share/nethack/Sam-loca.lev -share/nethack/Sam-strt.lev -share/nethack/Tou-fila.lev -share/nethack/Tou-filb.lev -share/nethack/Tou-goal.lev -share/nethack/Tou-loca.lev -share/nethack/Tou-strt.lev -share/nethack/Val-fila.lev -share/nethack/Val-filb.lev -share/nethack/Val-goal.lev -share/nethack/Val-loca.lev -share/nethack/Val-strt.lev -share/nethack/Wiz-fila.lev -share/nethack/Wiz-filb.lev -share/nethack/Wiz-goal.lev -share/nethack/Wiz-loca.lev -share/nethack/Wiz-strt.lev -share/nethack/air.lev -share/nethack/asmodeus.lev -share/nethack/astral.lev -share/nethack/baalz.lev -share/nethack/bigrm-1.lev -share/nethack/bigrm-2.lev -share/nethack/bigrm-3.lev -share/nethack/bigrm-4.lev -share/nethack/bigrm-5.lev -share/nethack/castle.lev -share/nethack/cmdhelp -share/nethack/data -share/nethack/dungeon -share/nethack/earth.lev -share/nethack/fakewiz1.lev -share/nethack/fakewiz2.lev -share/nethack/fire.lev -share/nethack/help -share/nethack/hh -share/nethack/history -share/nethack/juiblex.lev -share/nethack/knox.lev -share/nethack/license -share/nethack/medusa-1.lev -share/nethack/medusa-2.lev -share/nethack/minefill.lev -share/nethack/minend-1.lev -share/nethack/minend-2.lev -share/nethack/minetn-1.lev -share/nethack/minetn-2.lev -share/nethack/opthelp -share/nethack/options -share/nethack/oracle.lev -share/nethack/oracles -share/nethack/orcus.lev -share/nethack/quest.dat -share/nethack/rumors -share/nethack/sanctum.lev -share/nethack/soko1-1.lev -share/nethack/soko1-2.lev -share/nethack/soko2-1.lev -share/nethack/soko2-2.lev -share/nethack/soko3-1.lev -share/nethack/soko3-2.lev -share/nethack/soko4-1.lev -share/nethack/soko4-2.lev -share/nethack/tower1.lev -share/nethack/tower2.lev -share/nethack/tower3.lev -share/nethack/valley.lev -share/nethack/water.lev -share/nethack/wizard1.lev -share/nethack/wizard2.lev -share/nethack/wizard3.lev -share/nethack/wizhelp -@mode 664 -share/nethack/logfile -share/nethack/record -share/nethack/perm -@dirrm share/nethack -@dirrm share/doc/nethack diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile index e1c1b27dee70..fa0c7e39d7d4 100644 --- a/games/nethack34-qt/Makefile +++ b/games/nethack34-qt/Makefile @@ -5,43 +5,10 @@ # $FreeBSD$ # -PORTNAME= nethack -PKGNAMESUFFIX= -qt -PORTVERSION= 3.3.1 -CATEGORIES= games -MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} -EXTRACT_SUFX= .tgz +MASTERDIR= ${.CURDIR}/../nethack34 MAINTAINER= ports@FreeBSD.org -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_QT_VER= 2 -USE_GMAKE= yes -MAKE_ENV= CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \ - QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" -MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 +WITH_QT_GRAPHICS= yes -pre-everything:: - @${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - @${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!" - @${ECHO} "!! But nethack-qt might read your prior nethack scores !!" - @${ECHO} "!! Don't forget to backup your nethack libdir if it's !!" - @${ECHO} "!! important for you !!" - @${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - -post-patch: - @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h - -pre-configure: - @cd ${WRKSRC}/sys/unix; ${SH} setup.sh - -post-install: - @cd ${WRKSRC}/doc; ${CHMOD} 644 *.6 - @cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR} -.endif - -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/games/nethack34-qt/distinfo b/games/nethack34-qt/distinfo deleted file mode 100644 index 24595f9d9a12..000000000000 --- a/games/nethack34-qt/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 diff --git a/games/nethack34-qt/files/patch-include:config.h b/games/nethack34-qt/files/patch-include:config.h deleted file mode 100644 index bfb4a2c47a67..000000000000 --- a/games/nethack34-qt/files/patch-include:config.h +++ /dev/null @@ -1,36 +0,0 @@ ---- include/config.h.orig Sat Jul 22 10:13:51 2000 -+++ include/config.h Sat Aug 11 10:09:12 2001 -@@ -44,7 +44,7 @@ - */ - #define TTY_GRAPHICS /* good old tty based graphics */ - /* #define X11_GRAPHICS */ /* X11 interface */ --/* #define QT_GRAPHICS */ /* Qt interface */ -+#define QT_GRAPHICS /* Qt interface */ - /* #define GNOME_GRAPHICS */ /* Gnome interface */ - - /* -@@ -151,11 +151,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 -@@ -186,7 +186,7 @@ - * otherwise it will be the current directory. - */ - # ifndef HACKDIR --# define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ -+# define HACKDIR "%%PREFIX%%/lib/nethack" /* nethack directory */ - # endif - - /* diff --git a/games/nethack34-qt/files/patch-include:unixconf.h b/games/nethack34-qt/files/patch-include:unixconf.h deleted file mode 100644 index d43f9d82b7dd..000000000000 --- a/games/nethack34-qt/files/patch-include:unixconf.h +++ /dev/null @@ -1,20 +0,0 @@ ---- include/unixconf.h.orig Mon Jul 17 11:03:51 2000 -+++ include/unixconf.h Fri Oct 13 10:06:57 2000 -@@ -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 diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.doc b/games/nethack34-qt/files/patch-sys:unix:Makefile.doc deleted file mode 100644 index 2527c7b4128e..000000000000 --- a/games/nethack34-qt/files/patch-sys:unix:Makefile.doc +++ /dev/null @@ -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 --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.src b/games/nethack34-qt/files/patch-sys:unix:Makefile.src deleted file mode 100644 index 1a58379ae1ad..000000000000 --- a/games/nethack34-qt/files/patch-sys:unix:Makefile.src +++ /dev/null @@ -1,62 +0,0 @@ ---- sys/unix/Makefile.src.orig Sat Aug 5 19:52:57 2000 -+++ sys/unix/Makefile.src Sat Aug 11 09:53:08 2001 -@@ -144,14 +144,14 @@ - # flags for debugging: - # CFLAGS = -g -I../include - --CFLAGS = -O -I../include -+CFLAGS += -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 - # 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 -@@ -203,8 +203,8 @@ - - # - # --WINSRC = $(WINTTYSRC) --WINOBJ = $(WINTTYOBJ) -+WINSRC = $(WINTTYSRC) $(WINQTSRC) -+WINOBJ = $(WINTTYOBJ) $(WINQTOBJ) - - # on some systems the termcap library is in -ltermcap or -lcurses - # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -230,7 +230,7 @@ - # 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 -@@ -244,7 +244,7 @@ - # libraries for BeOS - WINBELIB = -lbe - --WINLIB = $(WINTTYLIB) -+WINLIB = $(WINTTYLIB) $(WINQTLIB) - - # any other strange libraries your system needs (for Sysunix only -- the more - # specialized targets should already be right) -@@ -445,10 +445,10 @@ - - # 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 - - 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 - - $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \ - ../include/objclass.h ../include/monsym.h \ diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.top b/games/nethack34-qt/files/patch-sys:unix:Makefile.top deleted file mode 100644 index fb4a9021dd90..000000000000 --- a/games/nethack34-qt/files/patch-sys:unix:Makefile.top +++ /dev/null @@ -1,44 +0,0 @@ ---- sys/unix/Makefile.top.orig Tue Jul 4 09:42:05 2000 -+++ sys/unix/Makefile.top Sat Aug 11 11:21:15 2001 -@@ -14,18 +14,17 @@ - # MAKE = make - - # make NetHack --PREFIX = /usr - GAME = nethack - # 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,14 +34,14 @@ - # 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 = $(PREFIX)/lib/$(GAME) - 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 pet_mark.xbm rip.xpm - # for Atari/Gem - # VARDATND = nh16.img title.img GEM_RSC.RSC - # for BeOS diff --git a/games/nethack34-qt/pkg-comment b/games/nethack34-qt/pkg-comment deleted file mode 100644 index 2a563dc5bfe5..000000000000 --- a/games/nethack34-qt/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A dungeon explorin', slashin', hackin' game with graphic and sound diff --git a/games/nethack34-qt/pkg-descr b/games/nethack34-qt/pkg-descr deleted file mode 100644 index c80764a5e38c..000000000000 --- a/games/nethack34-qt/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -NetHack is a Free graphical one-player roleplaying game with a -highly modular window system interface supporting TTY, VGA, Mac, -Amiga, and other displays. Qt is a graphical user interface toolkit. -So, "NetHack with Qt interface" is a version of NetHack which has -a user interface module written using the Qt toolkit. - -The Qt interface has these extra features: - -o Tiles (graphics) in the inventory and other item-menu windows. -o The player cursor changes colour as your relative hit-points drop. -o The message window greys-out older message. -o The item menus allow a count (click to left of icon - hidden feature). -o Icons for the major attributes and player states. -o Menus (only needed by newbie dungeon fodder). -o Variable size fonts and tiles. -o More space for the map as messages and status are side-by-side. -o You rarely need to put the mouse in a pop-up to interact with it. -o Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it -o It is much easier to code, so new feature-requests are more easily done. -o Sound support. - -WWW: http://trolls.troll.no/warwick/nethack/ diff --git a/games/nethack34-qt/pkg-plist b/games/nethack34-qt/pkg-plist deleted file mode 100644 index 95e4f2cc5823..000000000000 --- a/games/nethack34-qt/pkg-plist +++ /dev/null @@ -1,137 +0,0 @@ -bin/nethack -%%PORTDOCS%%share/doc/nethack/Guidebook.txt -lib/nethack/nethack -@exec mkdir %D/lib/nethack/save -@exec chmod -R 775 %D/lib/nethack -@exec chmod 2755 %D/lib/nethack/nethack -@exec chown games:games %D/lib/nethack/save -@unexec rm -rf %D/lib/nethack/save -lib/nethack/Arc-fila.lev -lib/nethack/Arc-filb.lev -lib/nethack/Arc-goal.lev -lib/nethack/Arc-loca.lev -lib/nethack/Arc-strt.lev -lib/nethack/Bar-fila.lev -lib/nethack/Bar-filb.lev -lib/nethack/Bar-goal.lev -lib/nethack/Bar-loca.lev -lib/nethack/Bar-strt.lev -lib/nethack/Cav-fila.lev -lib/nethack/Cav-filb.lev -lib/nethack/Cav-goal.lev -lib/nethack/Cav-loca.lev -lib/nethack/Cav-strt.lev -lib/nethack/Hea-fila.lev -lib/nethack/Hea-filb.lev -lib/nethack/Hea-goal.lev -lib/nethack/Hea-loca.lev -lib/nethack/Hea-strt.lev -lib/nethack/Kni-fila.lev -lib/nethack/Kni-filb.lev -lib/nethack/Kni-goal.lev -lib/nethack/Kni-loca.lev -lib/nethack/Kni-strt.lev -lib/nethack/Mon-fila.lev -lib/nethack/Mon-filb.lev -lib/nethack/Mon-goal.lev -lib/nethack/Mon-loca.lev -lib/nethack/Mon-strt.lev -lib/nethack/Pri-fila.lev -lib/nethack/Pri-filb.lev -lib/nethack/Pri-goal.lev -lib/nethack/Pri-loca.lev -lib/nethack/Pri-strt.lev -lib/nethack/Ran-fila.lev -lib/nethack/Ran-filb.lev -lib/nethack/Ran-goal.lev -lib/nethack/Ran-loca.lev -lib/nethack/Ran-strt.lev -lib/nethack/Rog-fila.lev -lib/nethack/Rog-filb.lev -lib/nethack/Rog-goal.lev -lib/nethack/Rog-loca.lev -lib/nethack/Rog-strt.lev -lib/nethack/Sam-fila.lev -lib/nethack/Sam-filb.lev -lib/nethack/Sam-goal.lev -lib/nethack/Sam-loca.lev -lib/nethack/Sam-strt.lev -lib/nethack/Tou-fila.lev -lib/nethack/Tou-filb.lev -lib/nethack/Tou-goal.lev -lib/nethack/Tou-loca.lev -lib/nethack/Tou-strt.lev -lib/nethack/Val-fila.lev -lib/nethack/Val-filb.lev -lib/nethack/Val-goal.lev -lib/nethack/Val-loca.lev -lib/nethack/Val-strt.lev -lib/nethack/Wiz-fila.lev -lib/nethack/Wiz-filb.lev -lib/nethack/Wiz-goal.lev -lib/nethack/Wiz-loca.lev -lib/nethack/Wiz-strt.lev -lib/nethack/air.lev -lib/nethack/asmodeus.lev -lib/nethack/astral.lev -lib/nethack/baalz.lev -lib/nethack/bigrm-1.lev -lib/nethack/bigrm-2.lev -lib/nethack/bigrm-3.lev -lib/nethack/bigrm-4.lev -lib/nethack/bigrm-5.lev -lib/nethack/castle.lev -lib/nethack/cmdhelp -lib/nethack/data -lib/nethack/dungeon -lib/nethack/earth.lev -lib/nethack/fakewiz1.lev -lib/nethack/fakewiz2.lev -lib/nethack/fire.lev -lib/nethack/help -lib/nethack/hh -lib/nethack/history -lib/nethack/juiblex.lev -lib/nethack/knox.lev -lib/nethack/license -lib/nethack/medusa-1.lev -lib/nethack/medusa-2.lev -lib/nethack/minefill.lev -lib/nethack/minend-1.lev -lib/nethack/minend-2.lev -lib/nethack/minetn-1.lev -lib/nethack/minetn-2.lev -lib/nethack/opthelp -lib/nethack/options -lib/nethack/oracle.lev -lib/nethack/oracles -lib/nethack/orcus.lev -lib/nethack/pet_mark.xbm -lib/nethack/quest.dat -lib/nethack/rip.xpm -lib/nethack/rumors -lib/nethack/sanctum.lev -lib/nethack/soko1-1.lev -lib/nethack/soko1-2.lev -lib/nethack/soko2-1.lev -lib/nethack/soko2-2.lev -lib/nethack/soko3-1.lev -lib/nethack/soko3-2.lev -lib/nethack/soko4-1.lev -lib/nethack/soko4-2.lev -lib/nethack/tower1.lev -lib/nethack/tower2.lev -lib/nethack/tower3.lev -lib/nethack/valley.lev -lib/nethack/water.lev -lib/nethack/wizard1.lev -lib/nethack/wizard2.lev -lib/nethack/wizard3.lev -lib/nethack/wizhelp -lib/nethack/x11tiles -@mode 664 -lib/nethack/logfile -lib/nethack/record -lib/nethack/perm -@dirrm lib/nethack -%%PORTDOCS%%@dirrm share/doc/nethack diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile index ea19b7314b8f..06f91c14c1d6 100644 --- a/games/nethack34/Makefile +++ b/games/nethack34/Makefile @@ -6,29 +6,74 @@ # PORTNAME= nethack -PORTVERSION= 3.3.1 -CATEGORIES= games +PORTVERSION= 3.4.0 +CATEGORIES?= games MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/ -MASTER_SITE_SUBDIR= nethack DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g} EXTRACT_SUFX= .tgz -MAINTAINER= dscheidt@enteract.com +MAINTAINER?= dscheidt@enteract.com WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_XPM= yes + USE_GMAKE= yes +MAKE_ENV= CXX="${CXX}" GRAPHICS="${GRAPHICS}" + MAN6= dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 +.if defined(WITH_GNOME_GRAPHICS) +CATEGORIES= games gnome +PKGNAMESUFFIX= -gnome +LIB_DEPENDS+= gnugetopt:${PORTSDIR}/devel/libgnugetopt +USE_GNOME= yes +GRAPHICS= GNOME_GRAPHICS +.elif defined(WITH_QT_GRAPHICS) +PKGNAMESUFFIX= -qt +USE_QT_VER= 2 +MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" \ + MOC="${MOC}" LIBQT="-l${QTNAME}" +GRAPHICS= QT_GRAPHICS +.elif defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11) +PKGNAMESUFFIX= -nox11 +.else +USE_XPM= yes +GRAPHICS= X11_GRAPHICS +.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: + @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h + @${PERL} -pi -e 's|<regex.h>|<gnuregex.h>|g' ${WRKSRC}/src/sounds.c + @${PERL} -pi -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; ${CHMOD} 644 *.6 - @cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages + @cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/nethack - ${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/games/nethack34/distinfo b/games/nethack34/distinfo index 24595f9d9a12..f3f5ea35d5e5 100644 --- a/games/nethack34/distinfo +++ b/games/nethack34/distinfo @@ -1 +1 @@ -MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2 +MD5 (nethack-340.tgz) = 0093f14fbbe449d5b188bfb6aa4eae4f diff --git a/games/nethack34/files/patch-aa b/games/nethack34/files/patch-aa index 00fdb88cfdef..02d7fda4f77f 100644 --- a/games/nethack34/files/patch-aa +++ b/games/nethack34/files/patch-aa @@ -1,24 +1,15 @@ ---- ./include/config.h.orig Sat Jul 22 11:13:51 2000 -+++ ./include/config.h Fri Oct 13 09:31:24 2000 -@@ -43,7 +43,7 @@ - * Some combinations make no sense. See the installation document. - */ - #define TTY_GRAPHICS /* good old tty based graphics */ --/* #define X11_GRAPHICS */ /* X11 interface */ -+#define X11_GRAPHICS /* X11 interface */ - /* #define QT_GRAPHICS */ /* Qt interface */ - /* #define GNOME_GRAPHICS */ /* Gnome interface */ - -@@ -110,7 +110,7 @@ +--- include/config.h.orig Fri Mar 22 20:22:26 2002 ++++ include/config.h Fri Mar 22 20:28:13 2002 +@@ -122,7 +122,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 */ ++# define USE_XPM /* Disable if you do not have the XPM library */ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif -@@ -151,11 +151,11 @@ +@@ -163,11 +163,11 @@ #ifdef UNIX /* path and file name extension for compression program */ @@ -34,12 +25,12 @@ #endif #ifndef COMPRESS -@@ -186,7 +186,7 @@ - * otherwise it will be the current directory. - */ - # ifndef HACKDIR --# define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ -+# define HACKDIR "/usr/local/share/nethack" /* nethack directory */ +@@ -201,7 +201,7 @@ + # ifdef __APPLE__ + # define HACKDIR "nethackdir" /* nethack directory */ + # else +-# define HACKDIR "/usr/games/lib/nethackdir" ++# define HACKDIR "%%PREFIX%%/lib/nethack" + # endif # endif - /* diff --git a/games/nethack34/files/patch-ac b/games/nethack34/files/patch-ac index 69afffdc04f2..d2eec6982326 100644 --- a/games/nethack34/files/patch-ac +++ b/games/nethack34/files/patch-ac @@ -1,5 +1,5 @@ ---- ./include/unixconf.h.orig Mon Jul 17 11:03:51 2000 -+++ ./include/unixconf.h Fri Oct 13 10:06:57 2000 +--- include/unixconf.h.orig Mon Jul 17 11:03:51 2000 ++++ include/unixconf.h Fri Oct 13 10:06:57 2000 @@ -47,7 +47,7 @@ * job control (note that AIX is SYSV otherwise) * Also define this for AIX 3.2 */ @@ -14,7 +14,7 @@ */ -#define MAIL /* Deliver mail during the game */ -+/* #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 diff --git a/games/nethack34/files/patch-ad b/games/nethack34/files/patch-ad index 55ac0004fdf5..aed85203e4f2 100644 --- a/games/nethack34/files/patch-ad +++ b/games/nethack34/files/patch-ad @@ -1,51 +1,118 @@ ---- ./sys/unix/Makefile.src.orig Sat Aug 5 20:52:57 2000 -+++ ./sys/unix/Makefile.src Fri Oct 13 10:10:21 2000 -@@ -144,8 +144,8 @@ +--- sys/unix/Makefile.src.orig Thu Mar 21 08:43:54 2002 ++++ sys/unix/Makefile.src Sat Mar 23 04:08:06 2002 +@@ -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. + # +-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 += -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 ++endif -CFLAGS = -O -I../include --LFLAGS = -+CFLAGS += -O -I../include -I${X11BASE}/include -+LFLAGS = -L${X11BASE}/lib + 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 -@@ -203,8 +203,8 @@ + # 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 +@@ -204,7 +213,26 @@ # # --WINSRC = $(WINTTYSRC) --WINOBJ = $(WINTTYOBJ) -+WINSRC = $(WINTTYSRC) $(WINX11SRC) -+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) + 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 -@@ -224,7 +224,7 @@ +@@ -224,19 +252,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 -lXext -lXt -lX11 -lXpm ++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 -@@ -244,7 +244,7 @@ - # libraries for BeOS + # + # 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) -lgnugetopt + # + # libraries for Gem port + WINGEMLIB = -le_gem -lgem +@@ -245,6 +273,15 @@ WINBELIB = -lbe --WINLIB = $(WINTTYLIB) -+WINLIB = $(WINTTYLIB) $(WINX11LIB) + 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) -@@ -271,7 +271,7 @@ - # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup - # LIBS = -lsun - # --LIBS = -+LIBS = -lSM -lICE +@@ -450,13 +487,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 + + 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 + + qttableview.moc: ../include/qttableview.h +- $(QTDIR)/bin/moc ../include/qttableview.h > qttableview.moc ++ ${MOC} ../include/qttableview.h > qttableview.moc - # make NetHack - GAME = nethack + $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \ + ../include/objclass.h ../include/monsym.h \ diff --git a/games/nethack34/files/patch-ae b/games/nethack34/files/patch-ae index e655d0e9ff0b..42d88c741d3f 100644 --- a/games/nethack34/files/patch-ae +++ b/games/nethack34/files/patch-ae @@ -1,5 +1,5 @@ ---- ./sys/unix/Makefile.top.orig Tue Jul 4 10:42:05 2000 -+++ ./sys/unix/Makefile.top Fri Oct 13 10:13:50 2000 +--- sys/unix/Makefile.top.orig Tue Jul 4 09:42:05 2000 ++++ sys/unix/Makefile.top Tue Oct 9 22:21:45 2001 @@ -14,18 +14,17 @@ # MAKE = make @@ -23,15 +23,28 @@ # GAMEDIR also appears in config.h as "HACKDIR". # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR -@@ -35,9 +34,9 @@ +@@ -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 = $(PREFIX)/share/$(GAME) ++GAMEDIR = $(PREFIX)/lib/$(GAME) VARDIR = $(GAMEDIR) -SHELLDIR = $(PREFIX)/games +SHELLDIR = $(PREFIX)/bin # per discussion in Install.X11 and Install.Qt - VARDATND = +-VARDATND = ++# VARDATND = + # VARDATND = x11tiles pet_mark.xbm + # VARDATND = x11tiles 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 --git a/games/nethack34/files/patch-af b/games/nethack34/files/patch-af index 3a01201d6ae6..2527c7b4128e 100644 --- a/games/nethack34/files/patch-af +++ b/games/nethack34/files/patch-af @@ -1,6 +1,6 @@ ---- ./sys/unix/Makefile.doc.orig Mon Dec 13 14:49:15 1999 -+++ ./sys/unix/Makefile.doc Mon Dec 13 14:44:53 1999 -@@ -31,7 +31,7 @@ +--- 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 @@ -9,7 +9,20 @@ MANEXT = 6 # manual installation for most BSD-style systems -@@ -48,11 +48,11 @@ +-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: diff --git a/games/nethack34/files/patch-ag b/games/nethack34/files/patch-ag new file mode 100644 index 000000000000..340e20d6467c --- /dev/null +++ b/games/nethack34/files/patch-ag @@ -0,0 +1,21 @@ +--- 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 --git a/games/nethack34/pkg-descr b/games/nethack34/pkg-descr index 4579f0f864dc..00c5ff4f67c8 100644 --- a/games/nethack34/pkg-descr +++ b/games/nethack34/pkg-descr @@ -1,6 +1,6 @@ -This is version 3.3.1 of nethack, a clasic 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! +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! WWW: http://www.nethack.org/ diff --git a/games/nethack34/pkg-plist b/games/nethack34/pkg-plist index f5efba70be15..59380fdc1278 100644 --- a/games/nethack34/pkg-plist +++ b/games/nethack34/pkg-plist @@ -1,134 +1,145 @@ bin/nethack -share/nethack/nethack -@exec mkdir %D/share/nethack/save -@exec chmod -R 775 %D/share/nethack -@exec chmod 2755 %D/share/nethack/nethack -@exec chown games:games %D/share/nethack/save -@unexec rm -rf %D/share/nethack/save -share/doc/nethack/Guidebook.txt -share/nethack/Arc-fila.lev -share/nethack/Arc-filb.lev -share/nethack/Arc-goal.lev -share/nethack/Arc-loca.lev -share/nethack/Arc-strt.lev -share/nethack/Bar-fila.lev -share/nethack/Bar-filb.lev -share/nethack/Bar-goal.lev -share/nethack/Bar-loca.lev -share/nethack/Bar-strt.lev -share/nethack/Cav-fila.lev -share/nethack/Cav-filb.lev -share/nethack/Cav-goal.lev -share/nethack/Cav-loca.lev -share/nethack/Cav-strt.lev -share/nethack/Hea-fila.lev -share/nethack/Hea-filb.lev -share/nethack/Hea-goal.lev -share/nethack/Hea-loca.lev -share/nethack/Hea-strt.lev -share/nethack/Kni-fila.lev -share/nethack/Kni-filb.lev -share/nethack/Kni-goal.lev -share/nethack/Kni-loca.lev -share/nethack/Kni-strt.lev -share/nethack/Mon-fila.lev -share/nethack/Mon-filb.lev -share/nethack/Mon-goal.lev -share/nethack/Mon-loca.lev -share/nethack/Mon-strt.lev -share/nethack/Pri-fila.lev -share/nethack/Pri-filb.lev -share/nethack/Pri-goal.lev -share/nethack/Pri-loca.lev -share/nethack/Pri-strt.lev -share/nethack/Ran-fila.lev -share/nethack/Ran-filb.lev -share/nethack/Ran-goal.lev -share/nethack/Ran-loca.lev -share/nethack/Ran-strt.lev -share/nethack/Rog-fila.lev -share/nethack/Rog-filb.lev -share/nethack/Rog-goal.lev -share/nethack/Rog-loca.lev -share/nethack/Rog-strt.lev -share/nethack/Sam-fila.lev -share/nethack/Sam-filb.lev -share/nethack/Sam-goal.lev -share/nethack/Sam-loca.lev -share/nethack/Sam-strt.lev -share/nethack/Tou-fila.lev -share/nethack/Tou-filb.lev -share/nethack/Tou-goal.lev -share/nethack/Tou-loca.lev -share/nethack/Tou-strt.lev -share/nethack/Val-fila.lev -share/nethack/Val-filb.lev -share/nethack/Val-goal.lev -share/nethack/Val-loca.lev -share/nethack/Val-strt.lev -share/nethack/Wiz-fila.lev -share/nethack/Wiz-filb.lev -share/nethack/Wiz-goal.lev -share/nethack/Wiz-loca.lev -share/nethack/Wiz-strt.lev -share/nethack/air.lev -share/nethack/asmodeus.lev -share/nethack/astral.lev -share/nethack/baalz.lev -share/nethack/bigrm-1.lev -share/nethack/bigrm-2.lev -share/nethack/bigrm-3.lev -share/nethack/bigrm-4.lev -share/nethack/bigrm-5.lev -share/nethack/castle.lev -share/nethack/cmdhelp -share/nethack/data -share/nethack/dungeon -share/nethack/earth.lev -share/nethack/fakewiz1.lev -share/nethack/fakewiz2.lev -share/nethack/fire.lev -share/nethack/help -share/nethack/hh -share/nethack/history -share/nethack/juiblex.lev -share/nethack/knox.lev -share/nethack/license -share/nethack/medusa-1.lev -share/nethack/medusa-2.lev -share/nethack/minefill.lev -share/nethack/minend-1.lev -share/nethack/minend-2.lev -share/nethack/minetn-1.lev -share/nethack/minetn-2.lev -share/nethack/opthelp -share/nethack/options -share/nethack/oracle.lev -share/nethack/oracles -share/nethack/orcus.lev -share/nethack/quest.dat -share/nethack/rumors -share/nethack/sanctum.lev -share/nethack/soko1-1.lev -share/nethack/soko1-2.lev -share/nethack/soko2-1.lev -share/nethack/soko2-2.lev -share/nethack/soko3-1.lev -share/nethack/soko3-2.lev -share/nethack/soko4-1.lev -share/nethack/soko4-2.lev -share/nethack/tower1.lev -share/nethack/tower2.lev -share/nethack/tower3.lev -share/nethack/valley.lev -share/nethack/water.lev -share/nethack/wizard1.lev -share/nethack/wizard2.lev -share/nethack/wizard3.lev -share/nethack/wizhelp +lib/nethack/nethack +@exec mkdir %D/lib/nethack/save +@exec chmod -R 775 %D/lib/nethack +@exec chmod 2755 %D/lib/nethack/nethack +@exec chown games:games %D/lib/nethack/save +@unexec rm -rf %D/lib/nethack/save +lib/nethack/Arc-fila.lev +lib/nethack/Arc-filb.lev +lib/nethack/Arc-goal.lev +lib/nethack/Arc-loca.lev +lib/nethack/Arc-strt.lev +lib/nethack/Bar-fila.lev +lib/nethack/Bar-filb.lev +lib/nethack/Bar-goal.lev +lib/nethack/Bar-loca.lev +lib/nethack/Bar-strt.lev +lib/nethack/Cav-fila.lev +lib/nethack/Cav-filb.lev +lib/nethack/Cav-goal.lev +lib/nethack/Cav-loca.lev +lib/nethack/Cav-strt.lev +lib/nethack/Hea-fila.lev +lib/nethack/Hea-filb.lev +lib/nethack/Hea-goal.lev +lib/nethack/Hea-loca.lev +lib/nethack/Hea-strt.lev +lib/nethack/Kni-fila.lev +lib/nethack/Kni-filb.lev +lib/nethack/Kni-goal.lev +lib/nethack/Kni-loca.lev +lib/nethack/Kni-strt.lev +lib/nethack/Mon-fila.lev +lib/nethack/Mon-filb.lev +lib/nethack/Mon-goal.lev +lib/nethack/Mon-loca.lev +lib/nethack/Mon-strt.lev +lib/nethack/Pri-fila.lev +lib/nethack/Pri-filb.lev +lib/nethack/Pri-goal.lev +lib/nethack/Pri-loca.lev +lib/nethack/Pri-strt.lev +lib/nethack/Ran-fila.lev +lib/nethack/Ran-filb.lev +lib/nethack/Ran-goal.lev +lib/nethack/Ran-loca.lev +lib/nethack/Ran-strt.lev +lib/nethack/Rog-fila.lev +lib/nethack/Rog-filb.lev +lib/nethack/Rog-goal.lev +lib/nethack/Rog-loca.lev +lib/nethack/Rog-strt.lev +lib/nethack/Sam-fila.lev +lib/nethack/Sam-filb.lev +lib/nethack/Sam-goal.lev +lib/nethack/Sam-loca.lev +lib/nethack/Sam-strt.lev +lib/nethack/Tou-fila.lev +lib/nethack/Tou-filb.lev +lib/nethack/Tou-goal.lev +lib/nethack/Tou-loca.lev +lib/nethack/Tou-strt.lev +lib/nethack/Val-fila.lev +lib/nethack/Val-filb.lev +lib/nethack/Val-goal.lev +lib/nethack/Val-loca.lev +lib/nethack/Val-strt.lev +lib/nethack/Wiz-fila.lev +lib/nethack/Wiz-filb.lev +lib/nethack/Wiz-goal.lev +lib/nethack/Wiz-loca.lev +lib/nethack/Wiz-strt.lev +lib/nethack/air.lev +lib/nethack/asmodeus.lev +lib/nethack/astral.lev +lib/nethack/baalz.lev +lib/nethack/bigrm-1.lev +lib/nethack/bigrm-2.lev +lib/nethack/bigrm-3.lev +lib/nethack/bigrm-4.lev +lib/nethack/bigrm-5.lev +lib/nethack/castle.lev +lib/nethack/cmdhelp +lib/nethack/data +lib/nethack/dungeon +lib/nethack/earth.lev +lib/nethack/fakewiz1.lev +lib/nethack/fakewiz2.lev +lib/nethack/fire.lev +lib/nethack/help +lib/nethack/hh +lib/nethack/history +lib/nethack/juiblex.lev +lib/nethack/knox.lev +lib/nethack/license +lib/nethack/mapbg.xpm +lib/nethack/medusa-1.lev +lib/nethack/medusa-2.lev +lib/nethack/minefill.lev +lib/nethack/minend-1.lev +lib/nethack/minend-2.lev +lib/nethack/minend-3.lev +lib/nethack/minetn-1.lev +lib/nethack/minetn-2.lev +lib/nethack/minetn-3.lev +lib/nethack/minetn-4.lev +lib/nethack/minetn-5.lev +lib/nethack/minetn-6.lev +lib/nethack/minetn-7.lev +lib/nethack/opthelp +lib/nethack/options +lib/nethack/oracle.lev +lib/nethack/oracles +lib/nethack/orcus.lev +lib/nethack/pet_mark.xbm +lib/nethack/quest.dat +lib/nethack/rip.xpm +lib/nethack/rumors +lib/nethack/sanctum.lev +lib/nethack/soko1-1.lev +lib/nethack/soko1-2.lev +lib/nethack/soko2-1.lev +lib/nethack/soko2-2.lev +lib/nethack/soko3-1.lev +lib/nethack/soko3-2.lev +lib/nethack/soko4-1.lev +lib/nethack/soko4-2.lev +lib/nethack/tower1.lev +lib/nethack/tower2.lev +lib/nethack/tower3.lev +lib/nethack/valley.lev +lib/nethack/water.lev +lib/nethack/wizard1.lev +lib/nethack/wizard2.lev +lib/nethack/wizard3.lev +lib/nethack/wizhelp +lib/nethack/x11tiles @mode 664 -share/nethack/logfile -share/nethack/record -share/nethack/perm -@dirrm share/nethack -@dirrm share/doc/nethack +lib/nethack/logfile +lib/nethack/record +lib/nethack/perm +@mode +%%PORTDOCS%%share/doc/nethack/Guidebook.txt +%%PORTDOCS%%@dirrm share/doc/nethack +@dirrm lib/nethack |