Update to xfsprogs 2.7.11

6 files changed, 37 insertions, 20 deletions

diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 2d60a396ea58..d4da4fcadad2 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfsprogs
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.11
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://oss.sgi.com/projects/xfs/cmd_tars/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/xfsprogs/distinfo b/sysutils/xfsprogs/distinfo
index 47d223722c25..00140cce1921 100644
--- a/sysutils/xfsprogs/distinfo
+++ b/sysutils/xfsprogs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfsprogs-2.7.3.src.tar.gz) = 89728c0d84258c94e629bf39e4ba1509
-SHA256 (xfsprogs-2.7.3.src.tar.gz) = 12bb398036d780e3778d54c59d7f33368507f166b50f02a1f90b402327cf1aa3
-SIZE (xfsprogs-2.7.3.src.tar.gz) = 895400
+MD5 (xfsprogs-2.7.11.src.tar.gz) = d4a78fced98c0f3f32627a473e8e0a59
+SHA256 (xfsprogs-2.7.11.src.tar.gz) = 011740a254dedcaa7109c3337945a4b95296831ef1c98ec48f6eda6d268ed95f
+SIZE (xfsprogs-2.7.11.src.tar.gz) = 878186
diff --git a/sysutils/xfsprogs/files/patch-Makefile b/sysutils/xfsprogs/files/patch-Makefile
index f0f4e24824cb..e6238d1ce05c 100644
--- a/sysutils/xfsprogs/files/patch-Makefile
+++ b/sysutils/xfsprogs/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Fri Oct  7 12:51:32 2005
-+++ Makefile	Fri Oct  7 14:42:35 2005
-@@ -44,7 +44,7 @@
+--- Makefile.orig	Mon Jan 16 22:46:46 2006
++++ Makefile	Tue Feb  7 20:37:21 2006
+@@ -16,7 +16,7 @@
  	Logs/* built .census install.* install-dev.* *.gz
  
  SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk \
--	copy db fsck growfs io logprint mkfile mkfs quota repair rtcp \
-+	db fsck growfs io logprint mkfile mkfs quota repair rtcp \
+-	copy db fsck growfs io logprint mkfs quota repair rtcp \
++	db fsck growfs io logprint mkfs quota repair rtcp \
  	m4 man doc po debian build
  
  default: $(CONFIGURE)
diff --git a/sysutils/xfsprogs/files/patch-builddefs.in b/sysutils/xfsprogs/files/patch-builddefs.in
deleted file mode 100644
index 1e1ed1d63971..000000000000
--- a/sysutils/xfsprogs/files/patch-builddefs.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/builddefs.in.orig	Thu Dec 23 13:38:50 2004
-+++ include/builddefs.in	Thu Dec 23 13:39:02 2004
-@@ -113,7 +113,7 @@
- PCFLAGS = -I/usr/local/include
- endif
- 
--GCFLAGS = -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
-+GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
- 	  -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
- 	  -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include
- 
diff --git a/sysutils/xfsprogs/files/patch-freebsd.h b/sysutils/xfsprogs/files/patch-freebsd.h
new file mode 100644
index 000000000000..49ba7f475f40
--- /dev/null
+++ b/sysutils/xfsprogs/files/patch-freebsd.h
@@ -0,0 +1,18 @@
+--- include/freebsd.h.orig	Tue Feb  7 21:14:51 2006
++++ include/freebsd.h	Tue Feb  7 21:15:07 2006
+@@ -39,15 +39,6 @@
+ #define	fdatasync	fsync
+ #define memalign(a,size)	valloc(size)
+ 
+-typedef u_int8_t	__u8;
+-typedef int8_t		__s8;
+-typedef u_int16_t	__u16;
+-typedef int16_t		__s16;
+-typedef u_int32_t	__u32;
+-typedef int32_t		__s32;
+-typedef u_int64_t	__u64;
+-typedef int64_t		__s64;
+-
+ #define constpp	char * const *
+ 
+ #define EFSCORRUPTED	990	/* Filesystem is corrupted */
diff --git a/sysutils/xfsprogs/files/patch-report.c b/sysutils/xfsprogs/files/patch-report.c
new file mode 100644
index 000000000000..2d05d189724f
--- /dev/null
+++ b/sysutils/xfsprogs/files/patch-report.c
@@ -0,0 +1,10 @@
+--- quota/report.c.orig	Tue Feb  7 21:24:32 2006
++++ quota/report.c	Tue Feb  7 21:25:12 2006
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <xfs/command.h>
++#include <sys/types.h>
+ #include <pwd.h>
+ #include <grp.h>
+ #include <utmp.h>