add bsd patch to clean up header inclusion

(Portage version: 2.0.51.22-r2)

5 files changed, 62 insertions, 23 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index d4c3b55d29db..60e332b49e9f 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freetype
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.77 2005/09/07 13:07:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.78 2005/10/09 16:04:25 foser Exp $
+
+*freetype-1.3.1-r5 (09 Oct 2005)
+
+  09 Oct 2005; Marinus Schraal <foser@gentoo.org> freetype-1.3.1-r5.ebuild :
+  Add patch to remove redundant header inclusions that break bsd (#104016)
+  Fix uclibctoolize -> elibtoolize
 
   07 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   freetype-1.3.1-r4.ebuild:
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index e27a5c022481..22ad7adcfaf9 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 83c03cdedf5536372bcc63f4c747ff35 freetype-1.3.1-r4.ebuild 3091
 MD5 40161b63bd5b3d8af07e6563561d13aa freetype-2.1.10.ebuild 1812
 MD5 83876af503362fea42fa81def8e9bf04 freetype-1.3.1-r3.ebuild 2741
+MD5 b20f375017ba1c9c071a38624b97524d freetype-1.3.1-r5.ebuild 3177
 MD5 217dfa3385a4883eccd8449f21269bed ChangeLog 11177
 MD5 68a04e23ccfb7971cff8ce012aee659c metadata.xml 221
 MD5 be70a34545fbf083a16aedca4c1c1c43 freetype-2.1.9-r1.ebuild 2160
@@ -12,12 +10,7 @@ MD5 f96e5959658f100cb8d1af8a197b8c45 files/freetype-2.1.10-internal_header.patch
 MD5 10bd432787c1a182edece351dbf82809 files/config.mk 1240
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r3 136
 MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r4 136
+MD5 d42207bb27a2046e454b706339adaa25 files/digest-freetype-1.3.1-r5 136
+MD5 57e853818bd9b49043095a0d17859f81 files/freetype-1.3.1-malloc.patch 180
 MD5 f9a58f527647abffba59f1db219693a4 files/digest-freetype-2.1.10 141
 MD5 29bbc2c883bf52623f42dd235cd23fd6 files/digest-freetype-2.1.9-r1 132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHuY9KRy60XGEcJIRArwQAJ9v+XJhmp/RC1PHVJSCq47pUsqt2ACgp+fk
-4uR6hSbvGBgmdmmAASYcXvI=
-=UKr5
------END PGP SIGNATURE-----
diff --git a/media-libs/freetype/files/digest-freetype-1.3.1-r3 b/media-libs/freetype/files/digest-freetype-1.3.1-r5
index 5ec419d7c63e..5ec419d7c63e 100644
--- a/media-libs/freetype/files/digest-freetype-1.3.1-r3
+++ b/media-libs/freetype/files/digest-freetype-1.3.1-r5
diff --git a/media-libs/freetype/files/freetype-1.3.1-malloc.patch b/media-libs/freetype/files/freetype-1.3.1-malloc.patch
new file mode 100644
index 000000000000..bf69c7f56339
--- /dev/null
+++ b/media-libs/freetype/files/freetype-1.3.1-malloc.patch
@@ -0,0 +1,24 @@
+Index: freetype-1.3.1/contrib/ttfbanner/ttfbanner.c
+===================================================================
+--- freetype-1.3.1.orig/contrib/ttfbanner/ttfbanner.c
++++ freetype-1.3.1/contrib/ttfbanner/ttfbanner.c
+@@ -4,7 +4,6 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include "freetype.h"
+ #include "ttfbanner.h"
+Index: freetype-1.3.1/freetype1-contrib/ttfbanner/ttfbanner.c
+===================================================================
+--- freetype-1.3.1.orig/freetype1-contrib/ttfbanner/ttfbanner.c
++++ freetype-1.3.1/freetype1-contrib/ttfbanner/ttfbanner.c
+@@ -4,7 +4,6 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include "freetype.h"
+ #include "ttfbanner.h"
diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r5.ebuild
index 1d232cf8a45d..152ab7264f02 100644
--- a/media-libs/freetype/freetype-1.3.1-r3.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.29 2005/01/15 21:49:16 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r5.ebuild,v 1.1 2005/10/09 16:04:25 foser Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -13,7 +13,7 @@
 # When we update to freetype-pre1.4 or any later version, we should use
 # the included contrib directory and not download any additional files.
 
-inherit gnuconfig
+inherit eutils libtool
 
 P2=${PN}1-contrib
 DESCRIPTION="TTF-Library"
@@ -25,20 +25,28 @@ SRC_URI="ftp://ftp.freetype.org/freetype/freetype1/${P}.tar.gz
 
 LICENSE="FTL"
 SLOT="1"
-KEYWORDS="x86 ppc sparc alpha arm hppa amd64 ia64 s390"
-IUSE="nls"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls tetex"
 
-DEPEND="virtual/libc"
-RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="virtual/libc
+	tetex? ( virtual/tetex )"
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
+
 	cd ${WORKDIR}
 	unpack ${P}.tar.gz
 	# freetype1-contrib goes under freetype-1.3.1
 	cd ${S}
 	unpack ${P2}.tar.gz
 
-	gnuconfig_update
+	cd ${S}
+	# remove unneeded include for BSD (#104016)
+	epatch ${FILESDIR}/${P}-malloc.patch
+
+	elibtoolize
+
 }
 
 src_compile() {
@@ -56,10 +64,12 @@ src_compile() {
 	make || die
 
 	# make contrib utils
-	for x in ttf2bdf ttf2pfb ttf2pk ttfbanner
-	do
+
+	use tetex && myconf="${myconf} --with-kpathsea-dir=/usr/lib"
+
+	for x in ttf2bdf ttf2pfb ttf2pk ttfbanner ; do
 		cd ${S}/freetype1-contrib/${x}
-		econf || die
+		econf ${myconf} || die
 		make || die
 	done
 }
@@ -70,10 +80,10 @@ src_install() {
 	# Seems to require a shared libintl (getetxt comes only with a static one
 	# But it seems to work without problems
 
-	make -f arch/unix/Makefile prefix=${D}/usr install || die
+	make -f arch/unix/Makefile prefix=${D}/usr libdir=${D}/usr/$(get_libdir) install || die
 
 	cd ${S}/po
-	make prefix=${D}/usr install || die
+	make prefix=${D}/usr libdir=${D}/usr/$(get_libdir) install || die
 
 	cd ${S}
 	dodoc announce PATENTS README readme.1st
@@ -88,6 +98,12 @@ src_install() {
 		ttf2pk/.libs/ttf2pk ttf2pk/.libs/ttf2tfm \
 		ttfbanner/.libs/ttfbanner \
 		|| die
+	if use tetex ; then
+		insinto /usr/share/texmf/ttf2pk
+		doins ttf2pk/data/* || die
+		insinto /usr/share/texmf/ttf2pfb
+		doins ttf2pfb/Uni-T1.enc || die
+	fi
 	newman ttf2bdf/ttf2bdf.man ttf2bdf/ttf2bdf.man.1
 	doman ttf2bdf/ttf2bdf.man.1
 	docinto contrib