summaryrefslogtreecommitdiff
path: root/sysutils/e2fsprogs
diff options
context:
space:
mode:
authorjlam <jlam>2007-06-20 19:51:08 +0000
committerjlam <jlam>2007-06-20 19:51:08 +0000
commitac1f2c62a465ac5075485fe8ffbd0573a86512e9 (patch)
tree364e99e24004c85732afb2efb2c29ef9287dda12 /sysutils/e2fsprogs
parent72557c853347900b13f59109769a5624e7dfea63 (diff)
downloadpkgsrc-ac1f2c62a465ac5075485fe8ffbd0573a86512e9.tar.gz
* Honor PKG_SYSCONFDIR.
* Simplify the PLISTs by merging them. This makes it easier to handle future platforms that want to install fsck. * Don't compress the info files during installation. The plist module can handle that automatically. * Install the example mke2fs.conf file into the right place. This should fix the latest bulk build error for e2fsprogs. Bump PKGREVISION to 1.
Diffstat (limited to 'sysutils/e2fsprogs')
-rw-r--r--sysutils/e2fsprogs/Makefile22
-rw-r--r--sysutils/e2fsprogs/PLIST (renamed from sysutils/e2fsprogs/PLIST.common)5
-rw-r--r--sysutils/e2fsprogs/PLIST.Linux3
-rw-r--r--sysutils/e2fsprogs/distinfo18
-rw-r--r--sysutils/e2fsprogs/patches/patch-aa17
-rw-r--r--sysutils/e2fsprogs/patches/patch-af11
-rw-r--r--sysutils/e2fsprogs/patches/patch-al13
-rw-r--r--sysutils/e2fsprogs/patches/patch-am13
-rw-r--r--sysutils/e2fsprogs/patches/patch-an15
-rw-r--r--sysutils/e2fsprogs/patches/patch-ao17
-rw-r--r--sysutils/e2fsprogs/patches/patch-ap22
-rw-r--r--sysutils/e2fsprogs/patches/patch-aq38
-rw-r--r--sysutils/e2fsprogs/patches/patch-ar22
-rw-r--r--sysutils/e2fsprogs/patches/patch-as24
-rw-r--r--sysutils/e2fsprogs/patches/patch-at22
-rw-r--r--sysutils/e2fsprogs/patches/patch-au24
-rw-r--r--sysutils/e2fsprogs/patches/patch-av13
-rw-r--r--sysutils/e2fsprogs/patches/patch-aw13
18 files changed, 293 insertions, 19 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 9bbf4495571..19ac19aa831 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/06/06 09:35:17 martti Exp $
+# $NetBSD: Makefile,v 1.14 2007/06/20 19:51:08 jlam Exp $
#
DISTNAME= e2fsprogs-1.39
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -11,12 +12,25 @@ COMMENT= Second extended file system (ext2fs) management programs
GNU_CONFIGURE= yes
USE_TOOLS+= makeinfo
-INFO_FILES= YES
+INFO_FILES= # PLIST
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux"
-CONFIGURE_ARGS+=--disable-fsck
+# Only build fsck(8) on platforms that need it.
+.if (${OPSYS} != "Linux")
+FSCK= "@comment "
+.else
+FSCK= # empty
.endif
+PLIST_SUBST+= FSCK=${FSCK}
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+.if !empty(FSCK)
+CONFIGURE_ARGS+= --disable-fsck
+.endif
+
+EGDIR= ${PREFIX}/share/examples/ext2fs
+CONF_FILES+= ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/e2fsprogs/PLIST.common b/sysutils/e2fsprogs/PLIST
index 3a1818a5a04..4872fc97ac6 100644
--- a/sysutils/e2fsprogs/PLIST.common
+++ b/sysutils/e2fsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.5 2007/06/06 09:35:17 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/06/20 19:51:08 jlam Exp $
bin/chattr
bin/lsattr
bin/uuidgen
@@ -18,6 +18,7 @@ man/man8/e2image.8
man/man8/e2label.8
man/man8/filefrag.8
man/man8/findfs.8
+${FSCK}man/man8/fsck.8
man/man8/fsck.ext2.8
man/man8/fsck.ext3.8
man/man8/logsave.8
@@ -36,6 +37,7 @@ sbin/e2image
sbin/e2label
sbin/filefrag
sbin/findfs
+${FSCK}sbin/fsck
sbin/fsck.ext2
sbin/fsck.ext3
sbin/logsave
@@ -45,6 +47,7 @@ sbin/mkfs.ext3
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
+share/examples/ext2fs/mke2fs.conf
share/locale/cs/LC_MESSAGES/e2fsprogs.mo
share/locale/de/LC_MESSAGES/e2fsprogs.mo
share/locale/es/LC_MESSAGES/e2fsprogs.mo
diff --git a/sysutils/e2fsprogs/PLIST.Linux b/sysutils/e2fsprogs/PLIST.Linux
deleted file mode 100644
index c43d345dce8..00000000000
--- a/sysutils/e2fsprogs/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2007/06/06 09:35:17 martti Exp $
-man/man8/fsck.8
-sbin/fsck
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index e4105734c8c..c90da654938 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,7 +1,19 @@
-$NetBSD: distinfo,v 1.12 2007/06/06 10:29:14 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/06/20 19:51:09 jlam Exp $
SHA1 (e2fsprogs-1.39.tar.gz) = c2dad0c9bd76701eafe3804e2a7d072aa198f046
RMD160 (e2fsprogs-1.39.tar.gz) = 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b
Size (e2fsprogs-1.39.tar.gz) = 3695111 bytes
-SHA1 (patch-aa) = a02135c39559a691f022063351ccb974f9930afb
-SHA1 (patch-af) = 4477e239e166295b06a5664d4ec7a92fa29c4f84
+SHA1 (patch-aa) = 5e7010e1d9280c9ad7b64b89eaa3675cc9262ec7
+SHA1 (patch-af) = 5bc4a9eec2a01154ade21c810ecb26272f3453c6
+SHA1 (patch-al) = 81d3169f156422739659f491ae52a53f932b0799
+SHA1 (patch-am) = 05a547a48b02d267e200d6161e982e5cf1226d3b
+SHA1 (patch-an) = 0324fe2a0b7a9464f8af401d554e07a0bcfa22e2
+SHA1 (patch-ao) = 57c8757cd378a72d728475f26cdf9a452afbf64b
+SHA1 (patch-ap) = 175e97acf1a7cfcbd3a18c80ed513f26ac111e13
+SHA1 (patch-aq) = 7289be157b0449a85fc3ec0a8f8a561333719116
+SHA1 (patch-ar) = 8a4a7ba5bd51ba8d68e6954c82ac6fd4cdf6153d
+SHA1 (patch-as) = e4a4221c5a870b6e2fa1001d77b01e5bf74dd20d
+SHA1 (patch-at) = 80785a73eaa57a4a73bd0a683697ea2f890f8dbc
+SHA1 (patch-au) = 87d7571695d7899323d30eb8acee108f6570c32f
+SHA1 (patch-av) = 07f3fbf646e2e9716ea10d55580fa15dd99db01d
+SHA1 (patch-aw) = 4f25dc800f6fc3a428f43eba2b9674c7b3256ea6
diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa
index a28ca4f4413..476e4aaa0d1 100644
--- a/sysutils/e2fsprogs/patches/patch-aa
+++ b/sysutils/e2fsprogs/patches/patch-aa
@@ -1,6 +1,8 @@
---- e2fsck/unix.c.orig 2007-06-06 13:04:31.000000000 +0300
-+++ e2fsck/unix.c 2007-06-06 13:19:33.000000000 +0300
-@@ -173,7 +173,7 @@
+$NetBSD: patch-aa,v 1.5 2007/06/20 19:51:09 jlam Exp $
+
+--- e2fsck/unix.c.orig 2006-03-19 20:31:06.000000000 -0500
++++ e2fsck/unix.c
+@@ -173,7 +173,7 @@ static void check_mount(e2fsck_t ctx)
retval = ext2fs_check_if_mounted(ctx->filesystem_name,
&ctx->mount_flags);
if (retval) {
@@ -9,3 +11,12 @@
_("while determining whether %s is mounted."),
ctx->filesystem_name);
return;
+@@ -568,7 +568,7 @@ static void syntax_err_report(const char
+ exit(FSCK_ERROR);
+ }
+
+-static const char *config_fn[] = { "/etc/e2fsck.conf", 0 };
++static const char *config_fn[] = { ETC_DIR "/e2fsck.conf", 0 };
+
+ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
+ {
diff --git a/sysutils/e2fsprogs/patches/patch-af b/sysutils/e2fsprogs/patches/patch-af
index 6a3a0a7431d..1a134399073 100644
--- a/sysutils/e2fsprogs/patches/patch-af
+++ b/sysutils/e2fsprogs/patches/patch-af
@@ -1,6 +1,7 @@
-$NetBSD: patch-af,v 1.4 2007/06/06 10:29:15 martti Exp $
---- lib/ext2fs/ismounted.c.orig 2007-06-06 13:22:30.000000000 +0300
-+++ lib/ext2fs/ismounted.c 2007-06-06 13:23:15.000000000 +0300
+$NetBSD: patch-af,v 1.5 2007/06/20 19:51:09 jlam Exp $
+
+--- lib/ext2fs/ismounted.c.orig 2005-09-06 05:40:14.000000000 -0400
++++ lib/ext2fs/ismounted.c
@@ -29,7 +29,11 @@
#include <sys/mount.h>
#endif /* HAVE_GETMNTINFO */
@@ -13,7 +14,7 @@ $NetBSD: patch-af,v 1.4 2007/06/06 10:29:15 martti Exp $
#include "ext2_fs.h"
#include "ext2fs.h"
-@@ -196,7 +200,11 @@
+@@ -196,7 +200,11 @@ static errcode_t check_mntent(const char
static errcode_t check_getmntinfo(const char *file, int *mount_flags,
char *mtpt, int mtlen)
{
@@ -25,7 +26,7 @@ $NetBSD: patch-af,v 1.4 2007/06/06 10:29:15 martti Exp $
int len, n;
const char *s1;
char *s2;
-@@ -325,9 +333,9 @@
+@@ -325,9 +333,9 @@ errcode_t ext2fs_check_mount_point(const
*mount_flags |= EXT2_MF_BUSY;
} else
close(fd);
diff --git a/sysutils/e2fsprogs/patches/patch-al b/sysutils/e2fsprogs/patches/patch-al
new file mode 100644
index 00000000000..b89d07c2dc5
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2007/06/20 19:51:09 jlam Exp $
+
+--- MCONFIG.in.orig 2006-03-22 20:19:19.000000000 -0500
++++ MCONFIG.in
+@@ -33,7 +33,7 @@ datadir = @datadir@
+
+ CC = @CC@
+ BUILD_CC = @BUILD_CC@
+-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
++DEFS = -DLOCALEDIR=\"$(localedir)\" -DETC_DIR=\"$(root_sysconfdir)\" @DEFS@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
+ INTL_FLAGS = @INTL_FLAGS@
diff --git a/sysutils/e2fsprogs/patches/patch-am b/sysutils/e2fsprogs/patches/patch-am
new file mode 100644
index 00000000000..aa5f42c0efc
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2007/06/20 19:51:09 jlam Exp $
+
+--- e2fsck/e2fsck.conf.5.in.orig 2006-03-27 00:55:38.000000000 -0500
++++ e2fsck/e2fsck.conf.5.in
+@@ -157,7 +157,7 @@ things out may be dangerous.)
+ }
+ .SH FILES
+ .TP
+-.I /etc/e2fsck.conf
++.I @root_sysconfdir@/e2fsck.conf
+ The configuration file for
+ .BR e2fsck (8).
+ .SH SEE ALSO
diff --git a/sysutils/e2fsprogs/patches/patch-an b/sysutils/e2fsprogs/patches/patch-an
new file mode 100644
index 00000000000..5659acbe99a
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2007/06/20 19:51:10 jlam Exp $
+
+--- e2fsck/e2fsck.h.orig 2006-03-18 21:33:55.000000000 -0500
++++ e2fsck/e2fsck.h
+@@ -58,6 +58,10 @@
+ #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
+ #endif
+
++#ifndef ETC_DIR
++#define ETC_DIR "/etc" /* Where to find the config file */
++#endif
++
+ /*
+ * Exit codes used by fsck-type programs
+ */
diff --git a/sysutils/e2fsprogs/patches/patch-ao b/sysutils/e2fsprogs/patches/patch-ao
new file mode 100644
index 00000000000..bd02fa4f549
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1 2007/06/20 19:51:10 jlam Exp $
+
+--- lib/blkid/blkidP.h.orig 2006-02-20 14:16:42.000000000 -0500
++++ lib/blkid/blkidP.h
+@@ -104,7 +104,11 @@ struct blkid_struct_cache
+ extern char *blkid_strdup(const char *s);
+ extern char *blkid_strndup(const char *s, const int length);
+
+-#define BLKID_CACHE_FILE "/etc/blkid.tab"
++#ifndef ETC_DIR
++#define ETC_DIR "/etc" /* Where to find the config file */
++#endif
++
++#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
+ extern const char *blkid_devdirs[];
+
+ #define BLKID_ERR_IO 5
diff --git a/sysutils/e2fsprogs/patches/patch-ap b/sysutils/e2fsprogs/patches/patch-ap
new file mode 100644
index 00000000000..842ac2caf88
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2007/06/20 19:51:10 jlam Exp $
+
+--- lib/blkid/libblkid.3.in.orig 2005-09-06 05:40:14.000000000 -0400
++++ lib/blkid/libblkid.3.in
+@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
+ specific block device names into configuration files.
+ .P
+ Block device information is normally kept in a cache file
+-.I /etc/blkid.tab
++.I @root_sysconfdir@/blkid.tab
+ and is verified to still be valid before being returned to the user
+ (if the user has read permission on the raw block device, otherwise not).
+ The cache file also allows unprivileged users (normally anyone other
+@@ -49,7 +49,7 @@ was written by Andreas Dilger for the ex
+ from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o.
+ .SH FILES
+ .TP
+-.I /etc/blkid.tab
++.I @root_sysconfdir@/blkid.tab
+ Caches data extracted from each recognized block device.
+ .SH AVAILABILITY
+ .B libblkid
diff --git a/sysutils/e2fsprogs/patches/patch-aq b/sysutils/e2fsprogs/patches/patch-aq
new file mode 100644
index 00000000000..3450720a885
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-aq
@@ -0,0 +1,38 @@
+$NetBSD: patch-aq,v 1.1 2007/06/20 19:51:10 jlam Exp $
+
+--- misc/Makefile.in.orig 2006-03-27 00:58:10.000000000 -0500
++++ misc/Makefile.in
+@@ -228,7 +228,7 @@ installdirs:
+ $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
+ $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+- $(DESTDIR)$(libdir) $(DESTDIR)/etc
++ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)
+
+ install: all $(SMANPAGES) $(UMANPAGES) installdirs
+ @for i in $(SPROGS); do \
+@@ -288,10 +288,10 @@ install: all $(SMANPAGES) $(UMANPAGES) i
+ echo " INSTALL_DATA $(man5dir)/$$i"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
+ done
+- @if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
+- echo " INSTALL_DATA /etc/mke2fs.conf"; \
++ @if ! test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
++ echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
+ $(INSTALL_DATA) $(srcdir)/mke2fs.conf \
+- $(DESTDIR)/etc/mke2fs.conf; \
++ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
+ fi
+
+ install-strip: install
+@@ -336,8 +336,8 @@ uninstall:
+ for i in $(FMANPAGES); do \
+ $(RM) -f $(DESTDIR)$(man5dir)/$$i; \
+ done
+- if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)/etc/mke2fs.conf; then \
+- $(RM) $(DESTDIR)/etc/mke2fs.conf; \
++ if cmp -s $(srcdir)/mke2fs.conf $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
++ $(RM) $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
+ fi
+
+ clean:
diff --git a/sysutils/e2fsprogs/patches/patch-ar b/sysutils/e2fsprogs/patches/patch-ar
new file mode 100644
index 00000000000..704028f4502
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-ar
@@ -0,0 +1,22 @@
+$NetBSD: patch-ar,v 1.1 2007/06/20 19:51:11 jlam Exp $
+
+--- misc/blkid.8.in.orig 2005-09-06 05:40:14.000000000 -0400
++++ misc/blkid.8.in
+@@ -55,7 +55,7 @@ more devices.
+ Read from
+ .I cachefile
+ instead of reading from the default cache file
+-.IR /etc/blkid.tab .
++.IR @root_sysconfdir@/blkid.tab .
+ If you want to start with a clean cache (i.e. don't report devices previously
+ scanned but not necessarily available at this time), specify
+ .IR /dev/null.
+@@ -139,7 +139,7 @@ Display version number and exit.
+ Write the device cache to
+ .I writecachefile
+ instead of writing it to the default cache file
+-.IR /etc/blkid.tab .
++.IR @root_sysconfdir@/blkid.tab .
+ If you don't want to save the cache to the default file, specify
+ .IR /dev/null.
+ If not specified it will be the same file as that given by the
diff --git a/sysutils/e2fsprogs/patches/patch-as b/sysutils/e2fsprogs/patches/patch-as
new file mode 100644
index 00000000000..34e8a06714f
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.1 2007/06/20 19:51:11 jlam Exp $
+
+--- misc/blkid.c.orig 2005-09-06 05:40:14.000000000 -0400
++++ misc/blkid.c
+@@ -24,6 +24,10 @@ extern int optind;
+
+ #include "blkid/blkid.h"
+
++#ifndef ETC_DIR
++#define ETC_DIR "/etc" /* Where to find the config file */
++#endif
++
+ const char *progname = "blkid";
+
+ static void print_version(FILE *out)
+@@ -39,7 +43,7 @@ static void usage(int error)
+ fprintf(out,
+ "usage:\t%s [-c <file>] [-hl] [-o format] "
+ "[-s <tag>] [-t <token>]\n [-v] [-w <file>] [dev ...]\n"
+- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
++ "\t-c\tcache file (default: " ETC_DIR "/blkid.tab, /dev/null = none)\n"
+ "\t-h\tprint this usage message and exit\n"
+ "\t-s\tshow specified tag(s) (default show all tags)\n"
+ "\t-t\tfind device with a specific token (NAME=value pair)\n"
diff --git a/sysutils/e2fsprogs/patches/patch-at b/sysutils/e2fsprogs/patches/patch-at
new file mode 100644
index 00000000000..c772bd02548
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-at
@@ -0,0 +1,22 @@
+$NetBSD: patch-at,v 1.1 2007/06/20 19:51:11 jlam Exp $
+
+--- misc/mke2fs.8.in.orig 2006-05-28 21:39:03.000000000 -0400
++++ misc/mke2fs.8.in
+@@ -347,7 +347,7 @@ enabled by default are specified by the
+ relation, either in the
+ .I [libdefaults]
+ section in the
+-.B /etc/mke2fs.conf
++.B @root_sysconfdir@/mke2fs.conf
+ configuration file, or in the subsection of the
+ .I [fs_types]
+ section for the filesystem type as specified by the
+@@ -441,7 +441,7 @@ Specify how the filesystem is going to b
+ .B mke2fs
+ can choose optimal filesystem parameters for that use. The filesystem
+ types that are can be supported are defined in the configuration file
+-.BR /etc/mke2fs.conf (5).
++.BR @root_sysconfdir@/mke2fs.conf (5).
+ The default configuration file contains definitions for the filesystem
+ types: small, floppy, news, largefile, and largefile4.
+ .TP
diff --git a/sysutils/e2fsprogs/patches/patch-au b/sysutils/e2fsprogs/patches/patch-au
new file mode 100644
index 00000000000..0d7edc224f6
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-au
@@ -0,0 +1,24 @@
+$NetBSD: patch-au,v 1.1 2007/06/20 19:51:11 jlam Exp $
+
+--- misc/mke2fs.c.orig 2006-05-13 09:16:57.000000000 -0400
++++ misc/mke2fs.c
+@@ -61,6 +61,10 @@ extern int optind;
+ #define ZAP_BOOTBLOCK
+ #endif
+
++#ifndef ETC_DIR
++#define ETC_DIR "/etc" /* Where to find the config file */
++#endif
++
+ extern int isatty(int);
+ extern FILE *fpopen(const char *cmd, const char *mode);
+
+@@ -870,7 +874,7 @@ static void syntax_err_report(const char
+ exit(1);
+ }
+
+-static const char *config_fn[] = { "/etc/mke2fs.conf", 0 };
++static const char *config_fn[] = { ETC_DIR "/mke2fs.conf", 0 };
+
+ static void edit_feature(const char *str, __u32 *compat_array)
+ {
diff --git a/sysutils/e2fsprogs/patches/patch-av b/sysutils/e2fsprogs/patches/patch-av
new file mode 100644
index 00000000000..b444887eac8
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2007/06/20 19:51:12 jlam Exp $
+
+--- misc/mke2fs.conf.5.in.orig 2006-05-22 17:50:10.000000000 -0400
++++ misc/mke2fs.conf.5.in
+@@ -183,7 +183,7 @@ This relation specifies the default inod
+ specify one on the command line.
+ .SH FILES
+ .TP
+-.I /etc/mke2fs.conf
++.I @root_sysconfdir@/mke2fs.conf
+ The configuration file for
+ .BR mke2fs (8).
+ .SH SEE ALSO
diff --git a/sysutils/e2fsprogs/patches/patch-aw b/sysutils/e2fsprogs/patches/patch-aw
new file mode 100644
index 00000000000..1d9c91e4673
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2007/06/20 19:51:12 jlam Exp $
+
+--- doc/Makefile.in.orig 2005-09-06 05:40:13.000000000 -0400
++++ doc/Makefile.in
+@@ -26,8 +26,6 @@ install-doc-libs:
+ echo " INSTALL_DATA $(infodir)/$$i" ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
+ done
+- @echo " GZIP $(infodir)/libext2fs.info*"
+- @gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+
+ uninstall-doc-libs:
+ $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*