diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-08-07 02:15:25 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-08-07 02:15:25 (GMT) |
| commit | b30e0fd6b09f179d2b3280f4eaa2600729325b42 (patch) | |
| tree | a4259fbbafbf2c91120bf443438e2c4cfa5406ef | |
| parent | 8959fc86be9d3d2e811b80b903acda6fdb66e3a2 (diff) | |
| download | linhes_pkgbuild-b30e0fd6b09f179d2b3280f4eaa2600729325b42.zip linhes_pkgbuild-b30e0fd6b09f179d2b3280f4eaa2600729325b42.tar.gz linhes_pkgbuild-b30e0fd6b09f179d2b3280f4eaa2600729325b42.tar.bz2 | |
e2fsprogs 1.42.4
| -rw-r--r-- | abs/core/e2fsprogs/Makefile-fsck.static.patch | 13 | ||||
| -rw-r--r-- | abs/core/e2fsprogs/PKGBUILD | 30 | ||||
| -rw-r--r-- | abs/core/e2fsprogs/e2fsprogs.install | 2 |
3 files changed, 17 insertions, 28 deletions
diff --git a/abs/core/e2fsprogs/Makefile-fsck.static.patch b/abs/core/e2fsprogs/Makefile-fsck.static.patch deleted file mode 100644 index a006443..0000000 --- a/abs/core/e2fsprogs/Makefile-fsck.static.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- e2fsprogs-1.40.4/misc/Makefile 2008-01-16 14:52:53.000000000 +0000 -+++ e2fsprogs-1.40.4/misc/Makefile.neu 2008-01-16 14:53:43.000000000 +0000 -@@ -376,6 +376,10 @@ - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_BLKID) $(LIBINTL) - -+fsck.static: $(FSCK_OBJS) $(DEPSTATIC_LIBBLKID) -+ @echo " LD $@" -+ @$(CC) $(ALL_LDFLAGS) -static -o fsck.static $(FSCK_OBJS) $(STATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(LIBINTL) -+ - badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS) - @echo " LD $@" - @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL) diff --git a/abs/core/e2fsprogs/PKGBUILD b/abs/core/e2fsprogs/PKGBUILD index 730522b..96afe85 100644 --- a/abs/core/e2fsprogs/PKGBUILD +++ b/abs/core/e2fsprogs/PKGBUILD @@ -1,46 +1,48 @@ -# $Id: PKGBUILD 80571 2010-05-19 18:38:36Z ronald $ +# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.41.12 +pkgver=1.42.4 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') url="http://e2fsprogs.sourceforge.net" groups=('base') -depends=('sh' 'util-linux-ng') +depends=('sh' 'util-linux') makedepends=('bc') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f' +sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { cd "${srcdir}/${pkgname}-${pkgver}" # Remove unnecessary init.d directory - sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1 + sed -i '/init\.d/s|^|#|' misc/Makefile.in - ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \ - --disable-fsck --disable-uuidd \ - --disable-libuuid --disable-libblkid || return 1 + ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ + --enable-elf-shlibs --disable-fsck --disable-uuidd \ + --disable-libuuid --disable-libblkid - - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-libs || return 1 + make DESTDIR="${pkgdir}" install install-libs - sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1 + sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" + + # remove references to build directory + sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" + sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ - "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1 - + "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" } diff --git a/abs/core/e2fsprogs/e2fsprogs.install b/abs/core/e2fsprogs/e2fsprogs.install index f91d39f..1a7fe20 100644 --- a/abs/core/e2fsprogs/e2fsprogs.install +++ b/abs/core/e2fsprogs/e2fsprogs.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(libext2fs.info.gz) post_install() { |