summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-05-03 00:01:52 +0000
committerroot <root@rshg054.dnsready.net>2012-05-03 00:01:52 +0000
commit5520a8b04cecf4af812cbf2285e9ab6efabe147f (patch)
tree842c0bf2e354faca64f878dce5a2166c7b0dad64 /core
parentdefe74c9cba07c321ad2869d8f6872e64a167324 (diff)
Thu May 3 00:01:52 UTC 2012
Diffstat (limited to 'core')
-rw-r--r--core/bzip2/PKGBUILD32
-rw-r--r--core/e2fsprogs/PKGBUILD10
2 files changed, 19 insertions, 23 deletions
diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
index 5381b848b..3e4ea2362 100644
--- a/core/bzip2/PKGBUILD
+++ b/core/bzip2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142378 2011-11-08 22:04:46Z ronald $
+# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=bzip2
pkgver=1.0.6
-pkgrel=3
+pkgrel=4
pkgdesc="A high-quality data compression program"
arch=('i686' 'x86_64')
license=('custom')
@@ -40,26 +40,22 @@ check() {
package() {
cd "$srcdir/$pkgname-$pkgver"
- install -dm755 $pkgdir/bin
- install -m755 bzip2-shared $pkgdir/bin/bzip2
- install -m755 bzip2recover $pkgdir/bin
- ln -sf bzip2 $pkgdir/bin/bunzip2
- ln -sf bzip2 $pkgdir/bin/bzcat
+ install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1}
- install -dm755 $pkgdir/usr/bin
- install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
+ install -m755 bzip2-shared $pkgdir/usr/bin/bzip2
+ install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin
+ ln -sf bzip2 $pkgdir/usr/bin/bunzip2
+ ln -sf bzip2 $pkgdir/usr/bin/bzcat
- install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
- ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
- ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
- ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
+ install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib
+ ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so
+ ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1
+ ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0
+ install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
- install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
- ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
+ install -m644 bzlib.h $pkgdir/usr/include/
- install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
-
- install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
+ install -m644 bzip2.1 $pkgdir/usr/share/man/man1/
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index d374faf8b..de432a83e 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 156633 2012-04-21 23:34:11Z allan $
+# $Id: PKGBUILD 158056 2012-05-02 01:13:00Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=e2fsprogs
pkgver=1.42.2
-pkgrel=1
+pkgrel=2
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')
@@ -25,8 +25,8 @@ build() {
# Remove unnecessary init.d directory
sed -i '/init\.d/s|^|#|' misc/Makefile.in
- ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \
- --disable-fsck --disable-uuidd \
+ ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
+ --enable-elf-shlibs --disable-fsck --disable-uuidd \
--disable-libuuid --disable-libblkid
make