Remove 6.1 ebuild.

(Portage version: 2.1.2_rc4-r6)
 (Signed Manifest commit)

9 files changed, 7 insertions, 1019 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 6f80d8fea31a..834a0895d8f9 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,66 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX freebsd-mk-defs-6.0-gentoo.patch 8177 RMD160 d92fa47019d14f1c2d3bbb4981c4871086bded32 SHA1 19580d265ce9a5d7f4cd342dac3c69f75800e4d6 SHA256 82db0cc47f8f3cb863b39592a2fb669786879d16db638e6d30e84b9be69ca5e1
-MD5 adfd04b6eba031ebd843605da95f57fb files/freebsd-mk-defs-6.0-gentoo.patch 8177
-RMD160 d92fa47019d14f1c2d3bbb4981c4871086bded32 files/freebsd-mk-defs-6.0-gentoo.patch 8177
-SHA256 82db0cc47f8f3cb863b39592a2fb669786879d16db638e6d30e84b9be69ca5e1 files/freebsd-mk-defs-6.0-gentoo.patch 8177
 AUX freebsd-mk-defs-6.0-gnu.patch 3584 RMD160 c9705a8a3f1d0f5c1be71587c391efdda846e3a3 SHA1 677729af4401fdc36f8f4582b7b3a0039759c9f4 SHA256 9519ea8a3e7b1261abdf3694501d1634d74670c8ff4e8a328e1e10e089a64695
 MD5 c97a6a9c5fff0c23f14d320e2fa68bae files/freebsd-mk-defs-6.0-gnu.patch 3584
 RMD160 c9705a8a3f1d0f5c1be71587c391efdda846e3a3 files/freebsd-mk-defs-6.0-gnu.patch 3584
 SHA256 9519ea8a3e7b1261abdf3694501d1634d74670c8ff4e8a328e1e10e089a64695 files/freebsd-mk-defs-6.0-gnu.patch 3584
-AUX freebsd-mk-defs-6.0-nowerror.patch 659 RMD160 fd514be7e9b998f57d84efc226e16ef146c35b6f SHA1 84469b86647a9f6d0eff0ffa4e835d338921dd1c SHA256 967eedd2540e3e384f44f330d514bf4c950628ef7b9cb0cbc43ba787cf3dd1b7
-MD5 f2bd3fffc2716aee32086f2b87276cf6 files/freebsd-mk-defs-6.0-nowerror.patch 659
-RMD160 fd514be7e9b998f57d84efc226e16ef146c35b6f files/freebsd-mk-defs-6.0-nowerror.patch 659
-SHA256 967eedd2540e3e384f44f330d514bf4c950628ef7b9cb0cbc43ba787cf3dd1b7 files/freebsd-mk-defs-6.0-nowerror.patch 659
-AUX freebsd-mk-defs-6.0-strip.patch 1235 RMD160 7aa18593c915a54aeec16b270e41fb3e3e645b33 SHA1 0269419911cf5e24400cc032791a8cf71e0649e0 SHA256 f7e976c5f699a8c968babbcee9b813ee62fb96ea220ddf52005468973d9bb063
-MD5 05422b14418bece763450063c220e305 files/freebsd-mk-defs-6.0-strip.patch 1235
-RMD160 7aa18593c915a54aeec16b270e41fb3e3e645b33 files/freebsd-mk-defs-6.0-strip.patch 1235
-SHA256 f7e976c5f699a8c968babbcee9b813ee62fb96ea220ddf52005468973d9bb063 files/freebsd-mk-defs-6.0-strip.patch 1235
-AUX freebsd-mk-defs-6.1-gentoo.patch 10693 RMD160 13e6591579cfe303dbf191b8daa80c15c48afe5a SHA1 bdba1c201f6ac3d1832e9b4c6cf2f07d8e98e481 SHA256 d6b506316738d04ba461e7b77bc9934597c80b9b694f037930658b54d00bd2d9
-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 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
-SHA256 7fcc34ca491e97f938c5e4d0d8c622502cab4213158680033a7908f1117d57f7 files/freebsd-mk-defs-6.2-gentoo.patch 11054
-AUX freebsd-mk-defs-flex.patch 867 RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 SHA1 9dde0c0b6b5efe99de35fe3759f3fde1308a4ed3 SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498
-MD5 7c6bf2b68cd685a9f76af8c0ea652599 files/freebsd-mk-defs-flex.patch 867
-RMD160 a6515de4317f00ec47765987ae3f5bbdd02bc489 files/freebsd-mk-defs-flex.patch 867
-SHA256 3373ded64bf6447a06e1a4e33acd0c3d758fee20488173ab9d6e891ed2399498 files/freebsd-mk-defs-flex.patch 867
-DIST freebsd-share-6.1.tar.bz2 3745745 RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a SHA1 1b21b5bb2338812cb8443bafeb6ed56e00a231c1 SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77
 DIST freebsd-share-6.2_rc2.tar.bz2 3762566 RMD160 d7e8392c49cd1b5f0989a1b87144cc799ae418fa SHA1 0858ea37090fceffb8d9893b38174f803fa7f544 SHA256 bff220ae3d7ab346494e339270a1c7f173593541db05fd102a1c6e8ef52fdda3
