3 files changed, 29 insertions, 5 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index d60b8d70f264..759964b2854e 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.41.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -58,10 +58,6 @@ PLIST_SUB=	NLS=""
 libintl=	"${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
 post-patch::
 	@${REINPLACE_CMD} -E -e \
 		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
@@ -107,6 +103,9 @@ post-build:
 	@${ECHO_CMD} '===>  Running e2fsprogs self-test suite'
 	cd ${WRKSRC}/tests && ${GMAKE} check \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
+# Now patch mke2fs.conf to default to 128 byte inodes - we need to do this
+# after self tests since they assume 256 byte inodes.
+	${PATCH} -N -d ${WRKSRC} <${FILESDIR}/diff-inode_size
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
diff --git a/sysutils/e2fsprogs/files/diff-inode_size b/sysutils/e2fsprogs/files/diff-inode_size
new file mode 100644
index 000000000000..98e8e7e90c6b
--- /dev/null
+++ b/sysutils/e2fsprogs/files/diff-inode_size
@@ -0,0 +1,14 @@
+# do not call this patch-* - we need to apply this after running self-tests!
+# -- Matthias Andree, 2009-02-10
+
+--- ./misc/mke2fs.conf.orig	2009-02-10 18:32:45.000000000 +0900
++++ ./misc/mke2fs.conf	2009-02-10 18:32:52.000000000 +0900
+@@ -1,7 +1,7 @@
+ [defaults]
+ 	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
+ 	blocksize = 4096
+-	inode_size = 256
++	inode_size = 128
+ 	inode_ratio = 16384
+ 
+ [fs_types]
diff --git a/sysutils/e2fsprogs/pkg-message b/sysutils/e2fsprogs/pkg-message
index 3f0e7e23609e..d99cda2c504f 100644
--- a/sysutils/e2fsprogs/pkg-message
+++ b/sysutils/e2fsprogs/pkg-message
@@ -1,4 +1,15 @@
 ===========================================================================
+Note: FreeBSD's ext2fs module, as of release 7.1, cannot mount ext2 file
+systems with 256-byte large inodes, only 128 byte sized.  Unfortunately,
+256 byte is the default size with many recent Linux distributions.
+The inode size cannot be changed after creation of a file system either.
+This port overrides the default to 128 bytes, but this only applies to ext2
+file systems created with this particular mke2fs.  If you format ext2 file
+systems with other operating systems, make sure that mke2fs is called with
+"-I 128" for partitions that you plan to share with FreeBSD.
+Remember to backup your data before re-formatting any existing file
+systems!
+---------------------------------------------------------------------------
 Note: this is a modified version of the e2fsprogs package, not the official
 package. Report all building and run-time trouble that originates in the
 package to the port maintainer, <matthias.andree@gmx.de>.