diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-16 16:49:47 +0200 |
| commit | bc864260b40f40e8f689788c54f6138007764077 (patch) | |
| tree | 9c9be0d9a53d7e3a03d76276fc4b02dd08b552bf /community/ndisc6 | |
| parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) | |
| parent | 453f3b8b2c568e9babcdc4852772278a39f130c0 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bird/PKGBUILD
community/drbd/PKGBUILD
community/etherape/PKGBUILD
community/ext4magic/PKGBUILD
community/fcron/PKGBUILD
community/fcron/systab.orig
community/gnome-panel/PKGBUILD
community/libident/PKGBUILD
community/libtorrent/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/usbipd.service
community/makedev/PKGBUILD
community/minbif/PKGBUILD
community/noip/PKGBUILD
community/notmuch/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/pound/PKGBUILD
community/preload/PKGBUILD
community/python-cchardet/PKGBUILD
community/rtorrent/PKGBUILD
community/tor/PKGBUILD
community/ude/PKGBUILD
core/openldap/PKGBUILD
core/sysvinit/PKGBUILD
extra/cd-discid/PKGBUILD
extra/cvs/PKGBUILD
extra/epiphany-extensions/PKGBUILD
extra/fbset/PKGBUILD
extra/fluidsynth/PKGBUILD
extra/gtkmm/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdepim/PKGBUILD
extra/libical/PKGBUILD
extra/mutt/PKGBUILD
extra/netkit-bsd-finger/PKGBUILD
extra/ossp/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/rtkit/PKGBUILD
extra/samba/PKGBUILD
extra/totem/PKGBUILD
extra/webkitgtk/PKGBUILD
libre/liferea-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
Diffstat (limited to 'community/ndisc6')
| -rw-r--r-- | community/ndisc6/PKGBUILD | 22 | ||||
| -rw-r--r-- | community/ndisc6/rdnssd.service | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD index f7f2b94d5..74420d0a1 100644 --- a/community/ndisc6/PKGBUILD +++ b/community/ndisc6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $ +# $Id: PKGBUILD 90526 2013-05-13 00:18:50Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=ndisc6 pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc='Collection of IPv6 networking utilities' arch=('i686' 'x86_64' 'mips64el') url='http://www.remlab.net/ndisc6/' @@ -13,17 +13,25 @@ license=('GPL') depends=('glibc' 'perl') makedepends=('glibc' 'gcc') options=(!emptydirs) -install=ndisc6.install +install=$pkgname.install source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2" 'rdnssd.service') md5sums=('50cb4c19606cf6ff2b7388e71832f579' - 'beeb4f033e9eb951e2de962f609c7c2a') + '88a290cbcf51ac5e10ed5f995a8ba4b9') + +prepare() { + # patch invalid path + sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \ + $pkgname-$pkgver/rdnssd/merge-hook.in +} build() { cd $pkgname-$pkgver - # patch invalid path - sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' rdnssd/merge-hook.in - ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --sysconfdir=/etc make } diff --git a/community/ndisc6/rdnssd.service b/community/ndisc6/rdnssd.service index dcaf73331..6fdf91f2d 100644 --- a/community/ndisc6/rdnssd.service +++ b/community/ndisc6/rdnssd.service @@ -6,7 +6,7 @@ Requires=network.target [Service] Type=forking PIDFile=/run/rdnssd.pid -ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook +ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook [Install] WantedBy=multi-user.target |