ÂFixes compilation in FreeBSD wrt #138123.

Package-Manager: portage-2.1.1_pre3

4 files changed, 34 insertions, 22 deletions

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 56a74c6de529..d1d10c47e0ab 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/man
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.89 2006/06/22 04:42:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.90 2006/07/18 20:07:39 the_paya Exp $
+
+  18 Jul 2006; Javier Villavicencio <the_paya@gentoo.org>
+  +files/man-1.6d-fbsd.patch, man-1.6d.ebuild:
+  Fixes compilation in FreeBSD wrt #138123
 
 *man-1.6d (22 Jun 2006)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 97587a0cdb7e..902568d184e8 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX makewhatis.cron 130 RMD160 8d0140b6ffe643b3195665a192ffcbcbb4535233 SHA1 9174c3c08a6d11ac668073d8778f29b84672568f SHA256 9eefb69edfd3bbc2fcea6af4d0f8a207b094b623b40d916b2eb45d2609ad2249
 MD5 8b2016cc778ed4e2570b912c0f420266 files/makewhatis.cron 130
 RMD160 8d0140b6ffe643b3195665a192ffcbcbb4535233 files/makewhatis.cron 130
@@ -69,15 +66,19 @@ AUX man-1.6c-makewhatis-typo.patch 461 RMD160 631470dbbccc5d339513e2dea786624e59
 MD5 76741ffabcab0009a9602bee8f9c47bf files/man-1.6c-makewhatis-typo.patch 461
 RMD160 631470dbbccc5d339513e2dea786624e594f091e files/man-1.6c-makewhatis-typo.patch 461
 SHA256 e4129d7c6d96ac65f1a1ba3e1400ffec3290cb39921fc855351c8c4b5c1e4e84 files/man-1.6c-makewhatis-typo.patch 461
+AUX man-1.6d-fbsd.patch 308 RMD160 e9dcf44d97d582c52230c00a8a085ac6a4f22c40 SHA1 d900a66c1d0f1af446a24318a884a3bd63f8978c SHA256 be33e9fbaa7d22cf7fb44eae65504ca115a779ef34e15191d396ec68cb2f2e00
+MD5 44319e5238442e8272f6ab2aecccbb33 files/man-1.6d-fbsd.patch 308
+RMD160 e9dcf44d97d582c52230c00a8a085ac6a4f22c40 files/man-1.6d-fbsd.patch 308
+SHA256 be33e9fbaa7d22cf7fb44eae65504ca115a779ef34e15191d396ec68cb2f2e00 files/man-1.6d-fbsd.patch 308
 AUX man-1.6d-headers.patch 929 RMD160 b56a2858bb075d8d4025791c801909fec89358de SHA1 6af23e84ab0436f96a566ef1c59841661e088722 SHA256 113670cdad5c09f51d3981442a271cbf449b8d737ded3ff63c382b1fed37d687
 MD5 f3188dbe359f6d1e72d97961ae3025fd files/man-1.6d-headers.patch 929
 RMD160 b56a2858bb075d8d4025791c801909fec89358de files/man-1.6d-headers.patch 929
 SHA256 113670cdad5c09f51d3981442a271cbf449b8d737ded3ff63c382b1fed37d687 files/man-1.6d-headers.patch 929
 DIST man-1.5p.tar.gz 233732 RMD160 f338f34392d4a38449e57383f9ba85d22580f6ff SHA256 e851e312c3bd1f143ab48be53368099c03ec1ec3f6c647bebfc9e765d54c2fff
-DIST man-1.6.tar.gz 234440 RMD160 0569871b03473385ffed5c34a57bfc17dbd05d78 SHA256 ec0e259550d520e0b7456cf2eb750a98cbc0ed63e497f0ad3b4c2ea1ce160811
+DIST man-1.6.tar.gz 234440 RMD160 0569871b03473385ffed5c34a57bfc17dbd05d78 SHA1 82c3244a6aef222abef41c91659847c0b4db08de SHA256 ec0e259550d520e0b7456cf2eb750a98cbc0ed63e497f0ad3b4c2ea1ce160811
 DIST man-1.6a.tar.gz 234660 RMD160 eb3b523142aa3163c6caa457f54abd0af611dd22 SHA256 2b4cf501b379066a3197a018f9b270a70a41818f7df0d5722588e4801e626f7a
 DIST man-1.6b.tar.gz 238993 RMD160 b1917219bb28aae3431297ba2e9c60a4ec22eee1 SHA256 2186dcdb79a9348e0ac5b984fa2e7d255e2a0dbfef55fa88b70677b9c66b4029
-DIST man-1.6c.tar.gz 245178 RMD160 1894ed00284ad522a80b256f20b85bdb058af48f SHA256 ad5f5e0b6e1cb1e223b5a8dcbac1826c6cfa710d1e858c46a0b60a99e23d2842
+DIST man-1.6c.tar.gz 245178 RMD160 1894ed00284ad522a80b256f20b85bdb058af48f SHA1 e9ac12abd0f806f936431faaf1dfad4b9d54c1df SHA256 ad5f5e0b6e1cb1e223b5a8dcbac1826c6cfa710d1e858c46a0b60a99e23d2842
 DIST man-1.6d.tar.gz 270140 RMD160 2c476a735c211acbb478d604b73a1becb54cb87b SHA1 f83aecdcd922f0cf3515665b8e1e0e2514c99286 SHA256 a6d03bdabe16542a5a51471b5d8e7eaa50ad782577c7b31d9c478382097cf4eb
 EBUILD man-1.5p.ebuild 2626 RMD160 9e0ab6fe0754cf889267860c56cbac297df5084d SHA1 219e4285f54092734288bf13ea8f25667930bee2 SHA256 53329e65b19a226acc2912bf7df7cceb8015b5529fc19046830bc42bb0b0d5a1
 MD5 dab5214f30dcc5dadd8cf8bcd83ba9cb man-1.5p.ebuild 2626
