Restore -Werror mangling, or the kernel will fail to build.

Package-Manager: portage-2.1.2_rc2-r1

3 files changed, 40 insertions, 12 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index 009d8f432c09..9c347794f921 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.25 2006/11/21 14:30:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.26 2006/11/24 17:16:44 flameeyes Exp $
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/freebsd-mk-defs-6.2-2-gentoo.patch:
+  Restore -Werror mangling, or the kernel will fail to build.
 
   21 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/freebsd-mk-defs-6.2-2-gentoo.patch:
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index fc3a23e66cac..f1a6b69c1a88 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -21,10 +21,10 @@ AUX freebsd-mk-defs-6.1-gentoo.patch 10693 RMD160 13e6591579cfe303dbf191b8daa80c
 MD5 6e35cb1e582a2dbe16bb01b0f43dd6e0 files/freebsd-mk-defs-6.1-gentoo.patch 10693
 RMD160 13e6591579cfe303dbf191b8daa80c15c48afe5a files/freebsd-mk-defs-6.1-gentoo.patch 10693
 SHA256 d6b506316738d04ba461e7b77bc9934597c80b9b694f037930658b54d00bd2d9 files/freebsd-mk-defs-6.1-gentoo.patch 10693
-AUX freebsd-mk-defs-6.2-2-gentoo.patch 9682 RMD160 b3370378b5ba86923d0054da7a9ca0daa5e62523 SHA1 cf6caf118ffbea06235b19c899961d2f263f29e7 SHA256 fe26804d0a8cc18727dea838a3ebbb90426d33d36153d5023d50e5f6c3d052da
-MD5 06de37c37ecb5c8e7667ba729564346f files/freebsd-mk-defs-6.2-2-gentoo.patch 9682
-RMD160 b3370378b5ba86923d0054da7a9ca0daa5e62523 files/freebsd-mk-defs-6.2-2-gentoo.patch 9682
-SHA256 fe26804d0a8cc18727dea838a3ebbb90426d33d36153d5023d50e5f6c3d052da files/freebsd-mk-defs-6.2-2-gentoo.patch 9682
+AUX freebsd-mk-defs-6.2-2-gentoo.patch 10377 RMD160 f36d72686e0c175193acff6f65abddea2d53a42c SHA1 4913957abd354db5ea7321f01e8c40e8e6f878f5 SHA256 6ce69b3c1735593d09ab51e9174f4e6bb6b185c68fa3fa30676d87174654d1c7
+MD5 2237bfa360a6b394b6b7e392517ff0a6 files/freebsd-mk-defs-6.2-2-gentoo.patch 10377
+RMD160 f36d72686e0c175193acff6f65abddea2d53a42c files/freebsd-mk-defs-6.2-2-gentoo.patch 10377
+SHA256 6ce69b3c1735593d09ab51e9174f4e6bb6b185c68fa3fa30676d87174654d1c7 files/freebsd-mk-defs-6.2-2-gentoo.patch 10377
 AUX freebsd-mk-defs-6.2-gentoo.patch 11054 RMD160 3c2ac6c9278d68f746135f9aa880a069bf6f38b1 SHA1 13a8a6e81a0d93acb76ace2469fe2545cc15ddbf SHA256 7fcc34ca491e97f938c5e4d0d8c622502cab4213158680033a7908f1117d57f7
 MD5 9c8d445ffed785adc363b2f429cbc7dc files/freebsd-mk-defs-6.2-gentoo.patch 11054
 RMD160 3c2ac6c9278d68f746135f9aa880a069bf6f38b1 files/freebsd-mk-defs-6.2-gentoo.patch 11054
@@ -48,10 +48,10 @@ EBUILD freebsd-mk-defs-6.2_rc1.ebuild 916 RMD160 d7eb0acc1b4df95fc4c03c865926865
 MD5 622cff68c37a5cff3d78c001c95cf310 freebsd-mk-defs-6.2_rc1.ebuild 916
 RMD160 d7eb0acc1b4df95fc4c03c865926865c3eebac93 freebsd-mk-defs-6.2_rc1.ebuild 916
 SHA256 ee642fc49a6b82872f73b049df22144b150a0eb914c2db4e9ae546d1c2234b6b freebsd-mk-defs-6.2_rc1.ebuild 916
-MISC ChangeLog 6264 RMD160 78a58781e1da61a31e93a0368e2d741ab9762f41 SHA1 292f0371c4398bedbf49a941ac824b2efc1c40f8 SHA256 768e901c2189d466b5530e994b94193d11fb78318614c912a55f2f7566bcc1a2
-MD5 ed56e859f5bc99c3cceae5b14ead1e84 ChangeLog 6264
-RMD160 78a58781e1da61a31e93a0368e2d741ab9762f41 ChangeLog 6264
-SHA256 768e901c2189d466b5530e994b94193d11fb78318614c912a55f2f7566bcc1a2 ChangeLog 6264
+MISC ChangeLog 6424 RMD160 fe4cbe82c695feb9c1665510ea08f798180f97cf SHA1 e2a89d165513b6609744c98b94a9371dece54d68 SHA256 39fba0ab2a1de8a136d6c6970e0cd0281385f2bd4c75f9b91d1876c46e46e600
+MD5 b799d8f1688c03574812dbd11fb26ccf ChangeLog 6424
+RMD160 fe4cbe82c695feb9c1665510ea08f798180f97cf ChangeLog 6424
+SHA256 39fba0ab2a1de8a136d6c6970e0cd0281385f2bd4c75f9b91d1876c46e46e600 ChangeLog 6424
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -68,7 +68,7 @@ SHA256 024124375c6ab02d75182c14804a05289130130427146a81fc2fde80eefa28ae files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYw2fAiZjviIA2XgRAgLMAKDR7FlMVa5mxAiwqxhx/PtJTZKd+QCfaiZk
-G2pk4hQ4MAnFI0u7wOMLQiI=
-=GtqT
+iD8DBQFFZykUAiZjviIA2XgRAp6zAJ9Al4TR+L4SBUoldcUFsv1JTLCopgCeKfe7
+siRqEjnvEtUa8a1qiPoGTmU=
+=gIgd
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
index 613aac808b1a..c09633b575b0 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
@@ -262,3 +262,27 @@ Index: fbsd-6.2b3/share/mk/bsd.libnames.mk
  LIBLN?=		"don't use LIBLN, use LIBL"
  .if !defined(NO_BIND)
  LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
+Index: fbsd-6.2b3/share/mk/bsd.sys.mk
+===================================================================
+--- fbsd-6.2b3.orig/share/mk/bsd.sys.mk
++++ fbsd-6.2b3/share/mk/bsd.sys.mk
+@@ -27,9 +27,6 @@ CFLAGS		+= -std=${CSTD}
+ . if defined(WARNS)
+ .  if ${WARNS} >= 1
+ CWARNFLAGS	+=	-Wsystem-headers
+-.   if !defined(NO_WERROR)
+-CWARNFLAGS	+=	-Werror
+-.   endif
+ .  endif
+ .  if ${WARNS} >= 2
+ CWARNFLAGS	+=	-Wall -Wno-format-y2k
+@@ -60,9 +57,6 @@ WFORMAT		=	1
+ .  if ${WFORMAT} > 0
+ #CWARNFLAGS	+=	-Wformat-nonliteral -Wformat-security -Wno-format-extra-args
+ CWARNFLAGS	+=	-Wformat=2 -Wno-format-extra-args
+-.   if !defined(NO_WERROR)
+-CWARNFLAGS	+=	-Werror
+-.   endif
+ .  endif
+ . endif
+ .endif