From 666a5843b0a723fd09cf5f845be5de4eb8e13cdb Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Tue, 29 Jan 2008 10:22:46 +0100
Subject: [PATCH] e2fsprogs: update to 1.40.5

---
 e2fsprogs/.md5sum                 |  4 ++--
 e2fsprogs/Pkgfile                 |  4 ++--
 e2fsprogs/e2fsprogs-symlink.patch | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/e2fsprogs/.md5sum b/e2fsprogs/.md5sum
index 4d4370fb..9785fff9 100644
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@@ -1,2 +1,2 @@
-124d744bdf9d443591eb8193c085944b  e2fsprogs-1.40.4.tar.gz
-0b92e8349e37b16afa111622c74f8825  e2fsprogs-symlink.patch
+69e55eaf543acfab8e2eb8ba2883d8cd  e2fsprogs-1.40.5.tar.gz
+e763980ca8dd04789a6a5faa6d4ee42f  e2fsprogs-symlink.patch
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 86424e1e..75c92ca0 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=e2fsprogs
-version=1.40.4
+version=1.40.5
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
         $name-symlink.patch)
@@ -24,6 +24,6 @@ build() {
                  --disable-nls
     make
     make DESTDIR=$PKG install install-libs
-    rm -rf $PKG/{usr/share/info,etc/init.d}
+    rm -r $PKG/{usr/share/info,etc/init.d}
     chmod +w -R $PKG
 }
diff --git a/e2fsprogs/e2fsprogs-symlink.patch b/e2fsprogs/e2fsprogs-symlink.patch
index 452dbe35..f34bda72 100644
--- a/e2fsprogs/e2fsprogs-symlink.patch
+++ b/e2fsprogs/e2fsprogs-symlink.patch
@@ -1,7 +1,7 @@
-diff -Nru e2fsprogs-1.40.orig/e2fsck/Makefile.in e2fsprogs-1.40/e2fsck/Makefile.in
---- e2fsprogs-1.40.orig/e2fsck/Makefile.in	2007-07-05 08:26:47.000000000 +0200
-+++ e2fsprogs-1.40/e2fsck/Makefile.in	2007-07-05 08:27:01.000000000 +0200
-@@ -182,10 +182,10 @@
+diff -Nru e2fsprogs-1.40.5.orig/e2fsck/Makefile.in e2fsprogs-1.40.5/e2fsck/Makefile.in
+--- e2fsprogs-1.40.5.orig/e2fsck/Makefile.in	2008-01-29 10:13:17.000000000 +0100
++++ e2fsprogs-1.40.5/e2fsck/Makefile.in	2008-01-29 10:13:29.000000000 +0100
+@@ -177,10 +177,10 @@
  		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
  	done
  	@echo "	LINK $(root_sbindir)/fsck.ext2"
@@ -14,7 +14,7 @@ diff -Nru e2fsprogs-1.40.orig/e2fsck/Makefile.in e2fsprogs-1.40/e2fsck/Makefile.
  			$(DESTDIR)$(root_sbindir)/fsck.ext3
  	@for i in $(MANPAGES); do \
  		for j in $(COMPRESS_EXT); do \
-@@ -202,10 +202,10 @@
+@@ -197,10 +197,10 @@
  		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
  	done
  	@echo "	LINK $(man8dir)/fsck.ext2.8"
@@ -27,9 +27,9 @@ diff -Nru e2fsprogs-1.40.orig/e2fsck/Makefile.in e2fsprogs-1.40/e2fsck/Makefile.
  		$(DESTDIR)$(man8dir)/fsck.ext3.8
  
  install-strip: install
-diff -Nru e2fsprogs-1.40.orig/lib/uuid/Makefile.in e2fsprogs-1.40/lib/uuid/Makefile.in
---- e2fsprogs-1.40.orig/lib/uuid/Makefile.in	2007-07-05 08:26:47.000000000 +0200
-+++ e2fsprogs-1.40/lib/uuid/Makefile.in	2007-07-05 08:27:01.000000000 +0200
+diff -Nru e2fsprogs-1.40.5.orig/lib/uuid/Makefile.in e2fsprogs-1.40.5/lib/uuid/Makefile.in
+--- e2fsprogs-1.40.5.orig/lib/uuid/Makefile.in	2008-01-29 10:13:17.000000000 +0100
++++ e2fsprogs-1.40.5/lib/uuid/Makefile.in	2008-01-29 10:13:29.000000000 +0100
 @@ -146,9 +146,9 @@
  	@$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
  		$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
@@ -42,10 +42,10 @@ diff -Nru e2fsprogs-1.40.orig/lib/uuid/Makefile.in e2fsprogs-1.40/lib/uuid/Makef
  	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
  	@$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
  
-diff -Nru e2fsprogs-1.40.orig/misc/Makefile.in e2fsprogs-1.40/misc/Makefile.in
---- e2fsprogs-1.40.orig/misc/Makefile.in	2007-07-05 08:26:48.000000000 +0200
-+++ e2fsprogs-1.40/misc/Makefile.in	2007-07-05 08:27:01.000000000 +0200
-@@ -247,16 +247,16 @@
+diff -Nru e2fsprogs-1.40.5.orig/misc/Makefile.in e2fsprogs-1.40.5/misc/Makefile.in
+--- e2fsprogs-1.40.5.orig/misc/Makefile.in	2008-01-29 10:13:17.000000000 +0100
++++ e2fsprogs-1.40.5/misc/Makefile.in	2008-01-29 10:13:29.000000000 +0100
+@@ -264,16 +264,16 @@
  		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
  	done
  	@echo "	LINK $(root_sbindir)/mkfs.ext2"
@@ -66,7 +66,7 @@ diff -Nru e2fsprogs-1.40.orig/misc/Makefile.in e2fsprogs-1.40/misc/Makefile.in
  		$(DESTDIR)$(root_sbindir)/findfs
  	@for i in $(UPROGS); do \
  		echo "	INSTALL $(bindir)/$$i"; \
-@@ -276,10 +276,10 @@
+@@ -293,10 +293,10 @@
  	@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
  		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
  	@echo "	LINK mkfs.ext2.8"