Add patch that makes mkioctl only look into the original includes, so that it doesn't get confused when Xorg is installed.

(Portage version: 2.1_pre7-r3)

5 files changed, 52 insertions, 21 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index cbe0ba0e5180..9517e228d3da 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.5 2006/04/03 04:37:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.6 2006/04/03 15:59:35 flameeyes Exp $
+
+  03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-ubin-6.0-kdump-ioctl.patch, freebsd-ubin-6.0-r1.ebuild:
+  Add patch that makes mkioctl only look into the original includes, so that
+  it doesn't get confused when Xorg is installed.
 
   03 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-ubin-6.0-r1.ebuild:
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 4a30a4d3b4f5..d2e7257928ee 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -1,21 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3a525be4e8c26e55e35e3e070a5e21e9 ChangeLog 5191
 RMD160 cbcdf3d3502e57b83506ac55817c80ee974eac24 ChangeLog 5191
 SHA256 6b018c25d514b3562810c1e69acad328d96adb75d02e3b74d3105e280a26624a ChangeLog 5191
 MD5 9256a421446d791cc6fbc17d4d8a9780 files/SA-06-02-ee.patch 2446
 RMD160 9934e6ee6c0ebaa1998939163bf4f1e233d5eba0 files/SA-06-02-ee.patch 2446
 SHA256 1c27b3e1f5906da36a654409290e9ffb0493b70a1e83bed89704942f2a9c0d10 files/SA-06-02-ee.patch 2446
-MD5 b04f5846b967d9817e733f8af23b36f1 files/digest-freebsd-ubin-6.0-r1 1277
-RMD160 cdb74ff894ea61c37c22719b6685e233030541cc files/digest-freebsd-ubin-6.0-r1 1277
-SHA256 626aa3602fcd8dc965fea3c4f5f8d557b3c21f2446e71ea150de1632cb2154b9 files/digest-freebsd-ubin-6.0-r1 1277
+MD5 613424f0099cad1ce85a06d47bcb49f6 files/digest-freebsd-ubin-6.0-r1 1539
+RMD160 d39f6c71d301f5e62cfcd5624afd871e6ef9442d files/digest-freebsd-ubin-6.0-r1 1539
+SHA256 6841a99d17c9cf21996c35a5b0edeefb23aca499ff9479f825a733e1b31d1dec files/digest-freebsd-ubin-6.0-r1 1539
 MD5 f9ae28120f1ddd8948695c613b5f399a files/freebsd-ubin-6.0-bsdcmp.patch 413
 RMD160 e8f9d8f9c873077d7113af6a1efd642a3ee7d12f files/freebsd-ubin-6.0-bsdcmp.patch 413
 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c files/freebsd-ubin-6.0-bsdcmp.patch 413
 MD5 be995572b7a8e5d687a2998219ae2fdb files/freebsd-ubin-6.0-fixmakefiles.patch 1457
 RMD160 9fed268f43c4b8949f734900cb18d3e66a639a3d files/freebsd-ubin-6.0-fixmakefiles.patch 1457
 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b files/freebsd-ubin-6.0-fixmakefiles.patch 1457
+MD5 ee052f54c634c307bf4e441264123023 files/freebsd-ubin-6.0-kdump-ioctl.patch 643
+RMD160 731140001a29ab9af6b7484528394f8da6497999 files/freebsd-ubin-6.0-kdump-ioctl.patch 643
+SHA256 44811f39f747d05624b1d4db9eecf0dbeb02d076f6d01cd1def493f1a44378e8 files/freebsd-ubin-6.0-kdump-ioctl.patch 643
 MD5 8e69a5c73317c371c037446c8b5c6fba files/freebsd-ubin-lint-stdarg.patch 792
 RMD160 673ce804ebd887121160da5d1993787334099903 files/freebsd-ubin-lint-stdarg.patch 792
 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 files/freebsd-ubin-lint-stdarg.patch 792
@@ -34,16 +34,9 @@ SHA256 ff964fd309462cac711422be051122f8a60b570da9b13756e9012b18b1864f79 files/pa
 MD5 764135d89f71d46bd96de7271f1083fc files/su.pamd 420
 RMD160 9888acbac2c2c79b64ec274cc7d96b13b86d8ad8 files/su.pamd 420
 SHA256 efe3a5efafd7e97e9305f4d24f2b4aacb44f65b261ca54bca1306b918b82cb08 files/su.pamd 420
-MD5 cb50fb0d1d1a14ded0fd20a5629719f7 freebsd-ubin-6.0-r1.ebuild 2547
-RMD160 61d389fde32306c542eb1143b3af3d0da382d72f freebsd-ubin-6.0-r1.ebuild 2547
-SHA256 4cd153cb3014cdd7e09cd22046349046a3f02d24dd416fdbef27258a8cf90088 freebsd-ubin-6.0-r1.ebuild 2547
+MD5 fe72002fd14f64994837f694a75251ea freebsd-ubin-6.0-r1.ebuild 2629
+RMD160 f6356115a4fd1a107d01cbf605251f9865275f65 freebsd-ubin-6.0-r1.ebuild 2629
+SHA256 e4cc3a87cb7657326b5dd9b0e93c14b2b7e43cc5952c9536d2d5d2c3c4228db6 freebsd-ubin-6.0-r1.ebuild 2629
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEMKaBAiZjviIA2XgRApYAAKCutb+pMmmzAYMBpEJvEGS373DtHACgmy+m
-N1UehiY9jhKOlm38R+5JQgU=
-=UcAe
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1
index 2091b60b68a2..e884b08aa329 100644
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1
@@ -7,6 +7,9 @@ SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd-
 MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941
 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941
 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941
+MD5 0a5937660818157a2a0bf09fe705f24c freebsd-include-6.0.tar.bz2 127219
+RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c freebsd-include-6.0.tar.bz2 127219
+SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b freebsd-include-6.0.tar.bz2 127219
 MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087
 RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087
 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
new file mode 100644
index 000000000000..a89cf52dfc4c
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
@@ -0,0 +1,28 @@
+By default the mkioctl program that generates code for kdump does look for
+ioctls in the whole /usr/include tree, but this does break when xorg is merged.
+This patch allows to look for include files only in the source tree.
+
+Index: fbsd-6/usr.bin/kdump/Makefile
+===================================================================
+--- fbsd-6.orig/usr.bin/kdump/Makefile
++++ fbsd-6/usr.bin/kdump/Makefile
+@@ -10,6 +10,6 @@ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CUR
+ CLEANFILES=	ioctl.c
+ 
+ ioctl.c: mkioctls
+-	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
++	sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
+ 
+ .include <bsd.prog.mk>
+Index: fbsd-6/usr.bin/truss/Makefile
+===================================================================
+--- fbsd-6.orig/usr.bin/truss/Makefile
++++ fbsd-6/usr.bin/truss/Makefile
+@@ -29,6 +29,6 @@ syscalls.h:	syscalls.master
+ 		${.CURDIR}/i386.conf
+ 
+ ioctl.c: ${.CURDIR}/../kdump/mkioctls
+-	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
++	sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
+ 
+ .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild
index e0116087b9b4..777c95504eb3 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild,v 1.4 2006/04/03 04:37:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.0-r1.ebuild,v 1.5 2006/04/03 15:59:35 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -14,7 +14,8 @@ SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2"
+		mirror://gentoo/${BIN}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2"
 
 RDEPEND="ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )
@@ -30,7 +31,7 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	sys-process/cronbase"
 
-S=${WORKDIR}/usr.bin
+S="${WORKDIR}/usr.bin"
 
 pkg_setup() {
 	use nls || mymakeopts="${mymakeopts} NO_NLS= "
@@ -50,7 +51,8 @@ PATCHES="${FILESDIR}/${PN}-${RV}-bsdcmp.patch
 	${FILESDIR}/${PN}-${RV}-fixmakefiles.patch
 	${FILESDIR}/${PN}-setXid.patch
 	${FILESDIR}/${PN}-lint-stdarg.patch
-	${FILESDIR}/SA-06-02-ee.patch"
+	${FILESDIR}/SA-06-02-ee.patch
+	${FILESDIR}/${PN}-${RV}-kdump-ioctl.patch"
 
 # Here we remove some sources we don't need because they are already
 # provided by portage's packages or similar. In order: