Thu Dec 23 06:34:50 2010 UTC ()
Update e2fsprogs to 1.41.12 from 1.40.7.
Fix PR pkg/43950.

Major change from 1.40.7:
* ext4 filesystem support
* many translation updates
* many bug-fixes
in detail, see RELEASE-NOTES.


(ryoon)
diff -r1.17 -r1.18 pkgsrc/sysutils/e2fsprogs/Makefile
diff -r1.5 -r1.6 pkgsrc/sysutils/e2fsprogs/PLIST
diff -r1.15 -r1.16 pkgsrc/sysutils/e2fsprogs/distinfo
diff -r1.6 -r1.7 pkgsrc/sysutils/e2fsprogs/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/sysutils/e2fsprogs/patches/patch-af
diff -r1.2 -r1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-al
diff -r1.2 -r1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-as
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-am
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-an
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-ao
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-ap
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-ar
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-at
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-av
diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-aw
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/e2fsprogs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/Makefile 2008/04/12 22:43:12 1.17
+++ pkgsrc/sysutils/e2fsprogs/Makefile 2010/12/23 06:34:50 1.18
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:12 jlam Exp $ 1# $NetBSD: Makefile,v 1.18 2010/12/23 06:34:50 ryoon Exp $
2 2
3DISTNAME= e2fsprogs-1.40.7 3DISTNAME= e2fsprogs-1.41.12
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://e2fsprogs.sourceforge.net/ 8HOMEPAGE= http://e2fsprogs.sourceforge.net/
9COMMENT= Second extended file system (ext2fs) management programs 9COMMENT= Second extended file system (ext2fs) management programs
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= makeinfo 14USE_TOOLS+= makeinfo gmake
15INFO_FILES= # PLIST 15INFO_FILES= # PLIST
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
20 20
21# Only build fsck(8) on platforms that need it. 21# Only build fsck(8) on platforms that need it.
22PLIST_VARS+= fsck 22PLIST_VARS+= fsck
23.if ${OPSYS} == "Linux" 23.if ${OPSYS} == "Linux"
24PLIST.fsck= yes 24PLIST.fsck= yes
25.else 25.else
26CONFIGURE_ARGS+= --disable-fsck 26CONFIGURE_ARGS+= --disable-fsck
27.endif 27.endif
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/e2fsprogs/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/PLIST 2008/04/12 22:43:12 1.5
+++ pkgsrc/sysutils/e2fsprogs/PLIST 2010/12/23 06:34:50 1.6
@@ -1,63 +1,77 @@ @@ -1,63 +1,77 @@
1@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:12 jlam Exp $ 1@comment $NetBSD: PLIST,v 1.6 2010/12/23 06:34:50 ryoon Exp $
2bin/chattr 2bin/chattr
3bin/lsattr 3bin/lsattr
4bin/uuidgen 4bin/uuidgen
5info/libext2fs.info 5info/libext2fs.info
6lib/e2initrd_helper 6lib/e2initrd_helper
7man/man1/chattr.1 7man/man1/chattr.1
8man/man1/lsattr.1 8man/man1/lsattr.1
9man/man1/uuidgen.1 9man/man1/uuidgen.1
10man/man5/e2fsck.conf.5 10man/man5/e2fsck.conf.5
11man/man5/mke2fs.conf.5 11man/man5/mke2fs.conf.5
12man/man8/badblocks.8 12man/man8/badblocks.8
13man/man8/blkid.8 13man/man8/blkid.8
14man/man8/debugfs.8 14man/man8/debugfs.8
15man/man8/dumpe2fs.8 15man/man8/dumpe2fs.8
 16man/man8/e2freefrag.8
16man/man8/e2fsck.8 17man/man8/e2fsck.8
17man/man8/e2image.8 18man/man8/e2image.8
18man/man8/e2label.8 19man/man8/e2label.8
 20man/man8/e2undo.8
19man/man8/filefrag.8 21man/man8/filefrag.8
20man/man8/findfs.8 22man/man8/findfs.8
21${PLIST.fsck}man/man8/fsck.8 23${PLIST.fsck}man/man8/fsck.8
22man/man8/fsck.ext2.8 24man/man8/fsck.ext2.8
23man/man8/fsck.ext3.8 25man/man8/fsck.ext3.8
 26man/man8/fsck.ext4.8
 27man/man8/fsck.ext4dev.8
