Update Inform to 6.30.2, courtesy of patches from David Griffith

(to whom I apologize for being very slow with this).
Also addresses PR pkg/24631.

1 files changed, 251 insertions, 223 deletions

diff --git a/lang/inform/PLIST b/lang/inform/PLIST
index 8895c155b86..d4e7967771f 100644
--- a/lang/inform/PLIST
+++ b/lang/inform/PLIST
@@ -1,221 +1,250 @@
-@comment $NetBSD: PLIST,v 1.5 2004/03/02 11:59:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/12/06 17:47:11 nathanw Exp $
 bin/inform
-bin/inform-6.21
-share/inform/6.21/include/AdHints.h
-share/inform/6.21/include/Menus.h
-share/inform/6.21/include/NewMenu.h
-share/inform/6.21/include/SmartCantGo.h
-share/inform/6.21/include/adhints.h
-share/inform/6.21/include/altmenu.h
-share/inform/6.21/include/calyx_adjectives.h
-share/inform/6.21/include/center.h
-share/inform/6.21/include/clothing.h
-share/inform/6.21/include/compass.h
-share/inform/6.21/include/dirs.h
-share/inform/6.21/include/domenu.h
-share/inform/6.21/include/doors.h
-share/inform/6.21/include/footnote.h
-share/inform/6.21/include/hints.h
-share/inform/6.21/include/info.h
-share/inform/6.21/include/istring.h
-share/inform/6.21/include/longint.h
-share/inform/6.21/include/manual.h
-share/inform/6.21/include/menus.h
-share/inform/6.21/include/money.h
-share/inform/6.21/include/moveclass.h
-share/inform/6.21/include/movie.h
-share/inform/6.21/include/newmenu.h
-share/inform/6.21/include/newmenus.h
-share/inform/6.21/include/outofrch.h
-share/inform/6.21/include/physics.h
-share/inform/6.21/include/pluralob.h
-share/inform/6.21/include/printtime.h
-share/inform/6.21/include/showobj.h
-share/inform/6.21/include/smartcantgo.h
-share/inform/6.21/include/timepiece.h
-share/inform/6.21/include/timesys.h
-share/inform/6.21/include/timewait.h
-share/inform/6.21/include/utility.h
-share/inform/6.21/include/waittime.h
-share/inform/6.21/include/whatis.h
-share/inform/6.21/include/whowhat.h
-share/inform/6.21/include/yesno.h
-share/inform/6.21/include/znsi.h
-share/inform/6.21/module/English.h
-share/inform/6.21/module/Grammar.h
-share/inform/6.21/module/Parser.h
-share/inform/6.21/module/VerbLib.h
-share/inform/6.21/module/Verblib.h
-share/inform/6.21/module/english.h
-share/inform/6.21/module/grammar.h
-share/inform/6.21/module/infix.h
-share/inform/6.21/module/linklpa.h
-share/inform/6.21/module/linklv.h
-share/inform/6.21/module/parser.h
-share/inform/6.21/module/parserm.h
-share/inform/6.21/module/parserm.m5
-share/inform/6.21/module/verblib.h
-share/inform/6.21/module/verblibm.h
-share/inform/6.21/module/verblibm.m5
-share/inform/manual/answers1/answer1.html
-share/inform/manual/answers1/answer10.html
-share/inform/manual/answers1/answer11.html
-share/inform/manual/answers1/answer12.html
-share/inform/manual/answers1/answer13.html
-share/inform/manual/answers1/answer14.html
-share/inform/manual/answers1/answer15.html
-share/inform/manual/answers1/answer16.html
-share/inform/manual/answers1/answer17.html
-share/inform/manual/answers1/answer18.html
-share/inform/manual/answers1/answer19.html
-share/inform/manual/answers1/answer2.html
-share/inform/manual/answers1/answer20.html
-share/inform/manual/answers1/answer21.html
-share/inform/manual/answers1/answer22.html
-share/inform/manual/answers1/answer23.html
-share/inform/manual/answers1/answer24.html
-share/inform/manual/answers1/answer25.html
-share/inform/manual/answers1/answer26.html
-share/inform/manual/answers1/answer27.html
-share/inform/manual/answers1/answer28.html
-share/inform/manual/answers1/answer29.html
-share/inform/manual/answers1/answer3.html
-share/inform/manual/answers1/answer30.html
-share/inform/manual/answers1/answer31.html
-share/inform/manual/answers1/answer32.html
-share/inform/manual/answers1/answer33.html
-share/inform/manual/answers1/answer34.html
-share/inform/manual/answers1/answer35.html
-share/inform/manual/answers1/answer36.html
-share/inform/manual/answers1/answer37.html
-share/inform/manual/answers1/answer38.html
-share/inform/manual/answers1/answer39.html
-share/inform/manual/answers1/answer4.html
-share/inform/manual/answers1/answer40.html
-share/inform/manual/answers1/answer41.html
-share/inform/manual/answers1/answer42.html
-share/inform/manual/answers1/answer43.html
-share/inform/manual/answers1/answer44.html
-share/inform/manual/answers1/answer45.html
-share/inform/manual/answers1/answer46.html
-share/inform/manual/answers1/answer47.html
-share/inform/manual/answers1/answer48.html
-share/inform/manual/answers1/answer49.html
-share/inform/manual/answers1/answer5.html
-share/inform/manual/answers1/answer50.html
-share/inform/manual/answers1/answer6.html
-share/inform/manual/answers1/answer7.html
-share/inform/manual/answers1/answer8.html
-share/inform/manual/answers1/answer9.html
-share/inform/manual/answers2/answer51.html
-share/inform/manual/answers2/answer52.html
-share/inform/manual/answers2/answer53.html
-share/inform/manual/answers2/answer54.html
-share/inform/manual/answers2/answer55.html
-share/inform/manual/answers2/answer56.html
-share/inform/manual/answers2/answer57.html
-share/inform/manual/answers2/answer58.html
-share/inform/manual/answers2/answer59.html
-share/inform/manual/answers2/answer60.html
-share/inform/manual/answers2/answer61.html
-share/inform/manual/answers2/answer62.html
-share/inform/manual/answers2/answer63.html
-share/inform/manual/answers2/answer64.html
-share/inform/manual/answers2/answer65.html
-share/inform/manual/answers2/answer66.html
-share/inform/manual/answers2/answer67.html
-share/inform/manual/answers2/answer68.html
-share/inform/manual/answers2/answer69.html
-share/inform/manual/answers2/answer70.html
-share/inform/manual/answers2/answer71.html
-share/inform/manual/answers2/answer72.html
-share/inform/manual/answers2/answer73.html
-share/inform/manual/answers2/answer74.html
-share/inform/manual/answers2/answer75.html
-share/inform/manual/answers2/answer76.html
-share/inform/manual/answers2/answer77.html
-share/inform/manual/answers2/answer78.html
-share/inform/manual/answers2/answer79.html
-share/inform/manual/answers2/answer80.html
-share/inform/manual/answers2/answer81.html
-share/inform/manual/answers2/answer82.html
-share/inform/manual/answers2/answer83.html
-share/inform/manual/answers2/answer84.html
-share/inform/manual/answers2/answer85.html
-share/inform/manual/answers2/answer86.html
-share/inform/manual/answers2/answer87.html
-share/inform/manual/answers2/answer88.html
-share/inform/manual/answers2/answer89.html
-share/inform/manual/answers2/answer90.html
-share/inform/manual/answers2/answer91.html
-share/inform/manual/answers2/answer92.html
-share/inform/manual/answers2/answer93.html
-share/inform/manual/answers2/answer94.html
-share/inform/manual/answers2/answer95.html
-share/inform/manual/answers2/answer96.html
-share/inform/manual/chapter1.html
-share/inform/manual/chapter2.html
-share/inform/manual/chapter3.html
-share/inform/manual/chapter4.html
-share/inform/manual/chapter5.html
-share/inform/manual/chapter6.html
-share/inform/manual/chapterA.html
+bin/inform-6.30
+share/inform/6.30/module/parserm.m5
+share/inform/6.30/module/verblibm.m5
+share/inform/6.30/module/english.h
+share/inform/6.30/module/grammar.h
+share/inform/6.30/module/linklpa.h
+share/inform/6.30/module/linklv.h
+share/inform/6.30/module/parser.h
+share/inform/6.30/module/parserm.h
+share/inform/6.30/module/verblib.h
+share/inform/6.30/module/verblibm.h
+share/inform/6.30/module/infix.h
+share/inform/6.30/module/English.h
+share/inform/6.30/module/Grammar.h
+share/inform/6.30/module/Parser.h
+share/inform/6.30/module/Verblib.h
+share/inform/6.30/module/VerbLib.h
+share/inform/6.30/include/action.h
+share/inform/6.30/include/adhints.h
+share/inform/6.30/include/altmenu.h
+share/inform/6.30/include/boxclever.h
+share/inform/6.30/include/branch.h
+share/inform/6.30/include/calyx_adjectives.h
+share/inform/6.30/include/ccpl.h
+share/inform/6.30/include/center.h
+share/inform/6.30/include/clothes.h
+share/inform/6.30/include/clothing.h
+share/inform/6.30/include/compass.h
+share/inform/6.30/include/daemons.h
+share/inform/6.30/include/diary.h
+share/inform/6.30/include/dirs.h
+share/inform/6.30/include/domenu.h
+share/inform/6.30/include/doors.h
+share/inform/6.30/include/dynobj.h
+share/inform/6.30/include/easydoors.h
+share/inform/6.30/include/expertgrammar.h
+share/inform/6.30/include/fkeys.h
+share/inform/6.30/include/follower.h
+share/inform/6.30/include/footnote.h
+share/inform/6.30/include/goneighbour.h
+share/inform/6.30/include/helproutines.h
+share/inform/6.30/include/hints.h
+share/inform/6.30/include/hintsms.h
+share/inform/6.30/include/howtoplay.h
+share/inform/6.30/include/info.h
+share/inform/6.30/include/istring.h
+share/inform/6.30/include/links.h
+share/inform/6.30/include/locksmith.h
+share/inform/6.30/include/longint.h
+share/inform/6.30/include/manual.h
+share/inform/6.30/include/menus.h
+share/inform/6.30/include/mistype.h
+share/inform/6.30/include/money.h
+share/inform/6.30/include/moveclass.h
+share/inform/6.30/include/movie.h
+share/inform/6.30/include/nameable.h
+share/inform/6.30/include/newbiegrammar.h
+share/inform/6.30/include/newmenu.h
+share/inform/6.30/include/newmenus.h
+share/inform/6.30/include/npc_engine.h
+share/inform/6.30/include/oldaemon.h
+share/inform/6.30/include/outofrch.h
+share/inform/6.30/include/phtalkoo.h
+share/inform/6.30/include/physics.h
+share/inform/6.30/include/pluralob.h
+share/inform/6.30/include/pname.h
+share/inform/6.30/include/printtime.h
+share/inform/6.30/include/recept.h
+share/inform/6.30/include/sampletranscript.h
+share/inform/6.30/include/scenic.h
+share/inform/6.30/include/scoper.h
+share/inform/6.30/include/showobj.h
+share/inform/6.30/include/shuffle.h
+share/inform/6.30/include/smartcantgo.h
+share/inform/6.30/include/sound.h
+share/inform/6.30/include/style.h
+share/inform/6.30/include/text_functions.h
+share/inform/6.30/include/timepiece.h
+share/inform/6.30/include/timesys.h
+share/inform/6.30/include/timewait.h
+share/inform/6.30/include/torch.h
+share/inform/6.30/include/trinitystat.h
+share/inform/6.30/include/utility.h
+share/inform/6.30/include/waittime.h
+share/inform/6.30/include/whatis.h
+share/inform/6.30/include/whowhat.h
+share/inform/6.30/include/yesno.h
+share/inform/6.30/include/zclock.h
+share/inform/6.30/include/znsi.h
+share/inform/6.30/include/adhints.txt
+share/inform/6.30/include/links.inf
+share/inform/6.30/include/npc_engine.inf
+share/inform/6.30/include/npc_engine.txt
+share/inform/6.30/include/pname.txt
+share/inform/6.30/include/text_functions.inf
+share/inform/6.30/include/CCPL.h
+share/inform/6.30/include/AdHints.h
+share/inform/6.30/include/ExpertGrammar.h
+share/inform/6.30/include/GoNeighbour.h
+share/inform/6.30/include/HelpRoutines.h
+share/inform/6.30/include/Locksmith.h
+share/inform/6.30/include/Menus.h
+share/inform/6.30/include/NewMenu.h
+share/inform/6.30/include/NewbieGrammar.h
+share/inform/6.30/include/NPC_ENGINE.h
+share/inform/6.30/include/SampleTranscript.h
+share/inform/6.30/include/Scenic.h
+share/inform/6.30/include/Scoper.h
+share/inform/6.30/include/SmartCantGo.h
+share/inform/manual/app.html
+share/inform/manual/backcover.html
+share/inform/manual/ch1.html
+share/inform/manual/ch2.html
+share/inform/manual/ch3.html
+share/inform/manual/ch4.html
+share/inform/manual/ch5.html
+share/inform/manual/ch6.html
+share/inform/manual/ch7.html
+share/inform/manual/ch8.html
+share/inform/manual/cited.html
+share/inform/manual/colophon.html
 share/inform/manual/contents.html
