Add patch from upstream to fix compilation on Darwin, BSD and possibly Solaris systems

Package-Manager: portage-2.2.01.18125-prefix/cvs/Darwin powerpc

4 files changed, 77 insertions, 4 deletions

diff --git a/app-text/xmlstarlet/ChangeLog b/app-text/xmlstarlet/ChangeLog
index 31df37c50058..9cd846ef3650 100644
--- a/app-text/xmlstarlet/ChangeLog
+++ b/app-text/xmlstarlet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xmlstarlet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/ChangeLog,v 1.23 2011/03/15 17:31:27 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/ChangeLog,v 1.24 2011/03/26 12:48:13 grobian Exp $
+
+  26 Mar 2011; Fabian Groffen <grobian@gentoo.org> xmlstarlet-1.0.6.ebuild,
+  +files/xmlstarlet-1.0.6-setmode.patch:
+  Add patch from upstream to fix compilation on Darwin, BSD and possibly
+  Solaris systems
 
 *xmlstarlet-1.0.6 (15 Mar 2011)
 
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 8735ef70dc78..6b75ced6af5c 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xmlstarlet-1.0.6-setmode.patch 1420 RMD160 e338875fe0319251a88c362fe67feadaa7f84bea SHA1 66a85434c453a6ec4ceb75056840ae8bf3df2458 SHA256 3e1e01e8fc69b1eb59f905d565f9fc2bd17c708b1819e426638ec8be6427615e
 DIST xmlstarlet-1.0.1.tar.gz 320847 RMD160 daa43d5731d9868a2f31c34908212cbc3896a08d SHA1 48fb2fa7ac9c2c6640b4f21f44459cb08369c18b SHA256 161c24cfbc54e141c230d2a12b91f21dfd552fde4c9f4b0cf975dd691580d698
 DIST xmlstarlet-1.0.2.tar.gz 375692 RMD160 02fd31bb13d5950020e843f3abdd48d9ffc1b9fa SHA1 ca1f06af07cc71c85dabe14000f5ad629c4502d5 SHA256 92cbbb9c557b514520e9e1f87babbe8c6ea88e9f83be770ff07e5f0cdd60451d
 DIST xmlstarlet-1.0.3.tar.gz 379746 RMD160 592e4ab16b93c2e78c1e9d7c27c19952ef42037b SHA1 053f75f656c2e7f865bcfcc56caa50620b6ca447 SHA256 a080bfb178671c6fc68ef25d797e9d21bcfd20fb4e0bcff46f4f1b4e6207f673
@@ -10,6 +14,13 @@ EBUILD xmlstarlet-1.0.2.ebuild 1357 RMD160 c9b0913dfe4ec9c1ae3da4813d59b3f39ea99
 EBUILD xmlstarlet-1.0.3.ebuild 1078 RMD160 c91e47557f3d92a326f86106083e98a18b0d379a SHA1 a5da246d24ff643613e1c5d05ecc00c3a5dda9af SHA256 89bd55dfc5a47a6f36bf6213752049839c13826e279d209b513a780f0e31c618
 EBUILD xmlstarlet-1.0.4.ebuild 891 RMD160 e2af613b8d2d74d5822808dce624285a31dd8cbf SHA1 89521fcfca6b95543b6c406639d091be0e8c11c1 SHA256 d16254793ed78497fc1e754eef4123595e80d859ef71adf261e14acb20a9e629
 EBUILD xmlstarlet-1.0.5.ebuild 905 RMD160 a10bd2fab8c001db00ded97582c58d076e4ef5ba SHA1 9707de1ce50b70b08a4da1956d97b17e1f71bcff SHA256 005c275e95230c6121b39321e142d3a086020da7863a7f5e4f0072522e4089ef
