Add patch to build on FreeBSD and add ~x86-fbsd keyword. See bug #146536.

Package-Manager: portage-2.1.1_rc1-r5

diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index bf458c8f77e4f9b6c0a7b017e8c7a86bbc2c3f2d..4157399c8252b1ec960e8abfb720e282f6d05f4b 100644 (file)
--- a/app-text/linuxdoc-tools/ChangeLog
+++ b/app-text/linuxdoc-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/linuxdoc-tools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.4 2006/07/01 19:15:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/ChangeLog,v 1.5 2006/09/06 23:03:42 flameeyes Exp $
+
+  06 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/linuxdoc-tools-0.9.21-malloc.patch,
+  linuxdoc-tools-0.9.21_p4.ebuild:
+  Add patch to build on FreeBSD and add ~x86-fbsd keyword. See bug #146536.
 
 *linuxdoc-tools-0.9.21_p4 (01 Jul 2006)
 

diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 6f34a41915762b0e8adfa68e64be23d73f1d6fab..570d8cb09913fd86e185dabe9144da881eca9897 100644 (file)
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -13,6 +13,10 @@ AUX linuxdoc-tools-0.9.20-strip.patch 348 RMD160 b44afd4975bcf7acd0137e4fe7a71b6
 MD5 0dd08fcb73bc04a46f6af4165b015554 files/linuxdoc-tools-0.9.20-strip.patch 348
 RMD160 b44afd4975bcf7acd0137e4fe7a71b66c5c5acb8 files/linuxdoc-tools-0.9.20-strip.patch 348
 SHA256 cf2e8127998c6c4215b7ea99035367780ac1767a83a1591359e5ee7f2c1a1d11 files/linuxdoc-tools-0.9.20-strip.patch 348
+AUX linuxdoc-tools-0.9.21-malloc.patch 319 RMD160 661ea0b64b0051362dbb856830b260d0d6650b50 SHA1 49bb3101115ca0ec40d7c327d24c12567c2c3092 SHA256 37739ab14bb0e2f7c89be84043c865eefe7d9f5473284ddd97fb1c05dd7916a3
+MD5 afd04d86a41faa67feb2cb399c97ebe4 files/linuxdoc-tools-0.9.21-malloc.patch 319
+RMD160 661ea0b64b0051362dbb856830b260d0d6650b50 files/linuxdoc-tools-0.9.21-malloc.patch 319
+SHA256 37739ab14bb0e2f7c89be84043c865eefe7d9f5473284ddd97fb1c05dd7916a3 files/linuxdoc-tools-0.9.21-malloc.patch 319
 AUX linuxdoc-tools-fi.patch 1126 RMD160 164cf2230e725ce43a7c0801cdd13c413f8a319e SHA1 c20027f6b997c72ff7dea1d95f5f5aa55446bcdf SHA256 57e547987c66153c5cb5add232c8b207e71155e72f6fa2df5752a8c937f4c9be
 MD5 5562df4a3f96b9fa60ef108b255ceffa files/linuxdoc-tools-fi.patch 1126
 RMD160 164cf2230e725ce43a7c0801cdd13c413f8a319e files/linuxdoc-tools-fi.patch 1126
@@ -23,14 +27,14 @@ EBUILD linuxdoc-tools-0.9.21.ebuild 1176 RMD160 5a8c72af4c8756aa5b0107f4f4f1c451
 MD5 064aafe6902c2e07a7a7a34cf7295b7d linuxdoc-tools-0.9.21.ebuild 1176
 RMD160 5a8c72af4c8756aa5b0107f4f4f1c45149a1fb17 linuxdoc-tools-0.9.21.ebuild 1176
 SHA256 ff11108d9c6194786a60aa552e0ba9a63e144dca8c7e4adfde800f46d19eac11 linuxdoc-tools-0.9.21.ebuild 1176
