upgrade e2fsprogs to 1.39

svn path=/nixpkgs/trunk/; revision=5517
This commit is contained in:
Armijn Hemel 2006-06-24 15:58:25 +00:00
parent b3e96cbefc
commit 7793f28f0f
2 changed files with 31 additions and 4 deletions

View file

@ -1,15 +1,15 @@
{stdenv, fetchurl, gettext}:
stdenv.mkDerivation {
name = "e2fsprogs-1.38";
name = "e2fsprogs-1.39";
builder = ./builder.sh;
src = fetchurl {
#url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.38.tar.gz;
md5 = "d774d4412bfb80d12cf3a4fdfd59de5a";
url = http://surfnet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz;
md5 = "06f7806782e357797fad1d34b7ced0c6";
};
configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
buildInputs = [gettext];
patches = [./e2fsprogs-1.39_etc.patch];
}

View file

@ -0,0 +1,27 @@
diff -ruN e2fsprogs-1.39/misc/Makefile.in e2fsprogs-1.39.new/misc/Makefile.in
--- e2fsprogs-1.39/misc/Makefile.in 2006-03-27 07:58:10.000000000 +0200
+++ e2fsprogs-1.39.new/misc/Makefile.in 2006-06-24 17:53:48.000000000 +0200
@@ -223,12 +223,12 @@
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+ @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
- $(DESTDIR)$(libdir) $(DESTDIR)/etc
+ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)/etc
install: all $(SMANPAGES) $(UMANPAGES) installdirs
@for i in $(SPROGS); do \
@@ -291,7 +291,7 @@
@if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
echo " INSTALL_DATA /etc/mke2fs.conf"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
- $(DESTDIR)/etc/mke2fs.conf; \
+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
fi
install-strip: install