[pkgsrc/trunk]: pkgsrc/sysutils/e2fsprogs * Honor PKG_SYSCONFDIR.

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b8d4103d2f3
branches:  trunk
changeset: 530274:0b8d4103d2f3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 20 19:51:08 2007 +0000

description:
* 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:

 sysutils/e2fsprogs/Makefile         |  22 +++++++++++--
 sysutils/e2fsprogs/PLIST            |  60 +++++++++++++++++++++++++++++++++++++
 sysutils/e2fsprogs/PLIST.Linux      |   3 -
 sysutils/e2fsprogs/PLIST.common     |  57 -----------------------------------
 sysutils/e2fsprogs/distinfo         |  18 +++++++++-
 sysutils/e2fsprogs/patches/patch-aa |  17 ++++++++-
 sysutils/e2fsprogs/patches/patch-af |  11 +++---
 sysutils/e2fsprogs/patches/patch-al |  13 ++++++++
 sysutils/e2fsprogs/patches/patch-am |  13 ++++++++
 sysutils/e2fsprogs/patches/patch-an |  15 +++++++++
 sysutils/e2fsprogs/patches/patch-ao |  17 ++++++++++
 sysutils/e2fsprogs/patches/patch-ap |  22 +++++++++++++
 sysutils/e2fsprogs/patches/patch-aq |  38 +++++++++++++++++++++++
 sysutils/e2fsprogs/patches/patch-ar |  22 +++++++++++++
 sysutils/e2fsprogs/patches/patch-as |  24 ++++++++++++++
 sysutils/e2fsprogs/patches/patch-at |  22 +++++++++++++
 sysutils/e2fsprogs/patches/patch-au |  24 ++++++++++++++
 sysutils/e2fsprogs/patches/patch-av |  13 ++++++++
 sysutils/e2fsprogs/patches/patch-aw |  13 ++++++++
 19 files changed, 349 insertions(+), 75 deletions(-)

diffs (truncated from 544 to 300 lines):

diff -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/Makefile
--- a/sysutils/e2fsprogs/Makefile       Wed Jun 20 18:45:52 2007 +0000
+++ b/sysutils/e2fsprogs/Makefile       Wed Jun 20 19:51:08 2007 +0000
@@ -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 @@
 
 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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/e2fsprogs/PLIST  Wed Jun 20 19:51:08 2007 +0000
