Add patch to fix compilation on Mac OS X using patch grabbed from upstream bugtracker

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

4 files changed, 28 insertions, 17 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index e2742339f50a..6438867cb014 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.230 2010/03/19 00:25:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.231 2010/03/20 17:48:09 grobian Exp $
+
+  20 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  +files/openmotif-2.3.2-darwin.patch, openmotif-2.3.3.ebuild:
+  Add patch to fix compilation on Mac OS X using patch grabbed from upstream
+  bugtracker
 
 *openmotif-2.3.3 (18 Mar 2010)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 45af7ff1ea9a..8c1f513c0627 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.1-ac-editres.patch 358 RMD160 2bace990711052d7d26a405aa63d6696a33ca50c SHA1 a83e8567f5bc9998f9cbdfbfafce007ac44009a8 SHA256 6ef38a5a3532e3a8d6be85549026410340da0d98aa97dd683aeb70eb5b9c5d52
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
+AUX openmotif-2.3.2-darwin.patch 485 RMD160 28edaf08c8e267b01c5afbd0d3dbf2c7d5ca8eea SHA1 f5823efcb4de3a37429000da58d859e0c9e71e30 SHA256 b0e7139dc091d8da390cc896e8e4a0cf04b7ca5599df9eb71ab4cceff6b01657
 AUX openmotif-2.3.2-ddd-layout.patch 274 RMD160 a99f67abb3722b993cc0ef5277dc5f39aacc7bed SHA1 58f93f5b8b376de628f6d406af9a94662b489000 SHA256 f3de455ff830de4cb08a5cc8ee0bba10bb730bbc8ab448749ce99b98329e13e0
 AUX openmotif-2.3.2-ldflags.patch 654 RMD160 8756d40e95f64a851838042f9cf2152a1b6e9f61 SHA1 f0f9958a259487b0ef6c9d0d9daf8ab2415faa1d SHA256 70236c905c93a50354d990fdb500ba32b94bb28b90ccf8b4ca5052d4ac23ca80
 AUX openmotif-2.3.2-libpng14.patch 339 RMD160 0c4b88048ef382c9690c467263e51b845b7240ae SHA1 1ff64ff0bf948d7a96751114c8d374b689b3cbe0 SHA256 54dde5fa69a3a1fc99455b57317c7c004dad050071d6b41e356e184e72dedf32
@@ -14,13 +12,6 @@ DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cb
 DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
 EBUILD openmotif-2.3.2-r2.ebuild 5158 RMD160 8caa8463db5e72629465026add4077c80cc1300e SHA1 801034c12573996e6cb6d6740e32258bc90d6c31 SHA256 c89af559a0fadf869b2a7f6cd43c275f041b3843e8f25fae6256af47228f248a
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
-EBUILD openmotif-2.3.3.ebuild 4851 RMD160 7f994f7f8763d10212bb83bfd87f3e6b5d84a0d1 SHA1 b0a75af4b5f1fea06bbf99e5e6a8b2297e59c202 SHA256 e5ae98b248256ebe77adb8c3ddc2876d892d71a5ab4e1abff307651a38007c49
-MISC ChangeLog 34923 RMD160 747898234aa3dc9162ebd3918d64eb96903926d8 SHA1 fcc211aa18e0f5e8482e467f804b001b3974f5f7 SHA256 45c799f7a3928a033fecb9c37db8c69cd65049c067e70050cfb7d2c286d10a87
+EBUILD openmotif-2.3.3.ebuild 4928 RMD160 3baa157dac1724f076527c6d2a65e633c6acc345 SHA1 39945ea9983f4906810879e0a7485960ff197224 SHA256 81276db96a95a71797dfe167e1a11fb7595f38dd7a3fe7a864e733211b789509
+MISC ChangeLog 35132 RMD160 860b6d7ce054aa62f03b12d07da0de527a375e14 SHA1 51198d7e1e50a032e25834697a31c298f06e8f2f SHA256 3c761d2ebfcb39c5d4dcddf58e2262e49c2e4e638c6df957e68adb01b5b5b86b
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuixMYACgkQOeoy/oIi7uwmsgCeMUFuUmIoki024I+4+k2OShRJ
-QVgAnjrkNFSp2mbXOYfKjfGiKl0vQFlx
-=Xwj4
------END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch b/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch
new file mode 100644
index 000000000000..feae00305ad6
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.3.2-darwin.patch
@@ -0,0 +1,14 @@
+http://bugs.motifzone.net/showattachment.cgi?attach_id=259
+http://bugs.motifzone.net/long_list.cgi?buglist=1479
+
+--- openmotif-2.3.2.org/clients/uil/UilDefI.h	2004-11-18 08:54:32.000000000 +0000
++++ openmotif-2.3.2/clients/uil/UilDefI.h	2009-11-08 13:24:29.000000000 +0000
+@@ -283,7 +283,7 @@
+ #include "UilIODef.h"
+ #include "UilDiagDef.h"
+ #include "UilSarDef.h"
+-#if defined(linux)
++#if defined(linux) || defined(__APPLE__)
+ #define YYSTYPE yystype
+ #endif
+ #include "UilLexPars.h"
diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
index 64916e98827a..24405739c8d6 100644
--- a/x11-libs/openmotif/openmotif-2.3.3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.1 2010/03/19 00:25:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.2 2010/03/20 17:48:09 grobian Exp $
 
-EAPI=3
+EAPI="3"
 
 inherit autotools eutils flag-o-matic multilib
 
@@ -79,6 +79,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.3.2-darwin.patch"
 	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
 	epatch "${FILESDIR}/${PN}-2.3.2-libpng14.patch"
 	[[ ${CHOST} == *-solaris2.11 ]] \
@@ -123,11 +124,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 MWMRCDIR=/etc/X11/mwm || die "emake failed"
+	emake -j1 MWMRCDIR="${EPREFIX}"/etc/X11/mwm || die "emake failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" MWMRCDIR=/etc/X11/mwm install \
+	emake -j1 DESTDIR="${D}" MWMRCDIR="${EPREFIX}"/etc/X11/mwm install \
 		|| die "emake install failed"
 
 	# mwm default configs