3 files changed, 36 insertions, 72 deletions

diff --git a/games/inform7/Makefile b/games/inform7/Makefile
index 8a4d3e041793..02d6562d924a 100644
--- a/games/inform7/Makefile
+++ b/games/inform7/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	inform7
-PORTVERSION=	6E72
-PORTREVISION=	1
+PORTVERSION=	6F95
 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_6E72_FreeBSD.zip:2
+		I7_6F95_FreeBSD.zip:2
 
 MAINTAINER=	akosela@andykosela.com
 COMMENT=	Inform 7 programming language (CLI edition)
diff --git a/games/inform7/distinfo b/games/inform7/distinfo
index 592e52befaaf..1bdeff5bc827 100644
--- a/games/inform7/distinfo
+++ b/games/inform7/distinfo
@@ -1,6 +1,4 @@
-MD5 (inform6.zip) = 0de11c601f0489963b687cb1862d0c2c
 SHA256 (inform6.zip) = 7dc5a67c6db59d6b566a647e2321b0e23bf8571480da0a14161a6768d84e9b5d
 SIZE (inform6.zip) = 262130
-MD5 (I7_6E72_FreeBSD.zip) = 0502f4858539067493b7a12a51cce2b1
-SHA256 (I7_6E72_FreeBSD.zip) = aff0917addc0a75efd8528de484f58f2c88f63372a7c21a198050ec1907c6a5e
-SIZE (I7_6E72_FreeBSD.zip) = 2932108
+SHA256 (I7_6F95_FreeBSD.zip) = 8ef792d8dcad069f95205a7a025ea179c86d68af983504766e8581cc96d86e10
+SIZE (I7_6F95_FreeBSD.zip) = 2903446
diff --git a/games/inform7/pkg-plist b/games/inform7/pkg-plist
index 4c00754a1e22..a4832164a7ee 100644
--- a/games/inform7/pkg-plist
+++ b/games/inform7/pkg-plist
@@ -1,99 +1,79 @@
 bin/i7
 bin/inform6
 bin/ni
+%%DATADIR%%/Extensions/David Fisher/English.i7x
 %%DATADIR%%/Extensions/Emily Short/Glulx Entry Points.i7x
 %%DATADIR%%/Extensions/Emily Short/Plurality.i7x
-%%DATADIR%%/Extensions/Emily Short/._Basic Screen Effects.i7x
-%%DATADIR%%/Extensions/Emily Short/._Basic Help Menu.i7x
-%%DATADIR%%/Extensions/Emily Short/._Plurality.i7x
 %%DATADIR%%/Extensions/Emily Short/Punctuation Removal.i7x
 %%DATADIR%%/Extensions/Emily Short/Locksmith.i7x
-%%DATADIR%%/Extensions/Emily Short/._Glulx Text Effects.i7x
-%%DATADIR%%/Extensions/Emily Short/._Glulx Image Centering.i7x
 %%DATADIR%%/Extensions/Emily Short/Menus.i7x
-%%DATADIR%%/Extensions/Emily Short/._Locksmith.i7x
 %%DATADIR%%/Extensions/Emily Short/Glulx Text Effects.i7x
 %%DATADIR%%/Extensions/Emily Short/Case Management.i7x
 %%DATADIR%%/Extensions/Emily Short/Complex Listing.i7x
 %%DATADIR%%/Extensions/Emily Short/Glulx Image Centering.i7x
-%%DATADIR%%/Extensions/Emily Short/._Complex Listing.i7x
-%%DATADIR%%/Extensions/Emily Short/._Punctuation Removal.i7x
-%%DATADIR%%/Extensions/Emily Short/._Glulx Entry Points.i7x
-%%DATADIR%%/Extensions/Emily Short/._Menus.i7x
 %%DATADIR%%/Extensions/Emily Short/Basic Help Menu.i7x
