summaryrefslogtreecommitdiff
path: root/libre/pacman/PKGBUILD
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-04-22 10:52:18 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-04-22 10:52:18 -0400
commit908d987dd1dcd4899f8f7f0878514c22ca8048b7 (patch)
tree29bf5986774207c3453044e1f370fb98d2431265 /libre/pacman/PKGBUILD
parent308bfb446305a96dffce945b6c4fb82b10d1b91b (diff)
parent8351d69e64a40d68fa32cfeea227b6fcf7afe974 (diff)
downloadabslibre-908d987dd1dcd4899f8f7f0878514c22ca8048b7.tar.gz
abslibre-908d987dd1dcd4899f8f7f0878514c22ca8048b7.tar.bz2
abslibre-908d987dd1dcd4899f8f7f0878514c22ca8048b7.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/pacman/PKGBUILD')
-rw-r--r--libre/pacman/PKGBUILD68
1 files changed, 33 insertions, 35 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 85ae5cc5f..6bc77a345 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,51 +1,47 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 171482 2012-11-18 01:57:51Z allan $
+# $Id: PKGBUILD 181860 2013-04-04 22:54:14Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
-pkgver=4.0.3
-pkgrel=5
+pkgver=4.1.0
+pkgrel=2.1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.archlinux.org/pacman/"
license=('GPL')
-groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
+groups=('base' 'base-devel')
+depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-makedepends=('asciidoc')
+checkdepends=('python2' 'fakechroot')
optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
- 0001-Add-conflict-for-replacing-owned-empty-directory.patch
- 0002-Check-empty-subdirectory-ownership.patch
- 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
- pacman.conf
+ pacman.conf.i686
pacman.conf.x86_64
pacman.conf.mips64el
makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
- '1a70392526c8768470da678b31905a6e'
- '1a9b79788640907a2b34e8671cacc94a'
- 'a9ddd43891bed364e1e97d27b2887bf1'
- '2e8cbf55a94b1954b167c5dee6b62317'
- '080d9f76f56e135cc62205874636aa0f'
- 'ce9943fc8086d491890565e91ea1a0d8'
- 'eb8dba9bd0b315230fbf0e5dc0a7335b'
- 'debc512689a1aa8c124fe0ccf27f5758')
+md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
+ '4959b8d00056398195f4e549e7bdd346'
+ '688feb0a552f42643a76f72e7198bfe4'
+ '765858b55d2112d948932fc645ea538b'
+ '9e0c64937ef751ae4273fa4d73381484'
+ '5a94cdf966ad72284ee1aa148202857b')
build() {
cd $srcdir/$pkgname-$pkgver
- patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
- patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
- patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
+ --localstatedir=/var --enable-doc \
+ --with-scriptlet-shell=/usr/bin/bash \
+ --with-ldconfig=/usr/bin/ldconfig
make
+ make -C contrib
}
check() {
@@ -55,29 +51,29 @@ check() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
+ make DESTDIR=$pkgdir -C contrib install
# install Arch specific stuff
- mkdir -p $pkgdir/etc
+ install -dm755 $pkgdir/etc
+ install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
case "$CARCH" in
i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
mycarch="i686"
mychost="i686-pc-linux-gnu"
- myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
;;
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 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
;;
mips64el)
- install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
mycarch="mips64el"
mychost="mips64el-unknown-linux-gnu"
- myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+ myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4"
myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
;;
esac
@@ -88,12 +84,14 @@ package() {
-e "s|@CHOST[@]|$mychost|g" \
-e "s|@LDFLAGS[@]|$myldflags|g" \
-e "s|@CARCHFLAGS[@]|$myflags|g"
+
+ # put bash_completion in the right location
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/pacman \
+ ${pkgdir}/usr/share/bash-completion/completions
+ rmdir ${pkgdir}/etc/bash_completion.d
- # install completion files
- install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
for f in makepkg pacman-key; do
ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
done
-
- install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}