5 files changed, 24 insertions, 12 deletions

diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index bcbff6534395..b83c2ff390e9 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xfsprogs
-PORTVERSION=	2.8.21
-PORTREVISION=	2
+PORTVERSION=	2.9.4
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/
+MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
+		ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	-1.tar.gz
 
@@ -30,8 +30,8 @@ ALL_TARGET=
 MAN5=	xfs.5
 MAN8=	fsck.xfs.8 mkfs.xfs.8 xfs_admin.8 xfs_bmap.8 xfs_check.8 \
 	xfs_copy.8 xfs_db.8 xfs_freeze.8 xfs_growfs.8 xfs_info.8 \
-	xfs_io.8 xfs_logprint.8 xfs_mkfile.8 xfs_ncheck.8 xfs_quota.8 \
-	xfs_repair.8 xfs_rtcp.8
+	xfs_io.8 xfs_logprint.8 xfs_mdrestore.8 xfs_metadump.8 xfs_mkfile.8 xfs_ncheck.8 \
+	xfs_quota.8 xfs_repair.8 xfs_rtcp.8
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/xfsprogs/distinfo b/sysutils/xfsprogs/distinfo
index 0462ceff0eca..f7aad3067d40 100644
--- a/sysutils/xfsprogs/distinfo
+++ b/sysutils/xfsprogs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfsprogs_2.8.21-1.tar.gz) = a40b7d656c9ddb775c3f221433cbf08a
-SHA256 (xfsprogs_2.8.21-1.tar.gz) = d0450b00ad9e321484802f83f913fd04ec608d80146d07861ee8019b00ebdf58
-SIZE (xfsprogs_2.8.21-1.tar.gz) = 978987
+MD5 (xfsprogs_2.9.4-1.tar.gz) = 174683e3b86b587ed59823fdbbb96ea4
+SHA256 (xfsprogs_2.9.4-1.tar.gz) = ae6b2481ab1cc23ba5179ca444c29c6e519504b412a0b2deaa13e05dc8f6f189
+SIZE (xfsprogs_2.9.4-1.tar.gz) = 997236
diff --git a/sysutils/xfsprogs/files/patch-Makefile b/sysutils/xfsprogs/files/patch-Makefile
index e6238d1ce05c..fc903794c2b8 100644
--- a/sysutils/xfsprogs/files/patch-Makefile
+++ b/sysutils/xfsprogs/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Mon Jan 16 22:46:46 2006
-+++ Makefile	Tue Feb  7 20:37:21 2006
+--- Makefile.orig	2007-09-10 22:01:13.000000000 -0400
++++ Makefile	2007-10-18 22:03:47.000000000 -0400
 @@ -16,7 +16,7 @@
  	Logs/* built .census install.* install-dev.* *.gz
  
  SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk \
--	copy db fsck growfs io logprint mkfs quota repair rtcp \
-+	db fsck growfs io logprint mkfs quota repair rtcp \
+-	copy db fsck growfs io logprint mkfs quota mdrestore repair rtcp \
++	db fsck growfs io logprint mkfs quota mdrestore repair rtcp \
  	m4 man doc po debian build
  
  default: $(CONFIGURE)
diff --git a/sysutils/xfsprogs/files/patch-freebsd.c b/sysutils/xfsprogs/files/patch-freebsd.c
new file mode 100644
index 000000000000..aee6d5893f21
--- /dev/null
+++ b/sysutils/xfsprogs/files/patch-freebsd.c
@@ -0,0 +1,10 @@
+--- libxfs/freebsd.c.orig	2007-10-18 22:02:28.000000000 -0400
++++ libxfs/freebsd.c	2007-10-18 22:02:39.000000000 -0400
+@@ -21,6 +21,7 @@
+ #include <sys/disk.h>
+ #include <sys/mount.h>
+ #include <sys/ioctl.h>
++#include <sys/sysctl.h>
+ 
+ int platform_has_uuid = 1;
+ extern char *progname;
diff --git a/sysutils/xfsprogs/pkg-plist b/sysutils/xfsprogs/pkg-plist
index 9b6bd52c25a5..35d3a04d76fa 100644
--- a/sysutils/xfsprogs/pkg-plist
+++ b/sysutils/xfsprogs/pkg-plist
@@ -8,7 +8,9 @@ bin/xfs_info
 bin/xfs_io
 bin/xfs_bmap
 bin/xfs_logprint
+bin/xfs_mdrestore
 bin/xfs_mkfile
+bin/xfs_metadump
 bin/xfs_quota
 bin/xfs_rtcp
 sbin/fsck.xfs