Patch for Gentoo/FreeBSD & keyword ~x86-fbsd (bug #177888)

Package-Manager: portage-2.1.2.9

4 files changed, 31 insertions, 22 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index f8fe26efcc8e..f03ef5832ee4 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.79 2006/08/11 19:34:49 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.80 2007/06/02 18:28:26 lavajoe Exp $
+
+  02 Jun 2007; Joe Peterson <lavajoe@gentoo.org>
+  +files/xv-3.10a-osx-bsd.patch, -files/xv-3.10a-r12-xv-osx.patch,
+  xv-3.10a-r12.ebuild:
+  Patch to work on Gentoo/FreeBSD; add ~x86-fbsd keyword
+  (bug #177888)
 
   11 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/xv-3.10a-r11-xv-osx.patch, -xv-3.10a-r8.ebuild,
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 5d4c26dd1033..183dc2e37b6e 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -10,14 +10,14 @@ AUX xv-3.10a-makefile-osx.patch 538 RMD160 4beeb0060d7825710011926305ae1682e7271
 MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
 RMD160 4beeb0060d7825710011926305ae1682e727133f files/xv-3.10a-makefile-osx.patch 538
 SHA256 4ed3e9ce901410626934d6f2c93a5d884b7ff1025ec55babc09c0fdbbbd62d1c files/xv-3.10a-makefile-osx.patch 538
+AUX xv-3.10a-osx-bsd.patch 1765 RMD160 99e517747bba0f80f62a82fb2bf15ce576951035 SHA1 f098d963de07b9b390392479ca688876983bf1bd SHA256 887188099d676a742f9798edcebb0e809f629195c76651b9112ab768f128cc03
+MD5 47d4f0881e20511280aeaba84ab569b1 files/xv-3.10a-osx-bsd.patch 1765
+RMD160 99e517747bba0f80f62a82fb2bf15ce576951035 files/xv-3.10a-osx-bsd.patch 1765
+SHA256 887188099d676a742f9798edcebb0e809f629195c76651b9112ab768f128cc03 files/xv-3.10a-osx-bsd.patch 1765
 AUX xv-3.10a-ppc.patch 359 RMD160 5090d5f8c0a27cac2a4720d11019856147715d4f SHA1 37b5844e98c8aeffcebebacefee340cfaef9bb6d SHA256 319caafe835d5e2667ed0736c302320246108e89983eeccbfb86c41f44911a6c
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
 RMD160 5090d5f8c0a27cac2a4720d11019856147715d4f files/xv-3.10a-ppc.patch 359
 SHA256 319caafe835d5e2667ed0736c302320246108e89983eeccbfb86c41f44911a6c files/xv-3.10a-ppc.patch 359
-AUX xv-3.10a-r12-xv-osx.patch 1686 RMD160 2884698d09f45d626d264316ea55415cbaf81b3c SHA1 c4b1ba7708cee49a092c68c582f3426249b170af SHA256 50ee90871d1285a02a7f22848e379dd228c21a4b57ef3916f3f3bdbb109c2429
-MD5 6bf2b7ee3f291595d8ee51f8d6bc59e6 files/xv-3.10a-r12-xv-osx.patch 1686
-RMD160 2884698d09f45d626d264316ea55415cbaf81b3c files/xv-3.10a-r12-xv-osx.patch 1686
-SHA256 50ee90871d1285a02a7f22848e379dd228c21a4b57ef3916f3f3bdbb109c2429 files/xv-3.10a-r12-xv-osx.patch 1686
 AUX xv-3.10a-security.diff 4079 RMD160 141e56658b406dcb3ba6346e8cf3fb4fa0d5b5a8 SHA1 f174acea0151e500bf6e8ac7f00e0e65526358a3 SHA256 c740ddb08b7c1d2b61ada0f32abda9c3ccf6d65deba2a5f820d52409a4e99472
 MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
 RMD160 141e56658b406dcb3ba6346e8cf3fb4fa0d5b5a8 files/xv-3.10a-security.diff 4079
@@ -56,14 +56,14 @@ RMD160 75b09ec334e8f7f5050827dabf05fe0f1b28b3d9 files/xv-use-getcwd.patch 222
 SHA256 948f82cf53ee052f115eb9a9c259638296ca4b9bf37a239732d968e06aa98159 files/xv-use-getcwd.patch 222
 DIST xv-3.10a-jumbo-patches-20050501.tar.bz2 369886 RMD160 d199e7d1b6c5162e0cad09d4118b3735f1d156ef SHA1 deb42fc30697312f13fcedb88f10cc3ed0ced8ac SHA256 e9f15364a6ffde06376ffb19b5652d604c3671308b7af89ac86e09a51c4d433d
 DIST xv-3.10a.tar.gz 2259124 RMD160 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d SHA1 9e6372f154be9e9e355972cbeb91d98d9c342474 SHA256 03eb26b1e8f315c3093f4ae794862ba46637d16c055e8efbe5e3beb5d40fc451
-EBUILD xv-3.10a-r12.ebuild 2362 RMD160 eccea7d73936698890732b18e1d4bbe24ad41a98 SHA1 bfa80254a9968c4a1978781d7064b695cedc466f SHA256 01877bb0f947fe6a1b637c7bc66a3919d3a4f79de47d896639109f42ad3ca058
-MD5 14e358fa01cbae72f3d263cfd6e403eb xv-3.10a-r12.ebuild 2362
-RMD160 eccea7d73936698890732b18e1d4bbe24ad41a98 xv-3.10a-r12.ebuild 2362
-SHA256 01877bb0f947fe6a1b637c7bc66a3919d3a4f79de47d896639109f42ad3ca058 xv-3.10a-r12.ebuild 2362
-MISC ChangeLog 11669 RMD160 f2228c6b4f27e89cc7000e6840eb44fab4a9ef51 SHA1 e3b2aa1ed1394fd5390484c35430baab50bcb218 SHA256 2f1428a59786e014ad411e5fd98b43b1884c1de4ee8ee73c59e59ac1a433778a
-MD5 ad2a62a959aea94c112c64cf512064b5 ChangeLog 11669
-RMD160 f2228c6b4f27e89cc7000e6840eb44fab4a9ef51 ChangeLog 11669
-SHA256 2f1428a59786e014ad411e5fd98b43b1884c1de4ee8ee73c59e59ac1a433778a ChangeLog 11669
+EBUILD xv-3.10a-r12.ebuild 2410 RMD160 42a3c35ed1a9738fcda0c0c4e3436219872a64c3 SHA1 30d9b78504a1a520e417b2ff1b48471d5342b5aa SHA256 8622127957a1ff7218f7d1b6d5671658caed4f9466b0b40cd6d144cc690d577e
+MD5 23d5eb0062c8d663872f024906482fd8 xv-3.10a-r12.ebuild 2410
+RMD160 42a3c35ed1a9738fcda0c0c4e3436219872a64c3 xv-3.10a-r12.ebuild 2410
+SHA256 8622127957a1ff7218f7d1b6d5671658caed4f9466b0b40cd6d144cc690d577e xv-3.10a-r12.ebuild 2410
+MISC ChangeLog 11880 RMD160 b976ae13ba272f6f6eab61c017c37a77694f43f1 SHA1 cee2e11435528ad9f23b1b13faec8a5e87317dfd SHA256 156395ce1989d8d21123db7346a4e370dc2cfab84743f136cde2c4985b98e3b5
+MD5 de1640fc6abe60db30e9a0302347ffa0 ChangeLog 11880
+RMD160 b976ae13ba272f6f6eab61c017c37a77694f43f1 ChangeLog 11880
+SHA256 156395ce1989d8d21123db7346a4e370dc2cfab84743f136cde2c4985b98e3b5 ChangeLog 11880
 MISC metadata.xml 222 RMD160 b93ab85e9e5ec9ccccb1b1df2f2bb3a22946edee SHA1 0e397b85d03a60d7919b1a5181146c74b5fbc5a4 SHA256 d0c39a98871deda25596752d660eb0121f1ba9a659fd2be08cca94d9fa316662
 MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
 RMD160 b93ab85e9e5ec9ccccb1b1df2f2bb3a22946edee metadata.xml 222
diff --git a/media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch b/media-gfx/xv/files/xv-3.10a-osx-bsd.patch
index 91ae305d3f9a..4d5fecdd2d6c 100644
--- a/media-gfx/xv/files/xv-3.10a-r12-xv-osx.patch
+++ b/media-gfx/xv/files/xv-3.10a-osx-bsd.patch
@@ -5,7 +5,7 @@
  #ifndef VMS
  #  include <errno.h>
 -#  ifndef __NetBSD__
-+#  if !defined(__NetBSD__) && !defined(__APPLE__)
++#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
  #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
         extern int   errno;         /* SHOULD be in errno.h, but often isn't */
         extern char *sys_errlist[]; /* this too... */
@@ -32,7 +32,7 @@
  
  #ifndef S_IRWUSR
 -#  define S_IRWUSR	(S_IRUSR|__S_IWRITE)
-+#  ifdef __APPLE__
++#  if defined(__FreeBSD__) || defined(__APPLE__)
 +#    define S_IRWUSR	(S_IRUSR|S_IWUSR)
 +#  else
 +#    define S_IRWUSR	(S_IRUSR|__S_IWRITE)
@@ -45,7 +45,7 @@
  #ifndef VMS       /* VMS hates multi-line definitions */
  #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
 -      defined(__bsdi__)
-+      defined(__bsdi__) || defined(__APPLE__)
++      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
  #    ifndef USE_MKSTEMP
  #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
  #    endif                      /* >> SECURITY ISSUE << */
diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild
index 7f5d8948ff40..b844127b1431 100644
--- a/media-gfx/xv/xv-3.10a-r12.ebuild
+++ b/media-gfx/xv/xv-3.10a-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.15 2006/05/23 18:16:37 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.16 2007/06/02 18:28:26 lavajoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -11,13 +11,14 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp:/
 
 LICENSE="xv"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86 ~x86-fbsd"
 IUSE="jpeg tiff png"
 
 DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )
 	png? ( >=media-libs/libpng-1.2 >=sys-libs/zlib-1.1.4 )"
+RDEPEND=${DEPEND}
 
 src_unpack() {
 	unpack ${A}
@@ -31,8 +32,10 @@ src_unpack() {
 	epatch ${WORKDIR}/${P}-jumbo-fix-patch-20050410.txt || die
 	epatch ${WORKDIR}/${P}-jumbo-enh-patch-${JUMBOV}.txt || die
 
-	# OSX malloc and define patches
-	epatch "${FILESDIR}/${P}"-r12-xv-osx.patch || die
+	# OSX and BSD xv.h define patches
+	epatch "${FILESDIR}/${P}"-osx-bsd.patch || die
+
+	# OSX malloc patch
 	epatch "${FILESDIR}/${P}"-vdcomp-osx.patch || die
 
 	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \