Add patch to drop -Werror and depend on a fixed version of freebsd-mk-defs so that a simple 'make' works.

(Portage version: 2.1_pre7-r5)

6 files changed, 49 insertions, 34 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 64aceb06864f..67efdd200e18 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.5 2006/04/04 08:39:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.6 2006/04/12 13:58:15 flameeyes Exp $
+
+*freebsd-sources-6.0-r3 (12 Apr 2006)
+
+  12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-sources-6.0-werror.patch,
+  files/freebsd-sources-gentoo.patch, -freebsd-sources-6.0-r2.ebuild,
+  +freebsd-sources-6.0-r3.ebuild:
+  Add patch to drop -Werror and depend on a fixed version of freebsd-mk-defs
+  so that a simple 'make' works.
 
   04 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/freebsd-sources-6.0-asm.patch, freebsd-sources-6.0-r2.ebuild:
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index ea21eab0458c..44f6b3740b01 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 67e1ad3430ec233f5e78e10a3a89e0be ChangeLog 4256
 RMD160 5ab2b8453c5c77f6deca2c918be8911a085ae9ba ChangeLog 4256
 SHA256 6f87f1582762586b7b390e6d45c9e0649f7a0bd54f329df73f1486550e8ebcf3 ChangeLog 4256
@@ -19,9 +16,9 @@ SHA256 876dc53071bf2f743ae443eed42fa55a5d902a7c7902e1f1581dd20979be12c7 files/SA
 MD5 afbee903132dd6d6d400b6d1ede0146f files/SA-06-11-ipsec.patch 906
 RMD160 dbd41d9ce4d2f0b6d5c45f915c9780c2ee43391a files/SA-06-11-ipsec.patch 906
 SHA256 33ee98a658ac5abaa8b1d1dea7e53c0e8a47aa11d109c3279defe29c734728ad files/SA-06-11-ipsec.patch 906
-MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r2 256
-RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r2 256
-SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r2 256
+MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r3 256
+RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r3 256
+SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r3 256
 MD5 d7ba170be5603b2bc377cbd544c82a23 files/freebsd-sources-6.0-asm.patch 4172
 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 files/freebsd-sources-6.0-asm.patch 4172
 SHA256 2431b2dae991eef15c00c3e19ac01e23e374a1e8e6992053e64486032631b52e files/freebsd-sources-6.0-asm.patch 4172
@@ -31,19 +28,15 @@ SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 files/fr
 MD5 c0b1372211b9f1eaa2d8a2715cb0b4b8 files/freebsd-sources-6.0-gentoover.patch 653
 RMD160 673b66cb91874a667546f9b39b973c6713f2832a files/freebsd-sources-6.0-gentoover.patch 653
 SHA256 16a6e168c993a64e4000bab47e3ba6c09e727198025422b3c89d52e88ceca76f files/freebsd-sources-6.0-gentoover.patch 653
+MD5 1c230261604f76eb3766df9769864942 files/freebsd-sources-6.0-werror.patch 898
+RMD160 41a6f582a70018f29c96c08a5853bcbf167157d0 files/freebsd-sources-6.0-werror.patch 898
+SHA256 7fbd139296e98697c94dcc6a4cd4d926b057779cb2415cb62bbb881b8acf26e5 files/freebsd-sources-6.0-werror.patch 898
 MD5 4330b108279af439a1b22dbaabe7976f files/freebsd-sources-gentoo.patch 1750
 RMD160 220e9fc91fa2691889792d812ba64fea5e90b411 files/freebsd-sources-gentoo.patch 1750
 SHA256 cf488cd530f1e49c80296937939024eb7cca09666325f3232af186cf376119bb files/freebsd-sources-gentoo.patch 1750
-MD5 45912ec35a43381bf7ebecf7e68afdb8 freebsd-sources-6.0-r2.ebuild 1729
-RMD160 fcf60307cd6c2e5155cbaca3f5d89e45a2801011 freebsd-sources-6.0-r2.ebuild 1729
-SHA256 777caf77cd95e803740efe26fa19ee819c671561abbbd3884b157998bbb06aa1 freebsd-sources-6.0-r2.ebuild 1729
+MD5 cef460c9ebf4303b8bd8edb15aec146e freebsd-sources-6.0-r3.ebuild 1812
+RMD160 1dde4ccfb0d1d0f8a8d98ecf3b53ae2341983133 freebsd-sources-6.0-r3.ebuild 1812
+SHA256 6ec012e6dd9dc5bdf6132b30722d5956f6ffc7482a7cda73743a0dfde19d2373 freebsd-sources-6.0-r3.ebuild 1812
 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)
