ports/178339: [MAINTAINER-UPDATE] games/inform7: update to 6G60_2

Sat May 4 20:50:01 UTC 2013

>Number:         178339
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] games/inform7: update to 6G60_2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 04 20:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Andy Kosela
>Release:        FreeBSD 7.3-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD zork 7.3-RELEASE-p2 FreeBSD 7.3-RELEASE-p2 #0: Mon Jul 12 19:23:19 UTC 2010 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
 - Bump port revision
 - Change -k to -w option
 - Fix i7.6 typo
 - Make portlint happier
 - Minor improvements to i7.sh.in

>How-To-Repeat:
	
>Fix:

--- inform7.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 317341)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	inform7
-# Date created:				23 September 2010
-# Whom:					Andy Kosela <akosela at andykosela.com>
-#
+# Created by: Andy Kosela <akosela at andykosela.com>
 # $FreeBSD$
-#
 
 PORTNAME=	inform7
 PORTVERSION=	6G60
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://ftp.ifarchive.org/if-archive/infocom/compilers/inform7/source/:1 \
 		http://ifarchive.heanet.ie/if-archive/infocom/compilers/inform7/source/:1 \
Index: files/i7.6
===================================================================
--- files/i7.6	(revision 317341)
+++ files/i7.6	(working copy)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2010 Andy Kosela <akosela at andykosela.com>
+.\" Copyright (c) 2010-2013 Andy Kosela <akosela at andykosela.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd October 2, 2010
+.Dd May 3, 2013
 .Dt I7 6
 .Os
 .Sh NAME
@@ -38,12 +38,12 @@
 .Op Fl 8g
 .Ar story.ni
 .Nm
-.Op Fl k
-.Ar story.key story.z5
-.Nm
 .Op Fl r
 .Ar story.scr story.z5
 .Nm
+.Op Fl w
+.Ar story.key story.z5
+.Nm
 .Op Fl h
 .Pp
 .Sh DESCRIPTION
@@ -68,7 +68,7 @@
 
 More resources:
  http://www.inform7.com
- http://www.brasslantern.com
+ http://www.brasslantern.org
  http://www.ifarchive.org
  http://en.wikipedia.org/wiki/Interactive_fiction
 
@@ -86,27 +86,30 @@
 create Glulx release.
 .It Fl h
 show usage.
-.It Fl k
-replay game from a keys or solution file.
 .It Fl r
 replay game from a transcript file.
+.It Fl w
+replay game from a walkthrough file.
 .Sh EXAMPLES
 .nf
 The most basic use of Inform7 for FreeBSD is:
+
 $ i7 story.ni
+
 which compiles your source story file into a Z-code v5 release.
 
 If you have a transcript file from game, you can use the -r option to
 replay it in story.z5
+
 $ i7 -r story.scr story.z5
 
 You will receive three files.
 story.$$.scr - new transcript file
-story.$$.key - keys file
+story.$$.key - walkthrough file
 story.$$.sav - save game from a transcript file
 
-You can also construct a simple keys file and then automatically replay
-its sequence of commands in your stories.
+You can also construct a simple walkthrough file and then automatically
+replay its sequence of commands in your stories.
 
 Example of a story.key
 VERBOSE
@@ -116,15 +119,15 @@
 GET LAMP
 SCORE
 
-A keys file can be very short, meant just to test some sequence of
-commands within your story, or it can be a full solution walkthrough.
+A walkthrough file can be very short, meant just to test some sequence
+of commands within your story, or it can be a full solution walkthrough.
 
-$ i7 -k story.key story.z5
+$ i7 -w story.key story.z5
 
 Once again you will receive three files.
 story.$$.scr - new transcript file
-story.$$.key - keys file
-story.$$.sav - save game from a keys file
+story.$$.key - walkthrough file
+story.$$.sav - save game from a walkthrough file
 .fi
 .Sh FILES
 .Bl -tag -width ".Pa /usr/local"