@@ -0,0 +1,60 @@
+@comment $NetBSD: PLIST,v 1.3 2007/06/20 19:51:08 jlam Exp $
+bin/chattr
+bin/lsattr
+bin/uuidgen
+info/libext2fs.info
+lib/e2initrd_helper
+man/man1/chattr.1
+man/man1/lsattr.1
+man/man1/uuidgen.1
+man/man5/e2fsck.conf.5
+man/man5/mke2fs.conf.5
+man/man8/badblocks.8
+man/man8/blkid.8
+man/man8/debugfs.8
+man/man8/dumpe2fs.8
+man/man8/e2fsck.8
+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
+man/man8/mke2fs.8
+man/man8/mkfs.ext2.8
+man/man8/mkfs.ext3.8
+man/man8/mklost+found.8
+man/man8/resize2fs.8
+man/man8/tune2fs.8
+sbin/badblocks
+sbin/blkid
+sbin/debugfs
+sbin/dumpe2fs
+sbin/e2fsck
+sbin/e2image
+sbin/e2label
+sbin/filefrag
+sbin/findfs
+${FSCK}sbin/fsck
+sbin/fsck.ext2
+sbin/fsck.ext3
+sbin/logsave
+sbin/mke2fs
+sbin/mkfs.ext2
+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
+share/locale/fr/LC_MESSAGES/e2fsprogs.mo
+share/locale/it/LC_MESSAGES/e2fsprogs.mo
+share/locale/nl/LC_MESSAGES/e2fsprogs.mo
+share/locale/pl/LC_MESSAGES/e2fsprogs.mo
+share/locale/rw/LC_MESSAGES/e2fsprogs.mo
+share/locale/sv/LC_MESSAGES/e2fsprogs.mo
+share/locale/tr/LC_MESSAGES/e2fsprogs.mo
diff -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/PLIST.Linux
--- a/sysutils/e2fsprogs/PLIST.Linux    Wed Jun 20 18:45:52 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/PLIST.common
--- a/sysutils/e2fsprogs/PLIST.common   Wed Jun 20 18:45:52 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.5 2007/06/06 09:35:17 martti Exp $
-bin/chattr
-bin/lsattr
-bin/uuidgen
-info/libext2fs.info
-lib/e2initrd_helper
-man/man1/chattr.1
-man/man1/lsattr.1
-man/man1/uuidgen.1
-man/man5/e2fsck.conf.5
-man/man5/mke2fs.conf.5
-man/man8/badblocks.8
-man/man8/blkid.8
-man/man8/debugfs.8
-man/man8/dumpe2fs.8
-man/man8/e2fsck.8
-man/man8/e2image.8
-man/man8/e2label.8
-man/man8/filefrag.8
-man/man8/findfs.8
-man/man8/fsck.ext2.8
-man/man8/fsck.ext3.8
-man/man8/logsave.8
-man/man8/mke2fs.8
-man/man8/mkfs.ext2.8
-man/man8/mkfs.ext3.8
-man/man8/mklost+found.8
-man/man8/resize2fs.8
-man/man8/tune2fs.8
-sbin/badblocks
-sbin/blkid
-sbin/debugfs
-sbin/dumpe2fs
-sbin/e2fsck
-sbin/e2image
-sbin/e2label
-sbin/filefrag
-sbin/findfs
-sbin/fsck.ext2
-sbin/fsck.ext3
-sbin/logsave
-sbin/mke2fs
-sbin/mkfs.ext2
-sbin/mkfs.ext3
-sbin/mklost+found
-sbin/resize2fs
-sbin/tune2fs
-share/locale/cs/LC_MESSAGES/e2fsprogs.mo
-share/locale/de/LC_MESSAGES/e2fsprogs.mo
-share/locale/es/LC_MESSAGES/e2fsprogs.mo
-share/locale/fr/LC_MESSAGES/e2fsprogs.mo
-share/locale/it/LC_MESSAGES/e2fsprogs.mo
-share/locale/nl/LC_MESSAGES/e2fsprogs.mo
-share/locale/pl/LC_MESSAGES/e2fsprogs.mo
-share/locale/rw/LC_MESSAGES/e2fsprogs.mo
-share/locale/sv/LC_MESSAGES/e2fsprogs.mo
-share/locale/tr/LC_MESSAGES/e2fsprogs.mo
diff -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/distinfo
--- a/sysutils/e2fsprogs/distinfo       Wed Jun 20 18:45:52 2007 +0000
+++ b/sysutils/e2fsprogs/distinfo       Wed Jun 20 19:51:08 2007 +0000
@@ -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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/patches/patch-aa
--- a/sysutils/e2fsprogs/patches/patch-aa       Wed Jun 20 18:45:52 2007 +0000
+++ b/sysutils/e2fsprogs/patches/patch-aa       Wed Jun 20 19:51:08 2007 +0000
@@ -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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/patches/patch-af
--- a/sysutils/e2fsprogs/patches/patch-af       Wed Jun 20 18:45:52 2007 +0000
+++ b/sysutils/e2fsprogs/patches/patch-af       Wed Jun 20 19:51:08 2007 +0000
@@ -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 @@
  
  #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 @@
          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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/e2fsprogs/patches/patch-al       Wed Jun 20 19:51:08 2007 +0000
@@ -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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/patches/patch-am
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/e2fsprogs/patches/patch-am       Wed Jun 20 19:51:08 2007 +0000
@@ -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 -r e735a231f9d4 -r 0b8d4103d2f3 sysutils/e2fsprogs/patches/patch-an
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/e2fsprogs/patches/patch-an       Wed Jun 20 19:51:08 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2007/06/20 19:51:10 jlam Exp $
+