Add ~x86-fbsd; deal with arch which has "-" in its name; add FreeBSD patch.

Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64

4 files changed, 64 insertions, 11 deletions

diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index 5925c003cdef..d38afaaa3b33 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xanim
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.30 2009/11/20 17:27:29 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.31 2011/11/20 13:39:09 naota Exp $
+
+  20 Nov 2011; Naohiro Aota <naota@gentoo.org> xanim-2.80.1-r4.ebuild,
+  +files/xanim-2.80.1-freebsd.patch:
+  Add ~x86-fbsd; deal with arch which has "-" in its name; add FreeBSD patch.
 
   20 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   xanim-2.80.1-r4.ebuild:
diff --git a/media-video/xanim/Manifest b/media-video/xanim/Manifest
index 2e9b51bf8899..28229e2dd6c4 100644
--- a/media-video/xanim/Manifest
+++ b/media-video/xanim/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xanim-2.80.1-freebsd.patch 328 RMD160 186684aef73d0d96d97ac00ab4b9e88faf10c81e SHA1 38429a7248a61e4e40f164a61e16434a70e70acb SHA256 99796a4c89c791e78074dbd75a09d1977561d7abe522125b8bde8562c5a00fd0
 AUX xanim-2.80.1-gcc41.patch 2346 RMD160 86ef21d9a89bfca0a6b2d96580e603d2ad6da855 SHA1 73807fe1f042b5e12ba67e8a98e89b900ed8040d SHA256 8ef7ac52da45708dc0dd52d573c735a96fff54983413bc0c9da4b9ad60fd635b
 DIST xa1.0_cyuv_linuxAlpha.o.gz 2053 RMD160 4b93f4df3fa1b04d920770703bfd985abe4746c0 SHA1 fcaebaafbe942e09b2bfe29f8bc9588de3d1d2f8 SHA256 3b0a75581e9e10d7f60a699514ee7bd9dd0271c1ba731d15e90b4bb0c12b7187
 DIST xa1.0_cyuv_linuxELFg21.o.gz 1141 RMD160 81ff86ccc99e72765da07c79708edfc496602235 SHA1 6d3c412bbd57be4f4afba550bd0f1b7287813b0e SHA256 9fa40166a40a20734ba1d00990d142a3961c2416e66dac3fe0767e8304aadb1a
@@ -12,6 +16,23 @@ DIST xa2.0_iv32_linuxPPC.o.Z 56163 RMD160 7e1904ea0d22c074d5e4d01526ac9508a285d3
 DIST xa2.0_iv32_sparcELF.o.Z 48813 RMD160 e4412117114a065d833e66fe0b04c64848ae60e1 SHA1 3837819a50d3d430149ac0f498db30cdec6245f3 SHA256 86b4613490ac3cadc73524cc433deafebedacbda692ad5f88bcb7c029113ad24
 DIST xa2.1_iv32_linuxELFg21.o.gz 29291 RMD160 2b2cf2a47cb9d91abe5d4558cd375919e69b1cff SHA1 395ce9f94e0710d67c0200f7a609868ab0969062 SHA256 41420dca15e5e546c455553b6434435d53de17a08a6307a79de75e753a85b3a1
 DIST xanim2801.tar.gz 441250 RMD160 d6cf77cb288d17866c569cb6cb571f87115ae6c0 SHA1 1966880880c3779d02199fbcd1acb771bc57f754 SHA256 72031927a70ab782e2b0a69daaef7894b0ec1c2c6c2d65d495aff5f50bbed0a9
