gentoo resync : 13.10.2019

8 files changed, 0 insertions, 518 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
deleted file mode 100644
index 7b3bf271db14..000000000000
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 BLAKE2B 9e27da87743872a3d4361a353c2864c00dacdbf33d7df2197507262769512e0f34e40aa3ff4247601e0393a0e2c4545a866448025ed6013a5e9ca283ff91a56d SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168
-AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af43f8d278c1eb9fe1aed95df0aea36a291d85d6e143d74ce7ff65fb777258f31ec4138ac8dc2b00710254538ff95f743fa SHA512 bda6a5396c653b964426a3de80ed9c37205d30f3a863f7df231e0cc708ce3bca65ef46f2ca8bf63ea9a37309e2d3ac74ccbf0000e147688be686c998d940ded0
-AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545
-AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2
-AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-EBUILD freebsd-mk-defs-11.1.ebuild 1136 BLAKE2B ffd94b408344303a33c949098cb8bf7084255cfe8adaf4f3bfb5d31a0907c37fb05596f955dd21ac0012c84a836c16267608b5083b343f187f16f1b622e4f4bb SHA512 645fff46a41d3c00ffb966139d58f2e46a6bedabbd163692300fa46bd7cf956d75dd5a7a41b733f7a6eb7743a2049de038a2c9484671a1a0d861dd2bab34b544
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch
deleted file mode 100644
index d12bbbe552fd..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-drop-unsupport-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 37c4d01..e840a25 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -112,7 +112,7 @@ CWARNFLAGS+=	-Wno-error=unused-function -Wno-error=enum-compare -Wno-error=logic
- .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600
- FORMAT_EXTENSIONS=	-D__printf__=__freebsd_kprintf__
- .else
--FORMAT_EXTENSIONS=	-fformat-extensions
-+FORMAT_EXTENSIONS=
- .endif
- 
- .if defined(IGNORE_PRAGMA)
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch
deleted file mode 100644
index 97e882d51aac..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gnu.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 92df111..88c75d9 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -184,7 +184,7 @@ _LIBS=		lib${LIB_PRIVATE}${LIB}.a
- lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--	${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+	${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -199,7 +199,7 @@ CLEANFILES+=	${POBJS}
- lib${LIB_PRIVATE}${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--	${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${POBJS} | tsort -q` ${ARADD}
-+	${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -247,7 +247,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .endif
- 	${_LD:N${CCACHE_BIN}} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' NMFLAGS='${NMFLAGS}' lorder ${SOBJS} | tsort -q` ${LDADD}
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -312,13 +312,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 3b1ecf8..26ac9c5 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -196,13 +196,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch
deleted file mode 100644
index 5da025d03f37..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-libproc-libcxx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
-index 14489a8..c993f7c 100644
---- a/share/mk/src.libnames.mk
-+++ b/share/mk/src.libnames.mk
-@@ -245,7 +245,7 @@ _DP_radius=	crypto
- .endif
- _DP_procstat=	kvm util elf
- .if ${MK_CXX} == "yes"
--.if ${MK_LIBCPLUSPLUS} != "no"
-+.if ${COMPILER_TYPE} == "clang"
- _DP_proc=	cxxrt
- .else
- _DP_proc=	supcplusplus
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch
deleted file mode 100644
index fd72f1fe846e..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-rename-libs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
-index 249ac52..14489a8 100644
---- a/share/mk/src.libnames.mk
-+++ b/share/mk/src.libnames.mk
-@@ -343,6 +343,11 @@ LIBATF_CXX=	${DESTDIR}${LIBDIR}/libprivateatf-c++.a
- LDADD_atf_c=	-lprivateatf-c
- LDADD_atf_cxx=	-lprivateatf-c++
- 
-+LDADD_bsdxml=	-lexpat
-+LDADD_l=	-lfl
-+LDADD_termcap=	-lncurses
-+LDADD_termcapw=	-lncursesw
-+
- .for _l in ${_PRIVATELIBS}
- LIB${_l:tu}?=	${DESTDIR}${LIBDIR}/libprivate${_l}.a
- .endfor
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.1-gentoo.patch
deleted file mode 100644
index 051fd899b748..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.1-gentoo.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 9baa335..8cb61e2 100644
---- a/share/mk/bsd.doc.mk
-+++ b/share/mk/bsd.doc.mk
-@@ -144,10 +144,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
- realinstall:
- .if ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/
- .endif
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/
- .endfor
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index 111a7f1..cde2568 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -61,6 +61,7 @@ stage_as.${file:T}: ${file}
- 
- installfiles-${group}: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -75,10 +76,12 @@ stage_files.${group}: ${_${group}FILES}
- installfiles-${group}: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
- .endif
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index 04c1407..06ddde3 100644
---- a/share/mk/bsd.incs.mk
-+++ b/share/mk/bsd.incs.mk
-@@ -60,6 +60,9 @@ stage_includes: stage_as.${header:T}
- 
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		-g ${${group}GRP_${.ALLSRC:T}} \
-+		${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -75,9 +78,13 @@ stage_includes: stage_files.${group}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/
- .endif
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index 46498fa..7b673f8 100644
---- a/share/mk/bsd.info.mk
-+++ b/share/mk/bsd.info.mk
-@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index c59027c..f996c35 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?=	-s
- .endif
- 
- .if ${SHLIBDIR:M*lib32*}
-@@ -336,14 +334,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
- 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
-@@ -388,10 +389,12 @@ _libinstall:
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/
- .endif
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index 98746fa..5c541ab 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -64,7 +64,7 @@ LIBELF?=	${DESTDIR}${LIBDIR_BASE}/libelf.a
- LIBEXECINFO?=	${DESTDIR}${LIBDIR_BASE}/libexecinfo.a
- LIBFETCH?=	${DESTDIR}${LIBDIR_BASE}/libfetch.a
- LIBFIGPAR?=	${DESTDIR}${LIBDIR_BASE}/libfigpar.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR_BASE}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR_BASE}/libform.a
- LIBG2C?=	${DESTDIR}${LIBDIR_BASE}/libg2c.a
- LIBGEOM?=	${DESTDIR}${LIBDIR_BASE}/libgeom.a
-@@ -93,7 +93,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR_BASE}/libkeycap.a
- LIBKICONV?=	${DESTDIR}${LIBDIR_BASE}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR_BASE}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR_BASE}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR_BASE}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR_BASE}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- LIBLZMA?=	${DESTDIR}${LIBDIR_BASE}/liblzma.a
- LIBM?=		${DESTDIR}${LIBDIR_BASE}/libm.a
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 75acbe1..b662439 100644
---- a/share/mk/bsd.links.mk
-+++ b/share/mk/bsd.links.mk
-@@ -16,9 +16,11 @@ afterinstall: _installlinks
- _installlinks:
- .for s t in ${LINKS}
- 	@${ECHO} "${t} -> ${s}" ;\
-+	test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
- 	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t}
- .endfor
- .for s t in ${SYMLINKS}
- 	@${ECHO} "${t} -> ${s}" ;\
-+	test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
- 	${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t}
- .endfor
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
-index 7306453..5fcd4f7 100644
---- a/share/mk/bsd.man.mk
-+++ b/share/mk/bsd.man.mk
-@@ -188,9 +188,11 @@ maninstall: ${MAN}
- .if ${MK_MANCOMPRESS} == "no"
- .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
-@@ -204,11 +206,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
-@@ -216,9 +221,11 @@ maninstall: ${MAN}
- .endif	# defined(MANFILTER)
- .else	# ${MK_MANCOMPRESS} == "yes"
- .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
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
-index 6f769d3..1679973 100644
---- a/share/mk/bsd.nls.mk
-+++ b/share/mk/bsd.nls.mk
-@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
- SYMLINKS+= ${NLSSYMLINKS}
- .endif
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- .if !empty(NLSLINKS_${file:R}:M${file:R})
- .error NLSLINKS_${file:R} contains itself: ${file:R}
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index 3450a01..8ad3e69 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -217,9 +217,6 @@ INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
- INSTALL_RSYMLINK?=	${INSTALL} ${RSYMLINK}
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index e4727ac..775fd8a 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -44,10 +44,6 @@ CTFFLAGS+= -g
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_ROOT)
- .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
- TAGS+=		package=${PACKAGE:Uruntime}
-@@ -217,6 +213,7 @@ realinstall: _proginstall
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .if ${MK_DEBUG_FILES} != "no"
-@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- STAGE_AS_${script:T}=		${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index cb79bf1..3cad05f 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -29,9 +29,6 @@ CFLAGS+=	-std=${CSTD}
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -103,9 +100,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
- .if ${WARNS} <= 3
- CWARNFLAGS.clang+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE})
-@@ -154,6 +148,13 @@ CFLAGS.clang+=	 -fno-dwarf2-cfi-asm
- # but not yet.
- CXXFLAGS.clang+=	 -Wno-c++11-extensions
- 
-+.if ${MK_SSP} == "no"
-+# gcc-4.9, -fstack-protector-strong is enabled by default.
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
-+SSP_CFLAGS?=    -fno-stack-protector
-+CFLAGS+=	${SSP_CFLAGS}
-+.endif
-+
- .if ${MK_SSP} != "no" && \
-     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
- .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk
-index 91d5a9a..7786edb 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -422,12 +422,6 @@ YFLAGS		?=	-d
- 	rm -f ${.PREFIX}.tmp.c
- 	${CTFCONVERT_CMD}
- 
--# Pull in global settings.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # late include for customization
- .sinclude <local.sys.mk>
- 
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
deleted file mode 100644
index 46502242b6f5..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="share/"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	local installdir
-
-	epatch "${FILESDIR}/${PN}-11.1-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch"
-	epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch"
-	epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch"
-
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		installdir="/usr/share/mk/freebsd"
-	else
-		installdir="/usr/share/mk"
-	fi
-
-	sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	freebsd_src_install
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd/system
-	else
-		insinto /usr/share/mk/system
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-mk-defs/metadata.xml b/sys-freebsd/freebsd-mk-defs/metadata.xml
deleted file mode 100644
index a00f3aeb1f81..000000000000
--- a/sys-freebsd/freebsd-mk-defs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-</pkgmetadata>