aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorroam <roam@FreeBSD.org>2006-09-27 03:51:10 +0800
committerroam <roam@FreeBSD.org>2006-09-27 03:51:10 +0800
commit860ed1fca06e092e8223a031bb89d33337b35650 (patch)
tree428013c255134ae2014248e9a33013971e4e1860 /games
parentb8937b930add404bb6da80426a9556b77260b23a (diff)
downloadfreebsd-ports-graphics-860ed1fca06e092e8223a031bb89d33337b35650.tar.gz
freebsd-ports-graphics-860ed1fca06e092e8223a031bb89d33337b35650.tar.zst
freebsd-ports-graphics-860ed1fca06e092e8223a031bb89d33337b35650.zip
Update to scare-1.3.4 - *all* the source files were reindented with
two-character tabs! Grrrowl. While I'm here, OPTIONS'ify the xglk support.
Diffstat (limited to 'games')
-rw-r--r--games/scare/Makefile8
-rw-r--r--games/scare/distinfo6
-rw-r--r--games/scare/files/patch-Makefile16
-rw-r--r--games/scare/files/patch-os_glk.c74
-rw-r--r--games/scare/files/xglk.patch14
5 files changed, 62 insertions, 56 deletions
diff --git a/games/scare/Makefile b/games/scare/Makefile
index 65a38027ef6..f265ae62db1 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scare
-PORTVERSION= 1.3.3
+PORTVERSION= 1.3.4
CATEGORIES= games
MASTER_SITES= ftp://ftp.ifarchive.org/if-archive/programming/adrift/ \
http://www.geocities.com/legion_if/
@@ -14,8 +14,12 @@ MASTER_SITES= ftp://ftp.ifarchive.org/if-archive/programming/adrift/ \
MAINTAINER= roam@FreeBSD.org
COMMENT= ADRIFT-compatible interactive games interpreter
+OPTIONS= XGLK "Use the xglk graphics library" off
+
USE_ZIP= yes
+.include <bsd.port.pre.mk>
+
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
BINFILES= scare
@@ -40,4 +44,4 @@ PLIST_FILES= ${BINFILES:S,^,bin/,}
do-install:
${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/,} ${PREFIX}/bin/
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/scare/distinfo b/games/scare/distinfo
index 681e38c86a1..cf72c082e86 100644
--- a/games/scare/distinfo
+++ b/games/scare/distinfo
@@ -1,3 +1,3 @@
-MD5 (scare-1.3.3.zip) = 432b809d4ecd217e2dbfd43c09703d15
-SHA256 (scare-1.3.3.zip) = eaec6c47ace10a33c18ca9f6648bf01ea20bacca7db58dafb90ffd577dd783e2
-SIZE (scare-1.3.3.zip) = 629739
+MD5 (scare-1.3.4.zip) = 82fc641ba6a92b933f9bd53f4963b9b9
+SHA256 (scare-1.3.4.zip) = fa93cb5f8cd35facad027d08ac898c569b4b60aecac038acacb7b7e6fb9218b1
+SIZE (scare-1.3.4.zip) = 633157
diff --git a/games/scare/files/patch-Makefile b/games/scare/files/patch-Makefile
index 863daadcf15..66a07d9dc13 100644
--- a/games/scare/files/patch-Makefile
+++ b/games/scare/files/patch-Makefile
@@ -1,32 +1,34 @@
---- Makefile.orig Sun Feb 6 21:18:36 2005
-+++ Makefile Sun Feb 6 21:22:41 2005
-@@ -26,16 +26,17 @@
+--- Makefile.orig Tue Sep 26 21:47:00 2006
++++ Makefile Tue Sep 26 21:49:23 2006
+@@ -26,18 +26,19 @@
#
# GCC compiler and linker flags.
-CC = gcc
-DEBUG =
-CEXTRA =
--CFLAGS = -O3 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W \
+-CFLAGS = -O2 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W \
+CC ?= gcc
+DEBUG ?=
+CEXTRA ?=
-+CFLAGS ?= -O3 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W \
++CFLAGS ?= -O2 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W \
-pedantic -Wshadow -Wpointer-arith -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
+ -Wwrite-strings -Wundef -Wbad-function-cast -Waggregate-return \
+ -Wnested-externs \
- $(DEBUG) $(CEXTRA)
-LDLIBS =
-LDEXTRA =
-LDFLAGS = $(DEBUG) $(LDEXTRA)
+ $(DEBUG)
-+CFLAGS+= ${CEXTRA}
++CFLAGS += $(CEXTRA)
+LDLIBS ?=
+LDEXTRA ?=
+LDFLAGS ?= $(DEBUG) $(LDEXTRA)
# Generic compiler and linker flags.
#CC = cc
-@@ -77,12 +78,12 @@
+@@ -79,12 +80,12 @@
SHELL = /bin/sh
# Miscellaneous tools, overridable by the command line.
diff --git a/games/scare/files/patch-os_glk.c b/games/scare/files/patch-os_glk.c
index 4f4781a1bd9..4f53fcd59c8 100644
--- a/games/scare/files/patch-os_glk.c
+++ b/games/scare/files/patch-os_glk.c
@@ -1,40 +1,40 @@
---- os_glk.c.orig Sat Feb 5 19:58:33 2005
-+++ os_glk.c Sat Feb 5 20:17:22 2005
-@@ -899,6 +899,8 @@
- && glk_gestalt (gestalt_Graphics, 0))
- {
- sc_char *buffer;
-+ char fname[80];
-+ int fd;
+--- os_glk.c.orig Tue Sep 26 21:50:17 2006
++++ os_glk.c Tue Sep 26 21:55:13 2006
+@@ -1110,6 +1110,8 @@
+ && gsclinux_graphics_enabled && glk_gestalt (gestalt_Graphics, 0))
+ {
+ sc_char *buffer;
++ char fname[80];
++ int fd;
- /*
- * Try to extract data with dd. Assuming that works, back-
-@@ -906,15 +908,23 @@
- * delay ten seconds and then delete the temporary file
- * containing the image. Not exactly finessed.
- */
-+ strcpy(fname, "/tmp/scare-XXXXXX.jpg");
-+ fd = mkstemps(fname, 4);
-+ if (fd < 0)
-+ return;
-+ close(fd);
- assert (gsclinux_game_file != NULL);
- buffer = gsc_malloc (strlen (gsclinux_game_file) + 128);
-- sprintf (buffer, "dd if=%s ibs=1c skip=%ld count=%ld obs=100k"
-- " of=/tmp/scare.jpg 2>/dev/null",
-- gsclinux_game_file, offset, length);
-+ sprintf (buffer, "dd if=%s ibs=1 skip=%ld count=%ld obs=100k"
-+ " of=%s 2>/dev/null",
-+ gsclinux_game_file, offset, length,
-+ fname);
-+ system (buffer);
-+ sprintf (buffer, "xv %s >/dev/null 2>&1 &", fname);
-+ system (buffer);
-+ sprintf (buffer, "( sleep 10; rm %s ) >/dev/null 2>&1 &", fname);
- system (buffer);
- free (buffer);
-- system ("xv /tmp/scare.jpg >/dev/null 2>&1 &");
-- system ("( sleep 10; rm /tmp/scare.jpg ) >/dev/null 2>&1 &");
- }
+ /*
+ * Try to extract data with dd. Assuming that works, background xv to
+@@ -1118,15 +1120,23 @@
+ * xv can usually use a small script, named xv, to invoke eog or an
+ * alternative image display binary. Not exactly finessed.
+ */
++ strcpy(fname, "/tmp/scare-XXXXXX.jpg");
++ fd = mkstemps(fname, 4);
++ if (fd < 0)
++ return;
++ close(fd);
+ assert (gsclinux_game_file);
+ buffer = gsc_malloc (strlen (gsclinux_game_file) + 128);
+- sprintf (buffer, "dd if=%s ibs=1c skip=%ld count=%ld obs=100k"
+- " of=/tmp/scare.jpg 2>/dev/null",
+- gsclinux_game_file, offset, length);
++ sprintf (buffer, "dd if=%s ibs=1 skip=%ld count=%ld obs=100k"
++ " of=%s 2>/dev/null",
++ gsclinux_game_file, offset, length,
++ fname);
++ system (buffer);
++ sprintf (buffer, "xv %s >/dev/null 2>&1 &", fname);
++ system (buffer);
++ sprintf (buffer, "( sleep 10; rm %s ) >/dev/null 2>&1 &", fname);
+ system (buffer);
+ free (buffer);
+- system ("xv /tmp/scare.jpg >/dev/null 2>&1 &");
+- system ("( sleep 10; rm /tmp/scare.jpg ) >/dev/null 2>&1 &");
+ }
}
#else
diff --git a/games/scare/files/xglk.patch b/games/scare/files/xglk.patch
index 454621c2deb..8f92bb477e9 100644
--- a/games/scare/files/xglk.patch
+++ b/games/scare/files/xglk.patch
@@ -1,6 +1,6 @@
---- Makefile.orig Fri Apr 30 08:05:12 2004
-+++ Makefile Fri Feb 4 22:18:07 2005
-@@ -68,7 +68,7 @@
+--- Makefile.orig Tue Sep 26 22:15:12 2006
++++ Makefile Tue Sep 26 22:17:36 2006
+@@ -73,7 +73,7 @@
# If your make can't handle sinclude or -include, and you're not building
# for Glk, comment out the include line.
GLKPATH = $(GLKDIR)/$(GLK)
@@ -9,12 +9,12 @@
GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS)
# Always use the Bourne shell.
-@@ -121,7 +121,7 @@
- $(LDLIBS) $(GLKLIBS)
+@@ -127,7 +127,7 @@
os_glk.o: os_glk.c $(HEADERS)
-- $(CC) $(GLKARCH) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(GLKARCH) $(CFLAGS) -DLINUX_GRAPHICS -I${X11BASE}/include/xglk -c -o $@ $<
+ $(CC) $(GLKARCH) $(CFLAGS) -Wno-write-strings \
+- -I $(GLKDIR)/$(GLK) -c -o $@ $<
++ -DLINUX_GRAPHICS -I${X11BASE}/include/xglk -c -o $@ $<
# Option to build an IFP plugin version of SCARE.
scare_plugin.c: scare.hdr