3 files changed, 39 insertions, 19 deletions

diff --git a/sysutils/ffs2recov/Makefile b/sysutils/ffs2recov/Makefile
index 43009098de48..cd3b9b9dd8e4 100644
--- a/sysutils/ffs2recov/Makefile
+++ b/sysutils/ffs2recov/Makefile
@@ -3,12 +3,15 @@
 
 PORTNAME=	ffs2recov
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.exit.com/Archives/FreeBSD/
+MASTER_SITES=	http://BSDforge.com/projects/source/sysutils/ffs2recov/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Utility to recover UFS2 filesystems
 
+LICENSE=	BSD2CLAUSE
+
 USES=		tar:bzip2 uidfix
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/sysutils/ffs2recov/files/patch-inode.c b/sysutils/ffs2recov/files/patch-inode.c
new file mode 100644
index 000000000000..8c1f86003155
--- /dev/null
+++ b/sysutils/ffs2recov/files/patch-inode.c
@@ -0,0 +1,13 @@
+--- inode.c.orig	2017-04-05 19:51:41 UTC
++++ inode.c
+@@ -52,6 +52,10 @@
+ #define NO_IN_EXTERNS
+ #include "ffs2recov.h"
+ 
++#ifdef UFS_NDADDR
++#define NDADDR UFS_NDADDR
++#endif
++
+ static uint64_t direct_maxblk;		/* Max block # for a direct block.    */
+ static uint64_t single_maxblk;		/* Max block # for a single indirect. */
+ static uint64_t double_maxblk;		/* Max block # for a double indirect. */
diff --git a/sysutils/ffs2recov/pkg-descr b/sysutils/ffs2recov/pkg-descr
index 39e3e23001c4..de5162e167a9 100644
--- a/sysutils/ffs2recov/pkg-descr
+++ b/sysutils/ffs2recov/pkg-descr
@@ -1,24 +1,28 @@
-This is the UFS2 version of ffsrecov, heavily (and I do mean _heavily_) based
-on John-Mark Gurney's program of the same name.  It does basically the same
-thing, only it's a little more resistant to crashes caused by bad pointers,
-offsets and the like, and it does a little more than his did.  Don't contact
-him for problems with this program, it's definitely _my_ fault if it breaks.
+This is the UFS2 version of ffsrecov, heavily (and I do mean _heavily_)
+based on John-Mark Gurney's program of the same name. It does basically
+the same thing, only it's a little more resistant to crashes caused by
+bad pointers, offsets and the like, and it does a little more than his
+did. Don't contact him for problems with this program, it's definitely
+_my_ fault if it breaks.
 
-This program is not ready for prime time.  It has some shortfalls, it has a
-bunch of new options that are mostly undocumented and the manpage could
-stand to be rewritten.  One _good_ thing is that it now uses the libufs
-library and is therefore not as dependent on carrying around low-level code.
+This program is not ready for prime time. It has some shortfalls, it
+has a bunch of new options that are mostly undocumented and the manpage
+could stand to be rewritten. One _good_ thing is that it now uses the
+libufs library and is therefore not as dependent on carrying around
+low-level code.
 
-On the other hand, it worked for me.  Using this tool, I was able to recover
-almost all of a several-hundred-gigabyte file system that had been stomped
-by a misconfigured RAID controller.  (That's why I wrote the thing in the
-first place, in fact.)  With the right knowledge and a lot of patience,
-it is possible to recover most or all of a trashed file system, at least if
-it's not _too_ trashed.
+On the other hand, it worked for me.  Using this tool, I was able to
+recover almost all of a several-hundred-gigabyte file system that had
+been stomped by a misconfigured RAID controller. (That's why I wrote the
+thing in the first place, in fact.)  With the right knowledge and a lot
+of patience, it is possible to recover most or all of a trashed file
+system, at least if it's not _too_ trashed.
 
 I'm releasing it under the Berkeley two-clause license in the hope that
-someone with more time will pick it up, polish it and make something
-a little more useful out of it.
+someone with more time will pick it up, polish it and make something a
+little more useful out of it.
 
 Frank Mayhar
 frank@exit.com
+
+WWW: http://BSDforge.com/projects/sysutils/ffs2recov/