games/inform7: update to 6L02

PR:		191530
Submitted by:	maintainer

5 files changed, 104 insertions, 68 deletions

diff --git a/games/inform7/Makefile b/games/inform7/Makefile
index c2b3f939ce5c..28e16ab9a93e 100644
--- a/games/inform7/Makefile
+++ b/games/inform7/Makefile
@@ -2,15 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	inform7
-PORTVERSION=	6G60
-PORTREVISION=	2
+PORTVERSION=	6L02
 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 \
-		http://ftp.ifarchive.org/if-archive/infocom/compilers/inform7/executables/:2 \
-		http://ifarchive.heanet.ie/if-archive/infocom/compilers/inform7/executables/:2
-DISTFILES=	inform6.zip:1 \
-		I7_6G60_FreeBSD.zip:2
+MASTER_SITES=	http://ftp.ifarchive.org/if-archive/infocom/compilers/inform7/executables/ \
+		http://ifarchive.heanet.ie/if-archive/infocom/compilers/inform7/executables/
+DISTFILES=	I7_6L02_FreeBSD.zip
 
 MAINTAINER=	akosela@andykosela.com
 COMMENT=	Inform 7 programming language (CLI edition)
@@ -25,11 +21,9 @@ SUB_FILES=	i7.sh
 .include <bsd.port.pre.mk>
 
 do-build:
-	@cd ${WRKDIR} && ${CC} ${CFLAGS} -o inform6 *.c
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/i7.sh ${STAGEDIR}${PREFIX}/bin/i7
-	@${INSTALL_PROGRAM} ${WRKDIR}/inform6 ${STAGEDIR}${PREFIX}/bin/inform6
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CP} -R ${WRKDIR}/Extensions ${STAGEDIR}${DATADIR}
@@ -38,8 +32,18 @@ do-install:
 
 .if ${ARCH} == "i386"
 	@${INSTALL_PROGRAM} ${WRKDIR}/ni.i386 ${STAGEDIR}${PREFIX}/bin/ni
+	@${INSTALL_PROGRAM} ${WRKDIR}/inform6.i386 ${STAGEDIR}${PREFIX}/bin/inform6
+	@${INSTALL_PROGRAM} ${WRKDIR}/cBlorb.i386 ${STAGEDIR}${PREFIX}/bin/cBlorb
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-frotz.i386 ${STAGEDIR}${PREFIX}/bin/dumb-frotz
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-git.i386 ${STAGEDIR}${PREFIX}/bin/dumb-git
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-glulxe.i386 ${STAGEDIR}${PREFIX}/bin/dumb-glulxe
 .else
 	@${INSTALL_PROGRAM} ${WRKDIR}/ni.amd64 ${STAGEDIR}${PREFIX}/bin/ni
+	@${INSTALL_PROGRAM} ${WRKDIR}/inform6.amd64 ${STAGEDIR}${PREFIX}/bin/inform6
+	@${INSTALL_PROGRAM} ${WRKDIR}/cBlorb.amd64 ${STAGEDIR}${PREFIX}/bin/cBlorb
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-frotz.amd64 ${STAGEDIR}${PREFIX}/bin/dumb-frotz
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-git.amd64 ${STAGEDIR}${PREFIX}/bin/dumb-git
+	@${INSTALL_PROGRAM} ${WRKDIR}/dumb-glulxe.amd64 ${STAGEDIR}${PREFIX}/bin/dumb-glulxe
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/inform7/distinfo b/games/inform7/distinfo
index 6434a542e87b..992328c7de83 100644
--- a/games/inform7/distinfo
+++ b/games/inform7/distinfo
@@ -1,4 +1,2 @@
-SHA256 (inform6.zip) = d007f3a681fae08956625d8a075311da2d2832e73c13b84134b8be048d6778e2
-SIZE (inform6.zip) = 253546
-SHA256 (I7_6G60_FreeBSD.zip) = 2f4a4dfe24406145a5fcf2226b887e28270e56038343509a08eb4876f4e9da61
-SIZE (I7_6G60_FreeBSD.zip) = 2949621
+SHA256 (I7_6L02_FreeBSD.zip) = 6a8fb139392934ae10e705005cb0cc53b758fedab286cfae52b86be258cf8aa9
+SIZE (I7_6L02_FreeBSD.zip) = 6531410
diff --git a/games/inform7/files/i7.6 b/games/inform7/files/i7.6
index 532c792f592e..28cbe2e0d100 100644
--- a/games/inform7/files/i7.6
+++ b/games/inform7/files/i7.6
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2010-2013 Andy Kosela <akosela@andykosela.com>
+.\" Copyright (c) 2010-2014 Andy Kosela <akosela@andykosela.com>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd May 3, 2013
+.Dd June 30, 2014
 .Dt I7 6
 .Os
 .Sh NAME
