Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/rfkill/PKGBUILD
	extra/libkgapi/PKGBUILD
	extra/transmission/PKGBUILD
	testing/grep/PKGBUILD
	testing/grep/grep.install

5 files changed, 19 insertions, 13 deletions

diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index 38100b693..f2484acbd 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72784 2012-06-22 12:49:49Z dreisner $
+# $Id: PKGBUILD 75347 2012-08-20 19:15:16Z dreisner $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
@@ -8,7 +8,7 @@
 
 pkgname=chrony
 pkgver=1.26
-pkgrel=3
+pkgrel=5
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
@@ -36,4 +36,7 @@ package() {
   install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
   install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony
   install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
+
+  install -dm755 "$pkgdir/usr/lib/ntp-units.d"
+  echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list"
 }
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 0f622554b..4c2b0ee2d 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74707 2012-08-02 09:04:30Z bpiotrowski $
+# $Id: PKGBUILD 75333 2012-08-20 06:45:01Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -6,8 +6,8 @@
 # Contributor: xduugu (.desktop and install files)
 
 pkgname=mupdf
-pkgver=1.0
-pkgrel=2
+pkgver=1.1
+pkgrel=1
 pkgdesc="lightweight PDF viewer and toolkit written in portable C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mupdf.com"
@@ -15,19 +15,19 @@ license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils')
 install=mupdf.install
 source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz")
-md5sums=('d986ab98e2b035b7abd61afc474562b3')
+md5sums=('f7b5fd753f40aca207e9afd70d8f8edf')
 
 build() {
     CFLAGS+=" -fPIC"
     CXXFLAGS+=" -fPIC"
 
 	cd "$srcdir"/$pkgname-$pkgver-source
-	make build=release prefix="$pkgdir/usr"
+	make build=release prefix="$pkgdir"/usr
 }
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver-source
-	make build=release prefix="$pkgdir/usr" install
+	make build=release prefix="$pkgdir"/usr install
 
 	sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop
   	sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 37aaa3ccb..645bd923b 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72171 2012-06-09 14:07:36Z dreisner $
+# $Id: PKGBUILD 75345 2012-08-20 19:14:50Z dreisner $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=15
+pkgrel=18
 pkgdesc="Free, easy to use implementation of the Network Time Protocol."
 url="http://www.openntpd.org/"
 arch=('x86_64' 'i686' 'mips64el')
@@ -21,7 +21,7 @@ sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49'
             '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96'
             '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2'
             'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5'
-            'b54b88cb0fe35636405e2b09744633cd815edb3e8c864035bcdb05f727858f53')
+            '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -52,6 +52,9 @@ package() {
 
   # avoid conflict with filesystem>=2012.06
   rm -r "$pkgdir/run"
+
+  install -dm755 "$pkgdir/usr/lib/ntp-units.d"
+  echo "$pkgname.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install
index 42063ef21..4f42aeb1f 100644
--- a/community/openntpd/openntpd.install
+++ b/community/openntpd/openntpd.install
@@ -10,7 +10,7 @@ createuser() {
 
 post_install() {
   createuser
-  systemd-tmpfiles --create /usr/lib/tmpfiles.d/openntpd.conf
+  systemd-tmpfiles --create openntpd.conf
 }
 
 post_upgrade() {
diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service
index db76531d1..e419204d4 100644
--- a/community/openntpd/openntpd.service
+++ b/community/openntpd/openntpd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/ntpd
+ExecStart=/usr/sbin/ntpd -s
 
 [Install]
 WantedBy=multi-user.target