-EBUILD freebsd-mk-defs-6.1-r1.ebuild 896 RMD160 46195e29a2c35335688a41299d7659196935dae1 SHA1 f234cc8eeca77f17f24f35e05b70e20467a4a6ce SHA256 52ed71e6f5877763811fe888936c5a675ded6b0e67777c9fbee25084944d5eb1
-MD5 ea616d97ef3404a83cc09a6cead32629 freebsd-mk-defs-6.1-r1.ebuild 896
-RMD160 46195e29a2c35335688a41299d7659196935dae1 freebsd-mk-defs-6.1-r1.ebuild 896
-SHA256 52ed71e6f5877763811fe888936c5a675ded6b0e67777c9fbee25084944d5eb1 freebsd-mk-defs-6.1-r1.ebuild 896
 EBUILD freebsd-mk-defs-6.2_rc2.ebuild 891 RMD160 6a2feacbd1e5c42be625c57126b687b7706960fd SHA1 6cdc6665a7d4a54482bbd5d698fac50ce40632e2 SHA256 3302953fd7db09ccf132bd20bf57bf118675aaa577468b65527105584e09b5fa
 MD5 286f97fbd8e233c1bac035eab7701570 freebsd-mk-defs-6.2_rc2.ebuild 891
 RMD160 6a2feacbd1e5c42be625c57126b687b7706960fd freebsd-mk-defs-6.2_rc2.ebuild 891
 SHA256 3302953fd7db09ccf132bd20bf57bf118675aaa577468b65527105584e09b5fa freebsd-mk-defs-6.2_rc2.ebuild 891
-MISC ChangeLog 6775 RMD160 3d05e2de3dd8693c0061c8b1b9446f5ddf183b1a SHA1 b00c97b375503358bbe47a081f7cd41b9fbc414b SHA256 5623c7765b7ac2c722ff9d178dcdcb6f9842b1674bd3925b89a67a0f2a1eb616
-MD5 ed40d875b7c9bd49ea2856c98b342182 ChangeLog 6775
-RMD160 3d05e2de3dd8693c0061c8b1b9446f5ddf183b1a ChangeLog 6775
-SHA256 5623c7765b7ac2c722ff9d178dcdcb6f9842b1674bd3925b89a67a0f2a1eb616 ChangeLog 6775
+MISC ChangeLog 7135 RMD160 1ab6df3f0d2dbeb20ab3c36eb4a89a81268f3a3f SHA1 ab2c40929c409b1f70e68e0656a3eeb59df40904 SHA256 32f63e296d59414f115205eeb76c217d8582605c8d9d1c5037595d89d82df75f
+MD5 56ae87f1c9dc4c9b77ca2db7f2c73c5e ChangeLog 7135
+RMD160 1ab6df3f0d2dbeb20ab3c36eb4a89a81268f3a3f ChangeLog 7135
+SHA256 32f63e296d59414f115205eeb76c217d8582605c8d9d1c5037595d89d82df75f ChangeLog 7135
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
-MD5 f1a72782a0d392837ecacfc1931ee36d files/digest-freebsd-mk-defs-6.1-r1 259
-RMD160 435f17331e2a54a6ee3811d7545237febace4c27 files/digest-freebsd-mk-defs-6.1-r1 259
-SHA256 1e8cf2e0f827c824b234f8af349dbc641d3ba4763cdac3fdf1cf37f49dc8e8d8 files/digest-freebsd-mk-defs-6.1-r1 259
 MD5 2a059d352a3670cda7a617e864018334 files/digest-freebsd-mk-defs-6.2_rc2 271
 RMD160 a23378364ed9ab420de38cdf597a67e261fac0a8 files/digest-freebsd-mk-defs-6.2_rc2 271
 SHA256 45d46dc4b418caa18cb2c441fa46163fe64e086fdc40153db7b0c38c80844562 files/digest-freebsd-mk-defs-6.2_rc2 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnrppAiZjviIA2XgRAg+vAJ9BeT9v8gVCT8o4WkSCw6FerQbOsACguBf2
