5 files changed, 51 insertions, 11 deletions

diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 253606a98929..bf5163298ab1 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	ifm
-PORTVERSION=	5.0
+PORTVERSION=	5.1
 CATEGORIES=	games tk84
-MASTER_SITES=	ftp://ftp.ifarchive.org/if-archive/mapping-tools/ \
-		ftp://www.plover.net/if-archive/mapping-tools/ \
-		ftp://ftp.guetech.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/
+MASTER_SITES=	http://www.ifarchive.org/%SUBDIR%/ \
+		ftp://ftp.ifarchive.org/%SUBDIR%/ \
+		ftp://www.plover.net/%SUBDIR%/ \
+		ftp://ftp.guetech.org/%SUBDIR%/ \
+		ftp://mirror.holmoak.co.uk/%SUBDIR%/ \
+		ftp://ftp.funet.fi/pub/misc/%SUBDIR%/ \
+		ftp://wuarchive.wustl.edu/doc/misc/%SUBDIR%/
+MASTER_SITE_SUBDIR=	if-archive/mapping-tools
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive Fiction mapper and walkthrough generator
diff --git a/games/ifm/distinfo b/games/ifm/distinfo
index 021647522c3a..69a21d8a5ce2 100644
--- a/games/ifm/distinfo
+++ b/games/ifm/distinfo
@@ -1,2 +1,2 @@
-MD5 (ifm-5.0.tar.gz) = b982b097e61a7af802b67630996ba743
-SIZE (ifm-5.0.tar.gz) = 1227074
+MD5 (ifm-5.1.tar.gz) = b6ed1f7ba02d27939cc6fab21c134c79
+SIZE (ifm-5.1.tar.gz) = 1357023
diff --git a/games/ifm/files/patch-vars::src::regex.c b/games/ifm/files/patch-vars::src::regex.c
new file mode 100644
index 000000000000..71d67b62a001
--- /dev/null
+++ b/games/ifm/files/patch-vars::src::regex.c
@@ -0,0 +1,29 @@
+--- vars/src/regex.c.orig	Fri Dec  3 16:43:02 2004
++++ vars/src/regex.c	Fri Jan 14 23:10:53 2005
+@@ -57,7 +57,7 @@
+ 
+ /* For platform which support the ISO C amendement 1 functionality we
+    support user defined character classes.  */
+-#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
++#if !defined(__FreeBSD__) && (defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H))
+ # include <wctype.h>
+ # include <wchar.h>
+ #endif
+@@ -1690,7 +1690,7 @@
+        } 								\
+     }
+ 
+-#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
++#if !defined(__FreeBSD__) && (defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H))
+ /* The GNU C library provides support for user-defined character classes
+    and the functions from ISO C amendement 1.  */
+ # ifdef CHARCLASS_NAME_MAX
+@@ -2190,7 +2190,7 @@
+                        the leading `:' and `[' (but set bits for them).  */
+                     if (c == ':' && *p == ']')
+                       {
+-#if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
++#if !defined(__FreeBSD__) && (defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H))
+                         boolean is_lower = STREQ (str, "lower");
+                         boolean is_upper = STREQ (str, "upper");
+ 			wctype_t wt;
diff --git a/games/ifm/pkg-descr b/games/ifm/pkg-descr
index 77fc93c74ea2..d19e0c3e5d75 100644
--- a/games/ifm/pkg-descr
+++ b/games/ifm/pkg-descr
@@ -15,3 +15,5 @@ like.
 The Ifm task commands, if used, allow you to specify the order in which
 game-solving tasks must be done.  The Ifm program can then calculate and
 print different styles of walkthrough for the game.
+
+WWW: http://www.sentex.net/~dchapes/ifm/
diff --git a/games/ifm/pkg-plist b/games/ifm/pkg-plist
index 73d480bc8bec..4e507df25ed0 100644
--- a/games/ifm/pkg-plist
+++ b/games/ifm/pkg-plist
@@ -3,7 +3,9 @@ bin/ifm2dev
 bin/ifm2tex
 bin/scr2ifm
 bin/tkifm
+lib/ifm/gpp
 %%PORTDOCS%%%%DOCSDIR%%/html/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/html/contents.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/html/footnode.htm
 %%PORTDOCS%%%%DOCSDIR%%/html/ifm.css
@@ -19,6 +21,7 @@ bin/tkifm
 %%PORTDOCS%%%%DOCSDIR%%/html/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/html/internals.pl
 %%PORTDOCS%%%%DOCSDIR%%/html/labels.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/next.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/next.png
 %%PORTDOCS%%%%DOCSDIR%%/html/node1.htm
 %%PORTDOCS%%%%DOCSDIR%%/html/node10.htm
@@ -31,13 +34,17 @@ bin/tkifm
 %%PORTDOCS%%%%DOCSDIR%%/html/node7.htm
 %%PORTDOCS%%%%DOCSDIR%%/html/node8.htm
 %%PORTDOCS%%%%DOCSDIR%%/html/node9.htm
+%%PORTDOCS%%%%DOCSDIR%%/html/nx_grp_g.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/nx_grp_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/prev.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/prev.png
+%%PORTDOCS%%%%DOCSDIR%%/html/prev_g.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/prev_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/up.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/up.png
+%%PORTDOCS%%%%DOCSDIR%%/html/up_g.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/ifm.pdf
-lib/ifm/gpp
 %%DATADIR%%/helvetica.ifm
 %%DATADIR%%/ifm-color.ifm
 %%DATADIR%%/ifm-compat.ifm
@@ -49,6 +56,6 @@ lib/ifm/gpp
 %%DATADIR%%/special.ifm
 %%DATADIR%%/verbose.ifm
 @dirrm %%DATADIR%%
-@dirrm lib/ifm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/ifm