summaryrefslogtreecommitdiffstats
path: root/abs/core/pacman/PKGBUILD
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2011-07-17 20:49:01 (GMT)
committerCecil <knoppmyth@gmail.com>2011-07-17 20:49:01 (GMT)
commit4e8509368ee8a5b76c4fd5cc1737dfc0f5fed607 (patch)
tree665570088d4fe2c675834c2409efafb80fe1a4e8 /abs/core/pacman/PKGBUILD
parent13e7dfcaf9aa5d46abd43fc0bfcc8c2167e99645 (diff)
parentf1e8cbd3510cef06cad3ea55eaedf40aca12f1ae (diff)
downloadlinhes_pkgbuild-4e8509368ee8a5b76c4fd5cc1737dfc0f5fed607.zip
linhes_pkgbuild-4e8509368ee8a5b76c4fd5cc1737dfc0f5fed607.tar.gz
linhes_pkgbuild-4e8509368ee8a5b76c4fd5cc1737dfc0f5fed607.tar.bz2
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/pacman/PKGBUILD')
-rw-r--r--abs/core/pacman/PKGBUILD39
1 files changed, 19 insertions, 20 deletions
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 2d4f776..59ff582 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 89780 2010-09-04 01:05:26Z dan $
+# $Id$
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=pacman
-pkgver=3.4.1
-pkgrel=3
+pkgver=3.5.3
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base')
-depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist')
+depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist')
optdepends=('fakeroot: for makepkg usage as normal user'
'curl: for rankmirrors usage')
backup=(etc/pacman.conf etc/makepkg.conf)
@@ -19,44 +19,43 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
pacman.conf.x86_64
makepkg.conf)
+md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
+ 'e99eb721b6b704f68c5f47468507c102'
+ 'f8b939d9b2beb79a0436961a2d707d7c'
+ 'a8684989d3dfad5a6e1bcf95af3e571b')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
- make || return 1
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --enable-doc
+ make
}
package() {
cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install || return 1
+ make DESTDIR=$pkgdir install
# install Arch specific stuff
mkdir -p $pkgdir/etc
case "$CARCH" in
i686)
install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
- ;;
- x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
- ;;
- esac
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
- # set things correctly in the default conf file
- case "$CARCH" in
- i686)
mycarch="i686"
mychost="i686-pc-linux-gnu"
myflags="-march=i686 "
;;
x86_64)
+ install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
myflags="-march=x86-64 "
;;
esac
+ install -m644 $srcdir/makepkg.conf $pkgdir/etc/
+ # set things correctly in the default conf file
sed -i $pkgdir/etc/makepkg.conf \
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
@@ -70,7 +69,7 @@ package() {
}
# vim: set ts=2 sw=2 et:
-md5sums=('4e4e8e4f636d9878fbed9cf840f162cf'
- '4792e61cd1b902d20046e19f97ae758d'
- '9ba146b4fa7bcb3cc18204b06d1f6157'
- 'aef317285c7d16ac495b0e53deeb948d')
+md5sums=('c36c18ed4d8ec69c0ecb4f9684266901'
+ '8f7e5462469cfc7520b3aade58ff28de'
+ 'f8b939d9b2beb79a0436961a2d707d7c'
+ 'a8684989d3dfad5a6e1bcf95af3e571b')