[arch-commits] Commit in bird/trunk (PKGBUILD bird6.service)

[Sébastien Luttringer]

    Date: Tuesday, May 14, 2013 @ 12:22:14
  Author: seblu
Revision: 90815

upgpkg: bird 1.3.10-3

- fix FS#35261
- fix FS#35260
- remove docs

Modified:
  bird/trunk/PKGBUILD
  bird/trunk/bird6.service

---------------+
 PKGBUILD      |   25 +++++++++++++++++++------
 bird6.service |    2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-14 09:02:17 UTC (rev 90814)
+++ PKGBUILD	2013-05-14 10:22:14 UTC (rev 90815)
@@ -4,7 +4,7 @@
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -14,7 +14,7 @@
         'bird6.service')
 md5sums=('553c331b32bca9e926519cb2f67d68be'
          '01360e3b71ff2ed2223e87a3176e0659'
-         '13a5f066a39f82136291f1461458651c')
+         'e03f7c51293d81ad260fd47176ea5765')
 
 build() {
   cd $pkgbase-$pkgver
@@ -24,12 +24,23 @@
 
   # build ipv4 bird
   cd _build4
-  ../configure
+  ../configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --docdir=/usr/share/doc/$pkgname
   make
 
   # build ipv6 bird
   cd ../_build6
-  ../configure --enable-ipv6
+  ../configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --docdir=/usr/share/doc/$pkgname \
+    --enable-ipv6
   make
 }
 
@@ -43,8 +54,9 @@
     sysconfdir="$pkgdir/etc" \
     sbindir="$pkgdir/usr/bin" \
     localstatedir="$pkgdir/var" \
+    docdir="$pkgdir/usr/share/doc/$pkgname" \
     install
-  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
+  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"
@@ -63,8 +75,9 @@
     sysconfdir="$pkgdir/etc" \
     sbindir="$pkgdir/usr/bin" \
     localstatedir="$pkgdir/var" \
+    docdir="$pkgdir/usr/share/doc/$pkgname" \
     install
-  make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
+  #make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs
 
   # no /var inside pkg
   rm -r "$pkgdir/var"

Modified: bird6.service
===================================================================
--- bird6.service	2013-05-14 09:02:17 UTC (rev 90814)
+++ bird6.service	2013-05-14 10:22:14 UTC (rev 90815)
@@ -4,7 +4,7 @@
 
 [Service]
 ExecStart=/usr/bin/bird6 -d
-ExecReload=/usr/bin/bird6c configure
+ExecReload=/usr/bin/birdc6 configure
 ExecStop=/usr/bin/bird6c down
 
 [Install]