head 1.10; access; symbols pkgsrc-2019Q3:1.9.0.2 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.8.0.82 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.80 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.78 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.76 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.74 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.72 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.70 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.68 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.64 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.62 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.60 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.58 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.56 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.54 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.52 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.50 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.48 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.46 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.44 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.42 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.40 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.38 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.36 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.34 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.32 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.30 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.28 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.26 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.24 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.22 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.20 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.18 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.16 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.14 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.12 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.10 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.8 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.6 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.4 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.2 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.7.0.52 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.50 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.48 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.46 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.44 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.42 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.40 pkgsrc-2008Q1:1.7.0.38 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.36 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.34 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.32 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.30 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.28 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.26 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.24 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.22 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.20 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.18 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.16 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.14 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.12 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.10 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.8 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.6 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.4 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.6.0.6 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.2 pkgviews-base:1.6 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.10 date 2019.11.24.00.45.39; author nia; state dead; branches; next 1.9; commitid GsYBZtysDVeXs2MB; 1.9 date 2019.07.18.11.54.26; author nia; state Exp; branches; next 1.8; commitid rMrRdf8A50LkjwvB; 1.8 date 2009.08.19.04.04.40; author yyamano; state Exp; branches; next 1.7; 1.7 date 2002.10.29.17.09.06; author dillo; state Exp; branches; next 1.6; 1.6 date 2002.06.29.01.48.53; author kristerw; state Exp; branches; next 1.5; 1.5 date 2002.03.25.18.23.37; author wiz; state Exp; branches; next 1.4; 1.4 date 2002.01.22.02.13.02; author hubertf; state Exp; branches; next 1.3; 1.3 date 2001.12.25.17.30.40; author wiz; state Exp; branches; next 1.2; 1.2 date 2001.05.23.13.35.10; author dillo; state Exp; branches; next 1.1; 1.1 date 99.08.14.06.59.42; author fredb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.08.14.06.59.42; author fredb; state Exp; branches; next ; desc @@ 1.10 log @frotz: Update to 2.50 NEW FEATURES - Added UTF-8 input and output. Plain ASCII is still available. - Added -L option for restoring save file directly from the command line. - Added -R option for restricted read/write path. - Sound effects in AIFF, MOD, and OGG formats supported per the Blorb specs. - Sound driver selection is automated through the use of libao. - Allow for an alternative Blorb file to be specified on the command line. BUG FIXES - Overhauled MacOS compilation. - Corrected problems with error handling. - Fixed a lot of unsafe strcpy() and strcat() calls. - Fixed numerous problems with portability to other flavors of Unix. - Fixed adaptive palette rendering for SDL. - Fixed scaling with manually specified window dimensions. - Fixed problem with unnecessary newlines with input timeouts. - Allow fontdir in .sfrotzrc to work relative to user's home directory. - Fixed problem with memory allocation leading to crashes in DOS. - Fixed problem with DOS Frotz creating non-portable Quetzal files. @ text @$NetBSD: patch-aa,v 1.9 2019/07/18 11:54:26 nia Exp $ Honour pkgsrc settings. --- Makefile.orig 2015-05-20 09:29:14.000000000 +0000 +++ Makefile @@@@ -1,30 +1,27 @@@@ # 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 = 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.) # -OPTS = -O2 # Pentium with gcc 2.7.0 or better #OPTS = -O2 -fomit-frame-pointer -malign-functions=2 -malign-loops=2 \ #-malign-jumps=2 # Define where you want Frotz installed. Usually this is /usr/local -PREFIX = /usr/local +#PREFIX = /usr/local MAN_PREFIX = $(PREFIX) #MAN_PREFIX = /usr/local/share -CONFIG_DIR = $(PREFIX)/etc #CONFIG_DIR = /etc # Define where you want Frotz to look for frotz.conf. # -CONFIG_DIR = /usr/local/etc #CONFIG_DIR = /etc #CONFIG_DIR = /usr/pkg/etc #CONFIG_DIR = @@@@ -195,7 +192,7 @@@@ FLAGS = $(OPTS) $(CURSES_DEFS) $(INCL) $(NAME): $(NAME)-curses curses: $(NAME)-curses $(NAME)-curses: $(COMMON_TARGET) $(CURSES_TARGET) $(BLORB_TARGET) - $(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) $(SOUND_LIB) + $(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) $(SOUND_LIB) dumb: $(NAME)-dumb d$(NAME): $(NAME)-dumb @@@@ -214,19 +211,19 @@@@ all: $(NAME) d$(NAME) .SUFFIXES: .c .o .h $(COMMON_OBJECT): %.o: %.c - $(CC) $(OPTS) $(COMMON_DEFS) -o $@@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(COMMON_DEFS) -o $@@ -c $< $(BLORB_OBJECT): %.o: %.c - $(CC) $(OPTS) -o $@@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@@ -c $< $(DUMB_OBJECT): %.o: %.c - $(CC) $(OPTS) -o $@@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@@ -c $< $(CURSES_OBJECT): %.o: %.c - $(CC) $(OPTS) $(CURSES_DEFS) -o $@@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(CURSES_DEFS) -o $@@ -c $< $(SDL_OBJECT): %.o: %.c - $(CC) $(OPTS) $(SDL_DEFS) -o $@@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_DEFS) -o $@@ -c $< # If you're going to make this target manually, you'd better know which @ 1.9 log @frotz: Update to 2.44 NEW FEATURES * Blorb support implemented. No support for audio in Blorb files yet. * Added an -m option for Dumb Frotz to suppress the [MORE] prompt. * Makefile and code for compiling for 16-bit DOS. BUG FIXES * Fixed a problem with saving and restoring in certain games. * Added some fflush() calls to make Dumb Frotz more suitable for bot use. * Removed old-style save support. It was getting hard to manage. Only the Quetzal save file format is supported now. * Fixed assorted minor 64-bitness problems. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.8 2009/08/19 04:04:40 yyamano Exp $ @ 1.8 log @Make this build on Mac OS X. Fixed PR pkg/41538. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2002/10/29 17:09:06 dillo Exp $ d3 3 a5 1 --- Makefile.orig 2002-10-27 17:21:52.000000000 -0800 d7 1 a7 1 @@@@ -1,7 +1,7 @@@@ d16 6 a21 1 @@@@ -14,7 +14,7 @@@@ OPTS = -O2 d30 3 a32 1 @@@@ -24,7 +24,7 @@@@ CONFIG_DIR = $(PREFIX)/etc a36 1 +CONFIG_DIR = ${PREFIX}/etc d40 1 a40 1 @@@@ -163,7 +163,7 @@@@ FLAGS = $(OPTS) $(COMP_DEFS) $(INCL) d42 29 a71 4 $(NAME)-curses: soundcard.h $(COMMON_TARGET) $(CURSES_TARGET) - $(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \ + $(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \ $(SOUND_LIB) d73 1 a73 1 all: $(NAME) d$(NAME) @ 1.7 log @update to 2.43: - confirmed working with NetBSD 1.6's curses - various other bugfixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig Mon Oct 28 02:21:52 2002 d14 1 a14 1 @@@@ -14,7 +14,7 @@@@ d23 1 a23 1 @@@@ -24,7 +24,7 @@@@ d32 1 a32 23 @@@@ -37,18 +37,18 @@@@ # Uncomment this if you have an OSS soundcard driver and want classical # Infocom sound support. # -#SOUND_DEFS = -DOSS_SOUND +SOUND_DEFS = -DOSS_SOUND # Uncomment this too if you're running BSD of some sort and are using # the OSS sound driver. # -#SOUND_LIB = -lossaudio +SOUND_LIB = ${LIBOSSAUDIO} # Define your sound device # This should probably be a command-line/config-file option. # #SOUND_DEV = /dev/dsp -#SOUND_DEV = /dev/sound +SOUND_DEV = ${DEVOSSSOUND} #SOUND_DEV = /dev/audio # If your vendor-supplied curses library won't work, uncomment the @@@@ -163,7 +163,7 @@@@ @ 1.6 log @Correct sound support. Patch provided by David Griffith. Solves PR 14061. @ text @d2 3 a4 2 --- Makefile.orig Sun Mar 10 01:24:16 2002 +++ Makefile Sat Jun 29 03:32:34 2002 d15 1 d17 1 a17 2 # Define where you want Frotz to be installed. Usually this is /usr/local # a19 1 #PREFIX = d21 2 a22 1 #Define where manpages should go. d32 1 a32 1 @@@@ -36,16 +36,23 @@@@ d34 1 a34 1 # Infocom sound support. Currently this works only for Linux. d39 2 a40 1 # Also uncomment this if you want sound through the OSS driver. d43 1 a43 8 +SOUND_LIB = -lossaudio + +# Define your sound device +# This should probably be a command-line/config-file option. +# +SOUND_DEV = /dev/sound +#SOUND_DEV = /dev/dsp +#SOUND_DEV = /dev/audio d45 2 a46 11 # 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${BUILDLINK_DIR}/include #INCL = -I/usr/pkg/include #INCL = -I/usr/freeware/include #INCL = -I/5usr/include @@@@ -55,7 +62,7 @@@@ # linking with. Usually, this isn't necessary if /etc/ld.so.conf is set # up correctly. d48 13 a60 35 -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 @@@@ -86,7 +93,7 @@@@ # Nothing under this line should need to be changed. ##################################################### -VERSION = 2.42 +VERSION = 2.42nb1 BINNAME = frotz @@@@ -103,17 +110,18 @@@@ ux_audio_none.o ux_audio_oss.o OPT_DEFS = -DCONFIG_DIR="\"$(CONFIG_DIR)\"" $(CURSES_DEF) \ - -DVERSION="\"$(VERSION)\"" + -DVERSION="\"$(VERSION)\"" -DSOUND_DEV="\"$(SOUND_DEV)\"" COMP_DEFS = $(OPT_DEFS) $(COLOR_DEFS) $(SOUND_DEFS) $(SOUNDCARD) \ $(MEMMOVE_DEF) -CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL) +CFLAGS += $(OPTS) $(COMP_DEFS) +all: frotz $(BINNAME): soundcard.h $(OBJECTS) - $(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB) + $(CC) -o $(BINNAME)$(EXTENSION) $(LDFLAGS) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB) all: $(BINNAME) d62 1 @ 1.5 log @Update to 2.42, as requested by David Griffith in pkg/15866. Bugfixes. @ text @a1 1 d3 1 a3 1 +++ Makefile d31 1 a31 1 @@@@ -36,16 +36,16 @@@@ d42 7 d58 1 a58 1 @@@@ -55,7 +55,7 @@@@ d67 17 a83 1 @@@@ -109,11 +109,12 @@@@ a97 9 @@@@ -161,7 +162,7 @@@@ rm -f $(BINNAME)$(EXTENSION) -rm -rf $(distdir) -rm -f $(distdir).tar $(distdir).tar.gz - + realclean: distclean clobber: distclean @ 1.4 log @Fix compilation on 1.5.3_ALPHA - the ncurses buildlink framework will always setup a proper libncurses, either real ncurses or the system's libcurses, so just link in libncurses ((from the buildlink area!) @ text @d3 1 a3 1 --- Makefile.orig Sun May 20 23:16:39 2001 d5 4 a8 2 @@@@ -1,6 +1,6 @@@@ #Define your C compiler. I recommend gcc if you have it. d10 2 a11 3 -#CC = cc +#CC = gcc +CC = cc d14 1 a14 3 # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.) @@@@ -10,42 +10,42 @@@@ #-malign-jumps=2 d17 1 d22 3 d26 1 d28 1 a28 1 +#CONFIG_DIR = /usr/local/etc d31 2 a32 6 -#CONFIG_DIR = +CONFIG_DIR = ${PREFIX}/etc # Uncomment this if you want color support. Usually this requires ncurses. COLOR_DEFS = -DCOLOR_SUPPORT d35 2 a36 1 -# SOUND_DEFS = -DOSS_SOUND d39 2 a40 2 # Uncomment the type of sound driver you want to use. # OSS d46 1 d48 1 a48 1 +#INCL = -I/usr/local/include d52 1 a52 4 -#INCL = +INCL = -I${BUILDLINK_DIR}/include # This should define the location and name of whatever curses library you're d55 1 d57 1 a57 1 +#LIB = -L/usr/local/lib d61 1 a61 6 -#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 @@@@ d76 9 @ 1.3 log @Buildlinkify. Use appropriate INCOMPAT_CURSES for setscrreg(). @ text @d14 1 a14 1 @@@@ -10,46 +10,46 @@@@ d65 1 a65 7 -CURSES = -lncurses # Linux always uses ncurses. -#CURSES = -lcurses +#CURSES = -lncurses # Linux always uses ncurses. +CURSES = -lcurses # Comment this out if you're not using ncurses. CURSES_DEF = -DUSE_NCURSES_H @ 1.2 log @Update to 2.41 most important changes: (for full summary see ChangeLog in the distfile) ======================================================================== - Beginning with 2.40, the reference version of Frotz (the DOS version) is distributed under the GNU Public License rather than the old "no commercial profit" license. And so is the Unix version. - V6 games supported by drawing the outlines of pictures. True display of the graphics are on hold until the X11 with GTK version is complete. - Classical Infocom sound effects supported through the OSS drivers. I'm only aware of "Lurking Horror" and "Sherlock: The Riddle of the Crown Jewels" as having such sound effects. See the INSTALL file for information on where the sound files should go. - Quetzal save format is now the default. Old Zip 2.0 format is still supported by command line option or config file setting. - History searchs has been added. Type the beginning of a past command and hit the up or down arrow key. @ text @d14 1 a14 1 @@@@ -10,42 +10,42 @@@@ d51 1 a51 1 +INCL = -I${PREFIX}/include d62 1 a62 1 +LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib d65 10 a74 2 CURSES = -lncurses # Linux always uses ncurses. @@@@ -87,6 +87,7 @@@@ d76 2 a77 1 CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL) d82 5 a86 1 $(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB) @ 1.1 log @Initial revision @ text @d2 6 a7 5 --- Makefile.orig Fri Oct 17 13:11:10 1997 +++ Makefile Fri Aug 13 15:52:29 1999 @@@@ -1,7 +1,6 @@@@ - # Define your c compiler. I recommend gcc if you've got it. d9 1 a9 1 -CC = gcc a10 1 +#CC = gcc d13 36 a48 11 # Debugging (don't use) @@@@ -43,21 +42,21 @@@@ # have that option. # #DEFS = -DUSE_GETOPT_H -DCOLOR_SUPPORT -DEMACS_EDITING -DEFS = +DEFS = -DUSE_UNISTD_H -DCOLOR_SUPPORT -DEMACS_EDITING -DUSE_NCURSES_H # This should point to the location of your curses or ncurses include file # if it's in a non-standard place. #INCL = -I/usr/local/include d50 1 a50 1 -INCL = d54 6 a59 3 # linking with. #LIB = -L/usr/local/lib #CURSES = -lncurses d61 1 a61 2 -LIB = -CURSES = -lcurses a62 1 +CURSES = -lncurses d64 3 a66 1 # Nothing under this line should need to be changed. d68 1 a68 3 @@@@ -71,3 +70,7 @@@@ frotz: $(OBJECTS) $(CC) -o frotz $(OBJECTS) $(LIB) $(CURSES) d71 3 a73 3 + +install: + ${INSTALL} -c frotz ${PREFIX}/bin @ 1.1.1.1 log @Initial import of frotz-2.32 Contributed by Peter Seebach, pkg/8203 @ text @@