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

Package-Manager: portage-2.1.2-r10

6 files changed, 60 insertions, 16 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/Manifest b/net-ftp/netkit-tftp/Manifest
index 813aa28d93c2..d83c0b566af4 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -1,16 +1,24 @@
+AUX man.patch 279 RMD160 19d22663bd0451e35f55662652c8901ea870da5d SHA1 6136616b6e785bddbeea7989866d5a37ac1f65ee SHA256 3ab46253253a278d416f8d2fac9b884e802fc8240aa88d04cc0536c98728d938
+MD5 37d60c914e2fce9ac61c53b80537663a files/man.patch 279
+RMD160 19d22663bd0451e35f55662652c8901ea870da5d files/man.patch 279
+SHA256 3ab46253253a278d416f8d2fac9b884e802fc8240aa88d04cc0536c98728d938 files/man.patch 279
+AUX memset.patch 280 RMD160 e7de5f8e41574e7dc649ee38bb5f7365fc0be4b6 SHA1 fe8c0cbd49f8ddb27b37ec24bd4be3be0abab064 SHA256 9b04964776efc6b321fe9b388dda6206101d681911b80ea20135593d47b948b8
+MD5 82dfb288c67dbce3be2e101318fab155 files/memset.patch 280
+RMD160 e7de5f8e41574e7dc649ee38bb5f7365fc0be4b6 files/memset.patch 280
+SHA256 9b04964776efc6b321fe9b388dda6206101d681911b80ea20135593d47b948b8 files/memset.patch 280
 DIST netkit-tftp-0.17.tar.gz 23620 RMD160 18fa9eaa4e31ec9579a8ba8a486a2f0da0b22747 SHA1 d3d661d6462f1989a69b37acba4006be5ae112bc SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d
-EBUILD netkit-tftp-0.17-r2.ebuild 727 RMD160 311526ad8039c1da17c8aecd1bd5110c750f29ed SHA1 3210385b443454ecdfb759ef4dc808013f1701e3 SHA256 c9d94d12b069f5eddc8ec6be920cba2ade517300b69807a8898d7e15ce5921e0
-MD5 dcdee01698eb20e9cebe0bfa887217df netkit-tftp-0.17-r2.ebuild 727
-RMD160 311526ad8039c1da17c8aecd1bd5110c750f29ed netkit-tftp-0.17-r2.ebuild 727
-SHA256 c9d94d12b069f5eddc8ec6be920cba2ade517300b69807a8898d7e15ce5921e0 netkit-tftp-0.17-r2.ebuild 727
-MISC ChangeLog 1489 RMD160 c3cb13eaae2beacfe224d6ba09e5d8b8c390ee01 SHA1 77190210512d18636c68000a16f3c68394ca0b97 SHA256 33fb00792f9bf616ebdbcb32876591a81b3a84ed7d62556c80d6189bd4918c12
-MD5 d7157beea10d5dbcfe26d7e67a6c3af3 ChangeLog 1489
-RMD160 c3cb13eaae2beacfe224d6ba09e5d8b8c390ee01 ChangeLog 1489
-SHA256 33fb00792f9bf616ebdbcb32876591a81b3a84ed7d62556c80d6189bd4918c12 ChangeLog 1489
+EBUILD netkit-tftp-0.17-r3.ebuild 886 RMD160 9cecbcbb4121ae70a8a1c078a674d3f7b2ba2914 SHA1 b4b51b21089bc08df574536765c58b57e3938ce3 SHA256 8c0fa04eab37feb601aaffd9dba1d62cc267ff39fe424063f3f5f0b7d772cf3d
+MD5 fa912838dd7bccb6a09a9649ec608ffc netkit-tftp-0.17-r3.ebuild 886
+RMD160 9cecbcbb4121ae70a8a1c078a674d3f7b2ba2914 netkit-tftp-0.17-r3.ebuild 886
+SHA256 8c0fa04eab37feb601aaffd9dba1d62cc267ff39fe424063f3f5f0b7d772cf3d netkit-tftp-0.17-r3.ebuild 886
+MISC ChangeLog 1792 RMD160 e97cc8790b944d78818520cc226073178e747292 SHA1 d4e736244268d7ad7919c930d1f3b780b591038d SHA256 d659b50fa40ef144f1d80f80c532eef4f89c60810df600f026371f2ade8a6b22
+MD5 409fe5cbda78b34acdc2ab139e980275 ChangeLog 1792
+RMD160 e97cc8790b944d78818520cc226073178e747292 ChangeLog 1792
+SHA256 d659b50fa40ef144f1d80f80c532eef4f89c60810df600f026371f2ade8a6b22 ChangeLog 1792
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210
 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210
 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210
-MD5 209efb222fc077ee2592589b114e7b6c files/digest-netkit-tftp-0.17-r2 247
-RMD160 a58f024955731eba24b066f566b900c824237990 files/digest-netkit-tftp-0.17-r2 247
-SHA256 d182b4e93d5175e8698237a06acba7a150d6c17a48f9a89e41a1eae42d092673 files/digest-netkit-tftp-0.17-r2 247
+MD5 209efb222fc077ee2592589b114e7b6c files/digest-netkit-tftp-0.17-r3 247
+RMD160 a58f024955731eba24b066f566b900c824237990 files/digest-netkit-tftp-0.17-r3 247
+SHA256 d182b4e93d5175e8698237a06acba7a150d6c17a48f9a89e41a1eae42d092673 files/digest-netkit-tftp-0.17-r3 247
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
 }