-share/inform/manual/icons/dbend.gif
-share/inform/manual/icons/ddbend.gif
-share/inform/manual/icons/dddbend.gif
-share/inform/manual/icons/ddexercise.gif
-share/inform/manual/icons/dexercise.gif
-share/inform/manual/icons/exercise.gif
-share/inform/manual/icons/refs.gif
-share/inform/manual/icons/warning.gif
+share/inform/manual/dm4index.html
+share/inform/manual/exdm4index.html
 share/inform/manual/index.html
 share/inform/manual/intro.html
-share/inform/manual/section1.html
-share/inform/manual/section10.html
-share/inform/manual/section11.html
-share/inform/manual/section12.html
-share/inform/manual/section13.html
-share/inform/manual/section14.html
-share/inform/manual/section15.html
-share/inform/manual/section16.html
-share/inform/manual/section17.html
-share/inform/manual/section18.html
-share/inform/manual/section19.html
-share/inform/manual/section2.html
-share/inform/manual/section20.html
-share/inform/manual/section21.html
-share/inform/manual/section22.html
-share/inform/manual/section23.html
-share/inform/manual/section24.html
-share/inform/manual/section25.html
-share/inform/manual/section26.html
-share/inform/manual/section27.html
-share/inform/manual/section28.html
-share/inform/manual/section29.html
-share/inform/manual/section3.html
-share/inform/manual/section30.html
-share/inform/manual/section31.html
-share/inform/manual/section32.html
-share/inform/manual/section33.html
-share/inform/manual/section4.html
-share/inform/manual/section5.html
-share/inform/manual/section6.html
-share/inform/manual/section7.html
-share/inform/manual/section8.html
-share/inform/manual/section9.html
-share/inform/manual/sectionA1.html
-share/inform/manual/sectionA10.html
-share/inform/manual/sectionA11.html
-share/inform/manual/sectionA12.html
-share/inform/manual/sectionA2.html
-share/inform/manual/sectionA3.html
-share/inform/manual/sectionA4.html
-share/inform/manual/sectionA5.html
-share/inform/manual/sectionA6.html
-share/inform/manual/sectionA7.html
-share/inform/manual/sectionA8.html
-share/inform/manual/sectionA9.html
+share/inform/manual/s1.html
+share/inform/manual/s10.html
+share/inform/manual/s11.html
+share/inform/manual/s12.html
+share/inform/manual/s13.html
+share/inform/manual/s14.html
+share/inform/manual/s15.html
+share/inform/manual/s16.html
+share/inform/manual/s17.html
+share/inform/manual/s18.html
+share/inform/manual/s19.html
+share/inform/manual/s2.html
+share/inform/manual/s20.html
+share/inform/manual/s21.html
+share/inform/manual/s22.html
+share/inform/manual/s23.html
+share/inform/manual/s24.html
+share/inform/manual/s25.html
+share/inform/manual/s26.html
+share/inform/manual/s27.html
+share/inform/manual/s28.html
+share/inform/manual/s29.html
+share/inform/manual/s3.html
+share/inform/manual/s30.html
+share/inform/manual/s31.html
+share/inform/manual/s32.html
+share/inform/manual/s33.html
+share/inform/manual/s34.html
+share/inform/manual/s35.html
+share/inform/manual/s36.html
+share/inform/manual/s37.html
+share/inform/manual/s38.html
+share/inform/manual/s39.html
+share/inform/manual/s4.html
+share/inform/manual/s40.html
+share/inform/manual/s41.html
+share/inform/manual/s42.html
+share/inform/manual/s43.html
+share/inform/manual/s44.html
+share/inform/manual/s45.html
+share/inform/manual/s46.html
+share/inform/manual/s47.html
+share/inform/manual/s48.html
+share/inform/manual/s49.html
+share/inform/manual/s5.html
+share/inform/manual/s50.html
+share/inform/manual/s51.html
+share/inform/manual/s52.html
+share/inform/manual/s6.html
+share/inform/manual/s7.html
+share/inform/manual/s8.html
+share/inform/manual/s9.html
+share/inform/manual/sa1.html
+share/inform/manual/sa2.html
+share/inform/manual/sa3.html
+share/inform/manual/sa4.html
+share/inform/manual/sa5.html
+share/inform/manual/sa6.html
+share/inform/manual/tables.html
+share/inform/manual/dm4-011_1.jpg
+share/inform/manual/dm4-015_1.jpg
+share/inform/manual/dm4-048_1.jpg
+share/inform/manual/dm4-057_1.jpg
+share/inform/manual/dm4-084_1.jpg
+share/inform/manual/dm4-092_1.jpg
+share/inform/manual/dm4-097_1.jpg
+share/inform/manual/dm4-106_1.jpg
+share/inform/manual/dm4-116_1.jpg
+share/inform/manual/dm4-122_1.jpg
+share/inform/manual/dm4-125_1.jpg
+share/inform/manual/dm4-126_1.jpg
+share/inform/manual/dm4-128_1.jpg
+share/inform/manual/dm4-132_1.jpg
+share/inform/manual/dm4-135_1.jpg
+share/inform/manual/dm4-137_1.jpg
+share/inform/manual/dm4-141_1.jpg
+share/inform/manual/dm4-144_1.jpg
+share/inform/manual/dm4-148_1.jpg
+share/inform/manual/dm4-154_1.jpg
+share/inform/manual/dm4-157_1.jpg
+share/inform/manual/dm4-162_1.jpg
+share/inform/manual/dm4-170_1.jpg
+share/inform/manual/dm4-176_1.jpg
+share/inform/manual/dm4-178_1.jpg
+share/inform/manual/dm4-186_1.jpg
+share/inform/manual/dm4-198_1.jpg
+share/inform/manual/dm4-204_1.jpg
+share/inform/manual/dm4-211_1.jpg
+share/inform/manual/dm4-216_1.jpg
+share/inform/manual/dm4-222_1.jpg
+share/inform/manual/dm4-225_1.jpg
+share/inform/manual/dm4-232_1.jpg
+share/inform/manual/dm4-241_1.jpg
+share/inform/manual/dm4-247_1.jpg
+share/inform/manual/dm4-253_1.jpg
+share/inform/manual/dm4-260_1.jpg
+share/inform/manual/dm4-262_1.jpg
+share/inform/manual/dm4-267_1.jpg
+share/inform/manual/dm4-279_1.jpg
+share/inform/manual/dm4-288_1.jpg
+share/inform/manual/dm4-295_1.jpg
+share/inform/manual/dm4-300_1.jpg
+share/inform/manual/dm4-314_1.jpg
+share/inform/manual/dm4-318_1.jpg
+share/inform/manual/dm4-331_1.jpg
+share/inform/manual/dm4-336_1.jpg
+share/inform/manual/dm4-344_1.jpg
+share/inform/manual/dm4-349_1.jpg
+share/inform/manual/dm4-352_1.jpg
+share/inform/manual/dm4-374_1.jpg
+share/inform/manual/dm4-378_1.jpg
+share/inform/manual/dm4-391_1.jpg
+share/inform/manual/dm4-392_1.jpg
+share/inform/manual/dm4-406_1.jpg
+share/inform/manual/dm4-412_1.jpg
+share/inform/manual/dm4-538_1.jpg
+share/inform/manual/dm4-546_1.jpg
+share/inform/manual/dm4-572_1.jpg
+share/inform/manual/roller2.jpg
 share/zcode/advent.z5
 share/zcode/adventureland.z5
 share/zcode/balances.z5
@@ -224,16 +253,15 @@ share/zcode/ruins1.z5
 share/zcode/ruins2.z5
 share/zcode/ruins3.z5
 share/zcode/toyshop.z5
-@dirrm share/zcode
+@exec ${MKDIR} %D/share/inform/include
 @exec ${MKDIR} %D/share/inform/module
-@dirrm share/inform/module
-@dirrm share/inform/manual/icons
-@dirrm share/inform/manual/answers2
-@dirrm share/inform/manual/answers1
+@exec ${MKDIR} %D/share/inform/manual
+@exec ${MKDIR} %D/share/zcode
+@dirrm share/zcode
 @dirrm share/inform/manual
-@exec ${MKDIR} %D/share/inform/include
+@dirrm share/inform/module
 @dirrm share/inform/include
-@dirrm share/inform/6.21/module
-@dirrm share/inform/6.21/include
-@dirrm share/inform/6.21
+@dirrm share/inform/6.30/module
+@dirrm share/inform/6.30/include
+@dirrm share/inform/6.30
 @dirrm share/inform