-
-iD8DBQFEMjC/AiZjviIA2XgRAlkLAJ9K8IBXMLfI/9JRIYZ5xPB6DxkyngCdG3yt
-k9u30qBFr6C7Dy8RsXgZJf8=
-=Ap2A
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r2 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r3
index 8ece252ae3b5..8ece252ae3b5 100644
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r2
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r3
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch
new file mode 100644
index 000000000000..0a57905abe8b
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-werror.patch
@@ -0,0 +1,26 @@
+Index: fbsd-6/sys/conf/kern.pre.mk
+===================================================================
+--- fbsd-6.orig/sys/conf/kern.pre.mk
++++ fbsd-6/sys/conf/kern.pre.mk
+@@ -76,7 +76,7 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KE
+ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
+ CFLAGS+= --param inline-unit-growth=100
+ CFLAGS+= --param large-function-growth=1000
+-WERROR?= -Werror
++WERROR?= -Wno-error
+ .endif
+ 
+ # XXX LOCORE means "don't declare C stuff" not "for locore.s".
+Index: fbsd-6/sys/conf/kmod.mk
+===================================================================
+--- fbsd-6.orig/sys/conf/kmod.mk
++++ fbsd-6/sys/conf/kmod.mk
+@@ -73,7 +73,7 @@ CFLAGS:=	${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|
+ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+=	-fno-strict-aliasing
+ . endif
+-WERROR?=	-Werror
++WERROR?=	-Wno-error
+ .endif
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
index b2ea95cb02ad..c4246c61a41f 100644
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-gentoo.patch
@@ -19,21 +19,6 @@ diff -ur sys/conf/kern.mk sys-gentoo/conf/kern.mk
  		-mno-mmx -mno-3dnow -mno-sse -mno-sse2
  INLINE_LIMIT?=	8000
  .endif
-Only in sys-gentoo/conf: kern.mk.orig
-diff -ur sys/conf/kern.pre.mk sys-gentoo/conf/kern.pre.mk
---- sys/conf/kern.pre.mk	2005-03-16 17:51:56 +0000
-+++ sys-gentoo/conf/kern.pre.mk	2005-07-21 11:08:20 +0000
-@@ -72,7 +72,8 @@
- CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
- CFLAGS+= --param inline-unit-growth=100
- CFLAGS+= --param large-function-growth=1000
--WERROR?= -Werror
-+# Gentoo's GCC outputs a few more warnings
-+#WERROR?= -Werror
- .endif
- 
- # XXX LOCORE means "don't declare C stuff" not "for locore.s".
-Only in sys-gentoo/conf: kern.pre.mk.orig
 diff -ur sys/dev/aic7xxx/aicasm/Makefile sys-gentoo/dev/aic7xxx/aicasm/Makefile
 --- sys/dev/aic7xxx/aicasm/Makefile	2005-02-13 07:23:32 +0000
 +++ sys-gentoo/dev/aic7xxx/aicasm/Makefile	2005-07-21 11:08:20 +0000
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r3.ebuild
index 6f1bdc8df24e..c601af0342f7 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r3.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-sources/freebsd-sources-6.0-r2.ebuild,v 1.2 2006/04/04 08:39:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r3.ebuild,v 1.1 2006/04/12 13:58:15 flameeyes Exp $
 
 inherit bsdmk freebsd
 
@@ -12,7 +12,7 @@ IUSE="symlink"
 
 SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
 
-RDEPEND=""
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
 DEPEND=""
 
 RESTRICT="nostrip"
@@ -27,8 +27,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoover.patch"
 	epatch "${FILESDIR}/${P}-flex-2.5.31.patch"
 	epatch "${FILESDIR}/${P}-asm.patch"
+	epatch "${FILESDIR}/${P}-werror.patch"
 
 	epatch "${FILESDIR}/SA-06-04-ipfw.patch"
 	epatch "${FILESDIR}/SA-06-05-80211.patch"