Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12219/10.3/unstable/main/finkinfo/games
Modified Files:
trackballs.info trackballs.patch nethack.info nethack.patch
Log Message:
Backport fixes and version-up from 10.4T
Index: nethack.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/nethack.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- nethack.info 4 Sep 2005 18:37:26 -0000 1.9
+++ nethack.info 20 Dec 2005 03:31:03 -0000 1.10
@@ -1,7 +1,7 @@
Info2: <<
Package: nethack%type_pkg[-x11]%type_pkg[-gnome]%type_pkg[-qt]
Version: 3.4.3
-Revision: 1
+Revision: 2
Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
Type: -x11 (boolean), -gnome (boolean), -qt (boolean)
BuildDepends: <<
@@ -51,7 +51,7 @@
<<
CompileScript: <<
(cd sys/unix; sh ./setup.sh)
- make GAMEDIR=%p/lib/nethack HACKDIR=%p/lib/nethack CC=gcc-3.3 CXX=g++-3.3
+ make GAMEDIR=%p/lib/nethack HACKDIR=%p/lib/nethack
<<
InstallScript: <<
make HACKDIR=%p/lib/nethack GAMEDIR=%i/lib/nethack SHELLDIR=%i/bin install
Index: trackballs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/trackballs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- trackballs.patch 7 Mar 2005 07:00:25 -0000 1.3
+++ trackballs.patch 20 Dec 2005 03:31:03 -0000 1.4
@@ -1,18 +1,6 @@
-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
+diff -ru trackballs-1.1.1-orig/share/Makefile.am
trackballs-1.1.1/share/Makefile.am
+--- trackballs-1.1.1-orig/share/Makefile.am 2005-12-19 17:42:32.000000000
-0800
++++ trackballs-1.1.1/share/Makefile.am 2005-12-19 17:42:47.000000000 -0800
@@ -4,6 +4,7 @@
EXTRA_DIST = $(pkgdata_DATA) trackballs.6
@@ -23,10 +11,10 @@
+ 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 @@
+diff -ru trackballs-1.1.1-orig/src/Makefile.in trackballs-1.1.1/src/Makefile.in
+--- trackballs-1.1.1-orig/src/Makefile.in 2005-12-19 17:42:32.000000000
-0800
++++ trackballs-1.1.1/src/Makefile.in 2005-12-19 17:42:47.000000000 -0800
+@@ -366,7 +366,7 @@
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
trackballs$(EXEEXT): $(trackballs_OBJECTS) $(trackballs_DEPENDENCIES)
@rm -f trackballs$(EXEEXT)
@@ -35,3 +23,4 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+Only in trackballs-1.1.1/src: Makefile.in.orig
Index: trackballs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/trackballs.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- trackballs.info 14 Dec 2005 09:41:58 -0000 1.9
+++ trackballs.info 20 Dec 2005 03:31:03 -0000 1.10
@@ -1,12 +1,12 @@
Package: trackballs
-Version: 1.1.0
+Version: 1.1.1
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
+Source-MD5: 34c4389aebeab9444ceb887192964fa0
Patch: %n.patch
SetCPPFLAGS: -I/usr/X11R6/include
SetLDFLAGS: -L/usr/X11R6/lib -lz
Index: nethack.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/games/nethack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nethack.patch 6 Apr 2004 04:56:37 -0000 1.3
+++ nethack.patch 20 Dec 2005 03:31:03 -0000 1.4
@@ -1,6 +1,6 @@
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
+--- nethack-3.4.3-orig/include/config.h 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/include/config.h 2005-12-19 15:34:30.000000000 -0800
@@ -103,6 +103,12 @@
# endif
#endif
@@ -15,8 +15,8 @@
# 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
+--- nethack-3.4.3-orig/include/system.h 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/include/system.h 2005-12-19 15:34:30.000000000 -0800
@@ -72,7 +72,7 @@
#if !defined(__cplusplus) && !defined(__GO32__)
@@ -27,8 +27,8 @@
# 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
+--- nethack-3.4.3-orig/include/unixconf.h 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/include/unixconf.h 2005-12-19 15:34:31.000000000 -0800
@@ -19,20 +19,20 @@
*/
@@ -72,8 +72,8 @@
* [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
+--- nethack-3.4.3-orig/src/files.c 2005-12-19 15:34:20.000000000 -0800
++++ nethack-3.4.3/src/files.c 2005-12-19 15:34:31.000000000 -0800
@@ -1341,7 +1341,7 @@
nesting--;
return FALSE;
@@ -102,8 +102,8 @@
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
+--- nethack-3.4.3-orig/sys/unix/Makefile.src 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/sys/unix/Makefile.src 2005-12-19 15:34:31.000000000
-0800
@@ -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.
@@ -152,8 +152,8 @@
# 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
+--- nethack-3.4.3-orig/sys/unix/Makefile.top 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/sys/unix/Makefile.top 2005-12-19 15:34:31.000000000
-0800
@@ -40,7 +40,7 @@
SHELLDIR = $(PREFIX)/games
@@ -182,8 +182,8 @@
< 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
+--- nethack-3.4.3-orig/sys/unix/unixmain.c 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/sys/unix/unixmain.c 2005-12-19 15:34:31.000000000 -0800
@@ -88,7 +88,7 @@
hackpid = getpid();
(void) umask(0777 & ~FCMASK);
@@ -194,8 +194,8 @@
#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
+--- nethack-3.4.3-orig/sys/unix/unixres.c 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/sys/unix/unixres.c 2005-12-19 15:34:31.000000000 -0800
@@ -18,6 +18,10 @@
#ifdef GETRES_SUPPORT
@@ -208,8 +208,8 @@
/* 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
+--- nethack-3.4.3-orig/win/Qt/qt_win.cpp 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/win/Qt/qt_win.cpp 2005-12-19 15:34:31.000000000 -0800
@@ -102,7 +102,7 @@
#include "qt_xpms.h"
@@ -220,8 +220,8 @@
#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
+--- nethack-3.4.3-orig/win/gnome/gnmain.c 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/win/gnome/gnmain.c 2005-12-19 15:34:31.000000000 -0800
@@ -725,7 +725,7 @@
uid = getuid();
euid = geteuid();
@@ -240,3 +240,17 @@
for(i = 0; i < SIZE(ghack_chain); i++)
ghack_chain[i].handler =
signal(ghack_chain[i].signum, ghack_sig_handler);
+diff -ru nethack-3.4.3-orig/win/tty/termcap.c nethack-3.4.3/win/tty/termcap.c
+--- nethack-3.4.3-orig/win/tty/termcap.c 2005-12-19 15:34:20.000000000
-0800
++++ nethack-3.4.3/win/tty/termcap.c 2005-12-19 15:34:51.000000000 -0800
+@@ -835,10 +835,6 @@
+
+ #include <curses.h>
+
+-#ifndef LINUX
+-extern char *tparm();
+-#endif
+-
+ # ifdef COLOR_BLACK /* trust include file */
+ #undef COLOR_BLACK
+ # else
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
