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

Package-Manager: portage-2.1_pre7-r5

6 files changed, 50 insertions, 18 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 4928d7153053..205ed7440132 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 aa834f08691ff8d1a81db358e4e01a52 ChangeLog 4606
 RMD160 9d41af5d3e6827609b578b319e11cf3276bd3e4d ChangeLog 4606
 SHA256 f163e5e63134c20e024eb67b4417b76c8032a7dda85ca4b3868090e64ae203ee ChangeLog 4606
@@ -40,3 +43,10 @@ SHA256 b065b28b0c59576ef7cd49e14f514be673831d16452d089b8e94d98ef331be9e freebsd-
 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)
+
+iD8DBQFEPQeFAiZjviIA2XgRAmChAJsF8lGbSD0V49oDIoRVw6ctwCt7YQCfTq3Z
+sQtlHs9Dur+nxRq0trpGpZA=
+=xKOS
+-----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"