summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/frotz/Makefile23
-rw-r--r--games/frotz/distinfo8
-rw-r--r--games/frotz/patches/patch-aa92
-rw-r--r--games/frotz/pkg/PLIST8
4 files changed, 85 insertions, 46 deletions
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 0fbe00e8fc2..f618e6786ad 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,21 +1,28 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:10:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/23 13:35:10 dillo Exp $
#
-DISTNAME= UnixFrotz232R2Std10
-PKGNAME= frotz-2.32
+DISTNAME= frotz-2.41
CATEGORIES= games
-MASTER_SITES= ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
+MASTER_SITES= http://www.cs.csubak.edu/~dgriffi/frotz/files/
+# 2.41 isn't on if-archive yet.
+#MASTER_SITES= ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
MAINTAINER= seebs@plethora.net
HOMEPAGE= ftp://ftp.gmd.de/if-archive/infocom/interpreters/frotz/
COMMENT= Curses-based interpreter for Infocom-compatible games
+# uses setscrreg, which is missing from our curses
DEPENDS+= ncurses>=4.2:../../devel/ncurses
-WRKSRC= ${WRKDIR}/frotz-2.32
+SAMPLEDIR= ${PREFIX}/share/examples/frotz
+DOCDIR= ${PREFIX}/share/doc/frotz
-post-install:
- cd ${WRKSRC}; \
- ${INSTALL_MAN} frotz.6 ${PREFIX}/man/man6/
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/frotz.6 ${PREFIX}/man/man6
+ ${INSTALL_DATA_DIR} ${SAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/frotz.conf-big ${SAMPLEDIR}/frotz.conf
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL HOW_TO_PLAY ${DOCDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/games/frotz/distinfo b/games/frotz/distinfo
index 6a103a72af9..5d2b7469450 100644
--- a/games/frotz/distinfo
+++ b/games/frotz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:24 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/23 13:35:10 dillo Exp $
-SHA1 (UnixFrotz232R2Std10.tar.gz) = cd5124a58aaff6a60eecbc352dd18c4402d87ce6
-Size (UnixFrotz232R2Std10.tar.gz) = 63021 bytes
-SHA1 (patch-aa) = 5f2e4cd319ef7f537558e01257264e7c30855007
+SHA1 (frotz-2.41.tar.gz) = 635f3ff0195ca3e429ba1582a90e00ef4403851a
+Size (frotz-2.41.tar.gz) = 137210 bytes
+SHA1 (patch-aa) = 4e520e2cbea3c617cf3e8a2042d26839cf9415c5
diff --git a/games/frotz/patches/patch-aa b/games/frotz/patches/patch-aa
index 0dec93c2613..653086a52f2 100644
--- a/games/frotz/patches/patch-aa
+++ b/games/frotz/patches/patch-aa
@@ -1,47 +1,73 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/14 06:59:42 fredb Exp $
---- 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.
--#CC = cc
+$NetBSD: patch-aa,v 1.2 2001/05/23 13:35:10 dillo Exp $
+
+--- Makefile.orig Sun May 20 23:16:39 2001
++++ Makefile
+@@ -1,6 +1,6 @@
+ #Define your C compiler. I recommend gcc if you have it.
-CC = gcc
-+CC = cc
+-#CC = cc
+#CC = gcc
++CC = cc
# Define your optimization flags. Most compilers understand -O and -O2,
- # 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
+ # Standard (note: Solaris on UltraSparc using gcc 2.8.x might not like this.)
+@@ -10,42 +10,42 @@
+ #-malign-jumps=2
+
+ # Define where you want Frotz to be installed. Usually this is /usr/local
+-PREFIX = /usr/local
++#PREFIX = /usr/local
+ #PREFIX =
+
+ # Define where you want Frotz to look for frotz.conf.
+-CONFIG_DIR = /usr/local/etc
++#CONFIG_DIR = /usr/local/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
+
+ # 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
+
+ # Uncomment the type of sound driver you want to use.
+ # OSS
+-#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/usr/pkg/include
+ #INCL = -I/usr/freeware/include
#INCL = -I/5usr/include
--INCL =
+-#INCL =
+INCL = -I${PREFIX}/include
# This should define the location and name of whatever curses library you're
- # linking with.
- #LIB = -L/usr/local/lib
- #CURSES = -lncurses
+ # 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/usr/pkg/lib
+ #LIB = -L/usr/freeware/lib
#LIB = -L/5usr/lib
--LIB =
--CURSES = -lcurses
+-#LIB =
+LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib
-+CURSES = -lncurses
- # Nothing under this line should need to be changed.
+ # One of these must be uncommented, use ncurses if you have it.
+ CURSES = -lncurses # Linux always uses ncurses.
+@@ -87,6 +87,7 @@
-@@ -71,3 +70,7 @@
- frotz: $(OBJECTS)
- $(CC) -o frotz $(OBJECTS) $(LIB) $(CURSES)
+ CFLAGS = $(OPTS) $(COMP_DEFS) $(INCL)
+all: frotz
-+
-+install:
-+ ${INSTALL} -c frotz ${PREFIX}/bin
+
+ $(BINNAME): soundcard.h $(OBJECTS)
+ $(CC) -o $(BINNAME)$(EXTENSION) $(OBJECTS) $(LIB) $(CURSES) $(SOUND_LIB)
diff --git a/games/frotz/pkg/PLIST b/games/frotz/pkg/PLIST
index e7a85f751d9..d42d83d6078 100644
--- a/games/frotz/pkg/PLIST
+++ b/games/frotz/pkg/PLIST
@@ -1,3 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/08/14 06:59:41 fredb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/23 13:35:10 dillo Exp $
bin/frotz
man/man6/frotz.6
+share/doc/frotz/README
+share/doc/frotz/INSTALL
+share/doc/frotz/HOW_TO_PLAY
+share/examples/frotz/frotz.conf
+@dirrm share/examples/frotz
+@dirrm share/doc/frotz