@@ -35,14 +35,14 @@
 .Nm
 .Ar story.ni
 .Nm
-.Op Fl 8g
+.Op Fl g
 .Ar story.ni
 .Nm
 .Op Fl r
-.Ar story.scr story.z5
+.Ar story.scr story
 .Nm
 .Op Fl w
-.Ar story.key story.z5
+.Ar story.key story
 .Nm
 .Op Fl h
 .Pp
@@ -79,8 +79,6 @@ interactive fiction stories.
 The following command line arguments are supported:
 .Bl -tag -width Fl
 .It Fl
-create Z-code v5 release.
-.It Fl 8
 create Z-code v8 release.
 .It Fl g
 create Glulx release.
@@ -96,12 +94,12 @@ The most basic use of Inform7 for FreeBSD is:
 
 $ i7 story.ni
 
-which compiles your source story file into a Z-code v5 release.
+which compiles your source story file into a Z-code v8 release.
 
 If you have a transcript file from game, you can use the -r option to
-replay it in story.z5
+replay it in story.z8
 
-$ i7 -r story.scr story.z5
+$ i7 -r story.scr story.z8
 
 You will receive three files.
 story.$$.scr - new transcript file
@@ -122,7 +120,7 @@ SCORE
 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 -w story.key story.z5
+$ i7 -w story.key story.z8
 
 Once again you will receive three files.
 story.$$.scr - new transcript file
@@ -140,7 +138,7 @@ Directory where Inform extensions are stored.
 language and compilers
 .An Andy Kosela <akosela@andykosela.com> -- CLI edition for FreeBSD
 .Sh CONTRIBUTORS
-.An Adam Thornton, Emily Short, David Fisher
+.An Adam Thornton, Emily Short, Eric Eve
 .Sh THANKS TO
 Will Crowther and Don Woods for creating the original Adventure, Infocom
 for the Z-machine standard and memorable titles like Zork, Graham Nelson
diff --git a/games/inform7/files/i7.sh.in b/games/inform7/files/i7.sh.in
index 66977d93ff2b..a1f031c77943 100644
--- a/games/inform7/files/i7.sh.in
+++ b/games/inform7/files/i7.sh.in
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 #
-#  Copyright (c) 2010-2013 Andy Kosela <akosela@andykosela.com>
+#  Copyright (c) 2010-2014 Andy Kosela <akosela@andykosela.com>
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
@@ -27,8 +27,8 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-ni=%%PREFIX%%/bin/ni
 inform=%%PREFIX%%/bin/inform6
+ni=%%PREFIX%%/bin/ni
 rules=%%DATADIR%%/Extensions
 
 main()
@@ -45,24 +45,32 @@ main()
 	fi
 	echo "Debug log: debug.log"
 	rm gameinfo.dbg 2>/dev/null