-EBUILD linuxdoc-tools-0.9.21_p4.ebuild 2270 RMD160 1e29c2ded105e999f1ce3423121fb4f3ad811302 SHA1 a6a26663d9d8207fc694e5d8fdd8304802b4405e SHA256 375bb074191eb0f26abd9a8d36eb90fd15467c2bee46e1ad13b521616eabfde8
-MD5 977836bc4f5b63aadc8ceace6b29a9fb linuxdoc-tools-0.9.21_p4.ebuild 2270
-RMD160 1e29c2ded105e999f1ce3423121fb4f3ad811302 linuxdoc-tools-0.9.21_p4.ebuild 2270
-SHA256 375bb074191eb0f26abd9a8d36eb90fd15467c2bee46e1ad13b521616eabfde8 linuxdoc-tools-0.9.21_p4.ebuild 2270
-MISC ChangeLog 1098 RMD160 b5b9f9775efeb59de6849c8c950364c6cd5c5f50 SHA1 d9f27bcc6c0d89da5b6aa0deb653b430f394c1c0 SHA256 5f70f3518a9cb560d22f46a967b9cc881f14d1186acfda3363cea4ed741613fc
-MD5 ae54037eb135612f1c53a0e79bd38491 ChangeLog 1098
-RMD160 b5b9f9775efeb59de6849c8c950364c6cd5c5f50 ChangeLog 1098
-SHA256 5f70f3518a9cb560d22f46a967b9cc881f14d1186acfda3363cea4ed741613fc ChangeLog 1098
+EBUILD linuxdoc-tools-0.9.21_p4.ebuild 2350 RMD160 2494981beeceeb0de01c48b61730d3813f38cad0 SHA1 38bf119602eeb43357fda86935193124580f81c1 SHA256 45b7e787558b8adb6b6e479aadd73f9129c80d79f4993ccbcf2601af4a2a39ad
+MD5 3037631f498821a6f620896fb0114e4f linuxdoc-tools-0.9.21_p4.ebuild 2350
+RMD160 2494981beeceeb0de01c48b61730d3813f38cad0 linuxdoc-tools-0.9.21_p4.ebuild 2350
+SHA256 45b7e787558b8adb6b6e479aadd73f9129c80d79f4993ccbcf2601af4a2a39ad linuxdoc-tools-0.9.21_p4.ebuild 2350
+MISC ChangeLog 1311 RMD160 d6e54283ee8547eda3d46c5db469d628fefb3109 SHA1 91a62806800a6a9106b546440019a0da199fee3c SHA256 21fc2d12b8def3d8cf7943ed30a9ade621e859772dcf8f7e735ef95ba2f0fbed
+MD5 9100ed12e4a683c625d38de7d115fbb6 ChangeLog 1311
+RMD160 d6e54283ee8547eda3d46c5db469d628fefb3109 ChangeLog 1311
+SHA256 21fc2d12b8def3d8cf7943ed30a9ade621e859772dcf8f7e735ef95ba2f0fbed ChangeLog 1311
 MISC metadata.xml 648 RMD160 111a055dafe82bc88b4734fa62b48bf8d8ac2ee2 SHA1 8bd67396644ad2323dddc6f60e2753f73419ead9 SHA256 566219da5a776449e607f466e3e07a5411a9769775872d48800e10c34663146e
 MD5 564c9aa2922a7ae31ab14119b850ea40 metadata.xml 648
 RMD160 111a055dafe82bc88b4734fa62b48bf8d8ac2ee2 metadata.xml 648
@@ -42,9 +46,9 @@ MD5 8f416727d3ad212105ab7e0f953563e3 files/digest-linuxdoc-tools-0.9.21_p4 277
 RMD160 cf4c80a8925527c11816f1004e6d22618f635b9f files/digest-linuxdoc-tools-0.9.21_p4 277
 SHA256 8d77085155c7c39ca544c42bcc9091d388101b60f7e715b5c4c245cae495a3e7 files/digest-linuxdoc-tools-0.9.21_p4 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEpsoj1ZcsMnZjRyIRAmTAAKC+kEqXr8VYqPqYtC5j3sIKGauffACfQRDB
-T9n7SHKP/7yPO1NHkNZh5kg=
-=HcaW
+iD8DBQFE/1PVAiZjviIA2XgRAta0AKCpiTL5GQR5fuYcqsKtOWPBOTK2NQCfbSIO
+RTmSMxHEB556w4GJUxSdOcU=
+=IQC2
 -----END PGP SIGNATURE-----

diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
new file mode 100644 (file)
index 0000000..2f5b3dc
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch
@@ -0,0 +1,13 @@
+Index: linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
+===================================================================
+--- linuxdoc-tools-0.9.21.orig/rtf-fix/rtf2rtf.l
++++ linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l
+@@ -22,7 +22,7 @@
+ 
+ %{
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 

diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild
index 7e17b4b51fcc1a6429a34fbc1dfa9750692070bd..ca90646436b33731b37044bdddd4152ddd842b7d 100644 (file)
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.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/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild,v 1.1 2006/07/01 19:15:36 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild,v 1.2 2006/09/06 23:03:42 flameeyes Exp $
 
 # If docs fails to generate with the following type of errors:
 #
@@ -23,7 +23,7 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="KenMacLeod SGMLUG"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="tetex"
 
 DEPEND="app-text/openjade
@@ -49,12 +49,13 @@ src_unpack() {
        epatch "${FILESDIR}/${PN}-0.9.13-letter.patch"
        epatch "${FILESDIR}/${PN}-0.9.20-lib64.patch"
        epatch "${FILESDIR}/${PN}-0.9.20-strip.patch"
+       epatch "${FILESDIR}/${PN}-0.9.21-malloc.patch"
 }
 src_compile() {
        local myconf="--with-installed-iso-entities"
 
        econf $myconf || die "./configure failed"
-       emake || die "Compilation failed"
+       emake CFLAGS="${CFLAGS}" || die "Compilation failed"
 }
 
 src_install() {