summaryrefslogtreecommitdiff
path: root/core/procps-ng
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-05-30 11:55:09 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-05-30 11:55:09 +0200
commitb0fdec08ea3b6e162b710ca98b0dd56f9ae105eb (patch)
tree376cc5751d9a587815d7270caa61070f38832766 /core/procps-ng
parent8abbf69cf497489fb7a0ac3538cb6975285486b7 (diff)
parent76ee9007095484a113d1856786b81e2d2fae8202 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/apcupsd/PKGBUILD community/bmp-musepack/PKGBUILD community/bmp-wma/PKGBUILD community/bonnie++/PKGBUILD community/cantata/PKGBUILD community/checkinstall/PKGBUILD community/chrootuid/PKGBUILD community/compiz-bcop/PKGBUILD community/compiz-fusion-plugins-extra/PKGBUILD community/compiz-fusion-plugins-main/PKGBUILD community/compiz/PKGBUILD community/compizconfig-backend-gconf/PKGBUILD community/compizconfig-python/PKGBUILD community/ekg2/PKGBUILD community/emerald/PKGBUILD community/fbgetty/PKGBUILD community/flumotion/PKGBUILD community/leafnode/PKGBUILD community/libcompizconfig/PKGBUILD community/libdnet/PKGBUILD community/libee/PKGBUILD community/libtxc_dxtn/PKGBUILD community/linux-tools/PKGBUILD community/openntpd/PKGBUILD community/osiris/PKGBUILD community/perl-package-stash-xs/PKGBUILD community/perl-params-util/PKGBUILD community/procstatd/PKGBUILD community/scponly/PKGBUILD community/sniffit/PKGBUILD community/synergy/PKGBUILD community/turbojpeg/PKGBUILD community/unbound/PKGBUILD community/uucp/PKGBUILD core/gawk/PKGBUILD core/ifenslave/PKGBUILD core/jfsutils/PKGBUILD core/openldap/PKGBUILD core/rfkill/PKGBUILD core/systemd/PKGBUILD core/wireless_tools/PKGBUILD core/xinetd/PKGBUILD extra/avahi/PKGBUILD extra/calligra/PKGBUILD extra/clutter-gst/PKGBUILD extra/flac/PKGBUILD extra/hddtemp/PKGBUILD extra/libbluray/PKGBUILD extra/libdmx/PKGBUILD extra/libfs/PKGBUILD extra/libjpeg-turbo/PKGBUILD extra/libtiff/PKGBUILD extra/libxau/PKGBUILD extra/libxfixes/PKGBUILD extra/licq/PKGBUILD extra/mariadb/PKGBUILD extra/mesa/PKGBUILD extra/perl-guard/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/pidgin/PKGBUILD extra/pigeonhole/PKGBUILD extra/poppler/PKGBUILD extra/postgresql/PKGBUILD extra/python-geoip/PKGBUILD extra/python/PKGBUILD extra/samba/PKGBUILD extra/sqlite/PKGBUILD extra/vde2/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD extra/wireshark/PKGBUILD extra/xfce4-dict/PKGBUILD libre/libquicktime-libre/PKGBUILD libre/xscreensaver-libre/PKGBUILD
Diffstat (limited to 'core/procps-ng')
-rw-r--r--core/procps-ng/PKGBUILD21
1 files changed, 16 insertions, 5 deletions
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index dfcaa3ea3..e59222069 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180917 2013-03-28 02:20:12Z bisson $
+# $Id: PKGBUILD 186026 2013-05-20 14:49:45Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=procps-ng
pkgver=3.3.7
-pkgrel=1
+pkgrel=2
pkgdesc='Utilities for monitoring your system and its processes'
url='http://gitorious.org/procps'
license=('GPL' 'LGPL')
@@ -23,11 +23,22 @@ replaces=('procps')
options=('!libtool')
-build() {
+prepare() {
cd "${srcdir}/procps-procps"
echo ${pkgver} > .tarball-version
./autogen.sh
- ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
+}
+
+build() {
+ cd "${srcdir}/procps-procps"
+ ./configure \
+ --prefix=/usr \
+ --exec-prefix=/ \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
+ --disable-static
make
}
@@ -37,6 +48,6 @@ package() {
install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
# provided by util-linux
- rm "${pkgdir}/bin/kill"
+ rm "${pkgdir}/usr/bin/kill"
rm "${pkgdir}/usr/share/man/man1/kill.1"
}