24man/man8/logsave.8 28man/man8/logsave.8
25man/man8/mke2fs.8 29man/man8/mke2fs.8
26man/man8/mkfs.ext2.8 30man/man8/mkfs.ext2.8
27man/man8/mkfs.ext3.8 31man/man8/mkfs.ext3.8
 32man/man8/mkfs.ext4.8
 33man/man8/mkfs.ext4dev.8
28man/man8/mklost+found.8 34man/man8/mklost+found.8
29man/man8/resize2fs.8 35man/man8/resize2fs.8
30man/man8/tune2fs.8 36man/man8/tune2fs.8
31man/man8/uuidd.8 37man/man8/uuidd.8
32sbin/badblocks 38sbin/badblocks
33sbin/blkid 39sbin/blkid
34sbin/debugfs 40sbin/debugfs
35sbin/dumpe2fs 41sbin/dumpe2fs
 42sbin/e2freefrag
36sbin/e2fsck 43sbin/e2fsck
37sbin/e2image 44sbin/e2image
38sbin/e2label 45sbin/e2label
 46sbin/e2undo
39sbin/filefrag 47sbin/filefrag
40sbin/findfs 48sbin/findfs
41${PLIST.fsck}sbin/fsck 49${PLIST.fsck}sbin/fsck
42sbin/fsck.ext2 50sbin/fsck.ext2
43sbin/fsck.ext3 51sbin/fsck.ext3
 52sbin/fsck.ext4
 53sbin/fsck.ext4dev
44sbin/logsave 54sbin/logsave
45sbin/mke2fs 55sbin/mke2fs
46sbin/mkfs.ext2 56sbin/mkfs.ext2
47sbin/mkfs.ext3 57sbin/mkfs.ext3
 58sbin/mkfs.ext4
 59sbin/mkfs.ext4dev
48sbin/mklost+found 60sbin/mklost+found
49sbin/resize2fs 61sbin/resize2fs
50sbin/tune2fs 62sbin/tune2fs
51sbin/uuidd 63sbin/uuidd
52share/examples/ext2fs/mke2fs.conf 64share/examples/ext2fs/mke2fs.conf
53share/locale/ca/LC_MESSAGES/e2fsprogs.mo 65share/locale/ca/LC_MESSAGES/e2fsprogs.mo
54share/locale/cs/LC_MESSAGES/e2fsprogs.mo 66share/locale/cs/LC_MESSAGES/e2fsprogs.mo
55share/locale/de/LC_MESSAGES/e2fsprogs.mo 67share/locale/de/LC_MESSAGES/e2fsprogs.mo
56share/locale/es/LC_MESSAGES/e2fsprogs.mo 68share/locale/es/LC_MESSAGES/e2fsprogs.mo
57share/locale/fr/LC_MESSAGES/e2fsprogs.mo 69share/locale/fr/LC_MESSAGES/e2fsprogs.mo
 70share/locale/id/LC_MESSAGES/e2fsprogs.mo
