diff options
author | drochner <drochner@pkgsrc.org> | 2009-04-08 16:31:56 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2009-04-08 16:31:56 +0000 |
commit | c48e1ab2dd0b16edeef68fbc4517cf22ecf6d8a8 (patch) | |
tree | 7654d3f45dea88bf399d6d7617ae7894082ef1bb /games/xsokoban/patches | |
parent | 06a2b474f8cbca7a8c84b22f34b5504e5724ebff (diff) | |
download | pkgsrc-c48e1ab2dd0b16edeef68fbc4517cf22ecf6d8a8.tar.gz |
add xsokoban-3.3c, from Aleksey Cheusov per pkgsrc-wip
Diffstat (limited to 'games/xsokoban/patches')
-rw-r--r-- | games/xsokoban/patches/patch-aa | 39 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ab | 75 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ac | 20 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ad | 35 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ae | 12 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-af | 63 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ag | 12 | ||||
-rw-r--r-- | games/xsokoban/patches/patch-ah | 19 |
8 files changed, 275 insertions, 0 deletions
diff --git a/games/xsokoban/patches/patch-aa b/games/xsokoban/patches/patch-aa new file mode 100644 index 00000000000..bee6f3bd8f8 --- /dev/null +++ b/games/xsokoban/patches/patch-aa @@ -0,0 +1,39 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- config.h.orig 1997-07-17 19:27:58.000000000 +0300 ++++ config.h +@@ -62,14 +62,14 @@ + in the same directory as the score file. + */ + #ifndef LOCKFILE +-#define LOCKFILE ROOTDIR "/scores/lock" ++#define LOCKFILE SAVEPATH "/lock" + #endif + + /* + SCOREFILE: the full pathname of the score file + */ + #ifndef SCOREFILE +-#define SCOREFILE ROOTDIR "/scores/scores" ++#define SCOREFILE SAVEPATH "/scores" + #endif + + /* +@@ -108,7 +108,7 @@ + /* + ANYLEVEL: Allow any user to play any level and enter a score for it + */ +-#define ANYLEVEL 0 ++#define ANYLEVEL 1 + + /* + MAXSOLNRANK: The maximum solution rank for which an entry is retained +@@ -147,7 +147,7 @@ + */ + + #ifndef WWW +-#define WWW 1 ++#define WWW 0 + #endif + + #define DEBUG_SERVER(x) diff --git a/games/xsokoban/patches/patch-ab b/games/xsokoban/patches/patch-ab new file mode 100644 index 00000000000..8052a80cb81 --- /dev/null +++ b/games/xsokoban/patches/patch-ab @@ -0,0 +1,75 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- configure.in.orig 1996-10-29 18:51:14.000000000 +0100 ++++ configure.in +@@ -42,40 +42,7 @@ AC_FEATURE_CHECK(www, WWW, WWW scoring) + if test $use_xpm = 1; then + libxpm=1 + incxpm=1 +- AC_CHECK_LIB(Xpm, main, [LIBS="$LIBS -lXpm"], +- [ +- libok=no; +- AC_MSG_CHECKING(other locations for libXpm) +- for lib in /usr/local/lib xpm*/lib ../xpm*/lib; +- do +- if test -r $lib/libXpm.a; then +- AC_MSG_RESULT(Found it in $lib!) +- LIBS="$LIBS -L$lib -lXpm"; +- libok=yes; +- break; +- fi +- done +- if test $libok = no; then +- AC_MSG_WARN(Can't find libXpm.a! You must add it to LIBS in Makefile.) +- fi +- ]) +- AC_HEADER_CHECK(xpm.h,, +- [ +- incok=no; +- for inc in /usr/local/include /usr/local/include/X11* \ +- /usr/local/X11*/include xpm*/lib ../xpm*/lib; +- do +- if test -r $inc/xpm.h; then +- AC_MSG_RESULT(Found it in $inc!) +- INCS="$INCS -I$inc"; +- incok=yes; +- break; +- fi +- done +- if test $incok = no; then +- AC_MSG_WARN(Can't find xpm.h! You must add its location to INCS in Makefile.) +- fi +- ]) ++ LIBS="$LIBS -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXpm" + fi + rm -f tmp.$$.c tmp2.$$ + +@@ -114,28 +81,6 @@ if test $www = 1; then + fi + + ############## +-# Figure out OWNER +-AC_MSG_CHECKING(owner of game) +-AC_VAR_CHECK(OWNER, OWNER) +-OWNER=`echo $OWNER | sed -e 's/"//g'` +-AC_TRY_RUN([ +-#include <stdio.h> +-#include <pwd.h> +-#include <stdlib.h> +- +-main(int argc, char **argv) { +- struct passwd *p; +- p = getpwnam("$OWNER"); +- exit((p == 0) ? 1 : 0); +-}], ownerok=1, ownerok="", ownerok=1) +-if test -n "$ownerok"; then +- AC_MSG_RESULT("owner is $OWNER") +- AC_SUBST(OWNER) +-else +- AC_MSG_WARN(\"$OWNER\" seems not to be a username. \nEdit \"config.h\" and change OWNER.), +-fi +- +-############## + # DEC bogosity + + AC_CHECK_LIB(dnet_stub,main) diff --git a/games/xsokoban/patches/patch-ac b/games/xsokoban/patches/patch-ac new file mode 100644 index 00000000000..781c18ad399 --- /dev/null +++ b/games/xsokoban/patches/patch-ac @@ -0,0 +1,20 @@ +$NetBSD: patch-ac,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- display.c.orig 1997-07-17 19:25:52.000000000 +0300 ++++ display.c +@@ -1,5 +1,6 @@ + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + #include <assert.h> + + #include "config_local.h" +@@ -19,7 +20,7 @@ + #include "display.h" + + #if USE_XPM +-#include "xpm.h" ++#include "X11/xpm.h" + #endif + + static short LoadBitmaps(void); diff --git a/games/xsokoban/patches/patch-ad b/games/xsokoban/patches/patch-ad new file mode 100644 index 00000000000..262c7e25ff1 --- /dev/null +++ b/games/xsokoban/patches/patch-ad @@ -0,0 +1,35 @@ +$NetBSD: patch-ad,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- main.c.orig 1996-07-03 16:56:06.000000000 +0300 ++++ main.c +@@ -47,7 +47,7 @@ static struct passwd *pwd; + static int movelen; + /* Length of the verified move sequence waiting on stdin if -v is used */ + +-void main(int argc, char **argv) ++int main(int argc, char **argv) + { + short ret = 0; + +@@ -93,7 +93,7 @@ void main(int argc, char **argv) + } + #endif + /* see if we are the owner */ +- owner = (strcmp(username, OWNER) == 0) ? _true_ : _false_; ++ owner = _true_; + if (ret == 0) { + if (opt_show_score) { + DEBUG_SERVER("sending score file"); +@@ -106,9 +106,9 @@ void main(int argc, char **argv) + } else if (opt_make_score) { + if (owner) { + /* make sure of that, shall we? */ +- ret = GetGamePassword(); +- if (ret == 0) +- ret = MakeNewScore(optfile); ++/* ret = GetGamePassword(); ++ if (ret == 0)*/ ++ ret = MakeNewScore(optfile); + } else + /* sorry, BAD owner */ + ret = E_NOSUPER; diff --git a/games/xsokoban/patches/patch-ae b/games/xsokoban/patches/patch-ae new file mode 100644 index 00000000000..9df4df59685 --- /dev/null +++ b/games/xsokoban/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- play.c.orig 1995-04-10 21:11:28.000000000 +0300 ++++ play.c +@@ -3,6 +3,7 @@ + #include <string.h> + #include <stdlib.h> + #include <ctype.h> ++#include <unistd.h> + + #include "externs.h" + #include "globals.h" diff --git a/games/xsokoban/patches/patch-af b/games/xsokoban/patches/patch-af new file mode 100644 index 00000000000..fefbf10c302 --- /dev/null +++ b/games/xsokoban/patches/patch-af @@ -0,0 +1,63 @@ +$NetBSD: patch-af,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- Makefile.in.orig 1996-07-03 15:56:27.000000000 +0200 ++++ Makefile.in +@@ -13,28 +13,30 @@ INCS = @INCS@ + WARN = @WARN@ + LIBS = @LIBS@ + DEFS = +-OWNER = @OWNER@ + + ############################################################ + # Other programs + ############################################################ +-INSTALL = @INSTALL@ -o $(OWNER) ++#INSTALL = @INSTALL@ -o $(OWNER) + CP = /bin/cp + CHOWN = /bin/chown ++CHGRP = /bin/chgrp + MKDIR = /bin/mkdir + + ############################################################ + # Where to install the executable, data files, and man page + ############################################################ +-INSTALL_BIN = /usr/local/bin +-INSTALL_LIB = /usr/local/lib/xsokoban +-INSTALL_MAN = /usr/local/man/man1 ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++BINDIR = ${DESTDIR}@bindir@ ++DATADIR = ${DESTDIR}@datadir@ ++MANDIR = ${DESTDIR}@mandir@/man1 + + ##### Nothing from here on should need customization ###################### + + CFLAGS = $(OPTIMIZER) $(WARN) $(INCS) $(DEFS) + OBJECTS = display.o main.o resources.o play.o score.o screen.o save.o \ +- scoredisp.o qtelnet.o ++ scoredisp.o + + xsokoban: $(OBJECTS) + $(CC) $(CFLAGS) -o xsokoban $(OBJECTS) $(LIBS) +@@ -46,15 +48,12 @@ clobber: clean + rm -f xsokoban config.cache config.status Makefile + + install: xsokoban +- $(INSTALL) -s -o $(OWNER) -m 4755 xsokoban $(INSTALL_BIN)/xsokoban +- $(INSTALL) xsokoban.man $(INSTALL_MAN)/xsokoban.1 +- -$(MKDIR) $(INSTALL_LIB) +- -$(MKDIR) $(INSTALL_LIB)/scores +- -$(MKDIR) $(INSTALL_LIB)/saves +- -$(MKDIR) $(INSTALL_LIB)/screens +- $(CP) screens/screen.* $(INSTALL_LIB)/screens +- $(CP) -r bitmaps $(INSTALL_LIB) +- $(CHOWN) $(OWNER) $(INSTALL_LIB)/scores ++ $(INSTALL_PROGRAM) xsokoban $(BINDIR)/xsokoban ++ $(INSTALL_MAN) xsokoban.man $(MANDIR)/xsokoban.1 ++ -$(MKDIR) $(DATADIR) ++ -$(MKDIR) $(DATADIR)/screens ++ $(INSTALL_DATA) screens/screen.* $(DATADIR)/screens ++ $(CP) -r bitmaps $(DATADIR) + @echo "Remember to run 'xsokoban -c' if you have no score file yet." + + # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/games/xsokoban/patches/patch-ag b/games/xsokoban/patches/patch-ag new file mode 100644 index 00000000000..f76ad74102e --- /dev/null +++ b/games/xsokoban/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- externs.h.orig 1995-04-16 01:46:14.000000000 +0300 ++++ externs.h +@@ -5,7 +5,6 @@ + #include <X11/Xresource.h> + #include <sys/stat.h> + #include <sys/types.h> +-#include <malloc.h> + + #ifdef NEED_NETINET_IN + #include <netinet/in.h> diff --git a/games/xsokoban/patches/patch-ah b/games/xsokoban/patches/patch-ah new file mode 100644 index 00000000000..cec20bb9652 --- /dev/null +++ b/games/xsokoban/patches/patch-ah @@ -0,0 +1,19 @@ +$NetBSD: patch-ah,v 1.1.1.1 2009/04/08 16:31:56 drochner Exp $ + +--- score.c.orig 1996-08-27 21:23:58.000000000 +0200 ++++ score.c +@@ -633,10 +633,11 @@ static short WriteScore() + char tempfile[MAXPATHLEN]; + strcpy(tempfile, tempnm); + +- (void)mktemp(tempfile); +- scorefile = fopen(tempfile, "w"); ++ sfdbn = mkstemp(tempfile); ++ if (sfdbn < 0) ++ return E_FOPENSCORE; ++ scorefile = fdopen(sfdbn, "w"); + if (!scorefile) return E_FOPENSCORE; +- sfdbn = fileno(scorefile); + + scoreentries = htons(scoreentries); + if (fwrite(SCORE_VERSION, 4, 1, scorefile) != 1) { |