-4j0k0RfctXkbeHFwAREDgZg=
-=pU7A
+iD8DBQFFnsLdAiZjviIA2XgRAmPiAJ44rjbOVR89kualKTu6Ys1GwMlLtwCgrQ1r
+ldKA08DOVpqk9A210zPvNxs=
+=VAaE
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1
deleted file mode 100644
index 80d00a6b0cb0..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745
-RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745
-SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch
deleted file mode 100644
index c52f6aa488d4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-Index: fbsd-6.0/share/mk/bsd.doc.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.doc.mk
-+++ fbsd-6.0/share/mk/bsd.doc.mk
-@@ -137,10 +137,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-Index: fbsd-6.0/share/mk/bsd.files.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.files.mk
-+++ fbsd-6.0/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.0/share/mk/bsd.incs.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.incs.mk
-+++ fbsd-6.0/share/mk/bsd.incs.mk
-@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,9 +55,11 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.0/share/mk/bsd.info.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.info.mk
-+++ fbsd-6.0/share/mk/bsd.info.mk
-@@ -85,6 +85,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -145,6 +146,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- .for x in ${INFO}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
-Index: fbsd-6.0/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.lib.mk
-+++ fbsd-6.0/share/mk/bsd.lib.mk
-@@ -208,14 +208,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-Index: fbsd-6.0/share/mk/bsd.man.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.man.mk
-+++ fbsd-6.0/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-Index: fbsd-6.0/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/bsd.prog.mk
-+++ fbsd-6.0/share/mk/bsd.prog.mk
-@@ -133,9 +133,11 @@ realinstall: _proginstall
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -163,6 +165,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-Index: fbsd-6.0/share/mk/sys.mk
-===================================================================
---- fbsd-6.0.orig/share/mk/sys.mk
-+++ fbsd-6.0/share/mk/sys.mk
-@@ -19,7 +19,7 @@ unix		?=	We run FreeBSD, not UNIX.
- .SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
- .endif
- 
--X11BASE		?=	/usr/X11R6
-+X11BASE		?=	/usr
- 
- AR		?=	ar
- .if defined(%POSIX)
-@@ -34,13 +34,13 @@ AFLAGS		?=
- 
- .if defined(%POSIX)
- CC		?=	c89
--CFLAGS		?=	-O
-+CFLAGS		?=	
- .else
--CC		?=	cc
--CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
-+CC		?=	gcc
-+CFLAGS		?=	-pipe
- .endif
- 
--CXX		?=	c++
-+CXX		?=	g++
- CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes}
- 
- CPP		?=	cpp
-@@ -259,12 +259,6 @@ MACHINE_ARCH	?=	i386
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # Default executable format
- # XXX hint for bsd.port.mk
- OBJFORMAT?=	elf
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch
deleted file mode 100644
index 28b496679034..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-nowerror.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fbsd-6/share/mk/bsd.sys.mk
-===================================================================
---- fbsd-6.orig/share/mk/bsd.sys.mk
-+++ fbsd-6/share/mk/bsd.sys.mk
-@@ -12,9 +12,6 @@
- . 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
-@@ -45,9 +42,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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch
deleted file mode 100644
index 2ed1b138730b..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: fbsd-6/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.orig/share/mk/bsd.lib.mk
-+++ fbsd-6/share/mk/bsd.lib.mk
-@@ -32,10 +32,6 @@ CFLAGS+=	${CRUNCH_CFLAGS}
- CFLAGS+= ${DEBUG_FLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-Index: fbsd-6/share/mk/bsd.own.mk
-===================================================================
---- fbsd-6.orig/share/mk/bsd.own.mk
-+++ fbsd-6/share/mk/bsd.own.mk
-@@ -157,10 +157,8 @@ NLSMODE?=	${NOBINMODE}
- 
- INCLUDEDIR?=	/usr/include
- 
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
-+# Don't strip things with install command, leave that to portage
-+STRIP=
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-Index: fbsd-6/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.orig/share/mk/bsd.prog.mk
-+++ fbsd-6/share/mk/bsd.prog.mk
-@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS}
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch
deleted file mode 100644
index 689e0e8652ab..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-Index: fbsd-6.1/share/mk/bsd.doc.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.doc.mk
-+++ fbsd-6.1/share/mk/bsd.doc.mk
-@@ -137,10 +137,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-Index: fbsd-6.1/share/mk/bsd.files.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.files.mk
-+++ fbsd-6.1/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.1/share/mk/bsd.incs.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.incs.mk
-+++ fbsd-6.1/share/mk/bsd.incs.mk
-@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,9 +55,11 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.1/share/mk/bsd.info.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.info.mk
-+++ fbsd-6.1/share/mk/bsd.info.mk
-@@ -85,6 +85,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -145,6 +146,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- .for x in ${INFO}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
-Index: fbsd-6.1/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.lib.mk
-+++ fbsd-6.1/share/mk/bsd.lib.mk
-@@ -32,10 +32,6 @@ CFLAGS+=	${CRUNCH_CFLAGS}
- CFLAGS+= ${DEBUG_FLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -208,14 +204,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-Index: fbsd-6.1/share/mk/bsd.man.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.man.mk
-+++ fbsd-6.1/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-Index: fbsd-6.1/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.prog.mk
-+++ fbsd-6.1/share/mk/bsd.prog.mk
-@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS}
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -133,9 +129,11 @@ realinstall: _proginstall
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-Index: fbsd-6.1/share/mk/sys.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/sys.mk
-+++ fbsd-6.1/share/mk/sys.mk
-@@ -19,7 +19,7 @@ unix		?=	We run FreeBSD, not UNIX.
- .SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
- .endif
- 
--X11BASE		?=	/usr/X11R6
-+X11BASE		?=	/usr
- 
- AR		?=	ar
- .if defined(%POSIX)
-@@ -34,13 +34,13 @@ AFLAGS		?=
- 
- .if defined(%POSIX)
- CC		?=	c89
--CFLAGS		?=	-O
-+CFLAGS		?=	
- .else
--CC		?=	cc
--CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
-+CC		?=	gcc
-+CFLAGS		?=	-pipe
- .endif
- 
--CXX		?=	c++
-+CXX		?=	g++
- CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes}
- 
- CPP		?=	cpp
-@@ -252,12 +252,6 @@ YFLAGS		?=	-d
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # Default executable format
- # XXX hint for bsd.port.mk
- OBJFORMAT?=	elf
-Index: fbsd-6.1/share/mk/bsd.libnames.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.libnames.mk
-+++ fbsd-6.1/share/mk/bsd.libnames.mk
-@@ -40,7 +40,7 @@ LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
- LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -65,7 +65,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeyca
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if !defined(NO_BIND)
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-Index: fbsd-6.1/share/mk/bsd.own.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.own.mk
-+++ fbsd-6.1/share/mk/bsd.own.mk
-@@ -157,10 +157,8 @@ NLSMODE?=	${NOBINMODE}
- 
- INCLUDEDIR?=	/usr/include
- 
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
-+# Don't strip things with install command, leave that to portage
-+STRIP=
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-Index: fbsd-6.1/share/mk/bsd.sys.mk
-===================================================================
---- fbsd-6.1.orig/share/mk/bsd.sys.mk
-+++ fbsd-6.1/share/mk/bsd.sys.mk
-@@ -12,9 +12,6 @@
- . 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
-@@ -45,9 +42,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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch
deleted file mode 100644
index aba8b4f76604..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-gentoo.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-Index: fbsd-6.2b3/share/mk/bsd.doc.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.doc.mk
-+++ fbsd-6.2b3/share/mk/bsd.doc.mk
-@@ -137,10 +137,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${
- realinstall:
- .for _dev in ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-Index: fbsd-6.2b3/share/mk/bsd.files.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.files.mk
-+++ fbsd-6.2b3/share/mk/bsd.files.mk
-@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
- installfiles: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.incs.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.incs.mk
-+++ fbsd-6.2b3/share/mk/bsd.incs.mk
-@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
-+	    ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -51,9 +55,11 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.info.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.info.mk
-+++ fbsd-6.2b3/share/mk/bsd.info.mk
-@@ -85,6 +85,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -146,12 +147,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
- 	    --defsection=${INFOSECTION} \
- 	    --defentry=${INFOENTRY_${x}} \
-Index: fbsd-6.2b3/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.lib.mk
-+++ fbsd-6.2b3/share/mk/bsd.lib.mk
-@@ -32,10 +32,6 @@ CFLAGS+=	${CRUNCH_CFLAGS}
- CFLAGS+= ${DEBUG_FLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .include <bsd.libnames.mk>
- 
- # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -208,14 +204,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-Index: fbsd-6.2b3/share/mk/bsd.man.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.man.mk
-+++ fbsd-6.2b3/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- 	${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-Index: fbsd-6.2b3/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.prog.mk
-+++ fbsd-6.2b3/share/mk/bsd.prog.mk
-@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS}
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -133,9 +129,11 @@ realinstall: _proginstall
- _proginstall:
- .if defined(PROG)
- .if defined(PROGNAME)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
- .endif
-@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-Index: fbsd-6.2b3/share/mk/sys.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/sys.mk
-+++ fbsd-6.2b3/share/mk/sys.mk
-@@ -19,7 +19,7 @@ unix		?=	We run FreeBSD, not UNIX.
- .SUFFIXES:	.out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh
- .endif
- 
--X11BASE		?=	/usr/X11R6
-+X11BASE		?=	/usr
- 
- AR		?=	ar
- .if defined(%POSIX)
-@@ -34,13 +34,13 @@ AFLAGS		?=
- 
- .if defined(%POSIX)
- CC		?=	c89
--CFLAGS		?=	-O
-+CFLAGS		?=	
- .else
--CC		?=	cc
--CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
-+CC		?=	gcc
-+CFLAGS		?=	-pipe
- .endif
- 
--CXX		?=	c++
-+CXX		?=	g++
- CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes}
- 
- CPP		?=	cpp
-@@ -252,12 +252,6 @@ YFLAGS		?=	-d
- 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
- 	rm -f ${.PREFIX}.tmp.c
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # Default executable format
- # XXX hint for bsd.port.mk
- OBJFORMAT?=	elf
-Index: fbsd-6.2b3/share/mk/bsd.libnames.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.libnames.mk
-+++ fbsd-6.2b3/share/mk/bsd.libnames.mk
-@@ -41,7 +41,7 @@ LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
- LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -66,7 +66,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeyca
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if !defined(NO_BIND)
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
-Index: fbsd-6.2b3/share/mk/bsd.own.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.own.mk
-+++ fbsd-6.2b3/share/mk/bsd.own.mk
-@@ -157,10 +157,8 @@ NLSMODE?=	${NOBINMODE}
- 
- INCLUDEDIR?=	/usr/include
- 
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
-+# Don't strip things with install command, leave that to portage
-+STRIP=
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch
deleted file mode 100644
index 2ca4d038bd3e..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur -x '*~' share/mk/bsd.libnames.mk share-flex/mk/bsd.libnames.mk
---- share/mk/bsd.libnames.mk	2004-11-28 15:10:18.000000000 +0100
-+++ share-flex/mk/bsd.libnames.mk	2005-07-10 01:45:38.009094320 +0200
-@@ -39,7 +39,7 @@
- LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
- LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
-@@ -64,7 +64,7 @@
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDOR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- .if !defined(NO_BIND)
- LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild
deleted file mode 100644
index 0b5089fc30b7..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild,v 1.1 2006/05/09 16:50:08 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="nostrip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}/share
-	epatch "${FILESDIR}/${PN}-6.1-gentoo.patch"
-
-	[[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
-		epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk
-}