4 files changed, 66 insertions, 69 deletions

diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 528b52f619ce..253606a98929 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ifm
-PORTVERSION=	4.1
-PORTREVISION=	2
+PORTVERSION=	5.0
 CATEGORIES=	games tk84
 MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/mapping-tools/ \
 		ftp://www.plover.net/if-archive/mapping-tools/ \
@@ -15,26 +14,27 @@ MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/mapping-tools/ \
 		ftp://mirror.holmoak.co.uk/if-archive/mapping-tools/ \
 		ftp://ftp.funet.fi/pub/misc/if-archive/mapping-tools/ \
 		ftp://wuarchive.wustl.edu/doc/misc/if-archive/mapping-tools/
-DISTFILES=	ifm41.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive Fiction mapper and walkthrough generator
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
+USE_PERL5=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	WISH=${LOCALBASE}/bin/wish8.4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502112
-BROKEN=		Install fails
-.endif
+post-patch:
+	@${PERL} -pi -e 's|lib doc progs|lib progs|g' ${WRKSRC}/Makefile.in
 
 post-install:
-	install-info ${PREFIX}/info/ifm.info ${PREFIX}/info/dir
-	install-info ${PREFIX}/info/scr2ifm.info ${PREFIX}/info/dir
-	install-info ${PREFIX}/info/tkifm.info ${PREFIX}/info/dir
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ifm.pdf ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/ifm/* ${DOCSDIR}/html
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/ifm/distinfo b/games/ifm/distinfo
index 6ed52b2fcdfe..021647522c3a 100644
--- a/games/ifm/distinfo
+++ b/games/ifm/distinfo
@@ -1,2 +1,2 @@
-MD5 (ifm41.tgz) = 057ce601e85c0b3cd67e8ced1bc737ea
-SIZE (ifm41.tgz) = 529497
+MD5 (ifm-5.0.tar.gz) = b982b097e61a7af802b67630996ba743
+SIZE (ifm-5.0.tar.gz) = 1227074
diff --git a/games/ifm/files/patch-ab b/games/ifm/files/patch-ab
deleted file mode 100644
index dbdfa7e58cf2..000000000000
--- a/games/ifm/files/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
---- doc/ifm.info.orig	Wed Sep 30 04:00:34 1998
-+++ doc/ifm.info	Mon Oct 12 12:11:34 1998
-@@ -1,5 +1,10 @@
- This is Info file ifm, created by infoize v1.0 from ifm.inf
- 
-+INFO-DIR-SECTION Gaming tools
-+START-INFO-DIR-ENTRY
-+* ifm: (ifm.info).		Interactive fiction mapper
-+END-INFO-DIR-ENTRY
-+
- 
- File: ifm  Node: Top, Up: (dir)
- 
---- scr2ifm/scr2ifm.info.orig	Mon Sep 28 08:56:55 1998
-+++ scr2ifm/scr2ifm.info	Mon Oct 12 12:12:39 1998
-@@ -1,5 +1,10 @@
- This is Info file scr2ifm, created by infoize v1.0 from scr2ifm.inf
- 
-+INFO-DIR-SECTION Gaming tools
-+START-INFO-DIR-ENTRY
-+* scr2ifm: (scr2ifm.info).   Create an IFM map from a game transcript
-+END-INFO-DIR-ENTRY
-+
- 
- File: scr2ifm  Node: Top, Up: (dir)
- 
---- tkifm/tkifm.info.orig	Mon Sep 28 08:56:59 1998
-+++ tkifm/tkifm.info	Mon Oct 12 12:13:32 1998
-@@ -1,5 +1,10 @@
- This is Info file tkifm, created by infoize v1.0 from tkifm.inf
- 
-+INFO-DIR-SECTION Gaming tools
-+START-INFO-DIR-ENTRY
-+* tkifm: (tkifm.info).   Graphical interface to IFM
-+END-INFO-DIR-ENTRY
-+
- 
- File: tkifm  Node: Top, Up: (dir)
- 
diff --git a/games/ifm/pkg-plist b/games/ifm/pkg-plist
index 5513d0f184a6..73d480bc8bec 100644
--- a/games/ifm/pkg-plist
+++ b/games/ifm/pkg-plist
@@ -1,18 +1,54 @@
 bin/ifm
-bin/tkifm
+bin/ifm2dev
+bin/ifm2tex
 bin/scr2ifm
-share/ifm/ifm-init.ifm
-share/ifm/ifm-pro.ps
-share/ifm/ifm-rgb.txt
-share/ifm/puzzle.ifm
-share/ifm/special.ifm
-@unexec install-info --delete %D/info/ifm.info %D/info/dir
-@unexec install-info --delete %D/info/tkifm.info %D/info/dir
-@unexec install-info --delete %D/info/scr2ifm.info %D/info/dir
-info/ifm.info
-info/tkifm.info
-info/scr2ifm.info
-@exec install-info %D/info/ifm.info %D/info/dir
-@exec install-info %D/info/tkifm.info %D/info/dir
-@exec install-info %D/info/scr2ifm.info %D/info/dir
-@dirrm share/ifm
+bin/tkifm
+%%PORTDOCS%%%%DOCSDIR%%/html/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/html/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/html/footnode.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/ifm.css
+%%PORTDOCS%%%%DOCSDIR%%/html/ifm.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/images.aux
+%%PORTDOCS%%%%DOCSDIR%%/html/images.bbl
+%%PORTDOCS%%%%DOCSDIR%%/html/images.log
+%%PORTDOCS%%%%DOCSDIR%%/html/images.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/images.tex
+%%PORTDOCS%%%%DOCSDIR%%/html/img1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/img3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/internals.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/node1.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node10.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node11.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node2.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node3.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node4.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node5.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node6.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node7.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node8.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/node9.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/nx_grp_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/up_g.png
+%%PORTDOCS%%%%DOCSDIR%%/ifm.pdf
+lib/ifm/gpp
+%%DATADIR%%/helvetica.ifm
+%%DATADIR%%/ifm-color.ifm
+%%DATADIR%%/ifm-compat.ifm
+%%DATADIR%%/ifm-init.ifm
+%%DATADIR%%/ifm-pro.ps
+%%DATADIR%%/ifm-rgb.txt
+%%DATADIR%%/puzzle.ifm
+%%DATADIR%%/reckless.ifm
+%%DATADIR%%/special.ifm
+%%DATADIR%%/verbose.ifm
+@dirrm %%DATADIR%%
+@dirrm lib/ifm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%