@@ -99,14 +100,14 @@ EBUILD man-1.6c.ebuild 3287 RMD160 e746b3c5b259e827b27e3351e8f99cfeaeec77fc SHA1
 MD5 bc0bbfb62ef4741d7fb4f13ec2af9e2d man-1.6c.ebuild 3287
 RMD160 e746b3c5b259e827b27e3351e8f99cfeaeec77fc man-1.6c.ebuild 3287
 SHA256 2980dffafd7ac6e662b4f57285805d7a19f12ac3009db12fe9f5e2784001351a man-1.6c.ebuild 3287
-EBUILD man-1.6d.ebuild 3176 RMD160 6c9fe8aca9658d9c48a5c279e89d6c0da58b08f8 SHA1 3f1e0a8ead797bbc46ce17f2e0bd7e82616dd31a SHA256 9e8165c98d50926474395a1e1ae801262c9c88c7f3c4e01993a8b75af972e708
-MD5 e435ff9638445e624255496493ec7bec man-1.6d.ebuild 3176
-RMD160 6c9fe8aca9658d9c48a5c279e89d6c0da58b08f8 man-1.6d.ebuild 3176
-SHA256 9e8165c98d50926474395a1e1ae801262c9c88c7f3c4e01993a8b75af972e708 man-1.6d.ebuild 3176
-MISC ChangeLog 13291 RMD160 8df9dc72f04225372e94f9041e9d5b35e428882a SHA1 a49670b57f16d98d83eef425b3a634edda0aed99 SHA256 90afa3c31748f59d930b68c463a293269771edc18b9a54b92796f7e12105e6f3
-MD5 a58696486c668f19cbbcb951fbfda7da ChangeLog 13291
-RMD160 8df9dc72f04225372e94f9041e9d5b35e428882a ChangeLog 13291
-SHA256 90afa3c31748f59d930b68c463a293269771edc18b9a54b92796f7e12105e6f3 ChangeLog 13291
+EBUILD man-1.6d.ebuild 3265 RMD160 008ab9533a5529ff118c2de1c6a9b5ea09b3f90a SHA1 4e5a363d40f4fd7e0b8dab515bc535cf048c4ad4 SHA256 492b8bfaa11411cc7524b8caf69b1fb908aa94f2574a0986f53dfe6d6eaf2941
+MD5 5921876d83301161c4377feca8c7ecb8 man-1.6d.ebuild 3265
+RMD160 008ab9533a5529ff118c2de1c6a9b5ea09b3f90a man-1.6d.ebuild 3265
+SHA256 492b8bfaa11411cc7524b8caf69b1fb908aa94f2574a0986f53dfe6d6eaf2941 man-1.6d.ebuild 3265
+MISC ChangeLog 13442 RMD160 3e7f4f025334c42a2dbb266a8b8cfcf2535c743f SHA1 139df18054070ccc9d97454db523edfa21e97934 SHA256 8414d4b386fbc44a7d3319b55ddd9a9a65ac1aa5ad0f1d1b8d0154c7ff98c9a1
+MD5 db7dca6cffa6a3a07e1ffb1952cb5592 ChangeLog 13442
+RMD160 3e7f4f025334c42a2dbb266a8b8cfcf2535c743f ChangeLog 13442
+SHA256 8414d4b386fbc44a7d3319b55ddd9a9a65ac1aa5ad0f1d1b8d0154c7ff98c9a1 ChangeLog 13442
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -129,10 +130,3 @@ SHA256 c21d226a38ea7063984990a078c1c06e93988befd4774246bb4b02be8bc0d327 files/di
 MD5 213003d588ce0a364038ed043cde8807 files/digest-man-1.6d 226
 RMD160 7f3d633eee73d7d6b6a5bca47f8579694428626a files/digest-man-1.6d 226
 SHA256 3c06b90149690c7de5586cf6a94dd561580b511eb40d33533aa5e9460a42cb47 files/digest-man-1.6d 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEqC4SamhnQswr0vIRAuQRAJ9NruvyhgizFKTcp84UwnMhLqWjkwCfcaQ+
-7ksZ6NrsF0uW/4b6kuGNiJ0=
-=tF1m
------END PGP SIGNATURE-----
diff --git a/sys-apps/man/files/man-1.6d-fbsd.patch b/sys-apps/man/files/man-1.6d-fbsd.patch
new file mode 100644
index 000000000000..5882645d9018
--- /dev/null
+++ b/sys-apps/man/files/man-1.6d-fbsd.patch
@@ -0,0 +1,11 @@
+--- man-1.6d/gencat/genlib.c.orig	2006-06-26 21:26:10 -0300
++++ man-1.6d/gencat/genlib.c	2006-06-26 21:34:46 -0300
+@@ -54,7 +54,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__FreeBSD__)
+ #include <memory.h>
+ static int bcopy(src, dst, length)
+ char *src, *dst;
diff --git a/sys-apps/man/man-1.6d.ebuild b/sys-apps/man/man-1.6d.ebuild
index c2e02c0874fb..91edb65e700f 100644
--- a/sys-apps/man/man-1.6d.ebuild
+++ b/sys-apps/man/man-1.6d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6d.ebuild,v 1.2 2006/07/02 20:29:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6d.ebuild,v 1.3 2006/07/18 20:07:39 the_paya Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -59,6 +59,9 @@ src_unpack() {
 	# use non-lazy binds for man
 	epatch "${FILESDIR}"/man-1.6b-build.patch
 
+	# Fixes compilation in FreeBSD wrt #138123
+	epatch "${FILESDIR}"/man-1.6d-fbsd.patch
+
 	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
 }