From f54e5bb138207feeebfe92423d782ca907a1c886 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Jun 2009 16:07:28 +0000
Subject: [PATCH] extra/nfs-utils: upgrade to 1.2.0

---
 extra/nfs-utils/APKBUILD            | 11 +++++------
 extra/nfs-utils/nfs-utils-rpc.patch | 11 -----------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 extra/nfs-utils/nfs-utils-rpc.patch

diff --git a/extra/nfs-utils/APKBUILD b/extra/nfs-utils/APKBUILD
index 6a51efb1ba6..b9225f96635 100644
--- a/extra/nfs-utils/APKBUILD
+++ b/extra/nfs-utils/APKBUILD
@@ -1,19 +1,18 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
-pkgver=1.1.6
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 license="GPL"
-depends="uclibc portmap libblkid"
-makedepends="e2fsprogs-dev g++"
+depends="portmap"
+makedepends="e2fsprogs-dev"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2
 	nfs.initd
 	nfs.confd
 	nfs.exports
-	nfs-utils-rpc.patch
 	nfs-utils-no-exec.patch
 	nfs-utils-mtab-sym.patch"
 
@@ -21,6 +20,7 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
 	for i in "$srcdir"/*.patch; do
+		msg "Applying $i"
 		patch -p0 -i "${i}" || return 1
 	done
 
@@ -46,10 +46,9 @@ build() {
 	install -m755 -D tools/rpcgen/rpcgen "$pkgdir"/usr/bin/rpcgen
 }
 
-md5sums="b0d1b8ec5c8c081a340cfc77bb8670cd  nfs-utils-1.1.6.tar.bz2
+md5sums="779cf81044e92cb51ad590960e7b3671  nfs-utils-1.2.0.tar.bz2
 4538f67470c916f8da9c76a17e314906  nfs.initd
 09135438d6df50b868bbe5a2260f973c  nfs.confd
 4f1bb7b2412ce5952ecb5ec22d8ed99d  nfs.exports
-dd9a90ce39cf8c725fdbf65d1139447f  nfs-utils-rpc.patch
 5e0963b0889e779ff36af0299d17d6cb  nfs-utils-no-exec.patch
 a3a7338f8de3ac37c1ffc05bdcb77d16  nfs-utils-mtab-sym.patch"
diff --git a/extra/nfs-utils/nfs-utils-rpc.patch b/extra/nfs-utils/nfs-utils-rpc.patch
deleted file mode 100644
index b05b67a6bd0..00000000000
--- a/extra/nfs-utils/nfs-utils-rpc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/rpcgen/rpc_main.c     Tue Apr  7 21:53:12 2009
-+++ tools/rpcgen/rpc_main.c	Tue Apr  7 21:53:12 2009
-@@ -550,7 +550,7 @@
- 	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
- #else
- 	if( !tirpcflag )
--	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
- #endif
- 	if( Cflag && (inetdflag || pmflag ) ) {
- 	  f_print(fout, "#ifdef __cplusplus\n");