Index: files/i7.sh.in
===================================================================
--- files/i7.sh.in	(revision 317341)
+++ files/i7.sh.in	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 #
-#  Copyright (c) 2010 Andy Kosela <akosela at andykosela.com>
+#  Copyright (c) 2010-2013 Andy Kosela <akosela at andykosela.com>
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
@@ -33,15 +33,17 @@
 
 main()
 {
+	pkg=`basename $story | cut -d. -f1 2>/dev/null`
 	mkdir -p $pkg.inform/Build $pkg.inform/Source $pkg.inform/Index
-	cp $pkg.ni $pkg.inform/Source/story.ni
+	cp $story $pkg.inform/Source/story.ni
 	$ni --release --rules $rules --extension=$zsuf --package $pkg.inform
 	mv "$pkg.inform/Build/Debug log.txt" debug.log
 	if [ -s $pkg.inform/Build/auto.inf ]; then
 		echo ""
 		$inform $zopts $pkg.inform/Build/auto.inf -o $pkg.$zsuf
-		mv $pkg.inform/Build/Map.eps ${pkg}_map.eps
+		mv $pkg.inform/Build/Map.eps ${pkg}_map.eps 1>/dev/null 2>&1
 	fi
+	echo "Debug log: debug.log"
 	rm gameinfo.dbg 2>/dev/null
 	rm -rf $pkg.inform "$pkg Materials" 2>/dev/null
 	exit 0
@@ -49,9 +51,6 @@
 
 replay()
 {
-	story=$3
-	[ -z `echo "$story"` ] && story=`echo $pkg.[zu]*`
-
 	if [ -z "`grep 'script off' $pkg.$$.key`" ]; then
 		echo -e "\$a\nscript off\n.\nw" | ed - $pkg.$$.key
 	fi
@@ -66,7 +65,7 @@
 
 	echo "$pkg.$$.scr -- replay transcript file"
 	echo "$pkg.$$.sav -- replay save file"
-	echo "$pkg.$$.key -- replay keys file"
+	echo "$pkg.$$.key -- replay walkthrough file"
 	exit 0
 }
 
@@ -74,13 +73,13 @@
 {
 	echo "Usage: i7 story.ni"
 	echo "       i7 [-8g] story.ni"
-	echo "       i7 [-k] story.key story.z5"
 	echo "       i7 [-r] story.scr story.z5"
+	echo "       i7 [-w] story.key story.z5"
 	echo ""
 	echo "       -8 : create Z-code v8 release"
 	echo "       -g : create Glulx release"
-	echo "       -k : replay game from a keys or solution file"
 	echo "       -r : replay game from a transcript file"
+	echo "       -w : replay game from a walkthrough file"
 	echo ""
 	echo "By default i7 creates Z-code v5 releases."
 	exit 0
@@ -88,33 +87,38 @@
 
 # Start of script
 
-if [ ! -z `echo $1 | grep '.ni'` ]; then
+if [ ! -z `echo $1 | grep '.ni\|.inf\|.txt'` ]; then
 	zsuf=z5
 	zopts=-kE2w~S~DC0xv5
-	pkg=`basename $1 | cut -d. -f1 2>/dev/null`
+	story=$1
 	main
 elif [ -z "$1" ]; then
 	usage
 fi	
 
-while getopts 8:g:k:r:h opts
+while getopts 8:g:r:w:h opts
 do
-	pkg=`basename $OPTARG | cut -d. -f1 2>/dev/null`
 	case $opts in
-		8) zsuf=z8
+		8) story=$OPTARG
+		   zsuf=z8
 		   zopts=-kE2w~S~DC0xv8
 		   main
 		;;
-		g) zsuf=ulx
+		g) story=$OPTARG
+		   zsuf=ulx
 		   zopts=-kE2w~S~DC0xG
 		   main
 		;;
 		h) usage
 		;;
-		k) cp `basename $OPTARG` $pkg.$$.key
+		r) story=$3
+		   pkg=`basename $OPTARG | cut -d. -f1 2>/dev/null`
+		   grep '>' $OPTARG | cut -d'>' -f2 > $pkg.$$.key
 		   replay
 		;;
-	 	r) grep '>' `basename $OPTARG` | cut -d'>' -f2 > $pkg.$$.key
+		w) story=$3
+		   pkg=`basename $OPTARG | cut -d. -f1 2>/dev/null`
+		   cp $OPTARG $pkg.$$.key
 		   replay
 		;;
 		*) usage
--- inform7.diff ends here ---



--Andy
>Release-Note:
>Audit-Trail:
>Unformatted:
