Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/games In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18073
Added Files: nethack.info nethack.patch sdl-ttf.info sdl-ttf.patch trackballs.info trackballs.patch Log Message: Moved from unstable --- NEW FILE: trackballs.patch --- diff -ru trackballs-1.1.0-orig/po/Makefile.in.in trackballs-1.1.0/po/Makefile.in.in --- trackballs-1.1.0-orig/po/Makefile.in.in Tue Feb 15 09:16:34 2005 +++ trackballs-1.1.0/po/Makefile.in.in Sun Mar 6 17:21:41 2005 @@ -27,7 +27,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +mkinstalldirs = $(SHELL) "$(MKINSTALLDIRS)" GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ diff -ru trackballs-1.1.0-orig/share/Makefile.am trackballs-1.1.0/share/Makefile.am --- trackballs-1.1.0-orig/share/Makefile.am Sun Feb 27 04:59:59 2005 +++ trackballs-1.1.0/share/Makefile.am Sun Mar 6 14:25:41 2005 @@ -4,6 +4,7 @@ EXTRA_DIST = $(pkgdata_DATA) trackballs.6 install-pkgdataDATA: - -install -D -m664 -g games highScores $(DESTDIR)@with_highscores@ - -chgrp -R games $(DESTDIR)$(pkgdatadir)/levels + mkdir -p $(DESTDIR)/share/trackballs + install -m664 -g games highScores $(DESTDIR)@with_highscores@ + chgrp -R games $(DESTDIR)$(pkgdatadir)/levels chmod -R g+r $(DESTDIR)$(pkgdatadir)/levels diff -ru trackballs-1.1.0-orig/src/Makefile.in trackballs-1.1.0/src/Makefile.in --- trackballs-1.1.0-orig/src/Makefile.in Fri Mar 4 10:26:01 2005 +++ trackballs-1.1.0/src/Makefile.in Sun Mar 6 17:12:39 2005 @@ -361,7 +361,7 @@ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) trackballs$(EXEEXT): $(trackballs_OBJECTS) $(trackballs_DEPENDENCIES) @rm -f trackballs$(EXEEXT) - $(CXXLINK) $(trackballs_LDFLAGS) $(trackballs_OBJECTS) $(trackballs_LDADD) $(LIBS) + $(CXXLINK) $(trackballs_LDFLAGS) $(trackballs_OBJECTS) $(trackballs_LDADD) $(LIBS) $(LTLIBINTL) mostlyclean-compile: -rm -f *.$(OBJEXT) --- NEW FILE: trackballs.info --- Package: trackballs Version: 1.1.0 Revision: 1 GCC: 3.3 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]> BuildDepends: sdl, sdl-image, sdl-mixer, sdl-ttf, guile16, guile16-dev Depends: sdl-shlibs, sdl-image-shlibs, sdl-mixer-shlibs, sdl-ttf-shlibs, guile16-libs, guile16-shlibs, passwd Source: mirror:sourceforge:%n/%n-%v.tar.gz Source-MD5: 4d1c4be3274ac88038bc03e2d470546c Patch: %n.patch SetCPPFLAGS: -I/usr/X11R6/include SetLDFLAGS: -L/usr/X11R6/lib -lz ConfigureParams: --mandir='$(prefix)/share/man' CompileScript: << GUILE=%p/bin/guile-1.6 GUILE_CONFIG=%p/bin/guile-1.6-config ./configure %c make << DocFiles: AUTHORS COPYING NEWS README TODO Description: Marble Madness Clone DescDetail: << Trackballs is a simple game similar to the classical game Marble Madness on the Amiga in the 80's. By steering a marble ball through a labyrinth filled with vicious hammers, pools of acid and other obstacles the player collects points. When the ball reaches the destination it continues to the next, more difficult track - unless the time runs out. << Homepage: http://trackballs.sourceforge.net License: GPL --- NEW FILE: nethack.patch --- diff -ru nethack-3.4.3-orig/include/config.h nethack-3.4.3/include/config.h --- nethack-3.4.3-orig/include/config.h Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/include/config.h Sun Mar 28 21:22:39 2004 @@ -103,6 +103,12 @@ # endif #endif +#ifdef X11_GRAPHICS +# ifndef DEFAULT_WINDOW_SYS +# define DEFAULT_WINDOW_SYS "x11" +# endif +#endif + #ifdef MSWIN_GRAPHICS # ifdef TTY_GRAPHICS # undef TTY_GRAPHICS diff -ru nethack-3.4.3-orig/include/system.h nethack-3.4.3/include/system.h --- nethack-3.4.3-orig/include/system.h Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/include/system.h Sun Mar 28 19:06:48 2004 @@ -72,7 +72,7 @@ #if !defined(__cplusplus) && !defined(__GO32__) -#if defined(BSD) || defined(ULTRIX) || defined(RANDOM) +#if (defined(BSD) && !defined(__APPLE__)) || defined(ULTRIX) || defined(RANDOM) # ifdef random # undef random # endif diff -ru nethack-3.4.3-orig/include/unixconf.h nethack-3.4.3/include/unixconf.h --- nethack-3.4.3-orig/include/unixconf.h Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/include/unixconf.h Tue Mar 30 00:59:08 2004 @@ -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 */ @@ -284,7 +284,7 @@ #endif #if defined(BSD) || defined(ULTRIX) -# if !defined(DGUX) && !defined(SUNOS4) +# if !defined(DGUX) && !defined(SUNOS4) && !defined(__APPLE__) #define memcpy(d, s, n) bcopy(s, d, n) #define memcmp(s1, s2, n) bcmp(s2, s1, n) # endif @@ -331,7 +331,7 @@ # define GETRES_SUPPORT # endif #else -# if defined(BSD) || defined(SVR4) +# if (defined(BSD) && !defined(__APPLE__)) || defined(SVR4) /* * [ALI] We assume that SVR4 means we can safely include syscall.h * (although it's really a BSDism). This is certainly true for Solaris 2.5, diff -ru nethack-3.4.3-orig/src/files.c nethack-3.4.3/src/files.c --- nethack-3.4.3-orig/src/files.c Sun Mar 28 17:51:03 2004 +++ nethack-3.4.3/src/files.c Tue Mar 30 00:28:39 2004 @@ -1341,7 +1341,7 @@ nesting--; return FALSE; case EACCES: - HUP raw_printf("No write permission to lock %s!", filename); + HUP raw_printf("No write permission to lock %s [%s]!", filename, lockname); nesting--; return FALSE; # ifdef VMS /* c__translate(vmsfiles.c) */ @@ -1556,17 +1556,6 @@ Sprintf(tmp_config, "%s/%s", envp, configfile); if ((fp = fopenp(tmp_config, "r")) != (FILE *)0) return(fp); -# if defined(__APPLE__) - /* try an alternative */ - if (envp) { - Sprintf(tmp_config, "%s/%s", envp, "Library/Preferences/NetHack Defaults"); - if ((fp = fopenp(tmp_config, "r")) != (FILE *)0) - return(fp); - Sprintf(tmp_config, "%s/%s", envp, "Library/Preferences/NetHack Defaults.txt"); - if ((fp = fopenp(tmp_config, "r")) != (FILE *)0) - return(fp); - } -# endif if (errno != ENOENT) { char *details; diff -ru nethack-3.4.3-orig/sys/unix/Makefile.src nethack-3.4.3/sys/unix/Makefile.src --- nethack-3.4.3-orig/sys/unix/Makefile.src Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/sys/unix/Makefile.src Sun Mar 28 22:54:47 2004 @@ -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 = -O -I../include -DHACKDIR=\"$(HACKDIR)\" [EMAIL PROTECTED]@/include -I/usr/X11R6/include -no-cpp-precomp +LFLAGS = [EMAIL PROTECTED]@/lib -L/usr/X11R6/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 @@ -230,24 +230,24 @@ # 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 -lXext -lXt -lXpm -lX11 # 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 = -L$(QTDIR)/lib -lqt-mt # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext # # libraries for Gnome -WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt +WINGNOMELIB = `gnome-config --libs gnome gnomeui` # # libraries for Gem port WINGEMLIB = -le_gem -lgem diff -ru nethack-3.4.3-orig/sys/unix/Makefile.top nethack-3.4.3/sys/unix/Makefile.top --- nethack-3.4.3-orig/sys/unix/Makefile.top Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/sys/unix/Makefile.top Mon Mar 29 01:08:47 2004 @@ -40,7 +40,7 @@ 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 +48,7 @@ # for BeOS # VARDATND = beostiles # for Gnome -# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm +VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm mapbg.xpm VARDATD = data oracles options quest.dat rumors VARDAT = $(VARDATD) $(VARDATND) @@ -186,7 +186,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) diff -ru nethack-3.4.3-orig/sys/unix/unixmain.c nethack-3.4.3/sys/unix/unixmain.c --- nethack-3.4.3-orig/sys/unix/unixmain.c Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/sys/unix/unixmain.c Sun Mar 28 18:08:21 2004 @@ -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.3-orig/sys/unix/unixres.c nethack-3.4.3/sys/unix/unixres.c --- nethack-3.4.3-orig/sys/unix/unixres.c Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/sys/unix/unixres.c Sun Mar 28 19:11:34 2004 @@ -18,6 +18,10 @@ #ifdef GETRES_SUPPORT +# if defined(__APPLE__) +#include <sys/stat.h> +# endif + # if defined(LINUX) /* requires dynamic linking with libc */ diff -ru nethack-3.4.3-orig/win/Qt/qt_win.cpp nethack-3.4.3/win/Qt/qt_win.cpp --- nethack-3.4.3-orig/win/Qt/qt_win.cpp Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/win/Qt/qt_win.cpp Sun Mar 28 22:48:13 2004 @@ -102,7 +102,7 @@ #include "qt_xpms.h" #include <dirent.h> -#ifdef Q_WS_MACX +#ifdef __APPLE__ # include <sys/malloc.h> #else # include <malloc.h> diff -ru nethack-3.4.3-orig/win/gnome/gnmain.c nethack-3.4.3/win/gnome/gnmain.c --- nethack-3.4.3-orig/win/gnome/gnmain.c Sun Mar 28 17:51:04 2004 +++ nethack-3.4.3/win/gnome/gnmain.c Mon Mar 29 23:52:44 2004 @@ -725,7 +725,7 @@ uid = getuid(); euid = geteuid(); if (uid != euid) - setuid(uid); + seteuid(uid); hide_privileges(TRUE); /* XXX gnome_init must print nethack options for --help, but does not */ gnome_init ("nethack", VERSION_STRING, argc, argv); @@ -768,7 +768,7 @@ * to not refresh the window when adding widgets after the window * has already been shown */ if (uid != euid) - setuid(euid); + seteuid(euid); for(i = 0; i < SIZE(ghack_chain); i++) ghack_chain[i].handler = signal(ghack_chain[i].signum, ghack_sig_handler); --- NEW FILE: sdl-ttf.info --- Package: sdl-ttf Version: 2.0.6 Revision: 16 Maintainer: None <fink-devel@lists.sourceforge.net> Depends: %N-shlibs (= %v-%r) BuildDependsOnly: true BuildDepends: sdl Source: http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-%v.tar.gz Source-MD5: 880ca22ac3e8beb5cca2326cc8069733 NoSetCPPFLAGS: true InstallScript: make install DESTDIR=%d SplitOff: << Package: %N-shlibs Depends: sdl-shlibs Replaces: %N (<= 2.0.4-1) Files: lib/libSDL_ttf-*.dylib Shlibs: %p/lib/libSDL_ttf-2.0.0.6.0.dylib 7.0.0 %n (>= 2.0.6-1) Docfiles: CHANGES COPYING README << DocFiles: CHANGES COPYING README Description: SDL TrueType font library DescDetail: << Sample library which allows you to use TrueType fonts in your SDL applications. << Homepage: http://www.libsdl.org/projects/SDL_ttf/ License: LGPL Patch: %n.patch --- NEW FILE: sdl-ttf.patch --- diff -Naur new/SDL_ttf.c SDL_ttf-2.0.6/SDL_ttf.c --- new/SDL_ttf.c Fri Feb 21 12:38:15 2003 +++ SDL_ttf-2.0.6/SDL_ttf.c Thu Feb 24 15:57:42 2005 @@ -39,6 +39,7 @@ #define FREEA(p) free(p) #endif +#include <ft2build.h> #include <freetype/freetype.h> #include <freetype/ftoutln.h> #include <freetype/ttnameid.h> --- NEW FILE: nethack.info --- Info2: << Package: nethack%type_pkg[-x11]%type_pkg[-gnome]%type_pkg[-qt] Version: 3.4.3 Revision: 1 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]> Type: -x11 (boolean), -gnome (boolean), -qt (boolean) BuildDepends: << gettext-dev, gcc3.3, (%type_raw[-x11] = -x11) x11-dev, (%type_raw[-gnome] = -gnome) libjpeg, (%type_raw[-gnome] = -gnome) libpng3, (%type_raw[-gnome] = -gnome) libtiff, (%type_raw[-gnome] = -gnome) netpbm, (%type_raw[-gnome] = -gnome) audiofile, (%type_raw[-gnome] = -gnome) esound, (%type_raw[-gnome] = -gnome) glib, (%type_raw[-gnome] = -gnome) gtk+, (%type_raw[-gnome] = -gnome) gnome-libs-dev, (%type_raw[-gnome] = -gnome) imlib , (%type_raw[-qt] = -qt) qt3 << Depends: << passwd (>= 20011007-1), (%type_raw[-x11] = -x11) x11, (%type_raw[-gnome] = -gnome) gnome-libs, (%type_raw[-qt] = -qt) qt3-shlibs << Conflicts: nethack, nethack-x11, nethack-gnome, nethack-x11-gnome, nethack-qt, nethack-x11-qt, nethack-x11-gnome-qt, nethack-gnome-qt Replaces: nethack, nethack-x11, nethack-gnome, nethack-x11-gnome, nethack-qt, nethack-x11-qt, nethack-x11-gnome-qt, nethack-gnome-qt Source: mirror:sourceforge:%{Ni}/%{Ni}-343-src.tgz Source-MD5: 21479c95990eefe7650df582426457f9 SourceDirectory: %{Ni}-%v PatchScript: << #!/bin/bash -ev sed 's:@PREFIX@:%p:g' <%a/%{Ni}.patch | patch -p1 if [ "%type_raw[-x11]" == "-x11" ]; then perl -i.bak -pe 's|.*define X11_GRAPHICS.*|#define X11_GRAPHICS|' include/config.h perl -i.bak -pe 's#^(WIN(SRC|OBJ|LIB).*)#\1 \$(WINX11\2)#' sys/unix/Makefile.src fi if [ "%type_raw[-gnome]" == "-gnome" ]; then perl -i.bak -pe "s|.*define GNOME_GRAPHICS.*|#define GNOME_GRAPHICS|" include/config.h perl -i.bak -pe 's#^(WIN(SRC|OBJ|LIB).*)#\1 \$(WINGNOME\2)#' sys/unix/Makefile.src if [ "%type_raw[-qt]" == "-qt" -o "%type_raw[-x11]" == "-x11" ]; then perl -i.bak -pe 's#gnworn.o\s+tile.o#gnworn.o#' sys/unix/Makefile.src fi fi if [ "%type_raw[-qt]" == "-qt" ]; then perl -i.bak -pe "s|.*define QT_GRAPHICS.*|#define QT_GRAPHICS|" include/config.h perl -i.bak -pe 's#^(WIN(SRC|OBJ|LIB).*)#\1 \$(WINQT\2)#; s#^(CFLAGS.*)#\1 -I%p/include/qt#; s#^(LINK).*#\1 = c++#' sys/unix/Makefile.src if [ "%type_raw[-x11]" == "-x11" ]; then perl -i.bak -pe 's#qttableview.o\s+tile.o#qttableview.o#' sys/unix/Makefile.src fi fi << CompileScript: << (cd sys/unix; sh ./setup.sh) make GAMEDIR=%p/lib/nethack HACKDIR=%p/lib/nethack CC=gcc-3.3 CXX=g++-3.3 << 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. << DescPackaging: << This package deliberately tries to exercise the new (fink > 0.19.2) package variant support to the fullest extent. << License: GPL Homepage: http://www.nethack.org << ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits