Add patch to build on FreeBSD. Bug #352663. Re-add ~x86-fbsd

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

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index e9cf17763015ff7d8ad47feb46a69d620e46f4e7..f27d7c8343e86bb9b5d95266cdaa26674882fbf8 100644 (file)
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.214 2011/09/05 19:19:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.215 2011/09/09 14:25:49 naota Exp $
+
+  09 Sep 2011; Naohiro Aota <naota@gentoo.org> xinit-1.3.1.ebuild,
+  +files/xinit-1.3.1-prio-process.patch:
+  Add patch to build on FreeBSD. Bug #352663. Re-add ~x86-fbsd
 
   05 Sep 2011; Markus Meier <maekke@gentoo.org> xinit-1.3.1.ebuild:
   arm stable, bug #380421

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 67ffd919a2f8d0c2b4044417953bb39d4eea12fb..d7b8eb030afea36a1d123aef40815c087f93e229 100644 (file)
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -6,17 +6,18 @@ AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e435
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1301 RMD160 4ebebef5d48d0b344f1c8af8baac60ece9671a12 SHA1 67f1afc86fb2788c6d75713bfb37550820360b5e SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0
 AUX startDM.sh 923 RMD160 b457ea1bf2cb059a4faf5c98811589412c5026fc SHA1 b462b58ac0d76f0f5b1c8e3562da75d99488b7da SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499
+AUX xinit-1.3.1-prio-process.patch 357 RMD160 212206c365f6a0c501336670f12c36cb422d126f SHA1 655d41ef8e65baa7471589fc8fa424b65a0d07ff SHA256 64588930bab42c8492e5f647c8261e5bd9efd6e4e4e99f94cac18ce2ddefba07
 AUX xserverrc 45 RMD160 ba59828df58de185ac8cbe762f746cc4b5b25594 SHA1 297121e4f3bc8abbaade83cd2583d16e8887e15b SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387
 DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
 DIST xinit-1.3.1.tar.bz2 147067 RMD160 aadb0729c65438819cfaae4733f512574fa39c2d SHA1 6d3981c23ce49212a26912651d6d2473a5065766 SHA256 c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0
 EBUILD xinit-1.3.0-r2.ebuild 1670 RMD160 6747e0a03a2228f5d42bab22a7265d77f8f5c8b8 SHA1 0ce712851536ceafc53355031e3b0c95984d8186 SHA256 6477c0a8deac0067f54ed00ebe3a6d13d0e10b99276b6a0673390017f9e3b38c
-EBUILD xinit-1.3.1.ebuild 1665 RMD160 c38962465344e279f0a4ce3f47e1f31a106c3bc5 SHA1 92ba34ef5b52d3c4524f6c10226b4fb0ecbbdabd SHA256 aa7d1c2b456557cb05d332331b4867225e3fe268e9aa9267cd81828595a782e5
-MISC ChangeLog 32885 RMD160 2dd59c79bd2d026f5dbce5a3027cf0e8a987271a SHA1 18e187dcb51cf5ae0b0da3679f6f94fe87faecd5 SHA256 ba6540dd14ca6936674c37466eaaa45cdd2615b671d8a67a58a594a2aca5aef0
+EBUILD xinit-1.3.1.ebuild 1713 RMD160 01c4423e660c995f4d27c405e2b599dfec524f43 SHA1 77adb0a3cc08f02aa4cd6dc802ae7830162b6b3c SHA256 be53e73fbc6c361c6571c34b13fb087b907802a2359d84b95c2a809609ea2004
+MISC ChangeLog 33056 RMD160 761801a790d8789ace3eadeb8b3c946cec3deaed SHA1 33b71ce6cd01f1b7fa873e1a484c875b6a6cd4f1 SHA256 5c69b1e6e5711703a11257fba381b03f6171c7f753e61b8b3606248d7f5f3f0b
 MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5lIRQACgkQkKaRLQcq0GKobgCffHZtm1gGKnqWu0BQDLbYjfBd
-DvQAn11a4NHa6VTbfu6tHLQsqBEs3EnF
-=UchJ
+iEYEARECAAYFAk5qIfMACgkQGpDnPLSHuMB0mgCfbr6gnt+7jfeNvViSYHl0xOXm
+zPkAn3Q5i0tXYR+lEsfha8REiIKpS3jp
+=ZAXV
 -----END PGP SIGNATURE-----

diff --git a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
new file mode 100644 (file)
index 0000000..838171b
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
@@ -0,0 +1,14 @@
+diff --git a/xinit.c b/xinit.c
+index 42ff008..2ab817f 100644
+--- a/xinit.c
++++ b/xinit.c
+@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group.
+ #endif
+ 
+ /* For PRIO_PROCESS and setpriority() */
+-#ifdef __DragonFly__
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#endif /* __DragonFly__ */
+ 
+ #include <stdlib.h>

diff --git a/x11-apps/xinit/xinit-1.3.1.ebuild b/x11-apps/xinit/xinit-1.3.1.ebuild
index aee2eca9caf67005a423ebb4862179c34999ab69..a18f0ecfa65b8fc5c72eff3d56189f28dfb1de8b 100644 (file)
--- a/x11-apps/xinit/xinit-1.3.1.ebuild
+++ b/x11-apps/xinit/xinit-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.5 2011/09/05 19:19:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.6 2011/09/09 14:25:49 naota Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="+minimal"
 
 RDEPEND="
@@ -29,6 +29,7 @@ PDEPEND="x11-apps/xrdb
 
 PATCHES=(
        "${FILESDIR}/0001-Gentoo-customizations.patch"
+       "${FILESDIR}/${P}-prio-process.patch"
 )
 
 pkg_setup() {