Update to 6.21.4. Closes PR pkg/19298 and PR pkg/21934. Changes:

Version 6.21.4 (17 Jun 03):

* Applied patches from www.inform-fiction.org to the source and library, as
  supplied by Dave Griffith <dgriffi@cs.csubak.edu>.
* There's a new Ruins demo game, with more stuff implemented.  The previous
  Ruins demos have been renamed: ruins -> ruins1, ruinsplus -> ruins2.  The
  new one is called ruins3.
* The Alice demo in the 'tutor' directory has been updated to the latest
  Inform version.
* Included a more up-to-date inform-mode.el.

Version 6.21.3 (6 Nov 02):

* The Inform included here is now Andrew Plotkin's bi-platform version,
  which can compile for Glulx, following a suggestion by Marshall
  T. Vandegrift <vandem2.rpi.edu>.
* Now includes HTML version of the Designer's Manual.
* Several more library include files have been added.

6 files changed, 246 insertions, 34 deletions

diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index d149082ee03..72430fc7bcd 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/09/02 09:55:44 dillo Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/16 18:55:03 jmmv Exp $
 
-DISTNAME=	inform-6.21.2
+DISTNAME=	inform-6.21.4
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.gmd.de/if-archive/infocom/compilers/inform6/source/
+MASTER_SITES=	http://mirror.ifarchive.org/if-archive/infocom/compilers/inform6/source/
 
 MAINTAINER=	nathanw@mit.edu
 HOMEPAGE=	http://www.inform-fiction.org/
@@ -11,6 +11,7 @@ COMMENT=	Interactive fiction compiler (creates z-code)
 LICENSE=	no-profit
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 INFO_FILES=	inform
 
diff --git a/lang/inform/PLIST b/lang/inform/PLIST
index fbd4d3c24de..1b40a907ea0 100644
--- a/lang/inform/PLIST
+++ b/lang/inform/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2003/07/05 14:56:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/09/16 18:55:04 jmmv Exp $
 bin/inform
 bin/inform-6.21
 info/inform
 info/inform-1
+info/inform-10
+info/inform-11
+info/inform-12
+info/inform-13
+info/inform-14
 info/inform-2
 info/inform-3
 info/inform-4
@@ -11,29 +16,13 @@ info/inform-6
 info/inform-7
 info/inform-8
 info/inform-9
-info/inform-10
-info/inform-11
-info/inform-12
-info/inform-13
-info/inform-14
-share/inform/6.21/module/parserm.m5
-share/inform/6.21/module/verblibm.m5
-share/inform/6.21/module/english.h
-share/inform/6.21/module/grammar.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/verblib.h
-share/inform/6.21/module/verblibm.h
-share/inform/6.21/module/infix.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/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
@@ -57,7 +46,6 @@ 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/yesno.h
 share/inform/6.21/include/smartcantgo.h
 share/inform/6.21/include/timepiece.h
 share/inform/6.21/include/timesys.h
@@ -66,20 +54,201 @@ 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/include/AdHints.h
-share/inform/6.21/include/NewMenu.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
+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/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/zcode/advent.z5
 share/zcode/adventureland.z5
 share/zcode/balances.z5
 share/zcode/museum.z5
-share/zcode/ruins.z5
-share/zcode/ruinsplus.z5
+share/zcode/ruins1.z5
+share/zcode/ruins2.z5
+share/zcode/ruins3.z5
 share/zcode/toyshop.z5
+@dirrm share/zcode
+@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
+@dirrm share/inform/manual
+@exec ${MKDIR} %D/share/inform/include
 @dirrm share/inform/include
 @dirrm share/inform/6.21/module
 @dirrm share/inform/6.21/include
 @dirrm share/inform/6.21
 @dirrm share/inform
-@dirrm share/zcode
diff --git a/lang/inform/distinfo b/lang/inform/distinfo
index 14d066712a6..0c7ccf06032 100644
--- a/lang/inform/distinfo
+++ b/lang/inform/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/22 03:41:49 nathanw Exp $
+$NetBSD: distinfo,v 1.2 2003/09/16 18:55:04 jmmv Exp $
 
-SHA1 (inform-6.21.2.tar.gz) = e60410b63bb803c2783b54520eb8fff8b96149c9
-Size (inform-6.21.2.tar.gz) = 819128 bytes
+SHA1 (inform-6.21.4.tar.gz) = c9a9a6eccf9658100709a3227ed67ac7ddf988fb
+Size (inform-6.21.4.tar.gz) = 1177122 bytes
+SHA1 (patch-aa) = be6eaa24934669c068be81521a674f60fa508de5
+SHA1 (patch-ab) = 57499217d679affff26b551b367b76fe02a06a64
+SHA1 (patch-ac) = 067b2bea40e29ccf9f58eabd18669c0bd2cbe95f
diff --git a/lang/inform/patches/patch-aa b/lang/inform/patches/patch-aa
new file mode 100644
index 00000000000..b6c9bc2a100
--- /dev/null
+++ b/lang/inform/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/09/16 18:55:05 jmmv Exp $
+
+--- html/Makefile.in.orig	2003-06-17 16:41:20.000000000 +0200
++++ html/Makefile.in
+@@ -302,7 +302,7 @@ uninstall-am: uninstall-htmlDATA uninsta
+ 
+ install-data-hook:
+ 	for dir in $(EXTRA_DIRS); do					\
+-	    cp -rp $(srcdir)/$$dir $(DESTDIR)$(htmldir);		\
++	    cp -r $(srcdir)/$$dir $(DESTDIR)$(htmldir);		\
+ 	    rm -rf $(DESTDIR)$(htmldir)/$$dir/CVS;			\
+ 	done
+ 
diff --git a/lang/inform/patches/patch-ab b/lang/inform/patches/patch-ab
new file mode 100644
index 00000000000..8af24bb2779
--- /dev/null
+++ b/lang/inform/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/09/16 18:55:06 jmmv Exp $
+
+--- include/Makefile.in.orig	2003-06-13 10:32:30.000000000 +0200
++++ include/Makefile.in
+@@ -296,7 +296,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-includeHEADERS
++install-data-am: install-includeHEADERS install-data-local 
+ 
+ install-exec-am:
+ 
diff --git a/lang/inform/patches/patch-ac b/lang/inform/patches/patch-ac
new file mode 100644
index 00000000000..470fb7d95ca
--- /dev/null
+++ b/lang/inform/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/09/16 18:55:07 jmmv Exp $
+
+--- lib/Makefile.in.orig	2003-06-17 16:42:19.000000000 +0200
++++ lib/Makefile.in
+@@ -309,7 +309,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-moduleDATA
++install-data-am: install-moduleDATA install-data-local
+ 
+ install-exec-am:
+