-	rm -rf $pkg.inform "$pkg Materials" 2>/dev/null
+	rm -rf $pkg.inform $pkg.materials 2>/dev/null
 	exit 0
 }
 
 replay()
 {
+	if [ ! -z "`grep -e quit -e save $pkg.$$.key`" ]; then
+		sed -i '' '/^quit/d ; /^save/d' $pkg.$$.key
+	fi
 	if [ -z "`grep 'script off' $pkg.$$.key`" ]; then
-		echo -e "\$a\nscript off\n.\nw" | ed - $pkg.$$.key
+		echo "script off" >> $pkg.$$.key
 	fi
-
 	echo -e \
 	"0a\nscript\n$pkg.$$.scr\n.\n\$a\nsave\n$pkg.$$.sav\nquit\ny\ny\n.\nw" |
 	    ed - $pkg.$$.key
-	cat $pkg.$$.key | frotz -S 72 $story 1>/dev/null 2>&1
+
+	if [ ! -z `echo $story | grep -e \.ulx -e \.gblorb -e \.blb` ]; then
+		cat $pkg.$$.key | dumb-glulxe $story 1>/dev/null 2>&1
+		cat $pkg.$$.scr | fold -s -72 > $pkg.$$.scr
+	else
+		cat $pkg.$$.key | frotz -QS 72 $story 1>/dev/null 2>&1
+	fi
+
 	echo -e \
 	"g/^script/d\ng/^quit/d\ng/^save/d\ng/.sav/d\ng/.scr/d\ng/^y$/d\nw" |
 	    ed - $pkg.$$.key
-
 	echo "$pkg.$$.scr -- replay transcript file"
 	echo "$pkg.$$.sav -- replay save file"
 	echo "$pkg.$$.key -- replay walkthrough file"
@@ -72,38 +80,32 @@ replay()
 usage()
 {
 	echo "Usage: i7 story.ni"
-	echo "       i7 [-8g] story.ni"
-	echo "       i7 [-r] story.scr story.z5"
-	echo "       i7 [-w] story.key story.z5"
+	echo "       i7 [-g] story.ni"
+	echo "       i7 [-r] story.scr story"
+	echo "       i7 [-w] story.key story"
 	echo ""
-	echo "       -8 : create Z-code v8 release"
 	echo "       -g : create Glulx release"
 	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."
+	echo "By default i7 creates Z-code v8 releases."
 	exit 0
 }
 
 # Start of script
 
 if [ ! -z `echo $1 | grep '.ni\|.inf\|.txt'` ]; then
-	zsuf=z5
-	zopts=-kE2w~S~DC0xv5
+	zsuf=z8
+	zopts=-kE2w~S~DC0xv8
 	story=$1
 	main
 elif [ -z "$1" ]; then
 	usage
 fi	
 
-while getopts 8:g:r:w:h opts
+while getopts g:r:w:h opts
 do
 	case $opts in
-		8) story=$OPTARG
-		   zsuf=z8
-		   zopts=-kE2w~S~DC0xv8
-		   main
-		;;
 		g) story=$OPTARG
 		   zsuf=ulx
 		   zopts=-kE2w~S~DC0xG
diff --git a/games/inform7/pkg-plist b/games/inform7/pkg-plist
index be61c01d6080..25af80b3f87e 100644
--- a/games/inform7/pkg-plist
+++ b/games/inform7/pkg-plist
@@ -1,22 +1,34 @@
+bin/cBlorb
+bin/dumb-frotz
+bin/dumb-git
+bin/dumb-glulxe
 bin/i7
 bin/inform6
 bin/ni
 man/man6/i7.6.gz
-%%DATADIR%%/Extensions/David Fisher/English.i7x
-%%DATADIR%%/Extensions/Emily Short/Glulx Entry Points.i7x
-%%DATADIR%%/Extensions/Emily Short/Plurality.i7x
+%%DATADIR%%/Extensions/Emily Short/Skeleton Keys.i7x
 %%DATADIR%%/Extensions/Emily Short/Punctuation Removal.i7x
 %%DATADIR%%/Extensions/Emily Short/Locksmith.i7x
 %%DATADIR%%/Extensions/Emily Short/Menus.i7x
+%%DATADIR%%/Extensions/Emily Short/Inanimate Listeners.i7x
 %%DATADIR%%/Extensions/Emily Short/Glulx Text Effects.i7x
-%%DATADIR%%/Extensions/Emily Short/Case Management.i7x
+%%DATADIR%%/Extensions/Emily Short/Glulx Entry Points.i7x
 %%DATADIR%%/Extensions/Emily Short/Complex Listing.i7x
 %%DATADIR%%/Extensions/Emily Short/Glulx Image Centering.i7x
 %%DATADIR%%/Extensions/Emily Short/Basic Help Menu.i7x
 %%DATADIR%%/Extensions/Emily Short/Basic Screen Effects.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Unicode Full Character Names.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Unicode Character Names.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Standard Rules.i7x
 %%DATADIR%%/Extensions/Graham Nelson/Rideable Vehicles.i7x
 %%DATADIR%%/Extensions/Graham Nelson/Metric Units.i7x