-EBUILD xanim-2.80.1-r4.ebuild 3174 RMD160 3a21b9f9f14ebda4aa1dd72746e02cfbb3d24806 SHA1 8524a699987e9dbc8708ee1fb465fd3402b4c66f SHA256 04813b10ee5a53faaad2918f5fba4b83ef998f4704448d81e09afcae00812888
-MISC ChangeLog 4139 RMD160 5b5b10d296f880bb58a5cb13344361201a1b3661 SHA1 aa23f6b996919b34c66e14c1650427d8576879f2 SHA256 53e2b2efdad33d365e1d1fae7ea6b428e33ae25d75b03d31f243ebe0ac3f68c9
+EBUILD xanim-2.80.1-r4.ebuild 3616 RMD160 db976daf851dcaf4024792731f44d68787cbdd38 SHA1 d989d5a9dbb335f39a7db69beac9b93d62754f02 SHA256 fbbab87ef2b22ac80a6089f6b0312196b09e8ed094d2c719dc3b61f363b5f292
+MISC ChangeLog 4323 RMD160 711389d24c45bdb0c42dd7eee32e0c66a887d703 SHA1 552ad28e16378427f1ae2c6ce7de8d2816193280 SHA256 6828f88d255b1e089bb153ed3d0346a51d7928ec9e7112f3497c751a64a5d934
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOyQMLAAoJEDYO1FT4VRUUOdwP/i2yauZPFCPdR3LOx/V8MPCV
+qdpEC/+6hjbPG7/onqrS20tZTVWMsYUw4NK879Bb4BfKc8VSC73EnXnAt7Cu51YU
+Nd5M7ddTFmvSF0r8efmwZYjN7WQToyYp9/e2GG8h+kBi9eoodvgXQzxucQrisnSM
+BS6bceBm/lXIcIlaZZthwPn7B7IA9vy8P3aUcPzDOhHtf9Zq2xx+T0Jzb8kF2l7b
+YNmmw+xC73PlEMnlaPeHIgODqu0tRiHCwI0sy3HfiWnnVvjVU2L9JPNfs4kH76el
+9PQQZsYeSClIsQOQL7ARD6QAHP5YqbZTNtvMYjr/2Ogxajubrw22maSDpZMA6w3e
+xP9b13+BM4iL5U7DjNQZCDspedep6gb7DSmIhO575TGzGzSTSPcH6Lwi5rcbz99I
+wJtiy91GNC42ymSNPscvsecec8XFbBEE7vRXpU8q8l7fVQy1DQi37uYtBgc7u0Sw
+s95S2T+GGlVBKdusMfnsfdFPjUSmnBEJtZrkuA/GTx8ABh2K3swsZKYuhicE9fNU
+fRUPqDOCB2iC/LnlMkwUFmjwZl6I72Ya8Yva6umBPs0y4LZxbTsxszFq8dSNseBw
+Z/vb46X3sALXHq65ULoWM7lvI8bcXTeDUBNpSd+3MFdhEUiXmnUNO266JJfbFD29
+zRbVHEs3LC3JnNUGWYg/
+=+9rG
+-----END PGP SIGNATURE-----
diff --git a/media-video/xanim/files/xanim-2.80.1-freebsd.patch b/media-video/xanim/files/xanim-2.80.1-freebsd.patch
new file mode 100644
index 000000000000..c31651a74fbe
--- /dev/null
+++ b/media-video/xanim/files/xanim-2.80.1-freebsd.patch
@@ -0,0 +1,14 @@
+--- xa_audio.h.old	Thu Apr 11 08:48:39 2002
++++ xa_audio.h	Thu Apr 11 08:49:25 2002
+@@ -139,7 +139,11 @@
+ #define _FILE_DSP "/dev/dsp"
+ #define _FILE_MIXER "/dev/mixer"
+ #ifdef __FreeBSD__
++#if __FreeBSD__ > 3
++#include <sys/soundcard.h>
++#else
+ #include <machine/soundcard.h>
++#endif
+ #else
+ #include <sys/soundcard.h>
+ #endif
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index 7b2a94a1584d..7897c234882b 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.39 2009/12/19 13:02:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.40 2011/11/20 13:39:09 naota Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://xanim.polter.net/"
 
 LICENSE="XAnim"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-libs/libXext
@@ -42,12 +42,18 @@ _XA_CVID_x86=xa2.0_cvid_linuxELFg21.o
 _XA_IV32_x86=xa2.1_iv32_linuxELFg21.o
 _XA_EXT_x86=.gz
 
+_XA_CYUV_x86_fbsd=xa1.0_cyuv_linuxELFg21.o
+_XA_CVID_x86_fbsd=xa2.0_cvid_linuxELFg21.o
+_XA_IV32_x86_fbsd=xa2.1_iv32_linuxELFg21.o
+_XA_EXT_x86_fbsd=.gz
+
 # This might leave _XA_EXT empty and that's fine, just indicates no
 # particular support for a given arch
-eval _XA_EXT=\${_XA_EXT_${ARCH}}
-eval _XA_CVID=\${_XA_CVID_${ARCH}}
-eval _XA_CYUV=\${_XA_CYUV_${ARCH}}
-eval _XA_IV32=\${_XA_IV32_${ARCH}}
+MY_ARCH=${ARCH/-/_}
+eval _XA_EXT=\${_XA_EXT_${MY_ARCH}}
+eval _XA_CVID=\${_XA_CVID_${MY_ARCH}}
+eval _XA_CYUV=\${_XA_CYUV_${MY_ARCH}}
+eval _XA_IV32=\${_XA_IV32_${MY_ARCH}}
 
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 	sparc? (
@@ -69,6 +75,11 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 		mirror://gentoo/${_XA_CVID_x86}${_XA_EXT_x86}
 		mirror://gentoo/${_XA_CYUV_x86}${_XA_EXT_x86}
 		mirror://gentoo/${_XA_IV32_x86}${_XA_EXT_x86}
+	)
+	x86-fbsd? (
+		mirror://gentoo/${_XA_CVID_x86}${_XA_EXT_x86}
+		mirror://gentoo/${_XA_CYUV_x86}${_XA_EXT_x86}
+		mirror://gentoo/${_XA_IV32_x86}${_XA_EXT_x86}
 	)"
 
 src_unpack() {
@@ -84,6 +95,9 @@ src_unpack() {
 	sed -i -e 's:/usr/X11R6:/usr:g' Makefile*
 
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-freebsd.patch"
+
+	use elibc_glibc || sed -i -e 's/-ldl//' Makefile*
 }
 
 src_compile() {