Index: head/games/scare/Makefile =================================================================== --- head/games/scare/Makefile (revision 182919) +++ head/games/scare/Makefile (revision 182920) @@ -1,47 +1,50 @@ # New ports collection makefile for: scare # Date created: 6 February 2005 # Whom: Peter Pentchev # # $FreeBSD$ # PORTNAME= scare -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.5 CATEGORIES= games MASTER_SITES= ftp://ftp.ifarchive.org/if-archive/programming/adrift/ \ http://www.geocities.com/legion_if/ MAINTAINER= roam@FreeBSD.org COMMENT= ADRIFT-compatible interactive games interpreter OPTIONS= XGLK "Use the xglk graphics library" off USE_ZIP= yes .include BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip BINFILES= scare .if defined(WITH_XGLK) PKGNAMESUFFIX= -glk BUILD_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk RUN_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk ALL_TARGET= all glkscare EXTRA_PATCHES= ${FILESDIR}/xglk.patch BINFILES+= glkscare .else EXTRA_PATCHES= ${FILESDIR}/no-xglk.patch .endif PLIST_FILES= ${BINFILES:S,^,bin/,} do-install: - ${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/,} ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${BINFILES:S,^,${WRKSRC}/source/,} ${PREFIX}/bin/ + +test: build + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check .include Property changes on: head/games/scare/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/games/scare/distinfo =================================================================== --- head/games/scare/distinfo (revision 182919) +++ head/games/scare/distinfo (revision 182920) @@ -1,3 +1,3 @@ -MD5 (scare-1.3.4.zip) = 82fc641ba6a92b933f9bd53f4963b9b9 -SHA256 (scare-1.3.4.zip) = fa93cb5f8cd35facad027d08ac898c569b4b60aecac038acacb7b7e6fb9218b1 -SIZE (scare-1.3.4.zip) = 633157 +MD5 (scare-1.3.5.zip) = 1f26a09440f2fc180ac6435c47a0a6e5 +SHA256 (scare-1.3.5.zip) = 8b65d60591b6db6618ce35ef027e4d2c51fda1362b1d74632e74f62571ac8722 +SIZE (scare-1.3.5.zip) = 1305393 Property changes on: head/games/scare/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/games/scare/files/no-xglk.patch =================================================================== --- head/games/scare/files/no-xglk.patch (revision 182919) +++ head/games/scare/files/no-xglk.patch (revision 182920) @@ -1,14 +1,14 @@ ---- Makefile Fri Feb 4 22:09:46 2005 -+++ Makefile.noglk Fri Feb 4 22:09:33 2005 -@@ -68,8 +68,9 @@ +--- source/Makefile Sun Jan 21 23:18:36 2007 ++++ source/Makefile.noglk Sun Jan 21 23:21:08 2007 +@@ -73,8 +73,9 @@ # If your make can't handle sinclude or -include, and you're not building # for Glk, comment out the include line. GLKPATH = $(GLKDIR)/$(GLK) -sinclude $(GLKPATH)/Make.$(GLK) -GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS) +#sinclude $(GLKPATH)/Make.$(GLK) +#GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS) +GLKLIBS = # Always use the Bourne shell. SHELL = /bin/sh Property changes on: head/games/scare/files/no-xglk.patch ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/games/scare/files/patch-Makefile =================================================================== --- head/games/scare/files/patch-Makefile (revision 182919) +++ head/games/scare/files/patch-Makefile (revision 182920) @@ -1,49 +1,43 @@ ---- Makefile.orig Tue Sep 26 21:47:00 2006 -+++ Makefile Tue Sep 26 21:49:23 2006 +--- source/Makefile.old Sun Jan 21 23:16:03 2007 ++++ source/Makefile Sun Jan 21 23:18:36 2007 @@ -26,18 +26,19 @@ # # GCC compiler and linker flags. -CC = gcc -DEBUG = -CEXTRA = -CFLAGS = -O2 -D__NO_STRING_INLINES -fPIC -ansi -D_STRICT_ANSI_ -Wall -W \ +CC ?= gcc +DEBUG ?= +CEXTRA ?= -+CFLAGS ?= -O2 -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 -@@ -79,12 +80,12 @@ +@@ -79,9 +80,9 @@ SHELL = /bin/sh # Miscellaneous tools, overridable by the command line. --ZIP = zip -UNZIP = unzip -RM = rm --LN = ln --TAR = tar -TEST = test -+ZIP ?= zip +UNZIP ?= unzip +RM ?= rm -+LN ?= ln -+TAR ?= tar +TEST ?= test # SCARE objects and headers. OBJECTS = sctafpar.o sctaffil.o scprops.o scvars.o scexpr.o scprintf.o \ Property changes on: head/games/scare/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/games/scare/files/patch-os_glk.c =================================================================== --- head/games/scare/files/patch-os_glk.c (revision 182919) +++ head/games/scare/files/patch-os_glk.c (revision 182920) @@ -1,40 +1,40 @@ ---- os_glk.c.orig Tue Sep 26 21:50:17 2006 -+++ os_glk.c Tue Sep 26 21:55:13 2006 +--- source/os_glk.c.orig Tue Sep 26 21:50:17 2006 ++++ source/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, 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 Property changes on: head/games/scare/files/patch-os_glk.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/games/scare/files/xglk.patch =================================================================== --- head/games/scare/files/xglk.patch (revision 182919) +++ head/games/scare/files/xglk.patch (revision 182920) @@ -1,20 +1,20 @@ ---- Makefile.orig Tue Sep 26 22:15:12 2006 -+++ Makefile Tue Sep 26 22:17:36 2006 +--- source/Makefile Sun Jan 21 23:22:38 2007 ++++ source/Makefile.xglk Sun Jan 21 23:23:11 2007 @@ -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) -sinclude $(GLKPATH)/Make.$(GLK) +.include "$(X11BASE)/share/xglk/Make.$(GLK)" GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS) # Always use the Bourne shell. -@@ -127,7 +127,7 @@ +@@ -134,7 +134,7 @@ os_glk.o: os_glk.c $(HEADERS) $(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 Property changes on: head/games/scare/files/xglk.patch ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property