-%%DATADIR%%/Extensions/Graham Nelson/Standard Rules.i7x
+%%DATADIR%%/Extensions/Graham Nelson/English Language.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Approximate Metric Units.i7x
+%%DATADIR%%/Extensions/Reserved/Templates/Vorple/zvm.min.js
+%%DATADIR%%/Extensions/Reserved/Templates/Vorple/vorple.parchment.min.js
+%%DATADIR%%/Extensions/Reserved/Templates/Vorple/vorple.css
+%%DATADIR%%/Extensions/Reserved/Templates/Vorple/soundmanager2.swf
+%%DATADIR%%/Extensions/Reserved/Templates/Vorple/(manifest).txt
 %%DATADIR%%/Extensions/Reserved/Templates/Standard/index.html
 %%DATADIR%%/Extensions/Reserved/Templates/Standard/source.html
 %%DATADIR%%/Extensions/Reserved/Templates/Standard/play.html
@@ -31,35 +43,45 @@ man/man6/i7.6.gz
 %%DATADIR%%/Extensions/Reserved/Templates/Quixe/(manifest).txt
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/jquery.min.js
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/parchment.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/parchment.css
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/gnusto.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/zmachine.min.js
+%%DATADIR%%/Extensions/Reserved/Templates/Parchment/parchment.min.css
+%%DATADIR%%/Extensions/Reserved/Templates/Parchment/zvm.min.js
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/(manifest).txt
-%%DATADIR%%/Extensions/Reserved/IntroductionToIF.pdf
-%%DATADIR%%/Extensions/Reserved/WinExtensionFileModel.html
-%%DATADIR%%/Extensions/Reserved/WinExtensionsModel.html
+%%DATADIR%%/Extensions/Reserved/Languages/Swedish/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/Swedish/about.txt
+%%DATADIR%%/Extensions/Reserved/Languages/Spanish/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/Spanish/about.txt
+%%DATADIR%%/Extensions/Reserved/Languages/Italian/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/Italian/about.txt
+%%DATADIR%%/Extensions/Reserved/Languages/German/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/German/about.txt
+%%DATADIR%%/Extensions/Reserved/Languages/French/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/French/about.txt
+%%DATADIR%%/Extensions/Reserved/Languages/English/Syntax.preform
+%%DATADIR%%/Extensions/Reserved/Languages/English/flag.png
+%%DATADIR%%/Extensions/Reserved/Languages/English/about.txt
 %%DATADIR%%/Extensions/Reserved/definitions.html
-%%DATADIR%%/Extensions/Reserved/Small Cover.jpg
-%%DATADIR%%/Extensions/Reserved/ExtensionsModel.html
-%%DATADIR%%/Extensions/Reserved/CblorbModel.html
-%%DATADIR%%/Extensions/Reserved/Cover.jpg
-%%DATADIR%%/Extensions/Reserved/DefaultCover.jpg
-%%DATADIR%%/Extensions/Reserved/ExtensionFileModel.html
-%%DATADIR%%/Extensions/Reserved/Actions.i6t
+%%DATADIR%%/Extensions/Reserved/ZMachine.i6t
 %%DATADIR%%/Extensions/Reserved/WorldModel.i6t
+%%DATADIR%%/Extensions/Reserved/WinExtensionsModel.html
+%%DATADIR%%/Extensions/Reserved/WinExtensionFileModel.html
 %%DATADIR%%/Extensions/Reserved/Utilities.i6t
 %%DATADIR%%/Extensions/Reserved/UnicodeData.i6t
 %%DATADIR%%/Extensions/Reserved/Time.i6t
+%%DATADIR%%/Extensions/Reserved/Text.i6t
 %%DATADIR%%/Extensions/Reserved/Tests.i6t
 %%DATADIR%%/Extensions/Reserved/Tables.i6t
