Sun May 5 01:06:40 PDT 2013

17 files changed, 81 insertions, 201 deletions

diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index 96eb71ee8..fc1107a6b 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183360 2013-04-21 22:09:15Z heftig $
+# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=(!libtool)
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('38f158d71ce8fb14dca74928053a3edf32751e142400d1429bec5fe0f4bbb8f0'
+sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 0a4c04796..a63dfba2c 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 183385 2013-04-21 22:10:00Z heftig $
+#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37')
+sha256sums=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index cf6214957..60251ada3 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 179971 2013-03-13 16:25:37Z jgc $
+# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.1
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' 'gobject-introspection')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils'
+             'gobject-introspection' 'optipng')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
@@ -20,12 +21,13 @@ options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         gnumeric-1.12.1-automake-1.13.patch
         revert-warnings.patch)
-sha256sums=('0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901'
+sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874'
             '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
             'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
   patch -Np0 -i ../revert-warnings.patch
 
@@ -33,8 +35,16 @@ build() {
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
   autoreconf -fi
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=699683
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-ssindex --disable-schemas-compile --enable-introspection --enable-compile-warnings=no
+    --disable-schemas-compile --enable-introspection
   make
 }
 
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 46008e22c..33b8e9bef 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 172981 2012-12-08 01:33:56Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 184222 2013-05-04 08:38:14Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 # Contributor: pumbur
 
 pkgname=opus
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.opus-codec.org/"
-license=('custom')
-depends=('glibc')
+license=(BSD)
+depends=(glibc)
 options=('!libtool')
-source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c503ad05a59ddb44deab96204401be03')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --enable-custom-modes
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/opus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 28530bc73..7dc7aaa02 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179004 2013-03-01 10:26:47Z andrea $
+# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.9.3
-pkgrel=2
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -16,13 +16,11 @@ optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('502db0d865a392d87bff22c4f3bcfb3d0755937b1c18496edd941fd2d1784a3d'
-            '120388a92c3b720bd82e7617a908f3f7e1071d3b9075e9b537b7c60fc3575b08')
+sha256sums=('6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c'
+            'SKIP')
 options=(!libtool)
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index e85a3e1e6..4fd34a023 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $
+# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $
 # Mantainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
+pkgver=2.14
+pkgrel=2
 pkgdesc='Linux NIS Tools'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/yp-tools/'
 license=('GPL2')
 depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
+backup=('etc/nisdomainname')
+install=yp-tools.install
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	'domainname.service'
+	'domainname.conf')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +27,9 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+	install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname"
 	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
 }
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
+md5sums=('ba1f121c17e3ad65368be173b977cd13'
+         '5a78cd2218936241133e5f61383a2dc8'
+         '74298e047121f528a2a5c221afd783ab')
diff --git a/extra/yp-tools/domainname.conf b/extra/yp-tools/domainname.conf
new file mode 100644
index 000000000..d43d5f53e
--- /dev/null
+++ b/extra/yp-tools/domainname.conf
@@ -0,0 +1,4 @@
+#
+# NIS domain to be set by domainname.service
+#
+NISDOMAINNAME=""
diff --git a/extra/yp-tools/domainname.service b/extra/yp-tools/domainname.service
index 035f767c8..7a1705688 100644
--- a/extra/yp-tools/domainname.service
+++ b/extra/yp-tools/domainname.service
@@ -3,7 +3,7 @@ Description=NIS Domainname
 
 [Service]
 Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
+EnvironmentFile=/etc/nisdomainname
 ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
 RemainAfterExit=true
 
diff --git a/extra/yp-tools/yp-tools.install b/extra/yp-tools/yp-tools.install
new file mode 100644
index 000000000..19e8ecaf4
--- /dev/null
+++ b/extra/yp-tools/yp-tools.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	if [ "$(vercmp 2.14-2 "$2")" -eq 1 ]; then
+		printf '===> Configure your NIS domain name in /etc/nisdomainname\n'
+	fi
+}
diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index d4ce1b4d9..56ade6c6c 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 162167 2012-06-22 13:00:20Z dreisner $
+# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
+pkgver=1.37.1
+pkgrel=4
 pkgdesc='Linux NIS daemon'
 url='http://www.linux-nis.org/nis/ypbind-mt/'
 license=('GPL2')
 arch=('i686' 'x86_64')
 makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
+depends=('rpcbind' 'openslp' 'yp-tools')
+backup=('etc/yp.conf')
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	'ypbind.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
+		--prefix=/usr
 
 	make
 }
@@ -37,14 +32,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 
 	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
 	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
 	install -d -m755 "${pkgdir}"/var/yp/binding
 }
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
+md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82'
+         '9083debd16fc49c6645372caa25969b5')
diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/extra/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/extra/ypbind-mt/ypbind.conf b/extra/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/extra/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service
index c59231000..08e4fe14e 100644
--- a/extra/ypbind-mt/ypbind.service
+++ b/extra/ypbind-mt/ypbind.service
@@ -8,6 +8,9 @@ Before=systemd-user-sessions.service
 Type=forking
 PIDFile=/run/ypbind.pid
 ExecStart=/usr/sbin/ypbind
+# Terrible hack, upstream ypbind should sort something out
+# Wait for at most 10 seconds for a NIS master to become available
+ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 694c43665..879df8781 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 168108 2012-10-06 00:49:54Z dreisner $
+# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.28
-pkgrel=2
+pkgver=2.31
+pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/ypserv/'
@@ -15,16 +15,12 @@ depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
 optdepends=('gawk: for printcap support')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
 source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'confpost.patch'
         'ypxfrd.service'
         'yppasswdd.service'
-	'ypserv.service'
-        'yppasswd'
-        'ypserv')
+	'ypserv.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
 	./configure --prefix=/usr
 	make
 }
@@ -36,19 +32,11 @@ package() {
 	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
 	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
 	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
 	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
 	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
-
-	# Provide native service for arch-daemons generator
-	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
 }
-md5sums=('ed64f489bab494218fc5c5942b95d5b6'
-         '8acb314f30d6e531ac9efa8655f68ccb'
+md5sums=('4537b8f0e917edca8f57b70b9cbc37f3'
          'c80e253756446d59a90c4c21b1cb8740'
          '7cba3dd3544436c3c1f05e36c0018e92'
-         '3398271c3e0a054e64b06b99aa2dc63d'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
+         '3398271c3e0a054e64b06b99aa2dc63d')
diff --git a/extra/ypserv/confpost.patch b/extra/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/extra/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/extra/ypserv/yppasswd b/extra/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/extra/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/ypserv/ypserv b/extra/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/extra/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac