sys-freebsd/freebsd-mk-defs: update ${PN}-11.0-gentoo.patch

2 files changed, 29 insertions, 13 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 239188f..798a003 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,7 +1,7 @@
 AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba
 AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7
 AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 SHA256 4f592c92b88173156bb4688ccc2f26d79a37fa2c9905fc93286291fe80fb9533 SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 WHIRLPOOL de041217c36baee221543ebfd6fd202bd8a7f753d27cb9118f8c38b4f94bdde6b6726db6967a007f6ed6aba4b65e39aa139ae374858b32e5a895cb7bd3335d33
-AUX freebsd-mk-defs-11.0-gentoo.patch 12249 SHA256 43a1f6fbbb4c8290c0104a7363f9f66f54de0082487107fdd477205ef44c527f SHA512 992451114b971684c17e5a6eb849599763dc89f703885bda65d8aed67c5b45f939713c384a8eebdec9c68260495af68ec0bb41fa0ffd064d6e58fd18d49a2d3e WHIRLPOOL 1ac9559e8ce8f742f2fc5dff987038bf6af91d18b2cd16c347967671f24de5fee753b2a67d494353cc0ced4cc6bd098e8e902055bd24432c21e00fa5057bc17d
+AUX freebsd-mk-defs-11.0-gentoo.patch 12840 SHA256 30b491c6037f302f62c6d7d9cec93d32b03333ded0dc4bf54dbd37b0394801c6 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 WHIRLPOOL 1e3d87efa5303586218e9719e9d7aa86b9168413638c7b98cb64ff670f30c84d024627c66e8f53f8227c62b945333a8d625160caaaa9b7ce943718a8556c9736
 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 SHA256 dbefba73ba46a51a252fe17dbd0530df9fcf613ea990bdfa75689151e24d9ef8 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545 WHIRLPOOL 1a6df92d61ac0d72ce04c0989377e63a08f995990abb0d7c6fbe876594bf005c6fc277d2fc63b54e5f1dafbf7c1d1740da263a6441fede72d13eb617fae4713b
 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 SHA256 a776bf656af7c328d2cd02c13e95e2c869240476459d8129e0227254e79a0847 SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2 WHIRLPOOL 5e175ca3eba51680ae1fdd54dfe92eff92f83de4d9b589d7067e0cdd4480991b264da01a28f2a3e237cfe781332ca26e5bbc12f61c5fc9f8e90646a438df0a87
 AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch
index 3724f13..e87bdba 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch
@@ -1,5 +1,5 @@
 diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 9fc6d8f..8ec6e9e 100644
+index 9f4ea2c..0f666bf 100644
 --- a/share/mk/bsd.doc.mk
 +++ b/share/mk/bsd.doc.mk
 @@ -144,10 +144,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
@@ -16,7 +16,7 @@ index 9fc6d8f..8ec6e9e 100644
  	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/
  .endfor
 diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index 04a0621..45c059e 100644
+index bc123e1..4707b84 100644
 --- a/share/mk/bsd.files.mk
 +++ b/share/mk/bsd.files.mk
 @@ -63,6 +63,7 @@ stage_as.${file:T}: ${file}
@@ -41,7 +41,7 @@ index 04a0621..45c059e 100644
  	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
  .endif
 diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index 897618a..a5548bc 100644
+index 9636e8c..fc2751a 100644
 --- a/share/mk/bsd.incs.mk
 +++ b/share/mk/bsd.incs.mk
 @@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T}
@@ -69,7 +69,7 @@ index 897618a..a5548bc 100644
  	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/
  .endif
 diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index 3081488..11d4547 100644
+index 0544662..1a7aad7 100644
 --- a/share/mk/bsd.info.mk
 +++ b/share/mk/bsd.info.mk
 @@ -83,6 +83,7 @@ INFO2HTML?=	info2html
@@ -103,7 +103,7 @@ index 3081488..11d4547 100644
  .endif
  .endfor
 diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 3145dbd..5932e17 100644
+index bd93e57..92df111 100644
 --- a/share/mk/bsd.lib.mk
 +++ b/share/mk/bsd.lib.mk
 @@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS}
@@ -147,7 +147,7 @@ index 3145dbd..5932e17 100644
  	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/
  .endif
 diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index 101cddf..2285b63 100644
+index 0844ae2..caec715 100644
 --- a/share/mk/bsd.libnames.mk
 +++ b/share/mk/bsd.libnames.mk
 @@ -63,7 +63,7 @@ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
@@ -168,8 +168,24 @@ index 101cddf..2285b63 100644
  LIBLN?=		"don't use LIBLN, use LIBL"
  LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
  LIBM?=		${DESTDIR}${LIBDIR}/libm.a
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 0c7d063..f5d1779 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 1eec745..31089fd 100644
+index 6f78501..bc9a1a6 100644
 --- a/share/mk/bsd.man.mk
 +++ b/share/mk/bsd.man.mk
 @@ -188,9 +188,11 @@ maninstall: ${MAN}
@@ -212,7 +228,7 @@ index 1eec745..31089fd 100644
  		${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 b1a8094..91ab4f3 100644
+index 87a7347..c860c97 100644
 --- a/share/mk/bsd.nls.mk
 +++ b/share/mk/bsd.nls.mk
 @@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
@@ -226,7 +242,7 @@ index b1a8094..91ab4f3 100644
  .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 49f6929..2cadaea 100644
+index c10e492..5984215 100644
 --- a/share/mk/bsd.own.mk
 +++ b/share/mk/bsd.own.mk
 @@ -233,9 +233,6 @@ INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
@@ -240,7 +256,7 @@ index 49f6929..2cadaea 100644
  COMPRESS_CMD?=	gzip -cn
  COMPRESS_EXT?=	.gz
 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index bf1bd80..75d2f06 100644
+index f1a5c65..3b1ecf8 100644
 --- a/share/mk/bsd.prog.mk
 +++ b/share/mk/bsd.prog.mk
 @@ -44,10 +44,6 @@ CTFFLAGS+= -g
@@ -271,7 +287,7 @@ index bf1bd80..75d2f06 100644
  	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
  	    ${.ALLSRC} \
 diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 7885056..6263ba8 100644
+index 0ae45c5..37c4d01 100644
 --- a/share/mk/bsd.sys.mk
 +++ b/share/mk/bsd.sys.mk
 @@ -29,9 +29,6 @@ CFLAGS+=	-std=${CSTD}
@@ -309,7 +325,7 @@ index 7885056..6263ba8 100644
      ${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 27b259b..58091a5 100644
+index 5cfd0bb..25abf8e 100644
 --- a/share/mk/sys.mk
 +++ b/share/mk/sys.mk
 @@ -418,12 +418,6 @@ YFLAGS		?=	-d