1 files changed, 21 insertions, 37 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>