diff options
| -rw-r--r-- | games/frotz/Makefile | 4 | ||||
| -rw-r--r-- | games/frotz/distinfo | 9 | ||||
| -rw-r--r-- | games/frotz/patches/patch-aa | 68 | ||||
| -rw-r--r-- | games/frotz/patches/patch-ab | 20 |
4 files changed, 63 insertions, 38 deletions
diff --git a/games/frotz/Makefile b/games/frotz/Makefile index a3c0224f2e6..cc5e3760bc7 100644 --- a/games/frotz/Makefile +++ b/games/frotz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/12/25 17:30:39 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/25 18:23:36 wiz Exp $ # -DISTNAME= frotz-2.41 +DISTNAME= frotz-2.42 CATEGORIES= games # The maintainer has asked us to use the mirrors instead of www.cs.csubak.edu. #MASTER_SITES= http://www.cs.csubak.edu/~dgriffi/frotz/files/ diff --git a/games/frotz/distinfo b/games/frotz/distinfo index 7aacf014ff3..c7044bbd7a4 100644 --- a/games/frotz/distinfo +++ b/games/frotz/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/01/22 02:13:02 hubertf Exp $ +$NetBSD: distinfo,v 1.6 2002/03/25 18:23:36 wiz Exp $ -SHA1 (frotz-2.41.tar.gz) = 635f3ff0195ca3e429ba1582a90e00ef4403851a -Size (frotz-2.41.tar.gz) = 137210 bytes -SHA1 (patch-aa) = b471efa7cc92d3debd6a82ce9cb39935bcbc80d8 +SHA1 (frotz-2.42.tar.gz) = c447456d46a1dff833b32db0489aa753fdd4c5f2 +Size (frotz-2.42.tar.gz) = 135337 bytes +SHA1 (patch-aa) = 4c97269519ef0d0d1073ff815dfaabc699dcaea3 +SHA1 (patch-ab) = 4d619656c71758661f93acbaf5b04add8779d6c6 diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa index f294b6fe8b5..030a1c2ae14 100644 --- a/games/frotz/patches/patch-aa +++ b/games/frotz/patches/patch-aa @@ -1,69 +1,64 @@ -$NetBSD: patch-aa,v 1.4 2002/01/22 02:13:02 hubertf Exp $ +$NetBSD: patch-aa,v 1.5 2002/03/25 18:23:37 wiz Exp $ ---- Makefile.orig Sun May 20 23:16:39 2001 +--- Makefile.orig Sun Mar 10 01:24:16 2002 +++ Makefile -@@ -1,6 +1,6 @@ - #Define your C compiler. I recommend gcc if you have it. +@@ -1,7 +1,7 @@ + # Define your C compiler. I recommend gcc if you have it. + # MacOS users should use "cc" even though it's really "gcc". + # -CC = gcc --#CC = cc -+#CC = gcc -+CC = cc ++CC ?= cc + #CC = cc # Define your optimization flags. Most compilers understand -O and -O2, - # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) -@@ -10,42 +10,42 @@ - #-malign-jumps=2 +@@ -14,7 +14,7 @@ # Define where you want Frotz to be installed. Usually this is /usr/local + # -PREFIX = /usr/local +#PREFIX = /usr/local #PREFIX = + #Define where manpages should go. +@@ -24,7 +24,7 @@ + # Define where you want Frotz to look for frotz.conf. + # -CONFIG_DIR = /usr/local/etc -+#CONFIG_DIR = /usr/local/etc ++CONFIG_DIR = ${PREFIX}/etc #CONFIG_DIR = /etc #CONFIG_DIR = /usr/pkg/etc --#CONFIG_DIR = -+CONFIG_DIR = ${PREFIX}/etc - - # Uncomment this if you want color support. Usually this requires ncurses. - COLOR_DEFS = -DCOLOR_SUPPORT - + #CONFIG_DIR = +@@ -36,16 +36,16 @@ # Uncomment this if you have an OSS soundcard driver and want classical # Infocom sound support. Currently this works only for Linux. --# SOUND_DEFS = -DOSS_SOUND + # +-#SOUND_DEFS = -DOSS_SOUND +SOUND_DEFS = -DOSS_SOUND - # Uncomment the type of sound driver you want to use. - # OSS + # Also uncomment this if you want sound through the OSS driver. + # -#SOUND_LIB = -lossaudio +SOUND_LIB = -lossaudio # This should point to the location of your curses.h or ncurses.h include # file if your compiler doesn't know about it. + # -INCL = -I/usr/local/include -+#INCL = -I/usr/local/include ++INCL = -I${BUILDLINK_DIR}/include #INCL = -I/usr/pkg/include #INCL = -I/usr/freeware/include #INCL = -I/5usr/include --#INCL = -+INCL = -I${BUILDLINK_DIR}/include - - # This should define the location and name of whatever curses library you're +@@ -55,7 +55,7 @@ # linking with. Usually, this isn't necessary if /etc/ld.so.conf is set # up correctly. + # -LIB = -L/usr/local/lib -+#LIB = -L/usr/local/lib ++LIB = -L${BUILDLINK_DIR}/lib -Wl,-R${PREFIX}/lib #LIB = -L/usr/pkg/lib #LIB = -L/usr/freeware/lib #LIB = -L/5usr/lib --#LIB = -+LIB = -L${BUILDLINK_DIR}/lib -Wl,-R${PREFIX}/lib - - # One of these must be uncommented, use ncurses if you have it. - CURSES = -lncurses # Linux always uses ncurses. -@@ -85,11 +85,12 @@ +@@ -109,11 +109,12 @@ COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \ $(MEMMOVE_DEF) @@ -78,3 +73,12 @@ $NetBSD: patch-aa,v 1.4 2002/01/22 02:13:02 hubertf Exp $ all: $(BINNAME) +@@ -161,7 +162,7 @@ + rm -f $(BINNAME)$(EXTENSION) + -rm -rf $(distdir) + -rm -f $(distdir).tar $(distdir).tar.gz +- ++ + realclean: distclean + + clobber: distclean diff --git a/games/frotz/patches/patch-ab b/games/frotz/patches/patch-ab new file mode 100644 index 00000000000..ad4ff6ea9e5 --- /dev/null +++ b/games/frotz/patches/patch-ab @@ -0,0 +1,20 @@ +$NetBSD: patch-ab,v 1.1 2002/03/25 18:23:37 wiz Exp $ + +--- ux_input.c.orig Wed Feb 20 00:15:36 2002 ++++ ux_input.c +@@ -146,6 +146,7 @@ + return ZC_TIME_OUT; + else + continue; ++#if 0 + case 0: + /* Zero is the character code returned by curses when the + user types Ctrl-@ (or Ctrl-Space). It is also +@@ -153,6 +154,7 @@ + must not return a bogus timeout to the program. + */ + continue; ++#endif + + /* Screen decluttering. */ + case MOD_CTRL ^ 'L': case MOD_CTRL ^ 'R': |