summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-09-06 23:03:42 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-09-06 23:03:42 +0000
commit46254d72c583ebf7253b256c3ba3b7f94b146f73 (patch)
treebd6ddd126ca89618dc677b4c2b0fd66e41a6e6ad /app-text
parentRevision bump with a GCC patch and a security patch. Closing bug #142394 and... (diff)
downloadgentoo-2-46254d72c583ebf7253b256c3ba3b7f94b146f73.tar.gz
gentoo-2-46254d72c583ebf7253b256c3ba3b7f94b146f73.tar.bz2
gentoo-2-46254d72c583ebf7253b256c3ba3b7f94b146f73.zip
Add patch to build on FreeBSD and add ~x86-fbsd keyword. See bug #146536.
(Portage version: 2.1.1_rc1-r5)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/linuxdoc-tools/ChangeLog7
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch13
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.21_p4.ebuild7
3 files changed, 23 insertions, 4 deletions
diff --git a/app-text/linuxdoc-tools/ChangeLog b/app-text/linuxdoc-tools/ChangeLog
index bf458c8f77e4..4157399c8252 100644
--- 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/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
index 000000000000..2f5b3dc4a25a
--- /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 7e17b4b51fcc..ca90646436b3 100644
--- 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() {