Add patches for installing in proper man dir and solving two QA warnings (#167858 and #167800)

(Portage version: 2.1.2-r10)

5 files changed, 41 insertions, 5 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index a99210f43a8d..aa743b0829a0 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/netkit-tftp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.2 2005/04/23 13:04:31 swegener Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.3 2007/02/21 19:44:02 anant Exp $
+
+*netkit-tftp-0.17-r3 (21 Feb 2007)
+
+  21 Feb 2007; <anant@gentoo.org> +files/man.patch, +files/memset.patch,
+  -netkit-tftp-0.17-r2.ebuild, +netkit-tftp-0.17-r3.ebuild:
+  Add two patches to install man pages in /usr/share/man instead of /usr/man and
+  solve 2 QA warnings. Closes bugs #167800 and #167858
 
   21 Sep 2004; Tom Gall <tgall@gentoo.org> netkit-tftp-0.17-r2.ebuild:
   stable on ppc64
diff --git a/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r2 b/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r3
index d9eb6d399074..d9eb6d399074 100644
--- a/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r2
+++ b/net-ftp/netkit-tftp/files/digest-netkit-tftp-0.17-r3
diff --git a/net-ftp/netkit-tftp/files/man.patch b/net-ftp/netkit-tftp/files/man.patch
new file mode 100644
index 000000000000..d6c323340904
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/man.patch
@@ -0,0 +1,11 @@
+--- configure.old	2007-02-22 00:53:21.000000000 +0530
++++ configure	2007-02-22 00:53:29.000000000 +0530
+@@ -55,7 +55,7 @@
+ 
+ BINDIR="$EXECPREFIX/bin"
+ SBINDIR="$EXECPREFIX/sbin"
+-MANDIR="$PREFIX/man"
++MANDIR="$PREFIX/share/man"
+ 
+ echo "Directories: $BINDIR $SBINDIR $MANDIR "
+ 
diff --git a/net-ftp/netkit-tftp/files/memset.patch b/net-ftp/netkit-tftp/files/memset.patch
new file mode 100644
index 000000000000..183e51297a3b
--- /dev/null
+++ b/net-ftp/netkit-tftp/files/memset.patch
@@ -0,0 +1,10 @@
+--- tftp/tftpsubs-old.c	2000-07-22 21:06:29.000000000 +0200
++++ tftp/tftpsubs.c	2007-02-21 08:26:03.000000000 +0100
+@@ -56,6 +56,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ #ifndef FIONREAD
+ #if defined(__sun__) && defined(__svr4__)
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild
index 507518516524..587f4d76a540 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r2.ebuild,v 1.1 2005/04/23 04:44:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild,v 1.1 2007/02/21 19:44:02 anant Exp $
+
+inherit eutils
 
 DESCRIPTION="the tftp server included in netkit"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
@@ -15,11 +17,17 @@ DEPEND="!virtual/tftp"
 PROVIDE="virtual/tftp"
 
 src_compile() {
+	# Change default man directory	
+	epatch ${FILESDIR}/man.patch
+	# Solve QA warning by including string.h
+	epatch ${FILESDIR}/memset.patch
+
 	./configure --prefix=/usr --installroot=${D} || die
 	emake || die
 }
 
 src_install() {
-	dodir /usr/bin /usr/sbin /usr/man/man1 /usr/man/man8
+	dodir /usr/bin /usr/sbin
+	doman tftp/tftp.1 tftpd/tftpd.8
 	make install || die
 }