5 files changed, 164 insertions, 245 deletions

diff --git a/games/inform/Makefile b/games/inform/Makefile
index 2671b88753ff..1b3279d95533 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -6,67 +6,51 @@
 #
 
 PORTNAME=	inform
-PORTVERSION=	6.21
+PORTVERSION=	6.30
 CATEGORIES=	games
 MASTER_SITES=  	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/source/ \
 		ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/library/
-DISTFILES=	inform621_source.zip inform_library610.zip
+DISTFILES=	inform630_source.zip inform_library611.zip
 
 MAINTAINER=	mph@freebsd.org
 COMMENT=	Compiler for producing text adventure games
 
 .if !defined(NOPORTDOCS)
-MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/old/
-DISTFILES+=	designers_manual_html.zip
+MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/
+DISTFILES+=	designers_manual_4.zip
 .endif
 
 DIST_SUBDIR=	inform
 NO_WRKSUBDIR=	yes
 
-EXTRACT_ONLY=	inform621_source.zip
+EXTRACT_ONLY=	inform630_source.zip
 USE_ZIP=	yes
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-# I can hardly believe it, but the ".c" and ".h" extensions are
-# not present on the source files.
 post-extract:
-	@${MV} ${WRKSRC}/header ${WRKSRC}/header.h
-.for file in arrays asm bpatch chars directs errors expressc expressp \
-	files inform lexer linker memory objects states symbols syntax \
-	tables text veneer verbs
-	@${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.c
-.endfor
 	@${CP} ${FILESDIR}/Makefile.inform ${WRKSRC}/Makefile
 
-# Install the library files in ${PREFIX}/share/inform.  The compiler
-# is configured to use extensions under Unix, so we need to tack ".h"
-# onto each filename.  Set perms and ownership, because they're odd in
-# the archive.  Many games include "VerbLib" instead of "Verblib" so
-# make a symlink.  Finally, install documentation if appropriate.
+# Install the library files in ${PREFIX}/share/inform, and install
+# documentation if appropriate.
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/inform
-	@(cd ${PREFIX}/share/inform && \
-		unzip -qq -o ${DISTDIR}/${DIST_SUBDIR}/inform_library610.zip)
-.for file in English Grammar Parser Verblib infix linklpa linklv parserm \
-		verblibm
-	@${MV} ${PREFIX}/share/inform/${file} ${PREFIX}/share/inform/${file}.h
-	@ ${CHMOD} ${SHAREMODE} ${PREFIX}/share/inform/${file}.h
-	@ ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/inform/${file}.h
+	${MKDIR} ${PREFIX}/share/inform
+	(cd ${PREFIX}/share/inform && \
+		unzip -qq -o ${DISTDIR}/${DIST_SUBDIR}/inform_library611.zip)
+.for file in English.h Grammar.h Parser.h VerbLib.h infix.h linklpa.h \
+		linklv.h parserm.h verblibm.h
+	${CHMOD} ${SHAREMODE} ${PREFIX}/share/inform/${file}
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/inform/${file}
 .endfor
-	@${LN} -fs Verblib.h ${PREFIX}/share/inform/VerbLib.h
-	@ ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/inform/VerbLib.h
 .if defined(NOPORTDOCS)
-	@${RM} ${PREFIX}/share/inform/Relnote ${PREFIX}/share/inform/Relnote2
+	${RM} ${PREFIX}/share/inform/readme.txt
 .else
-	@ (umask 222 && unzip -qq -o -d ${PREFIX}/share/doc \
-		${DISTDIR}/${DIST_SUBDIR}/designers_manual_html.zip)
-	@${MKDIR} ${PREFIX}/share/doc/inform
-	@${MV} ${PREFIX}/share/doc/dman/* ${PREFIX}/share/doc/inform
-	@${RMDIR} ${PREFIX}/share/doc/dman
-	@${MV} ${PREFIX}/share/inform/Relnote ${PREFIX}/share/inform/Relnote2 ${PREFIX}/share/doc/inform
-	@ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/inform
-	
+	${MKDIR} ${PREFIX}/share/doc/inform
+	(umask 222 && unzip -qq -o -d ${PREFIX}/share/doc/inform \
+		${DISTDIR}/${DIST_SUBDIR}/designers_manual_4.zip)
+	${MV} ${PREFIX}/share/inform/readme.txt ${PREFIX}/share/doc/inform
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/inform
 .endif
 
+
 .include <bsd.port.mk>
diff --git a/games/inform/distinfo b/games/inform/distinfo
index c4578c46c749..5acec520d66e 100644
--- a/games/inform/distinfo
+++ b/games/inform/distinfo
@@ -1,6 +1,6 @@
-MD5 (inform/inform621_source.zip) = f154597285bc13eee318f2c679a3e0b6
-SIZE (inform/inform621_source.zip) = 200106
-MD5 (inform/inform_library610.zip) = e8fbb2cb74d3d5893b7f3602877575fd
-SIZE (inform/inform_library610.zip) = 84630
-MD5 (inform/designers_manual_html.zip) = 377f2f0224059171296360f6e67d8a95
-SIZE (inform/designers_manual_html.zip) = 344887
+MD5 (inform/inform630_source.zip) = 5d600f1d430e96ab0d6c4fff0cf88672
+SIZE (inform/inform630_source.zip) = 249490
+MD5 (inform/inform_library611.zip) = cce6a8f73838a1d13d33a24ba1cce282
+SIZE (inform/inform_library611.zip) = 100163
+MD5 (inform/designers_manual_4.zip) = 0063968c3378636add1a0697b6d1fc16
+SIZE (inform/designers_manual_4.zip) = 1141939
diff --git a/games/inform/files/patch-aa b/games/inform/files/patch-aa
index 37f11f4dff84..f465a25f8cba 100644
--- a/games/inform/files/patch-aa
+++ b/games/inform/files/patch-aa
@@ -1,10 +1,10 @@
 --- header.h.orig	Sun Jun 28 00:54:48 1998
 +++ header.h	Sun Jun 28 00:58:25 1998
-@@ -66,7 +66,7 @@
+@@ -68,7 +68,7 @@
  /*   out a block of definitions like those below.)                           */
  /* ------------------------------------------------------------------------- */
  
--#define ARCHIMEDES
+-/* #define UNIX */
 +#define UNIX
  
  /* ------------------------------------------------------------------------- */
diff --git a/games/inform/files/patch-ab b/games/inform/files/patch-ab
deleted file mode 100644
index c071f7d09251..000000000000
--- a/games/inform/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- veneer.c.orig	Sun May 23 13:23:38 1999
-+++ veneer.c	Sun May 23 13:24:16 1999
-@@ -6,6 +6,12 @@
- /*   Part of Inform 6.21                                                     */
- /*   copyright (c) Graham Nelson 1993, 1994, 1995, 1996, 1997, 1998, 1999    */
- /*                                                                           */
-+/*   Incorporates the patch by Andrew Plotkin/Torbörn Andersson which was    */
-+/*   posted on r.a.i.f. on 5 May 1999 by Michael Baum.  This fixes a memory  */
-+/*   problem on some platforms and also fixes a bug which occurs when debug  */
-+/*   mode is off. Note that you have to turn off strict mode, i.e. -~S, to   */
-+/*   turn off the debug mode.                                                */
-+/*                                                                           */
- /* ------------------------------------------------------------------------- */
- 
- #include "header.h"
-@@ -243,13 +249,18 @@
-          @check_arg_count 7 ?~A__x;y++;@check_arg_count 8 ?~A__x;y++;.A__x;",
-         "#ifdef INFIX;if (obj has infix__watching) n=1;#endif;\
-          #ifdef DEBUG;if (debug_flag & 1 ~= 0) n=1;#endif;\
--         if (n==1) { n=debug_flag & 1; debug_flag=debug_flag-n;\
--         print \"[ ~\", (name) obj, \"~.\", (property) id, \"(\";\
--     switch(y) { 1: print a; 2: print a,\",\",b; 3: print a,\",\",b,\",\",c;\
-+         if (n==1) {\
-+           #ifdef DEBUG;n=debug_flag & 1;\
-+debug_flag=debug_flag-n;#endif;\
-+           print \"[ ~\", (name) obj, \"~.\", (property) id, \"(\";\
-+     switch(y) { 1: print a; 2: print a,\",\",b; 3: print \
-+a,\",\",b,\",\",c;\
-      4: print a,\",\",b,\",\",c,\",\",d;\
-      5: print a,\",\",b,\",\",c,\",\",d,\",\",e;\
-      6: print a,\",\",b,\",\",c,\",\",d,\",\",e,\",\",f; }\
--           print \") ]^\"; debug_flag = debug_flag + n; }"
-+           print \") ]^\";\
-+           #ifdef DEBUG;debug_flag = debug_flag + n;#endif;\
-+           }",
-         "if (id > 0 && id < 64)\
-          { x = obj.&id; if (x==0) { x=$000a-->0 + 2*(id-1); n=2; }\
-          else n = obj.#id; }\
diff --git a/games/inform/pkg-plist b/games/inform/pkg-plist
index 0f54df522e1a..310df7f3d75b 100644
--- a/games/inform/pkg-plist
+++ b/games/inform/pkg-plist
@@ -6,172 +6,145 @@ share/inform/linklpa.h
 share/inform/linklv.h
 share/inform/Parser.h
 share/inform/parserm.h
-share/inform/Verblib.h
 share/inform/verblibm.h
 share/inform/VerbLib.h
-share/doc/inform/Relnote
-share/doc/inform/Relnote2
-share/doc/inform/answers1/answer10.html
-share/doc/inform/answers1/answer11.html
-share/doc/inform/answers1/answer12.html
-share/doc/inform/answers1/answer13.html
-share/doc/inform/answers1/answer14.html
-share/doc/inform/answers1/answer15.html
-share/doc/inform/answers1/answer16.html
-share/doc/inform/answers1/answer17.html
-share/doc/inform/answers1/answer18.html
-share/doc/inform/answers1/answer19.html
-share/doc/inform/answers1/answer2.html
-share/doc/inform/answers1/answer20.html
-share/doc/inform/answers1/answer21.html
-share/doc/inform/answers1/answer22.html
-share/doc/inform/answers1/answer23.html
-share/doc/inform/answers1/answer24.html
-share/doc/inform/answers1/answer25.html
-share/doc/inform/answers1/answer26.html
-share/doc/inform/answers1/answer27.html
-share/doc/inform/answers1/answer28.html
-share/doc/inform/answers1/answer29.html
-share/doc/inform/answers1/answer3.html
-share/doc/inform/answers1/answer30.html
-share/doc/inform/answers1/answer31.html
-share/doc/inform/answers1/answer32.html
-share/doc/inform/answers1/answer33.html
-share/doc/inform/answers1/answer34.html
-share/doc/inform/answers1/answer35.html
-share/doc/inform/answers1/answer36.html
-share/doc/inform/answers1/answer37.html
-share/doc/inform/answers1/answer38.html
-share/doc/inform/answers1/answer39.html
-share/doc/inform/answers1/answer4.html
-share/doc/inform/answers1/answer40.html
-share/doc/inform/answers1/answer41.html
-share/doc/inform/answers1/answer42.html
-share/doc/inform/answers1/answer43.html
-share/doc/inform/answers1/answer44.html
-share/doc/inform/answers1/answer45.html
-share/doc/inform/answers1/answer46.html
-share/doc/inform/answers1/answer47.html
-share/doc/inform/answers1/answer48.html
-share/doc/inform/answers1/answer49.html
-share/doc/inform/answers1/answer5.html
-share/doc/inform/answers1/answer50.html
-share/doc/inform/answers1/answer6.html
-share/doc/inform/answers1/answer7.html
-share/doc/inform/answers1/answer8.html
-share/doc/inform/answers1/answer9.html
-share/doc/inform/answers1/answer1.html
-share/doc/inform/answers2/answer52.html
-share/doc/inform/answers2/answer53.html
-share/doc/inform/answers2/answer54.html
-share/doc/inform/answers2/answer55.html
-share/doc/inform/answers2/answer56.html
-share/doc/inform/answers2/answer57.html
-share/doc/inform/answers2/answer58.html
-share/doc/inform/answers2/answer59.html
-share/doc/inform/answers2/answer60.html
-share/doc/inform/answers2/answer61.html
-share/doc/inform/answers2/answer62.html
-share/doc/inform/answers2/answer63.html
-share/doc/inform/answers2/answer64.html
-share/doc/inform/answers2/answer65.html
-share/doc/inform/answers2/answer66.html
-share/doc/inform/answers2/answer67.html
-share/doc/inform/answers2/answer68.html
-share/doc/inform/answers2/answer69.html
-share/doc/inform/answers2/answer70.html
-share/doc/inform/answers2/answer71.html
-share/doc/inform/answers2/answer72.html
-share/doc/inform/answers2/answer73.html
-share/doc/inform/answers2/answer74.html
-share/doc/inform/answers2/answer75.html
-share/doc/inform/answers2/answer76.html
-share/doc/inform/answers2/answer77.html
-share/doc/inform/answers2/answer78.html
-share/doc/inform/answers2/answer79.html
-share/doc/inform/answers2/answer80.html
-share/doc/inform/answers2/answer81.html
-share/doc/inform/answers2/answer82.html
-share/doc/inform/answers2/answer83.html
-share/doc/inform/answers2/answer84.html
-share/doc/inform/answers2/answer85.html
-share/doc/inform/answers2/answer86.html
-share/doc/inform/answers2/answer87.html
-share/doc/inform/answers2/answer88.html
-share/doc/inform/answers2/answer89.html
-share/doc/inform/answers2/answer90.html
-share/doc/inform/answers2/answer91.html
-share/doc/inform/answers2/answer92.html
-share/doc/inform/answers2/answer93.html
-share/doc/inform/answers2/answer94.html
-share/doc/inform/answers2/answer95.html
-share/doc/inform/answers2/answer96.html
-share/doc/inform/answers2/answer51.html
-share/doc/inform/chapter2.html
-share/doc/inform/chapter3.html
-share/doc/inform/chapter4.html
-share/doc/inform/chapter5.html
-share/doc/inform/chapter6.html
-share/doc/inform/chapterA.html
+share/doc/inform/readme.txt
+share/doc/inform/app.html
+share/doc/inform/backcover.html
+share/doc/inform/ch1.html
+share/doc/inform/ch2.html
+share/doc/inform/ch3.html
+share/doc/inform/ch4.html
+share/doc/inform/ch5.html
+share/doc/inform/ch6.html
+share/doc/inform/ch7.html
+share/doc/inform/ch8.html
+share/doc/inform/cited.html
+share/doc/inform/colophon.html
 share/doc/inform/contents.html
+share/doc/inform/dm4-011_1.jpg
+share/doc/inform/dm4-015_1.jpg
+share/doc/inform/dm4-048_1.jpg
+share/doc/inform/dm4-057_1.jpg
+share/doc/inform/dm4-084_1.jpg
+share/doc/inform/dm4-092_1.jpg
+share/doc/inform/dm4-097_1.jpg
+share/doc/inform/dm4-106_1.jpg
+share/doc/inform/dm4-116_1.jpg
+share/doc/inform/dm4-122_1.jpg
+share/doc/inform/dm4-125_1.jpg
+share/doc/inform/dm4-126_1.jpg
+share/doc/inform/dm4-128_1.jpg
+share/doc/inform/dm4-132_1.jpg
+share/doc/inform/dm4-135_1.jpg
+share/doc/inform/dm4-137_1.jpg
+share/doc/inform/dm4-141_1.jpg
+share/doc/inform/dm4-144_1.jpg
+share/doc/inform/dm4-148_1.jpg
+share/doc/inform/dm4-154_1.jpg
+share/doc/inform/dm4-157_1.jpg
+share/doc/inform/dm4-162_1.jpg
+share/doc/inform/dm4-170_1.jpg
+share/doc/inform/dm4-176_1.jpg
+share/doc/inform/dm4-178_1.jpg
+share/doc/inform/dm4-186_1.jpg
+share/doc/inform/dm4-198_1.jpg
+share/doc/inform/dm4-204_1.jpg
+share/doc/inform/dm4-211_1.jpg
+share/doc/inform/dm4-216_1.jpg
+share/doc/inform/dm4-222_1.jpg
+share/doc/inform/dm4-225_1.jpg
+share/doc/inform/dm4-232_1.jpg
+share/doc/inform/dm4-241_1.jpg
+share/doc/inform/dm4-247_1.jpg
+share/doc/inform/dm4-253_1.jpg
+share/doc/inform/dm4-260_1.jpg
+share/doc/inform/dm4-262_1.jpg
+share/doc/inform/dm4-267_1.jpg
+share/doc/inform/dm4-279_1.jpg
+share/doc/inform/dm4-288_1.jpg
+share/doc/inform/dm4-295_1.jpg
+share/doc/inform/dm4-300_1.jpg
+share/doc/inform/dm4-314_1.jpg
+share/doc/inform/dm4-318_1.jpg
+share/doc/inform/dm4-331_1.jpg
+share/doc/inform/dm4-336_1.jpg
+share/doc/inform/dm4-344_1.jpg
+share/doc/inform/dm4-349_1.jpg
+share/doc/inform/dm4-352_1.jpg
+share/doc/inform/dm4-374_1.jpg
+share/doc/inform/dm4-378_1.jpg
+share/doc/inform/dm4-391_1.jpg
+share/doc/inform/dm4-392_1.jpg
+share/doc/inform/dm4-406_1.jpg
+share/doc/inform/dm4-412_1.jpg
+share/doc/inform/dm4-538_1.jpg
+share/doc/inform/dm4-546_1.jpg
+share/doc/inform/dm4-572_1.jpg
+share/doc/inform/dm4.css
+share/doc/inform/dm4index.html
+share/doc/inform/exindex.html
 share/doc/inform/index.html
-share/doc/inform/icons/ddbend.gif
-share/doc/inform/icons/dddbend.gif
-share/doc/inform/icons/dexercise.gif
-share/doc/inform/icons/exercise.gif
-share/doc/inform/icons/refs.gif
-share/doc/inform/icons/warning.gif
-share/doc/inform/icons/dbend.gif
-share/doc/inform/icons/ddexercise.gif
 share/doc/inform/intro.html
-share/doc/inform/section1.html
-share/doc/inform/section11.html
-share/doc/inform/section12.html
-share/doc/inform/section14.html
-share/doc/inform/section15.html
-share/doc/inform/section17.html
-share/doc/inform/section18.html
-share/doc/inform/section2.html
-share/doc/inform/section20.html
-share/doc/inform/section21.html
-share/doc/inform/section23.html
-share/doc/inform/section24.html
-share/doc/inform/section26.html
-share/doc/inform/section27.html
-share/doc/inform/section29.html
-share/doc/inform/section3.html
-share/doc/inform/section30.html
-share/doc/inform/section32.html
-share/doc/inform/section33.html
-share/doc/inform/section4.html
-share/doc/inform/section5.html
-share/doc/inform/section6.html
-share/doc/inform/section7.html
-share/doc/inform/section8.html
-share/doc/inform/section9.html
-share/doc/inform/sectionA10.html
-share/doc/inform/sectionA11.html
-share/doc/inform/sectionA2.html
-share/doc/inform/sectionA3.html
-share/doc/inform/sectionA5.html
-share/doc/inform/sectionA6.html
-share/doc/inform/sectionA8.html
-share/doc/inform/sectionA9.html
-share/doc/inform/chapter1.html
-share/doc/inform/section10.html
-share/doc/inform/section13.html
-share/doc/inform/section16.html
-share/doc/inform/section19.html
-share/doc/inform/section22.html
-share/doc/inform/section25.html
-share/doc/inform/section28.html
-share/doc/inform/section31.html
-share/doc/inform/sectionA1.html
-share/doc/inform/sectionA12.html
-share/doc/inform/sectionA4.html
-share/doc/inform/sectionA7.html
+share/doc/inform/roller2.jpg
+share/doc/inform/s1.html
+share/doc/inform/s10.html
+share/doc/inform/s11.html
+share/doc/inform/s12.html
+share/doc/inform/s13.html
+share/doc/inform/s14.html
+share/doc/inform/s15.html
+share/doc/inform/s16.html
+share/doc/inform/s17.html
+share/doc/inform/s18.html
+share/doc/inform/s19.html
+share/doc/inform/s2.html
+share/doc/inform/s20.html
+share/doc/inform/s21.html
+share/doc/inform/s22.html
+share/doc/inform/s23.html
+share/doc/inform/s24.html
+share/doc/inform/s25.html
+share/doc/inform/s26.html
+share/doc/inform/s27.html
+share/doc/inform/s28.html
+share/doc/inform/s29.html
+share/doc/inform/s3.html
+share/doc/inform/s30.html
+share/doc/inform/s31.html
+share/doc/inform/s32.html
+share/doc/inform/s33.html
+share/doc/inform/s34.html
+share/doc/inform/s35.html
+share/doc/inform/s36.html
+share/doc/inform/s37.html
+share/doc/inform/s38.html
+share/doc/inform/s39.html
+share/doc/inform/s4.html
+share/doc/inform/s40.html
+share/doc/inform/s41.html
+share/doc/inform/s42.html
+share/doc/inform/s43.html
+share/doc/inform/s44.html
+share/doc/inform/s45.html
+share/doc/inform/s46.html
+share/doc/inform/s47.html
+share/doc/inform/s48.html
+share/doc/inform/s49.html
+share/doc/inform/s5.html
+share/doc/inform/s50.html
+share/doc/inform/s51.html
+share/doc/inform/s52.html
+share/doc/inform/s6.html
+share/doc/inform/s7.html
+share/doc/inform/s8.html
+share/doc/inform/s9.html
+share/doc/inform/sa1.html
+share/doc/inform/sa2.html
+share/doc/inform/sa3.html
+share/doc/inform/sa4.html
+share/doc/inform/sa5.html
+share/doc/inform/sa6.html
+share/doc/inform/tables.html
 @dirrm share/inform
-@dirrm share/doc/inform/answers1
-@dirrm share/doc/inform/answers2
-@dirrm share/doc/inform/icons
 @dirrm share/doc/inform