diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2012-08-02 18:17:11 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2012-08-02 18:17:11 +0000 |
| commit | 79446106b65937b5dbc2395f83eee8382a65a748 (patch) | |
| tree | c4a85f203e8ba7fced5af604a00b32eb3c9ff734 /sysutils/e2fsprogs | |
| parent | fc27b1c8f263fb09a0e3d876452659c69a89c1aa (diff) | |
| download | ports-79446106b65937b5dbc2395f83eee8382a65a748.tar.gz ports-79446106b65937b5dbc2395f83eee8382a65a748.zip | |
Notes
Diffstat (limited to 'sysutils/e2fsprogs')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-8f00911a | 24 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-misc__Makefile.in | 14 |
4 files changed, 10 insertions, 34 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 092ac49995d8..46aadf70c1cc 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.42.4 +PORTVERSION= 1.42.5 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index ee3aaf5a7406..43b3e868295c 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,2 +1,2 @@ -SHA256 (e2fsprogs-1.42.4.tar.gz) = 3946f347842a7b892b23476e231da21e572f9db828cb02a38bc57beb25db905e -SIZE (e2fsprogs-1.42.4.tar.gz) = 5873284 +SHA256 (e2fsprogs-1.42.5.tar.gz) = 76edaad8eb7464356e1317d60eb19952728091dad358f1f939239874cc1871ce +SIZE (e2fsprogs-1.42.5.tar.gz) = 5918892 diff --git a/sysutils/e2fsprogs/files/patch-8f00911a b/sysutils/e2fsprogs/files/patch-8f00911a deleted file mode 100644 index a765e30636e2..000000000000 --- a/sysutils/e2fsprogs/files/patch-8f00911a +++ /dev/null @@ -1,24 +0,0 @@ -commit 8f00911a21f4e95de84c60e09cc4df173e5b6701 -Author: Theodore Ts'o <tytso@mit.edu> -Date: Tue Jun 12 18:25:34 2012 -0400 - - libquota: remove unneeded #include of <sys/quota.h> - - The attempted inclusion of sys/quota.h is causing failures in when - building on the hurd and freebsd platforms for Debian. It's not - necessary any more, so just remove the #include. - - Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> - -diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c -index 67e74fc..c0ebaa1 100644 ---- a/lib/quota/quotaio.c -+++ b/lib/quota/quotaio.c -@@ -15,7 +15,6 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> --#include <sys/quota.h> - - #include "common.h" - #include "quotaio.h" diff --git a/sysutils/e2fsprogs/files/patch-misc__Makefile.in b/sysutils/e2fsprogs/files/patch-misc__Makefile.in index 312ce6244f10..6bbb60679e18 100644 --- a/sysutils/e2fsprogs/files/patch-misc__Makefile.in +++ b/sysutils/e2fsprogs/files/patch-misc__Makefile.in @@ -1,5 +1,5 @@ ---- ./misc/Makefile.in.orig 2012-03-27 06:36:20.000000000 +0200 -+++ ./misc/Makefile.in 2012-04-01 17:17:10.000000000 +0200 +--- ./misc/Makefile.in.orig 2012-07-17 07:21:04.000000000 +0200 ++++ ./misc/Makefile.in 2012-08-02 19:59:09.000000000 +0200 @@ -28,15 +28,15 @@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ @@ -40,7 +40,7 @@ profile.o: $(E) " CC $<" @@ -482,34 +482,9 @@ - echo " INSTALL_DATA $(man5dir)/$$i"; \ + $(ES) " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done - $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \ @@ -49,13 +49,13 @@ - true; \ - else \ - if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \ - echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \ - echo "Check to see if you need to update your $(root_sysconfdir)/mke2fs.conf"; \ - else \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - mv $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-old; \ - $(INSTALL_DATA) mke2fs.conf \ @@ -67,11 +67,11 @@ - echo " "; \ - fi; \ - else \ -- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ +- $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ - $(INSTALL_DATA) mke2fs.conf \ - $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \ - fi -+ $(Q) echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ ++ $(Q) $(ES) " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \ + $(INSTALL_DATA) mke2fs.conf.dist \ + $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.dist |