58share/locale/it/LC_MESSAGES/e2fsprogs.mo 71share/locale/it/LC_MESSAGES/e2fsprogs.mo
59share/locale/nl/LC_MESSAGES/e2fsprogs.mo 72share/locale/nl/LC_MESSAGES/e2fsprogs.mo
60share/locale/pl/LC_MESSAGES/e2fsprogs.mo 73share/locale/pl/LC_MESSAGES/e2fsprogs.mo
61share/locale/sv/LC_MESSAGES/e2fsprogs.mo 74share/locale/sv/LC_MESSAGES/e2fsprogs.mo
62share/locale/tr/LC_MESSAGES/e2fsprogs.mo 75share/locale/tr/LC_MESSAGES/e2fsprogs.mo
63share/locale/vi/LC_MESSAGES/e2fsprogs.mo 76share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 77share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/e2fsprogs/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/distinfo 2008/09/21 16:16:06 1.15
+++ pkgsrc/sysutils/e2fsprogs/distinfo 2010/12/23 06:34:50 1.16
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1$NetBSD: distinfo,v 1.15 2008/09/21 16:16:06 joerg Exp $ 1$NetBSD: distinfo,v 1.16 2010/12/23 06:34:50 ryoon Exp $
2 2
3SHA1 (e2fsprogs-1.40.7.tar.gz) = 56ff55add64c34bddf9cf15c3825811d230dd8b1 3SHA1 (e2fsprogs-1.41.12.tar.gz) = 62b002fe507b2ddafc24b89532e472fe4b55a14f
4RMD160 (e2fsprogs-1.40.7.tar.gz) = bfab47555ff31b8ae8d72d2e4de54c099bfc3b18 4RMD160 (e2fsprogs-1.41.12.tar.gz) = aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7
5Size (e2fsprogs-1.40.7.tar.gz) = 4087067 bytes 5Size (e2fsprogs-1.41.12.tar.gz) = 4496194 bytes
6SHA1 (patch-aa) = 446233b75bd23227c5c7d003cce0a19017f3f71b 
7SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909 6SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
8SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff 7SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
9SHA1 (patch-af) = c2c8b373fcba36f031005d364c0de2fbae97106f 8SHA1 (patch-af) = 8e1c2f5b90b78fdd4c5a4fcb573f23fc1db6e90f
10SHA1 (patch-al) = e976de195735cf1f96aaceff1b978b1be405dfc9 9SHA1 (patch-am) = 9c3be47010f6101e4f41343e108b967c88847c12
11SHA1 (patch-am) = 05a547a48b02d267e200d6161e982e5cf1226d3b 10SHA1 (patch-an) = 62acb3f18f61ae6a729a8eebd308a1a1efe83e50
12SHA1 (patch-an) = 0324fe2a0b7a9464f8af401d554e07a0bcfa22e2 11SHA1 (patch-ao) = 241b33700249d09f60f11f3167ef8cf771d1e588
13SHA1 (patch-ao) = 57c8757cd378a72d728475f26cdf9a452afbf64b 12SHA1 (patch-ap) = 4f9f8e47ecbea53acb1318e5ef0abe58cfbbb9ce
14SHA1 (patch-ap) = 175e97acf1a7cfcbd3a18c80ed513f26ac111e13 13SHA1 (patch-ar) = 9103ed55e0f13451fbb2f34c4bee28f5e24c216a
15SHA1 (patch-ar) = 8a4a7ba5bd51ba8d68e6954c82ac6fd4cdf6153d 14SHA1 (patch-as) = 6066be5bf84753419407d2ee70cd8934b918c298
16SHA1 (patch-as) = e8c444fe4e1e443d1d841dc44ce54d50d31b5994 15SHA1 (patch-at) = 53cbd25d89a9df733ba931490c1dcb77b20ddbe3
17SHA1 (patch-at) = 80785a73eaa57a4a73bd0a683697ea2f890f8dbc 16SHA1 (patch-av) = 92c9d34c82cba121744cfff5b23e4b92c9442545
18SHA1 (patch-av) = 07f3fbf646e2e9716ea10d55580fa15dd99db01d 17SHA1 (patch-aw) = cb5e382077c07f0ced114fcbf195537cc7b0058c
19SHA1 (patch-aw) = 4f25dc800f6fc3a428f43eba2b9674c7b3256ea6 
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-aa 2008/03/07 22:40:29 1.6
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-aa 2010/12/23 06:34:50 1.7
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1$NetBSD: patch-aa,v 1.6 2008/03/07 22:40:29 tron Exp $ 
2 
3--- configure.orig 2008-02-28 23:03:53.000000000 +0000 
4+++ configure 2008-03-07 20:24:01.000000000 +0000 
5@@ -15107,7 +15107,7 @@ 
6 fi 
7 { echo "$as_me:$LINENO: checking for unified diff option" >&5 
8 echo $ECHO_N "checking for unified diff option... $ECHO_C" >&6; } 
9-if diff -u $0 $0 >& /dev/null ; then 
10+if diff -u $0 $0 /dev/null 2>&1; then 
11 UNI_DIFF_OPTS=-u 
12 else 
13 UNI_DIFF_OPTS=-c 
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/e2fsprogs/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/patch-af 2008/03/07 22:40:29 1.6
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-af 2010/12/23 06:34:50 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-af,v 1.6 2008/03/07 22:40:29 tron Exp $ 1$NetBSD: patch-af,v 1.7 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- lib/ext2fs/ismounted.c.orig 2008-02-28 23:03:53.000000000 +0000 3--- lib/ext2fs/ismounted.c.orig 2010-05-18 03:04:39.000000000 +0000
4+++ lib/ext2fs/ismounted.c 2008-03-07 21:08:08.000000000 +0000 4+++ lib/ext2fs/ismounted.c
5@@ -196,7 +196,11 @@ 5@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
6 static errcode_t check_getmntinfo(const char *file, int *mount_flags, 6 static errcode_t check_getmntinfo(const char *file, int *mount_flags,
7 char *mtpt, int mtlen) 7 char *mtpt, int mtlen)
8 { 8 {
9- struct statfs *mp; 9- struct statfs *mp;
10+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900 10+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
11+ struct statvfs *mp; 11+ struct statvfs *mp;
12+#else 12+#else
13+ struct statfs *mp; 13+ struct statfs *mp;
14+#endif 14+#endif
15 int len, n; 15 int len, n;
16 const char *s1; 16 const char *s1;
17 char *s2; 17 char *s2;
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-al 2008/03/07 22:40:29 1.2
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-al 2010/12/23 06:34:50 1.3
@@ -1,14 +0,0 @@ @@ -1,14 +0,0 @@
1$NetBSD: patch-al,v 1.2 2008/03/07 22:40:29 tron Exp $ 
2 
3--- debugfs/util.c.orig 2008-02-28 23:03:53.000000000 +0000 
4+++ debugfs/util.c 2008-03-07 21:11:18.000000000 +0000 
5@@ -6,7 +6,8 @@ 
6 * 
7 */ 
8  
9-#define _XOPEN_SOURCE /* needed for strptime */ 
10+ 
11+#define _XOPEN_SOURCE 500 /* needed for strptime */ 
12  
13 #include <stdio.h> 
14 #include <unistd.h> 
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/e2fsprogs/patches/patch-as (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/patch-as 2008/03/07 22:40:29 1.2
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-as 2010/12/23 06:34:50 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-as,v 1.2 2008/03/07 22:40:29 tron Exp $ 1$NetBSD: patch-as,v 1.3 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- misc/blkid.c.orig 2008-02-19 04:33:10.000000000 +0000 3--- misc/blkid.c.orig 2009-08-13 01:39:57.000000000 +0000
4+++ misc/blkid.c 2008-03-07 20:19:07.000000000 +0000 4+++ misc/blkid.c
5@@ -40,7 +40,7 @@ 5@@ -52,7 +52,7 @@ static void usage(int error)
6 fprintf(out, 6 fprintf(out,
7 "usage:\t%s [-c <file>] [-ghl] [-o format] " 7 "usage:\t%s [-c <file>] [-ghlLv] [-o format] "
8 "[-s <tag>] [-t <token>]\n [-v] [-w <file>] [dev ...]\n" 8 "[-s <tag>] [-t <token>]\n [-w <file>] [dev ...]\n"
9- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n" 9- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
10+ "\t-c\tcache file (default: " ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n" 10+ "\t-c\tcache file (default: " ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n"
11 "\t-h\tprint this usage message and exit\n" 11 "\t-h\tprint this usage message and exit\n"
12 "\t-g\tgarbage collect the blkid cache\n" 12 "\t-g\tgarbage collect the blkid cache\n"
13 "\t-s\tshow specified tag(s) (default show all tags)\n" 13 "\t-s\tshow specified tag(s) (default show all tags)\n"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-am 2007/06/20 19:51:09 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-am 2010/12/23 06:34:50 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-am,v 1.1 2007/06/20 19:51:09 jlam Exp $ 1$NetBSD: patch-am,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- e2fsck/e2fsck.conf.5.in.orig 2006-03-27 00:55:38.000000000 -0500 3--- e2fsck/e2fsck.conf.5.in.orig 2010-05-13 22:59:49.000000000 +0000
4+++ e2fsck/e2fsck.conf.5.in 4+++ e2fsck/e2fsck.conf.5.in
5@@ -157,7 +157,7 @@ things out may be dangerous.) 5@@ -238,7 +238,7 @@ things out may be dangerous.)
6 } 6 }
7 .SH FILES 7 .SH FILES
8 .TP 8 .TP
9-.I /etc/e2fsck.conf 9-.I /etc/e2fsck.conf
10+.I @root_sysconfdir@/e2fsck.conf 10+.I @root_sysconfdir@/e2fsck.conf
11 The configuration file for  11 The configuration file for
12 .BR e2fsck (8). 12 .BR e2fsck (8).
13 .SH SEE ALSO 13 .SH SEE ALSO
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-an 2007/06/20 19:51:10 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-an 2010/12/23 06:34:50 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-an,v 1.1 2007/06/20 19:51:10 jlam Exp $ 1$NetBSD: patch-an,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- e2fsck/e2fsck.h.orig 2006-03-18 21:33:55.000000000 -0500 3--- e2fsck/e2fsck.h.orig 2010-05-13 22:59:49.000000000 +0000
4+++ e2fsck/e2fsck.h 4+++ e2fsck/e2fsck.h
5@@ -58,6 +58,10 @@ 5@@ -61,6 +61,10 @@
6 #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural)) 6 #define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
7 #endif 7 #endif
8  8
9+#ifndef ETC_DIR 9+#ifndef ETC_DIR
10+#define ETC_DIR "/etc" /* Where to find the config file */ 10+#define ETC_DIR "/etc" /* Where to find the config file */
11+#endif 11+#endif
12+ 12+
13 /* 13 /*
14 * Exit codes used by fsck-type programs 14 * Exit codes used by fsck-type programs
15 */ 15 */
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/patch-ao 2007/06/20 19:51:10 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-ao 2010/12/23 06:34:50 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ao,v 1.1 2007/06/20 19:51:10 jlam Exp $ 1$NetBSD: patch-ao,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- lib/blkid/blkidP.h.orig 2006-02-20 14:16:42.000000000 -0500 3--- lib/blkid/blkidP.h.orig 2009-08-13 01:39:57.000000000 +0000
4+++ lib/blkid/blkidP.h 4+++ lib/blkid/blkidP.h
5@@ -104,7 +104,11 @@ struct blkid_struct_cache 5@@ -104,7 +104,11 @@ struct blkid_struct_cache
6 extern char *blkid_strdup(const char *s); 6 extern char *blkid_strdup(const char *s);
7 extern char *blkid_strndup(const char *s, const int length); 7 extern char *blkid_strndup(const char *s, const int length);
8  8
9-#define BLKID_CACHE_FILE "/etc/blkid.tab" 9-#define BLKID_CACHE_FILE "/etc/blkid.tab"
10+#ifndef ETC_DIR 10+#ifndef ETC_DIR
11+#define ETC_DIR "/etc" /* Where to find the config file */ 11+#define ETC_DIR "/etc" /* Where to find the config file */
12+#endif 12+#endif
13+ 13+
14+#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab" 14+#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
15 extern const char *blkid_devdirs[]; 
16  15
17 #define BLKID_ERR_IO 5 16 #define BLKID_ERR_IO 5
 17 #define BLKID_ERR_PROC 9
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ap (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ap 2007/06/20 19:51:10 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ap 2010/12/23 06:34:50 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ap,v 1.1 2007/06/20 19:51:10 jlam Exp $ 1$NetBSD: patch-ap,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- lib/blkid/libblkid.3.in.orig 2005-09-06 05:40:14.000000000 -0400 3--- lib/blkid/libblkid.3.in.orig 2009-08-13 01:39:57.000000000 +0000
4+++ lib/blkid/libblkid.3.in 4+++ lib/blkid/libblkid.3.in
5@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a 5@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
6 specific block device names into configuration files. 6 specific block device names into configuration files.
7 .P 7 .P
8 Block device information is normally kept in a cache file 8 Block device information is normally kept in a cache file
9-.I /etc/blkid.tab 9-.I /etc/blkid.tab
10+.I @root_sysconfdir@/blkid.tab 10+.I @root_sysconfdir@/blkid.tab
11 and is verified to still be valid before being returned to the user 11 and is verified to still be valid before being returned to the user
12 (if the user has read permission on the raw block device, otherwise not). 12 (if the user has read permission on the raw block device, otherwise not).
13 The cache file also allows unprivileged users (normally anyone other 13 The cache file also allows unprivileged users (normally anyone other
14@@ -49,7 +49,7 @@ was written by Andreas Dilger for the ex 14@@ -51,7 +51,7 @@ was written by Andreas Dilger for the ex
15 from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o. 15 from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o.
16 .SH FILES 16 .SH FILES
17 .TP 17 .TP
18-.I /etc/blkid.tab  18-.I /etc/blkid.tab
19+.I @root_sysconfdir@/blkid.tab  19+.I @root_sysconfdir@/blkid.tab
20 Caches data extracted from each recognized block device. 20 Caches data extracted from each recognized block device.
21 .SH AVAILABILITY 21 .SH AVAILABILITY
22 .B libblkid 22 .B libblkid
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ar (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ar 2007/06/20 19:51:11 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-ar 2010/12/23 06:34:50 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-ar,v 1.1 2007/06/20 19:51:11 jlam Exp $ 1$NetBSD: patch-ar,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- misc/blkid.8.in.orig 2005-09-06 05:40:14.000000000 -0400 3--- misc/blkid.8.in.orig 2009-08-13 01:39:57.000000000 +0000
4+++ misc/blkid.8.in 4+++ misc/blkid.8.in
5@@ -55,7 +55,7 @@ more devices. 5@@ -55,7 +55,7 @@ more devices.
6 Read from 6 Read from
7 .I cachefile 7 .I cachefile
8 instead of reading from the default cache file 8 instead of reading from the default cache file
9-.IR /etc/blkid.tab . 9-.IR /etc/blkid.tab .
10+.IR @root_sysconfdir@/blkid.tab . 10+.IR @root_sysconfdir@/blkid.tab .
11 If you want to start with a clean cache (i.e. don't report devices previously 11 If you want to start with a clean cache (i.e. don't report devices previously
12 scanned but not necessarily available at this time), specify 12 scanned but not necessarily available at this time), specify
13 .IR /dev/null. 13 .IR /dev/null .
14@@ -139,7 +139,7 @@ Display version number and exit. 14@@ -133,7 +133,7 @@ Display version number and exit.
15 Write the device cache to 15 Write the device cache to
16 .I writecachefile 16 .I writecachefile
17 instead of writing it to the default cache file 17 instead of writing it to the default cache file
18-.IR /etc/blkid.tab . 18-.IR /etc/blkid.tab .
19+.IR @root_sysconfdir@/blkid.tab . 19+.IR @root_sysconfdir@/blkid.tab .
20 If you don't want to save the cache to the default file, specify 20 If you don't want to save the cache to the default file, specify
21 .IR /dev/null. 21 .IR /dev/null.
22 If not specified it will be the same file as that given by the 22 If not specified it will be the same file as that given by the
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-at (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-at 2007/06/20 19:51:11 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-at 2010/12/23 06:34:50 1.2
@@ -1,22 +1,46 @@ @@ -1,22 +1,46 @@
1$NetBSD: patch-at,v 1.1 2007/06/20 19:51:11 jlam Exp $ 1$NetBSD: patch-at,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- misc/mke2fs.8.in.orig 2006-05-28 21:39:03.000000000 -0400 3--- misc/mke2fs.8.in.orig 2010-02-06 03:51:19.000000000 +0000
4+++ misc/mke2fs.8.in 4+++ misc/mke2fs.8.in
5@@ -347,7 +347,7 @@ enabled by default are specified by the 5@@ -159,7 +159,7 @@ option was specified.
 6 .PP
 7 The defaults of the parameters for the newly created filesystem, if not
 8 overridden by the options listed below, are controlled by the
 9-.B /etc/mke2fs.conf
 10+.B @root_sysconfdir@/mke2fs.conf
 11 configuration file. See the
 12 .BR mke2fs.conf (5)
 13 manual page for more details.
 14@@ -445,7 +445,7 @@ enabled by default are specified by the
6 relation, either in the 15 relation, either in the
7 .I [libdefaults] 16 .I [defaults]
8 section in the 17 section in the
9-.B /etc/mke2fs.conf 18-.B /etc/mke2fs.conf
10+.B @root_sysconfdir@/mke2fs.conf 19+.B @root_sysconfdir@/mke2fs.conf
11 configuration file, or in the subsection of the  20 configuration file,
 21 or in the
12 .I [fs_types] 22 .I [fs_types]
13 section for the filesystem type as specified by the 23@@ -578,12 +578,12 @@ If this option is not specified,
14@@ -441,7 +441,7 @@ Specify how the filesystem is going to b 24 will pick a default either via how
15 .B mke2fs  25 the command was run (for example, using a name of the form mkfs.ext2,
16 can choose optimal filesystem parameters for that use. The filesystem 26 mkfs.ext3, etc.) or via a default as defined by the
17 types that are can be supported are defined in the configuration file  27-.BR /etc/mke2fs.conf (5)
 28+.BR @root_sysconfdir@/mke2fs.conf (5)
 29 file. This option controls which filesystem options are used by
 30 default, based on the
 31 .B fstypes
 32 configuration stanza in
 33-.BR /etc/mke2fs.conf (5).
 34+.BR @root_sysconfdir@/mke2fs.conf (5).
 35 .sp
 36 If the
 37 .B \-O
 38@@ -602,7 +602,7 @@ Specify how the filesystem is going to b
 39 .B mke2fs
 40 can choose optimal filesystem parameters for that use. The usage
 41 types that are supported are defined in the configuration file
18-.BR /etc/mke2fs.conf (5). 42-.BR /etc/mke2fs.conf (5).
19+.BR @root_sysconfdir@/mke2fs.conf (5). 43+.BR @root_sysconfdir@/mke2fs.conf (5).
20 The default configuration file contains definitions for the filesystem 44 The user may specify one or more usage types
21 types: small, floppy, news, largefile, and largefile4.  45 using a comma separated list.
22 .TP 46 .sp
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-av (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-av 2007/06/20 19:51:12 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/Attic/patch-av 2010/12/23 06:34:50 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-av,v 1.1 2007/06/20 19:51:12 jlam Exp $ 1$NetBSD: patch-av,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- misc/mke2fs.conf.5.in.orig 2006-05-22 17:50:10.000000000 -0400 3--- misc/mke2fs.conf.5.in.orig 2009-08-13 01:39:57.000000000 +0000
4+++ misc/mke2fs.conf.5.in 4+++ misc/mke2fs.conf.5.in
5@@ -183,7 +183,7 @@ This relation specifies the default inod 5@@ -354,7 +354,7 @@ by
6 specify one on the command line. 6 on a per-filesystem type basis.
7 .SH FILES 7 .SH FILES
8 .TP 8 .TP
9-.I /etc/mke2fs.conf 9-.I /etc/mke2fs.conf
10+.I @root_sysconfdir@/mke2fs.conf 10+.I @root_sysconfdir@/mke2fs.conf
11 The configuration file for  11 The configuration file for
12 .BR mke2fs (8). 12 .BR mke2fs (8).
13 .SH SEE ALSO 13 .SH SEE ALSO
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/e2fsprogs/patches/patch-aw (expand / switch to unified diff)

--- pkgsrc/sysutils/e2fsprogs/patches/patch-aw 2007/06/20 19:51:12 1.1
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-aw 2010/12/23 06:34:50 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aw,v 1.1 2007/06/20 19:51:12 jlam Exp $ 1$NetBSD: patch-aw,v 1.2 2010/12/23 06:34:50 ryoon Exp $
2 2
3--- doc/Makefile.in.orig 2005-09-06 05:40:13.000000000 -0400 3--- doc/Makefile.in.orig 2010-02-10 23:16:03.000000000 +0000
4+++ doc/Makefile.in 4+++ doc/Makefile.in
5@@ -26,8 +26,6 @@ install-doc-libs: 5@@ -26,8 +26,6 @@ install-doc-libs: libext2fs.info libext2
6 echo " INSTALL_DATA $(infodir)/$$i" ; \ 6 echo " INSTALL_DATA $(infodir)/$$i" ; \
7 $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ 7 $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
8 done 8 done
9- @echo " GZIP $(infodir)/libext2fs.info*" 9- $(E) " GZIP $(infodir)/libext2fs.info*"
10- @gzip -9 $(DESTDIR)$(infodir)/libext2fs.info* 10- -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
11  11
12 uninstall-doc-libs: 12 uninstall-doc-libs:
13 $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* 13 $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*