-%%DATADIR%%/Extensions/Emily Short/._Case Management.i7x
 %%DATADIR%%/Extensions/Emily Short/Basic Screen Effects.i7x
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/._parchment.css
+%%DATADIR%%/Extensions/Graham Nelson/Rideable Vehicles.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Metric Units.i7x
+%%DATADIR%%/Extensions/Graham Nelson/Standard Rules.i7x
+%%DATADIR%%/Extensions/Reserved/Templates/Standard/index.html
+%%DATADIR%%/Extensions/Reserved/Templates/Standard/source.html
+%%DATADIR%%/Extensions/Reserved/Templates/Standard/play.html
+%%DATADIR%%/Extensions/Reserved/Templates/Standard/style.css
+%%DATADIR%%/Extensions/Reserved/Templates/Classic/index.html
+%%DATADIR%%/Extensions/Reserved/Templates/Classic/source.html
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/quixe.min.js
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/glkote.css
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/waiting.gif
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/dialog.css
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/glkote.min.js
+%%DATADIR%%/Extensions/Reserved/Templates/Quixe/(manifest).txt
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/jquery.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/._(manifest).txt
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/parchment.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/._gnusto.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/zmachine.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/._parchment.min.js
 %%DATADIR%%/Extensions/Reserved/Templates/Parchment/(manifest).txt
-%%DATADIR%%/Extensions/Reserved/Templates/Parchment/._jquery.min.js
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/._index.html
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/source.html
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/play.html
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/._play.html
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/._source.html
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/._style.css
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/style.css
-%%DATADIR%%/Extensions/Reserved/Templates/Standard/index.html
-%%DATADIR%%/Extensions/Reserved/Templates/Classic/index.html
-%%DATADIR%%/Extensions/Reserved/Templates/Classic/source.html
-%%DATADIR%%/Extensions/Reserved/Templates/Classic/._source.html
-%%DATADIR%%/Extensions/Reserved/Templates/Classic/._index.html
-%%DATADIR%%/Extensions/Reserved/Templates/._Parchment
+%%DATADIR%%/Extensions/Reserved/IntroductionToIF.pdf
+%%DATADIR%%/Extensions/Reserved/WinExtensionFileModel.html
+%%DATADIR%%/Extensions/Reserved/WinExtensionsModel.html
+%%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/WorldModel.i6t
 %%DATADIR%%/Extensions/Reserved/Utilities.i6t
 %%DATADIR%%/Extensions/Reserved/UnicodeData.i6t
 %%DATADIR%%/Extensions/Reserved/Time.i6t
-%%DATADIR%%/Extensions/Reserved/DefaultCover.jpg
 %%DATADIR%%/Extensions/Reserved/Tests.i6t
 %%DATADIR%%/Extensions/Reserved/Tables.i6t
-%%DATADIR%%/Extensions/Reserved/._DefaultCover.jpg
-%%DATADIR%%/Extensions/Reserved/._Templates
-%%DATADIR%%/Extensions/Reserved/StoredAction.i6t
-%%DATADIR%%/Extensions/Reserved/IntroductionToIF.pdf
-%%DATADIR%%/Extensions/Reserved/._Cover.jpg
 %%DATADIR%%/Extensions/Reserved/Sort.i6t
-%%DATADIR%%/Extensions/Reserved/WinExtensionFileModel.html
-%%DATADIR%%/Extensions/Reserved/._ExtensionFileModel.html
+%%DATADIR%%/Extensions/Reserved/StoredAction.i6t
 %%DATADIR%%/Extensions/Reserved/Rulebooks.i6t
-%%DATADIR%%/Extensions/Reserved/._WinExtensionsModel.html
 %%DATADIR%%/Extensions/Reserved/Relations.i6t
 %%DATADIR%%/Extensions/Reserved/RelationKind.i6t
 %%DATADIR%%/Extensions/Reserved/RegExp.i6t
-%%DATADIR%%/Extensions/Reserved/WinExtensionsModel.html
 %%DATADIR%%/Extensions/Reserved/RTP.i6t
 %%DATADIR%%/Extensions/Reserved/Printing.i6t
