Update e2fsprogs to 1.43.1, using wip package for version 1.42.12 as base

Changes too numerous, see following page for details:
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.1

Compile-tested on NetBSD and Mac OS X

16 files changed, 185 insertions, 99 deletions

diff --git a/sysutils/e2fsprogs/DESCR b/sysutils/e2fsprogs/DESCR
index f76c3096763..8e00fbf7f3c 100644
--- a/sysutils/e2fsprogs/DESCR
+++ b/sysutils/e2fsprogs/DESCR
@@ -1,2 +1,2 @@
-The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs,
-dumpe2fs, fsck, and others.
+The filesystem utilities for the EXT2/EXT3/EXT4 filesystem, including
+e2fsck, mke2fs, dumpe2fs, fsck, and others.
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 5407cc355c5..544607078b1 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2014/05/04 00:43:00 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/09 21:46:06 jdolecek Exp $
 
-DISTNAME=	e2fsprogs-1.41.12
+DISTNAME=	e2fsprogs-1.43.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 
@@ -29,4 +29,21 @@ EGDIR=			${PREFIX}/share/examples/ext2fs
 CONF_FILES+=		${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
 
+SUBST_CLASSES+=		man
+SUBST_MESSAGE.man=	Give correct path for man page
+SUBST_STAGE.man=	post-patch
+
+SUBST_FILES.man+=	misc/mke2fs.8.in
+SUBST_FILES.man+=	misc/mke2fs.conf.5.in
+SUBST_FILES.man+=	e2fsck/e2fsck.conf.5.in
+SUBST_FILES.man+=	lib/blkid/libblkid.3.in
+SUBST_FILES.man+=	misc/blkid.8.in
+
+SUBST_SED.man+=		-e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
+SUBST_SED.man+=		-e '/mke2fs.conf/s,/etc,@root_sysconfdir@,'
+# next (two) path's in the man page do not exist
+SUBST_SED.man+=		-e '/e2fsck.conf/s,/etc,@root_sysconfdir@,'
+SUBST_SED.man+=		-e   '/blkid.tab/s,/etc,@root_sysconfdir@,'
+
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST
index 212949a1618..e6190c3a296 100644
--- a/sysutils/e2fsprogs/PLIST
+++ b/sysutils/e2fsprogs/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2010/12/23 06:34:50 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/08/09 21:46:06 jdolecek Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
 info/libext2fs.info
 lib/e2initrd_helper
 man/man1/chattr.1
+man/man1/fuse2fs.1
 man/man1/lsattr.1
 man/man1/uuidgen.1
 man/man5/e2fsck.conf.5
+man/man5/ext2.5
+man/man5/ext3.5
+man/man5/ext4.5
 man/man5/mke2fs.conf.5
 man/man8/badblocks.8
 man/man8/blkid.8
@@ -20,7 +24,6 @@ man/man8/e2label.8
 man/man8/e2undo.8
 man/man8/filefrag.8
 man/man8/findfs.8
-${PLIST.fsck}man/man8/fsck.8
 man/man8/fsck.ext2.8
 man/man8/fsck.ext3.8
 man/man8/fsck.ext4.8
@@ -46,7 +49,6 @@ sbin/e2label
 sbin/e2undo
 sbin/filefrag
 sbin/findfs
-${PLIST.fsck}sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/fsck.ext4
@@ -64,7 +66,9 @@ sbin/uuidd
 share/examples/ext2fs/mke2fs.conf
 share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 share/locale/cs/LC_MESSAGES/e2fsprogs.mo
+share/locale/da/LC_MESSAGES/e2fsprogs.mo
 share/locale/de/LC_MESSAGES/e2fsprogs.mo
+share/locale/eo/LC_MESSAGES/e2fsprogs.mo
 share/locale/es/LC_MESSAGES/e2fsprogs.mo
 share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 share/locale/id/LC_MESSAGES/e2fsprogs.mo
@@ -73,5 +77,6 @@ share/locale/nl/LC_MESSAGES/e2fsprogs.mo
 share/locale/pl/LC_MESSAGES/e2fsprogs.mo
 share/locale/sv/LC_MESSAGES/e2fsprogs.mo
 share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+share/locale/uk/LC_MESSAGES/e2fsprogs.mo
 share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 98e37ba4ed7..4b813f287cf 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:32:12 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/08/09 21:46:06 jdolecek Exp $
 
-SHA1 (e2fsprogs-1.41.12.tar.gz) = 62b002fe507b2ddafc24b89532e472fe4b55a14f
-RMD160 (e2fsprogs-1.41.12.tar.gz) = aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7
-SHA512 (e2fsprogs-1.41.12.tar.gz) = 9ca618ae21574cf25e9249b445cc8e89a4ddc9d717ba650af084979f95771e42026395148d7f38a9489402a81a8fbeb60524eb9cf8e9eec3b309fee7e6469bab
-Size (e2fsprogs-1.41.12.tar.gz) = 4496194 bytes
-SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
-SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
-SHA1 (patch-af) = 8e1c2f5b90b78fdd4c5a4fcb573f23fc1db6e90f
-SHA1 (patch-am) = 9c3be47010f6101e4f41343e108b967c88847c12
-SHA1 (patch-an) = 62acb3f18f61ae6a729a8eebd308a1a1efe83e50
-SHA1 (patch-ao) = 241b33700249d09f60f11f3167ef8cf771d1e588
-SHA1 (patch-ap) = 4f9f8e47ecbea53acb1318e5ef0abe58cfbbb9ce
-SHA1 (patch-ar) = 9103ed55e0f13451fbb2f34c4bee28f5e24c216a
-SHA1 (patch-as) = 6066be5bf84753419407d2ee70cd8934b918c298
-SHA1 (patch-at) = 53cbd25d89a9df733ba931490c1dcb77b20ddbe3
-SHA1 (patch-av) = 92c9d34c82cba121744cfff5b23e4b92c9442545
-SHA1 (patch-aw) = cb5e382077c07f0ced114fcbf195537cc7b0058c
-SHA1 (patch-e2fsck_jfs__user.h) = d0b8058f00a4ac5445645017bf83aafc8af63c8a
-SHA1 (patch-lib_ext2fs_bitops.h) = 3d3c8862e00622a0b715e7ef162d229910b43ec1
-SHA1 (patch-lib_ext2fs_ext2fs.h) = 0bd9fbfcf33008d90cecb7821d04791b27f286f2
-SHA1 (patch-lib_ext2fs_tdb.c) = 21f2109420b6e35f3a5c194f26ce14f6cb07f4ef
+SHA1 (e2fsprogs-1.43.1.tar.gz) = 26b75c27ba434e72ef630b160782a01b4d992b7a
+RMD160 (e2fsprogs-1.43.1.tar.gz) = 0392ed04ae20b2d6150d2cbce9c0fbc7f9d85f57
+SHA512 (e2fsprogs-1.43.1.tar.gz) = 979f6b83f0c0650fd27e0a63dfe0cfb7690de71977f374a43ccdb0b77f49c40531d6b9a6a16c4a3b31a16cc4f4906846862a489c6d4b8bf036530ce72ffd36bb
+Size (e2fsprogs-1.43.1.tar.gz) = 7009831 bytes
+SHA1 (patch-ab) = 9b686655a75239279a456dc8889113be06519cd7
+SHA1 (patch-ac) = 1b938d2b9032896aa1caf85c21727b328ecae2de
+SHA1 (patch-af) = bcda43bb14afdbf6a98dfedd949af4d1aff443d6
+SHA1 (patch-an) = 0649c3dbd33932265c291a593b393a55b2707626
+SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
+SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
+SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32
+SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
+SHA1 (patch-lib_ext2fs_bitops.c) = eb183d82a45c6902f45fcbffb71b6d9b61b248ad
+SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
+SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
+SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
diff --git a/sysutils/e2fsprogs/patches/patch-ab b/sysutils/e2fsprogs/patches/patch-ab
index d379df92bcd..4618da53b92 100644
--- a/sysutils/e2fsprogs/patches/patch-ab
+++ b/sysutils/e2fsprogs/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2008/09/21 16:16:06 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
 
---- lib/ext2fs/getsize.c.orig	2007-06-30 15:58:34 +0300
-+++ lib/ext2fs/getsize.c
-@@ -32,6 +32,9 @@
+DragonFly support
+
+--- lib/ext2fs/getsize.c.orig	2014-08-03 05:26:22.000000000 +0900
++++ lib/ext2fs/getsize.c	2014-12-10 20:45:18.000000000 +0900
+@@ -33,6 +33,9 @@
  #ifdef HAVE_SYS_DISKLABEL_H
  #include <sys/disklabel.h>
  #endif
@@ -10,17 +12,17 @@ $NetBSD: patch-ab,v 1.3 2008/09/21 16:16:06 joerg Exp $
 +#include <sys/disklabel32.h>
 +#endif
  #ifdef HAVE_SYS_DISK_H
- #ifdef HAVE_SYS_QUEUE_H
- #include <sys/queue.h> /* for LIST_HEAD */
-@@ -154,7 +157,11 @@ errcode_t ext2fs_get_device_size(const c
+ #include <sys/disk.h>
  #endif
+@@ -198,7 +201,11 @@ errcode_t ext2fs_get_device_size2(const 
  #ifdef HAVE_SYS_DISKLABEL_H
- 	int part;
+ 	{
+ 		int part;
 +#ifdef __DragonFly__
-+	struct disklabel32 lab;
++		struct disklabel32 lab;
 +#else
- 	struct disklabel lab;
+ 		struct disklabel lab;
 +#endif
- 	struct partition *pp;
- 	char ch;
- #endif /* HAVE_SYS_DISKLABEL_H */
+ 		struct partition *pp;
+ 		char ch;
+ 
diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac
index ead7746cc25..4e1c52e15c2 100644
--- a/sysutils/e2fsprogs/patches/patch-ac
+++ b/sysutils/e2fsprogs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2008/09/21 16:16:06 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
 
---- lib/blkid/getsize.c.orig	2008-06-30 00:05:45 +0300
+--- lib/blkid/getsize.c.orig	2016-06-08 21:39:43.000000000 +0000
 +++ lib/blkid/getsize.c
-@@ -32,6 +32,9 @@
+@@ -36,6 +36,9 @@
  #ifdef HAVE_SYS_DISKLABEL_H
  #include <sys/disklabel.h>
  #endif
@@ -10,31 +10,32 @@ $NetBSD: patch-ac,v 1.3 2008/09/21 16:16:06 joerg Exp $
 +#include <sys/disklabel32.h>
 +#endif
  #ifdef HAVE_SYS_DISK_H
- #ifdef HAVE_SYS_QUEUE_H
- #include <sys/queue.h> /* for LIST_HEAD */
-@@ -86,8 +89,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ #include <sys/disk.h>
  #endif
- #ifdef HAVE_SYS_DISKLABEL_H
- 	int part = -1;
+@@ -134,8 +137,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ #if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
+ 	{
+ 		int part = -1;
 +#ifdef __DragonFly__
-+	struct disklabel32 lab;
-+	struct partition32 *pp;
++		struct disklabel32 lab;
++		struct partition32 *pp;
 +#else
- 	struct disklabel lab;
- 	struct partition *pp;
+ 		struct disklabel lab;
+ 		struct partition *pp;
 +#endif
- 	char ch;
- 	struct stat st;
- #endif /* HAVE_SYS_DISKLABEL_H */
-@@ -144,7 +152,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
- 	 */
- 	if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
- 		part = st.st_rdev & 7;
+ 		char ch;
+ 		struct stat st;
+ 
+@@ -151,8 +159,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
+ 		if (fstat(fd, &st) >= 0 &&
+ 		    (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
+ 			part = st.st_rdev & 7;
+-
 +#ifdef __DragonFly__
-+	if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
++		if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
 +#else
- 	if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
+ 		if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
 +#endif
- 		pp = &lab.d_partitions[part];
- 		if (pp->p_size)
- 			return pp->p_size << 9;
+ 			pp = &lab.d_partitions[part];
+ 			if (pp->p_size)
+ 				return pp->p_size << 9;
diff --git a/sysutils/e2fsprogs/patches/patch-af b/sysutils/e2fsprogs/patches/patch-af
index 27fc0702020..b41f50873d3 100644
--- a/sysutils/e2fsprogs/patches/patch-af
+++ b/sysutils/e2fsprogs/patches/patch-af
@@ -1,4 +1,8 @@
-$NetBSD: patch-af,v 1.7 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-af,v 1.8 2016/08/09 21:46:07 jdolecek Exp $
+
+Add a patch to use struct statvfs on NetBSD 2.0F and newer.  Fixes PR 25891
+by Andreas Wiese.
+Upate __NetBSD_Version__ statvfs check from 200060000 to 299000900
 
 --- lib/ext2fs/ismounted.c.orig	2010-05-18 03:04:39.000000000 +0000
 +++ lib/ext2fs/ismounted.c
diff --git a/sysutils/e2fsprogs/patches/patch-an b/sysutils/e2fsprogs/patches/patch-an
index 4fcc58eaff7..6a35f7b1e08 100644
--- a/sysutils/e2fsprogs/patches/patch-an
+++ b/sysutils/e2fsprogs/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.2 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-an,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
 
---- e2fsck/e2fsck.h.orig	2010-05-13 22:59:49.000000000 +0000
+--- e2fsck/e2fsck.h.orig	2016-06-08 21:39:43.000000000 +0000
 +++ e2fsck/e2fsck.h
-@@ -61,6 +61,10 @@
- #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
- #endif
+@@ -69,6 +69,10 @@
+ 
+ #include "support/quotaio.h"
  
 +#ifndef ETC_DIR
 +#define ETC_DIR "/etc"		/* Where to find the config file */
diff --git a/sysutils/e2fsprogs/patches/patch-ao b/sysutils/e2fsprogs/patches/patch-ao
index d4069ebf8ac..a4613c70a93 100644
--- a/sysutils/e2fsprogs/patches/patch-ao
+++ b/sysutils/e2fsprogs/patches/patch-ao
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.2 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-ao,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
+
+Where to find the config file
 
 --- lib/blkid/blkidP.h.orig	2009-08-13 01:39:57.000000000 +0000
 +++ lib/blkid/blkidP.h
diff --git a/sysutils/e2fsprogs/patches/patch-as b/sysutils/e2fsprogs/patches/patch-as
index c0ae661f922..17c47b21633 100644
--- a/sysutils/e2fsprogs/patches/patch-as
+++ b/sysutils/e2fsprogs/patches/patch-as
@@ -1,4 +1,6 @@
-$NetBSD: patch-as,v 1.3 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-as,v 1.4 2016/08/09 21:46:07 jdolecek Exp $
+
+Give correct path for short help
 
 --- misc/blkid.c.orig	2009-08-13 01:39:57.000000000 +0000
 +++ misc/blkid.c
diff --git a/sysutils/e2fsprogs/patches/patch-aw b/sysutils/e2fsprogs/patches/patch-aw
index 34d58454c7d..161e4a4fe4d 100644
--- a/sysutils/e2fsprogs/patches/patch-aw
+++ b/sysutils/e2fsprogs/patches/patch-aw
@@ -1,4 +1,6 @@
-$NetBSD: patch-aw,v 1.2 2010/12/23 06:34:50 ryoon Exp $
+$NetBSD: patch-aw,v 1.3 2016/08/09 21:46:07 jdolecek Exp $
+
+Don't gzip info file
 
 --- doc/Makefile.in.orig	2010-02-10 23:16:03.000000000 +0000
 +++ doc/Makefile.in
diff --git a/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h b/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h
index 3d1e0857a21..35f95c85916 100644
--- a/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h
+++ b/sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h
@@ -1,13 +1,15 @@
-$NetBSD: patch-e2fsck_jfs__user.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
+$NetBSD: patch-e2fsck_jfs__user.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
 
---- e2fsck/jfs_user.h.orig	2012-11-19 02:21:35.000000000 +0000
-+++ e2fsck/jfs_user.h
-@@ -83,7 +83,7 @@ extern size_t journal_tag_bytes(journal_
- #define _INLINE_ extern
- #else
+Force GNU inline semantic.
+
+--- e2fsck/jfs_user.h.orig	2014-07-06 13:13:18.000000000 +0900
++++ e2fsck/jfs_user.h	2014-12-10 21:09:03.000000000 +0900
+@@ -93,7 +93,7 @@ extern size_t journal_tag_bytes(journal_
+ #define _INLINE_ inline
+ #else /* not C99 */
  #ifdef __GNUC__
 -#define _INLINE_ extern __inline__
 +#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
  #else				/* For Watcom C */
  #define _INLINE_ extern inline
- #endif
+ #endif /* __GNUC__ */
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
new file mode 100644
index 00000000000..bee5607a577
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-lib_ext2fs_bitops.c,v 1.1 2016/08/09 21:46:07 jdolecek Exp $
+
+--- lib/ext2fs/bitops.c.orig	2013-09-09 14:29:01.000000000 +0000
++++ lib/ext2fs/bitops.c
+@@ -116,14 +116,14 @@ int ext2fs_test_bit64(__u64 nr, const vo
+ 	return (mask & *ADDR);
+ }
+ 
+-static unsigned int popcount8(unsigned int w)
++static unsigned int ext2fs_popcount8(unsigned int w)
+ {
+ 	unsigned int res = w - ((w >> 1) & 0x55);
+ 	res = (res & 0x33) + ((res >> 2) & 0x33);
+ 	return (res + (res >> 4)) & 0x0F;
+ }
+ 
+-static unsigned int popcount32(unsigned int w)
++static unsigned int ext2fs_popcount32(unsigned int w)
+ {
+ 	unsigned int res = w - ((w >> 1) & 0x55555555);
+ 	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+@@ -139,19 +139,19 @@ unsigned int ext2fs_bitcount(const void 
+ 	unsigned int res = 0;
+ 
+ 	while (((((unsigned long) cp) & 3) != 0) && (nbytes > 0)) {
+-		res += popcount8(*cp++);
++		res += ext2fs_popcount8(*cp++);
+ 		nbytes--;
+ 	}
+ 	p = (const __u32 *) cp;
+ 
+ 	while (nbytes > 4) {
+-		res += popcount32(*p++);
++		res += ext2fs_popcount32(*p++);
+ 		nbytes -= 4;
+ 	}
+ 	cp = (const unsigned char *) p;
+ 
+ 	while (nbytes > 0) {
+-		res += popcount8(*cp++);
++		res += ext2fs_popcount8(*cp++);
+ 		nbytes--;
+ 	}
+ 	return res;
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
index d61cd0e6c65..5984377f992 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
+++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h
@@ -1,13 +1,15 @@
-$NetBSD: patch-lib_ext2fs_bitops.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
+$NetBSD: patch-lib_ext2fs_bitops.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
 
---- lib/ext2fs/bitops.h.orig	2012-11-19 02:21:39.000000000 +0000
-+++ lib/ext2fs/bitops.h
-@@ -135,7 +135,7 @@ extern __u32 ext2fs_get_generic_bitmap_e
- #define _INLINE_ extern
- #else
+Force GNU inline semantic.
+
+--- lib/ext2fs/bitops.h.orig	2014-07-03 23:33:48.000000000 +0900
++++ lib/ext2fs/bitops.h	2014-12-10 21:10:47.000000000 +0900
+@@ -238,7 +238,7 @@ extern errcode_t ext2fs_find_first_set_g
+ #define _INLINE_ inline
+ #else /* not C99 */
  #ifdef __GNUC__
 -#define _INLINE_ extern __inline__
 +#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
  #else				/* For Watcom C */
  #define _INLINE_ extern inline
- #endif
+ #endif /* __GNUC__ */
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
index 31de6cdc865..a5d497b30ef 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
+++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h
@@ -1,13 +1,15 @@
-$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
+$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
 
---- lib/ext2fs/ext2fs.h.orig	2012-11-19 02:21:42.000000000 +0000
-+++ lib/ext2fs/ext2fs.h
-@@ -1180,7 +1180,7 @@ extern unsigned int ext2fs_div_ceil(unsi
- #define _INLINE_ extern
+Force GNU inline semantic.
+
+--- lib/ext2fs/ext2fs.h.orig	2014-08-03 05:26:22.000000000 +0900
++++ lib/ext2fs/ext2fs.h	2014-12-10 21:03:40.000000000 +0900
+@@ -1529,7 +1529,7 @@ extern __u64 ext2fs_div64_ceil(__u64 a, 
+ #define _INLINE_ inline
  #else
  #ifdef __GNUC__
 -#define _INLINE_ extern __inline__
 +#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
  #else				/* For Watcom C */
  #define _INLINE_ extern inline
- #endif
+ #endif /* __GNUC__ */
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c
index 0237e616869..1005c0b0546 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c
+++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c
@@ -1,16 +1,21 @@
-$NetBSD: patch-lib_ext2fs_tdb.c,v 1.1 2012/06/27 08:52:05 bsiegert Exp $
+$NetBSD: patch-lib_ext2fs_tdb.c,v 1.2 2016/08/09 21:46:07 jdolecek Exp $
 
---- lib/ext2fs/tdb.c.orig	Tue Dec 13 04:47:53 2011
+Move #include <sys/types.h> before the #define of _XOPEN_SOURCE so that
+u_short etc. are being defined by it.
+
+Fixes build on MirBSD. 
+
+--- lib/ext2fs/tdb.c.orig	2016-06-07 05:01:19.000000000 +0000
 +++ lib/ext2fs/tdb.c
 @@ -36,6 +36,7 @@ Last Changed Date: 2007-06-22 13:36:10 -
  #define HAVE_UTIME_H
  #define HAVE_UTIME
  #endif
 +#include <sys/types.h>
+ #ifndef __FreeBSD__
  #define _XOPEN_SOURCE 600
- 
- #include <unistd.h>
-@@ -49,7 +50,6 @@ Last Changed Date: 2007-06-22 13:36:10 -
+ #endif
+@@ -52,7 +53,6 @@ Last Changed Date: 2007-06-22 13:36:10 -
  #include <sys/select.h>
  #endif
  #include <sys/time.h>