diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-24 23:55:24 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-24 23:55:24 -0300 |
| commit | d0667450d97b754454742d2c3954979ed0826f1b (patch) | |
| tree | bbf4c7fec1eb8013a10bd406fcbe3501cdb5a829 /core/e2fsprogs | |
| parent | c17c5a39aa47a22c64b63bdc0ccc5f20da37b98e (diff) | |
| parent | fad7e04efd4045c478db2e849bb8d457b82cdada (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ascii/PKGBUILD
community/shapelib/PKGBUILD
core/e2fsprogs/PKGBUILD
Diffstat (limited to 'core/e2fsprogs')
| -rw-r--r-- | core/e2fsprogs/PKGBUILD | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 55280c720..16ef05f87 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 188851 2013-06-23 03:24:28Z foutrelis $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.7 -pkgrel=2 +pkgver=1.42.8 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'MIT') @@ -16,8 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -options=('!makeflags') -sha1sums=('897ed5bab4f021834d00ec047ed83766d56ce0a8' +sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { @@ -27,7 +26,7 @@ build() { sed -i '/init\.d/s|^|#|' misc/Makefile.in ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ - --enable-elf-shlibs --disable-fsck --disable-uuidd \ + --sbindir=/usr/bin --enable-elf-shlibs --disable-fsck --disable-uuidd \ --disable-libuuid --disable-libblkid make @@ -38,7 +37,7 @@ package() { make DESTDIR="${pkgdir}" install install-libs 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" @@ -46,11 +45,4 @@ package() { # install MIT license install -Dm644 "${srcdir}/MIT-LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" - - # usrmove - cd "$pkgdir" - mv sbin/* usr/bin/ - rmdir sbin - mv usr/sbin/* usr/bin/ - rmdir usr/sbin } |