Menu
▾
▴
dists/10.2-gcc3.3/unstable/main/finkinfo/games lincity.info,NONE,1.1 nethack.info,NONE,1.1 nethack.patch,NONE,1.1 qthello-1.0-12.info,NONE,1.1 qthello-1.0-12.patch,NONE,1.1
|
From: David R. M. <dm...@us...> - 2003-11-30 16:07:48
|
Update of /cvsroot/fink/dists/10.2-gcc3.3/unstable/main/finkinfo/games In directory sc8-pr-cvs1:/tmp/cvs-serv7141 Added Files: lincity.info nethack.info nethack.patch qthello-1.0-12.info qthello-1.0-12.patch Log Message: move from 10.2 --- NEW FILE: lincity.info --- Package: lincity Version: 1.12pre55 Revision: 1 Maintainer: Matthias Neeracher <nee...@ma...> BuildDepends: dlcompat-dev, gettext-dev, gettext-bin, libiconv-dev Depends: x11, gettext Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: f30294d3d46c2ad9eafe2237dd6e874a ConfigureParams: --mandir='$(prefix)/share/man' DocFiles: CHANGES COPYING README TODO Description: City Simulation Game License: GPL Homepage: http://lincity.sourceforge.net --- NEW FILE: nethack.info --- Package: nethack Version: 3.4.2 Revision: 1 Maintainer: Matthias Neeracher <nee...@ma...> BuildDepends: gettext-dev, libjpeg, libpng3, libtiff, netpbm, audiofile, esound, glib, gtk+, orbit-dev, giflib, imlib, gnome-libs-dev, dlcompat-dev, libgnugetopt Depends: gnome-libs, passwd (>= 20011007-1), libgnugetopt-shlibs, audiofile-shlibs, esound-shlibs, giflib-shlibs, imlib-shlibs, dlcompat-shlibs Source: mirror:sourceforge:%n/%n-342.tgz Source-MD5: 90e971dbaee2f05f6a2ed3454851903a SourceDirectory: %n-%v PatchScript: sed 's:@PREFIX@:%p:g' <%a/%n.patch | patch -p1 CompileScript: << (cd sys/unix; sh ./setup.sh) make GAMEDIR=%p/lib/nethack HACKDIR=%p/lib/nethack << InstallScript: << make HACKDIR=%p/lib/nethack GAMEDIR=%i/lib/nethack SHELLDIR=%i/bin install mkdir -p %i/share/man/man6 cd doc; make MANDIR=%i/share/man/man6 manpages << DocFiles: doc/*.txt dat/license Description: Console/X11 based graphical adventure game DescPort: << The nethack configuration system is horrible (maybe deliberately so), so this package requires extensive patches to the makefiles. << License: GPL Homepage: http://www.nethack.org --- NEW FILE: nethack.patch --- diff -ru nethack-3.4.2-orig/include/config.h nethack-3.4.2/include/config.h --- nethack-3.4.2-orig/include/config.h Sun Oct 5 17:52:56 2003 +++ nethack-3.4.2/include/config.h Sun Oct 5 17:53:20 2003 @@ -42,10 +42,10 @@ * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. */ -#define TTY_GRAPHICS /* good old tty based graphics */ -/* #define X11_GRAPHICS */ /* X11 interface */ +#define TTY_GRAPHICS /* good old tty based graphics */ +#define X11_GRAPHICS /* X11 interface */ /* #define QT_GRAPHICS */ /* Qt interface */ -/* #define GNOME_GRAPHICS */ /* Gnome interface */ +#define GNOME_GRAPHICS /* Gnome interface */ /* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */ /* @@ -54,6 +54,9 @@ * * tty, X11, mac, amii, BeOS, Qt, Gem, Gnome */ + +/* Matthias Neeracher: X11 looks better than Gnome */ +#define DEFAULT_WINDOW_SYS "X11" /* MAC also means MAC windows */ #ifdef MAC diff -ru nethack-3.4.2-orig/include/system.h nethack-3.4.2/include/system.h --- nethack-3.4.2-orig/include/system.h Sun Oct 5 17:52:56 2003 +++ nethack-3.4.2/include/system.h Sun Oct 5 17:55:44 2003 @@ -80,7 +80,11 @@ E long NDECL(random); # endif # if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) +# if defined(__APPLE__) +E void FDECL(srandom, (unsigned long)); +# else E void FDECL(srandom, (unsigned int)); +# endif # else # if !defined(bsdi) && !defined(__FreeBSD__) E int FDECL(srandom, (unsigned int)); Only in nethack-3.4.2/include: system.h.orig Only in nethack-3.4.2/include: system.h~ diff -ru nethack-3.4.2-orig/include/unixconf.h nethack-3.4.2/include/unixconf.h --- nethack-3.4.2-orig/include/unixconf.h Sun Oct 5 17:52:56 2003 +++ nethack-3.4.2/include/unixconf.h Sun Oct 5 17:57:17 2003 @@ -19,20 +19,20 @@ */ /* define exactly one of the following four choices */ -/* #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 */ /* define any of the following that are appropriate */ -#define SVR4 /* use in addition to SYSV for System V Release 4 */ +/* #define SVR4 */ /* use in addition to SYSV for System V Release 4 */ /* including Solaris 2+ */ #define NETWORK /* if running on a networked system */ /* e.g. Suns sharing a playground through NFS */ @@ -324,7 +324,7 @@ # undef hc #endif -#if defined(GNOME_GRAPHICS) +#if defined(GNOME_GRAPHICS) && !defined(__APPLE__) #if defined(LINUX) # include <linux/unistd.h> # if defined(__NR_getresuid) && defined(__NR_getresgid) /* ie., >= v2.1.44 */ Only in nethack-3.4.2/include: unixconf.h.orig Only in nethack-3.4.2/include: unixconf.h~ diff -ru nethack-3.4.2-orig/src/files.c nethack-3.4.2/src/files.c --- nethack-3.4.2-orig/src/files.c Sun Oct 5 17:52:55 2003 +++ nethack-3.4.2/src/files.c Sun Oct 5 18:29:18 2003 @@ -1551,8 +1551,16 @@ # if defined(__APPLE__) /* try an alternative */ if (envp) { + uid_t saved_uid = geteuid(); + gid_t saved_gid = getegid(); + seteuid(getuid()); + setegid(getgid()); Sprintf(tmp_config, "%s/%s", envp, "Library/Preferences/NetHack Defaults"); - if ((fp = fopenp(tmp_config, "r")) != (FILE *)0) + fp = fopenp(tmp_config, "r"); + seteuid(saved_uid); + setegid(saved_gid); + + if (fp) return(fp); } # endif Only in nethack-3.4.2/src: files.c~ diff -ru nethack-3.4.2-orig/sys/unix/Makefile.src nethack-3.4.2/sys/unix/Makefile.src --- nethack-3.4.2-orig/sys/unix/Makefile.src Sun Oct 5 17:52:57 2003 +++ nethack-3.4.2/sys/unix/Makefile.src Sun Oct 5 17:58:40 2003 @@ -146,13 +146,13 @@ # 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=`gnome-config --cflags gnome` -I../win/gnome # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +CFLAGS = -g -DDARWIN -DHACKDIR=\"$(HACKDIR)\" -O -I../include -I@PREFIX@/include -I/usr/X11R6/include -no-cpp-precomp +LFLAGS = -L@PREFIX@/lib # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LINK line here to get @@ -198,7 +198,7 @@ ../win/gnome/gnworn.c WINGNOMEOBJ = gnaskstr.o gnbind.o gnglyph.o gnmain.o gnmap.o gnmenu.o \ gnmesg.o gnopts.o gnplayer.o gnsignal.o gnstatus.o gntext.o \ - gnyesno.o gnworn.o tile.o + gnyesno.o gnworn.o # # Files for a Gem port WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c \ @@ -214,8 +214,8 @@ # # -WINSRC = $(WINTTYSRC) -WINOBJ = $(WINTTYOBJ) +WINSRC = $(WINTTYSRC) $(WINGNOMESRC) $(WINX11SRC) +WINOBJ = $(WINTTYOBJ) $(WINGNOMEOBJ) $(WINX11OBJ) # 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,12 +230,12 @@ # WINTTYLIB = -ltermcap # WINTTYLIB = -lcurses # WINTTYLIB = -lcurses16 -# WINTTYLIB = -lncurses -WINTTYLIB = -ltermlib +WINTTYLIB = -lncurses +# WINTTYLIB = -ltermlib # # 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 -lXt -lXpm # 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 @@ -247,7 +247,7 @@ WINKDELIB = -lkdecore -lkdeui -lXext # # libraries for Gnome -WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt +WINGNOMELIB = `gnome-config --libs gnome gnomeui` -lgnugetopt # # libraries for Gem port WINGEMLIB = -le_gem -lgem @@ -255,7 +255,7 @@ # libraries for BeOS WINBELIB = -lbe -WINLIB = $(WINTTYLIB) +WINLIB = $(WINTTYLIB) $(WINGNOMELIB) $(WINX11LIB) # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) @@ -631,6 +631,8 @@ winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h $(CC) $(CFLAGS) -c ../win/X11/winval.c tile.o: tile.c $(HACK_H) +getopt.o: ../win/gnome/getopt.c ../win/gnome/getopt.h + $(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/getopt.c gnaskstr.o: ../win/gnome/gnaskstr.c ../win/gnome/gnaskstr.h \ ../win/gnome/gnmain.h $(CC) $(CFLAGS) $(GNOMEINC) -c ../win/gnome/gnaskstr.c Only in nethack-3.4.2/sys/unix: Makefile.src.orig Only in nethack-3.4.2/sys/unix: Makefile.src~ diff -ru nethack-3.4.2-orig/sys/unix/Makefile.top nethack-3.4.2/sys/unix/Makefile.top --- nethack-3.4.2-orig/sys/unix/Makefile.top Sun Oct 5 17:52:57 2003 +++ nethack-3.4.2/sys/unix/Makefile.top Sun Oct 5 17:59:35 2003 @@ -37,10 +37,11 @@ # instructions) GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir VARDIR = $(GAMEDIR) +HACKDIR = $(GAMEDIR) SHELLDIR = $(PREFIX)/games # per discussion in Install.X11 and Install.Qt -VARDATND = +# VARDATND = # VARDATND = x11tiles NetHack.ad pet_mark.xbm # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm # for Atari/Gem @@ -48,7 +49,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) @@ -186,7 +187,7 @@ cp src/$(GAME) $(GAMEDIR) cp util/recover $(GAMEDIR) -rm -f $(SHELLDIR)/$(GAME) - sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \ + sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \ < sys/unix/nethack.sh \ > $(SHELLDIR)/$(GAME) Only in nethack-3.4.2/sys/unix: Makefile.top.orig Only in nethack-3.4.2/sys/unix: Makefile.top~ diff -ru nethack-3.4.2-orig/sys/unix/unixmain.c nethack-3.4.2/sys/unix/unixmain.c --- nethack-3.4.2-orig/sys/unix/unixmain.c Sun Oct 5 17:52:57 2003 +++ nethack-3.4.2/sys/unix/unixmain.c Sun Oct 5 17:53:20 2003 @@ -88,7 +88,7 @@ hackpid = getpid(); (void) umask(0777 & ~FCMASK); - choose_windows(DEFAULT_WINDOW_SYS); + choose_windows(getenv("DISPLAY")?DEFAULT_WINDOW_SYS:"tty"); #ifdef CHDIR /* otherwise no chdir() */ /* diff -ru nethack-3.4.2-orig/sys/unix/unixres.c nethack-3.4.2/sys/unix/unixres.c --- nethack-3.4.2-orig/sys/unix/unixres.c Sun Oct 5 17:52:57 2003 +++ nethack-3.4.2/sys/unix/unixres.c Sun Oct 5 17:53:20 2003 @@ -16,6 +16,8 @@ #include "config.h" +#include <sys/stat.h> + #ifdef GETRES_SUPPORT # if defined(LINUX) diff -ru nethack-3.4.2-orig/win/gnome/gnmain.c nethack-3.4.2/win/gnome/gnmain.c --- nethack-3.4.2-orig/win/gnome/gnmain.c Sun Oct 5 17:52:57 2003 +++ nethack-3.4.2/win/gnome/gnmain.c Sun Oct 5 17:53:20 2003 @@ -6,8 +6,8 @@ #include "gnsignal.h" #include "gnbind.h" #include "gnopts.h" +#include <gnugetopt/getopt.h> #include <gnome.h> -#include <getopt.h> #include <gdk/gdk.h> #include <sys/time.h> #include <unistd.h> --- NEW FILE: qthello-1.0-12.info --- Package: qthello Version: 1.0 Revision: 12 ### License: OSI-Approved Maintainer: Ben Hines <bh...@al...> ### GCC: 3.3 Depends: qt3-shlibs (>= 3.0.5-9) BuildDepends: qt3 (>= 3.0.5-9), dlcompat-dev ### Source: mirror:sourceforge:%n/%n-%v.tar.bz2 Source-MD5: c3824d098054bceb6e0811ae82257fcc PatchScript: << perl -pi.bak -e 's#(viewmag|new\.xpm|stop\.png)#%p/share/%n/gfx/$1#g' othello.cpp perl -pi.bak -e 's#gfx#%p/share/%n/gfx#g' boardwidget.cpp patch -p1 < %a/%f.patch << ### CompileScript: make LIBS='-L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11' INCPATH='-I$(QTDIR)/include -I$(QTDIR)/include/qt' InstallScript: << mkdir -p %i/bin mkdir -p %i/share/%n/gfx cp %n %i/bin cp *.png %i/share/%n/gfx cp *.xpm %i/share/%n/gfx cp gfx/*.gif %i/share/%n/gfx strip %i/bin/%n << ### Description: Qt based othello game DescDetail: << QtHello is an Othello program written in Qt. It's design makes it easy to extend both the computer player and human player interface. It currently has 6 different computer players ranging from completely random to tree search with Alpha-Beta pruning. << DescPort: Patched main window so its not stuck at 0,0 size. Homepage: http://qthello.sourceforge.net/ --- NEW FILE: qthello-1.0-12.patch --- --- qthello-1.0/othello.cpp.orig 2002-10-06 05:31:34.000000000 -0700 +++ qthello-1.0/othello.cpp 2002-10-06 05:31:40.000000000 -0700 @@ -88,7 +88,7 @@ setCentralWidget( cw ); - setFixedSize( QSize( 0, 0 ) ); +// setFixedSize( QSize( 0, 0 ) ); // connect( NGame, SIGNAL( clicked() ), // BWidget, SLOT( newGame() ) ); |