-%%DATADIR%%/Extensions/Reserved/Sort.i6t
 %%DATADIR%%/Extensions/Reserved/StoredAction.i6t
+%%DATADIR%%/Extensions/Reserved/Sort.i6t
+%%DATADIR%%/Extensions/Reserved/Small Cover.jpg
 %%DATADIR%%/Extensions/Reserved/Rulebooks.i6t
 %%DATADIR%%/Extensions/Reserved/Relations.i6t
 %%DATADIR%%/Extensions/Reserved/RelationKind.i6t
 %%DATADIR%%/Extensions/Reserved/RegExp.i6t
+%%DATADIR%%/Extensions/Reserved/RealNumber.i6t
 %%DATADIR%%/Extensions/Reserved/RTP.i6t
 %%DATADIR%%/Extensions/Reserved/Printing.i6t
+%%DATADIR%%/Extensions/Reserved/Postcard.pdf
+%%DATADIR%%/Extensions/Reserved/Postcard.html
 %%DATADIR%%/Extensions/Reserved/Parser.i6t
 %%DATADIR%%/Extensions/Reserved/Output.i6t
 %%DATADIR%%/Extensions/Reserved/OutOfWorld.i6t
@@ -78,29 +100,41 @@ man/man6/i7.6.gz
 %%DATADIR%%/Extensions/Reserved/ListWriter.i6t
 %%DATADIR%%/Extensions/Reserved/Light.i6t
 %%DATADIR%%/Extensions/Reserved/Language.i6t
+%%DATADIR%%/Extensions/Reserved/IntroductionToIF.pdf
 %%DATADIR%%/Extensions/Reserved/Introduction.i6t
-%%DATADIR%%/Extensions/Reserved/IndexedText.i6t
 %%DATADIR%%/Extensions/Reserved/Glulx.i6t
 %%DATADIR%%/Extensions/Reserved/Flex.i6t
 %%DATADIR%%/Extensions/Reserved/FileIO.i6t
 %%DATADIR%%/Extensions/Reserved/Figures.i6t
+%%DATADIR%%/Extensions/Reserved/ExtensionsModel.html
+%%DATADIR%%/Extensions/Reserved/ExtensionFileModel.html
 %%DATADIR%%/Extensions/Reserved/Definitions.i6t
+%%DATADIR%%/Extensions/Reserved/DefaultCover.jpg
+%%DATADIR%%/Extensions/Reserved/Cover.jpg
 %%DATADIR%%/Extensions/Reserved/Combinations.i6t
 %%DATADIR%%/Extensions/Reserved/Chronology.i6t
 %%DATADIR%%/Extensions/Reserved/Char.i6t
+%%DATADIR%%/Extensions/Reserved/CblorbModel.html
 %%DATADIR%%/Extensions/Reserved/BlockValues.i6t
 %%DATADIR%%/Extensions/Reserved/Activities.i6t
-%%DATADIR%%/Extensions/Reserved/ZMachine.i6t
+%%DATADIR%%/Extensions/Reserved/Actions.i6t
 %%DATADIR%%/Extensions/Eric Eve/Epistemology.i7x
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Templates/Vorple
 @dirrmtry %%DATADIR%%/Extensions/Reserved/Templates/Standard
 @dirrmtry %%DATADIR%%/Extensions/Reserved/Templates/Quixe
 @dirrmtry %%DATADIR%%/Extensions/Reserved/Templates/Parchment
 @dirrmtry %%DATADIR%%/Extensions/Reserved/Templates/Classic
 @dirrmtry %%DATADIR%%/Extensions/Reserved/Templates
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/Swedish
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/Spanish
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/Italian
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/German
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/French
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages/English
+@dirrmtry %%DATADIR%%/Extensions/Reserved/Languages
 @dirrmtry %%DATADIR%%/Extensions/Reserved
 @dirrmtry %%DATADIR%%/Extensions/Graham Nelson
 @dirrmtry %%DATADIR%%/Extensions/Eric Eve
 @dirrmtry %%DATADIR%%/Extensions/Emily Short
-@dirrmtry %%DATADIR%%/Extensions/David Fisher
 @dirrmtry %%DATADIR%%/Extensions
 @dirrmtry %%DATADIR%%