3 files changed, 25 insertions, 31 deletions

diff --git a/games/inform/Makefile b/games/inform/Makefile
index b2fff9461a48..011af0cbe9bd 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -6,54 +6,48 @@
 #
 
 PORTNAME=	inform
-PORTVERSION=	6.30
+PORTVERSION=	6.32
 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=	inform630_source.zip inform_library611.zip
+MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/source/ \
+		ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/library/:lib
+DIST_SUBDIR=	inform
+DISTFILES=	inform${PORTVERSION:S/.//}_source.zip inform_library611.zip:lib
+.if !defined(NOPORTDOCS)
+MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/:doc
+DISTFILES+=	designers_manual_4.zip:doc
+.endif
+EXTRACT_ONLY=	inform${PORTVERSION:S/.//}_source.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for producing text adventure games
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
-
-.if !defined(NOPORTDOCS)
-MASTER_SITES+=	ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/
-DISTFILES+=	designers_manual_4.zip
-.endif
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-DIST_SUBDIR=	inform
 NO_WRKSUBDIR=	yes
 
-EXTRACT_ONLY=	inform630_source.zip
 USE_ZIP=	yes
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
-post-extract:
-	@${CP} ${FILESDIR}/Makefile.inform ${WRKSRC}/Makefile
+MAKEFILE=	${FILESDIR}/Makefile.inform
 
 # 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_library611.zip)
+	@${MKDIR} ${DATADIR}
+	(cd ${DATADIR} && \
+		${UNZIP_CMD} -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}
+	${CHMOD} ${SHAREMODE} ${DATADIR}/${file}
+	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${file}
 .endfor
 .if defined(NOPORTDOCS)
-	${RM} ${PREFIX}/share/inform/readme.txt
+	@${RM} ${DATADIR}/readme.txt
 .else
-	${MKDIR} ${PREFIX}/share/doc/inform
-	(umask 222 && unzip -qq -o -d ${PREFIX}/share/doc/inform \
+	@${MKDIR} ${DOCSDIR}
+	(umask 222 && ${UNZIP_CMD} -qq -o -d ${DOCSDIR} \
 		${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
+	@${MV} ${DATADIR}/readme.txt ${DOCSDIR}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-
 .include <bsd.port.mk>
diff --git a/games/inform/distinfo b/games/inform/distinfo
index 1c53e32c4de1..f361ac6942ef 100644
--- a/games/inform/distinfo
+++ b/games/inform/distinfo
@@ -1,5 +1,5 @@
-SHA256 (inform/inform630_source.zip) = e6d094fdc9fa672474648adffb8d0e984dde240a42d8d78dddd89ba67cb68a98
-SIZE (inform/inform630_source.zip) = 249490
+SHA256 (inform/inform632_source.zip) = d007f3a681fae08956625d8a075311da2d2832e73c13b84134b8be048d6778e2
+SIZE (inform/inform632_source.zip) = 253546
 SHA256 (inform/inform_library611.zip) = e6887175afd1291eaeb0dc10bf30534fae79920da3cc61488179b5059bfa1eeb
 SIZE (inform/inform_library611.zip) = 100163
 SHA256 (inform/designers_manual_4.zip) = 7cbe80169ed9495c63475da51809377f8d0e2002c947bb284915f6119a967f0c
diff --git a/games/inform/pkg-descr b/games/inform/pkg-descr
index 583e2dd7c518..4bb6426b4ece 100644
--- a/games/inform/pkg-descr
+++ b/games/inform/pkg-descr
@@ -8,4 +8,4 @@ as TeX, Postscript, or PDF, build the port with NOPORTDOCS=yes
 and obtain the manual from the FTP site.  The FTP site also
 contains example games and other resources.
 
-ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/
+WWW: http://www.ifarchive.org/indexes/if-archiveXinfocomXcompilersXinform6.html