-%%DATADIR%%/Extensions/Reserved/definitions.html
 %%DATADIR%%/Extensions/Reserved/Parser.i6t
 %%DATADIR%%/Extensions/Reserved/Output.i6t
-%%DATADIR%%/Extensions/Reserved/Small Cover.jpg
 %%DATADIR%%/Extensions/Reserved/OutOfWorld.i6t
 %%DATADIR%%/Extensions/Reserved/OrderOfPlay.i6t
-%%DATADIR%%/Extensions/Reserved/ExtensionsModel.html
 %%DATADIR%%/Extensions/Reserved/Number.i6t
 %%DATADIR%%/Extensions/Reserved/Main.i6t
-%%DATADIR%%/Extensions/Reserved/._WinExtensionFileModel.html
 %%DATADIR%%/Extensions/Reserved/MStack.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Times.i6t
-%%DATADIR%%/Extensions/Reserved/._IntroductionToIF.pdf
-%%DATADIR%%/Extensions/Reserved/Cover.jpg
 %%DATADIR%%/Extensions/Reserved/Load-Sounds.i6t
-%%DATADIR%%/Extensions/Reserved/Lists.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Scenes.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Files.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Figures.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Core.i6t
 %%DATADIR%%/Extensions/Reserved/Load-Actions.i6t
-%%DATADIR%%/Extensions/Reserved/CblorbModel.html
-%%DATADIR%%/Extensions/Reserved/._ExtensionsModel.html
+%%DATADIR%%/Extensions/Reserved/Lists.i6t
 %%DATADIR%%/Extensions/Reserved/ListWriter.i6t
 %%DATADIR%%/Extensions/Reserved/Light.i6t
 %%DATADIR%%/Extensions/Reserved/Language.i6t
@@ -101,37 +81,24 @@ bin/ni
 %%DATADIR%%/Extensions/Reserved/IndexedText.i6t
 %%DATADIR%%/Extensions/Reserved/Glulx.i6t
 %%DATADIR%%/Extensions/Reserved/Flex.i6t
-%%DATADIR%%/Extensions/Reserved/ExtensionFileModel.html
-%%DATADIR%%/Extensions/Reserved/._Small Cover.jpg
 %%DATADIR%%/Extensions/Reserved/FileIO.i6t
 %%DATADIR%%/Extensions/Reserved/Figures.i6t
 %%DATADIR%%/Extensions/Reserved/Definitions.i6t
 %%DATADIR%%/Extensions/Reserved/Combinations.i6t
-%%DATADIR%%/Extensions/Reserved/._CblorbModel.html
 %%DATADIR%%/Extensions/Reserved/Chronology.i6t
 %%DATADIR%%/Extensions/Reserved/Char.i6t
 %%DATADIR%%/Extensions/Reserved/BlockValues.i6t
 %%DATADIR%%/Extensions/Reserved/Activities.i6t
-%%DATADIR%%/Extensions/Reserved/Actions.i6t
 %%DATADIR%%/Extensions/Reserved/ZMachine.i6t
-%%DATADIR%%/Extensions/David Fisher/English.i7x
-%%DATADIR%%/Extensions/David Fisher/._English.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/Metric Units.i7x
-%%DATADIR%%/Extensions/Graham Nelson/Standard Rules.i7x
-%%DATADIR%%/Extensions/Graham Nelson/._Rideable Vehicles.i7x
-%%DATADIR%%/Extensions/._Graham Nelson
-%%DATADIR%%/Extensions/._Emily Short
-%%DATADIR%%/Extensions/._David Fisher
-%%DATADIR%%/Extensions/._Reserved
+%%DATADIR%%/Extensions/Eric Eve/Epistemology.i7x
 @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
 @dirrmtry %%DATADIR%%/Extensions/Graham\ Nelson
+@dirrmtry %%DATADIR%%/Extensions/Eric\ Eve
 @dirrmtry %%DATADIR%%/Extensions/Emily\ Short
 @dirrmtry %%DATADIR%%/Extensions/David\ Fisher
 @dirrmtry %%DATADIR%%/Extensions