-EBUILD xmlstarlet-1.0.6.ebuild 905 RMD160 20f54faf14baf7d01cd23b060b6e2f56afc1e412 SHA1 bc4a5226ea308f321a1ebbc6d81275a30978d558 SHA256 ca1a0e741614e9a6c2dafe4f2531a02f13be6fc181a403cbc68417fda05e6d9c
-MISC ChangeLog 3712 RMD160 086b2bd8d3244a3c50dbf92af75169b19307cc15 SHA1 b92e9d40803b3c89f121cdc7e18b5343ce00c037 SHA256 c035c38606d6f7c61642cfb3004180fa8e5e510e727c9b1557bc4ad8e0c308a6
+EBUILD xmlstarlet-1.0.6.ebuild 1006 RMD160 571bcf72da5116e6234998c072502c1e3bbec396 SHA1 18d2b2e02d28e071bcf5d8690f5fb685e38c55b0 SHA256 a38c0efc34d94693b97c9eaad413030777c0446884cf077f8aedbeff0edc8da5
+MISC ChangeLog 3923 RMD160 0137b80b03380dfa58fa0f76e27a430c1e440a06 SHA1 e7ef7d09a877306f6a765682e585f7052553bc0d SHA256 3c0ad93be06cc5b19ab0de0f789d35de680f4dbce9568355dbf6b6133154afad
 MISC metadata.xml 226 RMD160 f25eb4ca86a40c30907a17af15405a4eed8f8dd1 SHA1 a138ec2fd6f09173f0f3aecd6760cc10a65f5149 SHA256 2fae147e26acf275fb9a5f707d9a59882b82e302543a966c178bcd4fe19f5ab3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (Darwin)
+
+iEYEARECAAYFAk2N4D4ACgkQX3X2B8XHToleNQCeL3AbKGZd82Kjo2k6/0AcWZh/
+/koAn1v4BaYBJyslD8EZELNKatosASTd
+=Laf3
+-----END PGP SIGNATURE-----
diff --git a/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch b/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch
new file mode 100644
index 000000000000..034b732dbd29
--- /dev/null
+++ b/app-text/xmlstarlet/files/xmlstarlet-1.0.6-setmode.patch
@@ -0,0 +1,50 @@
+http://sourceforge.net/tracker/?func=detail&aid=3211822&group_id=66612&atid=515106
+http://xmlstar.git.sourceforge.net/git/gitweb.cgi?p=xmlstar/xmlstar;a=patch;h=5f2445dac0e2a255d89240ec919ecd753045cce5;hp=d0f9902aedc75cef168aa1a34593bc5b74e9669c
+
+
+From 5f2445dac0e2a255d89240ec919ecd753045cce5 Mon Sep 17 00:00:00 2001
+From: Noam Postavsky <npostavs@users.sourceforge.net>
+Date: Mon, 14 Mar 2011 18:13:37 -0400
+Subject: [PATCH 1/1] check that O_BINARY is declared before #include'ing io.h
+
+---
+ configure.ac   |    3 ++-
+ src/xml_C14N.c |    6 +++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b9eb53d..5b2d3bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,7 +109,8 @@ AS_IF([test "x$STATIC_LIBS" != xno],
+ 
+ AC_CHECK_FUNCS_ONCE([lstat stat])
+ 
+-AC_CHECK_DECL([O_BINARY], [], [], [[
++AC_CHECK_DECL([O_BINARY], [AC_DEFINE([HAVE_DECL_O_BINARY],1,[have O_BINARY])],
++[AC_DEFINE([HAVE_DECL_O_BINARY],0,[don't have O_BINARY])], [[
+ #include <io.h>
+ #include <fcntl.h>
+ ]])
+diff --git a/src/xml_C14N.c b/src/xml_C14N.c
+index 3ef1a7c..115e2ce 100644
+--- a/src/xml_C14N.c
++++ b/src/xml_C14N.c
+@@ -20,11 +20,11 @@
+ #include <stdlib.h>
+ #endif
+ 
+-#if !HAVE_SETMODE
+-# define setmode(fd, mode)
+-#else
++#if HAVE_SETMODE && HAVE_DECL_O_BINARY
+ # include <io.h>
+ # include <fcntl.h>
++#else
++# define setmode(fd, mode)
+ #endif
+ 
+ #include <libxml/xmlmemory.h>
+-- 
+1.7.0.1
+
diff --git a/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild b/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild
index d9ce7a8c58d9..91e6e0fb12f2 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild,v 1.1 2011/03/15 17:31:27 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.0.6.ebuild,v 1.2 2011/03/26 12:48:13 grobian Exp $
 
 EAPI="2"
 
+inherit eutils autotools
+
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
@@ -22,6 +24,11 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-setmode.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf --disable-static-libs
 }