Date: Wednesday, December 29, 2010 @ 20:16:24 Author: dan Revision: 104147
upgpkg: pacman 3.4.2-1 verbump 3.4.2 Modified: pacman/trunk/PKGBUILD ----------+ PKGBUILD | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-12-29 21:43:21 UTC (rev 104146) +++ PKGBUILD 2010-12-30 01:16:24 UTC (rev 104147) @@ -2,7 +2,7 @@ # Maintainer: Dan McGee <[email protected]> pkgname=pacman -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('4e4e8e4f636d9878fbed9cf840f162cf' +md5sums=('de9198368bdf669c108763c37d793063' 'eda9cbdb47f85fabda2e7e63801e3e16' '9ba146b4fa7bcb3cc18204b06d1f6157' 'aef317285c7d16ac495b0e53deeb948d') @@ -30,37 +30,31 @@ build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc - make || return 1 + 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|@car...@]|$mycarch|g" \ -e "s|@cho...@]|$mychost|g" \
