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

2 files changed, 8 insertions, 15 deletions

diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index e6e18a19c..b8d257e9d 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83750 2013-02-04 22:23:27Z bisson $
+# $Id: PKGBUILD 91246 2013-05-20 14:50:30Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
 pkgver=3.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -15,32 +15,25 @@ arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
 sha1sums=('e31a81ab7877422b34e1f163f9509cd93f395664'
-          '1cfa2d7254139be50f11753d4e07281ed2af36eb')
+          'f35ecb887e86ae0a54ac70aef5a7577fc8761877')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	./configure \
 		--prefix=/ \
-		--exec-prefix=/usr \
+		--sbindir=/usr/bin \
 		--datarootdir=/usr/share \
 		--with-pidfile=/run/nsd.pid \
-		--enable-ratelimit \
-
+		--enable-ratelimit
 	make
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	make DESTDIR="${pkgdir}" install
-
-	install -d "${pkgdir}"/etc/rc.d
-	ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service
-
 	rm doc/differences.pdf
 	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
 	install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}"
diff --git a/community/nsd/service b/community/nsd/service
index 28bb1c5b7..ca423c29c 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/nsd.pid
-ExecStart=/usr/sbin/nsdc start
-ExecReload=/usr/sbin/nsdc reload
-ExecStop=/usr/sbin/nsdc stop
+ExecStart=/usr/bin/nsdc start
+ExecReload=/usr/bin/nsdc reload
+ExecStop=/usr/bin/nsdc stop
 
 [Install]
 WantedBy=multi-user.target