* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-06-18 12:57 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-06-18 12:57 UTC (permalink / raw
To: gentoo-commits
commit: fbe78607c0b6ce5f271eed17c855a78f02313d09
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jun 18 12:47:42 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jun 18 12:47:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=fbe78607
freebsd-mk-defs-9.9999-gentoo.patch: Since source code has been changed, update the patch.
---
sys-freebsd/freebsd-mk-defs/Manifest | 2 +-
.../files/freebsd-mk-defs-9.9999-gentoo.patch | 29 ++++++++++------------
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index e3a2a84..d2f71e7 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,5 +2,5 @@ AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a57962
AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
-AUX freebsd-mk-defs-9.9999-gentoo.patch 12207 SHA256 2d491dfda925ef04e3982dddc50ae8851ecbdf4e4c081c97c70b565c8834f52d SHA512 a99165302462f353e81f966174a473ec5a8189d62f5a21abc6c7ad67292705046d2be208f61acd545a315d4b57f3a97dff568000b9d3c97551e72571ea1a2de9 WHIRLPOOL 48be8e60479365528a18c4d4fbc933407fe7944fd5eb4588c202e61107e3ee59f6fcb4fcab89b61d58d3878f2891f1b0d120863ed8fbe5f333e7b1db2567e9c2
+AUX freebsd-mk-defs-9.9999-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
EBUILD freebsd-mk-defs-9.9999.ebuild 773 SHA256 71d299b8108c607500cfa489d0d889ddabceee47bda1ffd731ee7e3923593d22 SHA512 c0a3da9b72ead3b00c9024e0743a2726ec64163dd562226ada159968efd8afcc078daf8cf4b99a9ca3864b9dd34b3908e397b35fb329a06c3fbc805ba167d25b WHIRLPOOL 5bacda2c2ff1b4f2dc40dc351320a49a088e1fff2022689d22d6a06f16bac85ae6e96083671f815cff5e0dcf2c9504c25c00728fa97c103768f2854e981fb980
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
index 0753043..ce66bc8 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
@@ -1,5 +1,4 @@
-tested revision 250694.
-
+tested revision 251934.
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
index d9f0ccf..9cf6b4f 100644
@@ -119,21 +118,19 @@ index c54b435..d283240 100644
.endif
.endfor
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 6b99a4d..f53f655 100644
+index 05a949f..215d198 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
-@@ -41,10 +41,6 @@ CTFFLAGS+= -g
+@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
.endif
+-.else
+-STRIP?= -s
.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
-@@ -259,14 +255,17 @@ realinstall: _libinstall
+@@ -256,14 +254,17 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -151,7 +148,7 @@ index 6b99a4d..f53f655 100644
${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -304,10 +303,12 @@ _libinstall:
+@@ -306,10 +307,12 @@ _libinstall:
.endif # SHLIB_LINK
.endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
@@ -280,7 +277,7 @@ index b871f91..bbcd667 100644
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 24f6e1c..48f62d4 100644
+index 0cf2f6d..50d5e54 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -28,10 +28,6 @@ CTFFLAGS+= -g
@@ -294,15 +291,15 @@ index 24f6e1c..48f62d4 100644
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
LDFLAGS+= -static
.endif
-@@ -153,6 +149,7 @@ realinstall: _proginstall
+@@ -152,6 +148,7 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
+ ${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -184,6 +181,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
+ .endif
+@@ -178,6 +175,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2016-09-30 11:40 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2016-09-30 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 99ef1e8a9dcf50cb93a20827c223d319008d7c8a
Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 11:34:28 2016 +0000
Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
CommitDate: Fri Sep 30 11:34:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=99ef1e8a
sys-freebsd/freebsd-mk-defs: update ${PN}-11.0-gentoo.patch
sys-freebsd/freebsd-mk-defs/Manifest | 2 +-
.../files/freebsd-mk-defs-11.0-gentoo.patch | 40 +++++++++++++++-------
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2014-07-13 3:14 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2014-07-13 3:14 UTC (permalink / raw
To: gentoo-commits
commit: 04fc0d4a2fb933d3339af68f314511ab217b5a32
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat May 17 08:49:36 2014 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat May 17 08:49:36 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=04fc0d4a
freebsd-mk-defs-9.9999: added freebsd-mk-defs-9.3-gentoo.patch
---
sys-freebsd/freebsd-mk-defs/Manifest | 3 +-
.../files/freebsd-mk-defs-9.3-gentoo.patch | 352 +++++++++++++++++++++
.../freebsd-mk-defs/freebsd-mk-defs-9.9999.ebuild | 2 +-
3 files changed, 355 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index b9e4a71..ef2ed7e 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -6,5 +6,6 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
+AUX freebsd-mk-defs-9.3-gentoo.patch 12275 SHA256 e77676e5604a77d10cb3f245de9e5d12acd37064f9d1220a7bc9b562de8068a6 SHA512 db184d82508f386c7176f68431009c89d97fe1d11a5fcb29579341162b85f1e14d4b8fcbe9b4e2c6bd4b097b4b8c68fb8282b27d56f053cf94eaf43e28b31301 WHIRLPOOL fc1bb6d56b93490a00b9c05273920d8051a3c89ec329efecc2483c8cc60d7fddc907b24bcd82a829e159e3f83a1ff85fc8cf2b7cd1e014f68f1fcf98809cbae0
EBUILD freebsd-mk-defs-10.0.9999.ebuild 771 SHA256 0ca344fabe81b986b96dda8f26db350327a987ef22f89135469463893d3965cb SHA512 a289facabe6b13a086162de780df42f087d83dd132b0dcd4725c6faba644148ed09bde54105c94ed0916060cdac269ad11fe379d17b237969ff486b566168636 WHIRLPOOL ea3eb5d2ae4ce418f2c4b94c0aeef41e489b37d97b628e600fb7742100f8eb9fec3766f19b2c3b7271fa820ee96775fd432b890d679b0a5bbd82323fb6ebf241
-EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 7994ede1d1013b451d8e8910a1d89f16d963fbc28f2b75d0f586600a607f5f40 SHA512 127d7db37343996a51efe65e54d07d292d8af644e8ede36dd8f8a279f4491bde242cb0f42b3b38997a549a5b9cb55b3cb0379928a2d09ae78d766262797bfda7 WHIRLPOOL a8e26259ed6250e8ffdabb70d294705bb57f57091fa02f42fcd11d534965b56b1d28e751ad1b4344928a0cbf02c9cc01562661a3fdbdf69fdb02cb3f336c219f
+EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 124a973998334da294f3a00559a1d1a62509e7a76661aa921730872e10544a31 SHA512 2962d1fe2af85eb0fc9624a0a0d59a05638fd3eb4d214ffa82774cc76bf3ae7b8ef83a4e6a2a8450b5f404d90e3fe06f537bcabe5b164e8beee8b2418b2b440e WHIRLPOOL 75a3b0b14c9b55402af8559f98526220ac011363dc0268fbacdf7eff9da0c01cf8faeef80fb6dfe17bd859c9d6ab8d6a750c78334570427e03d5fd2ab7449d42
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch
new file mode 100644
index 0000000..ba4b5cf
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.3-gentoo.patch
@@ -0,0 +1,352 @@
+tested revision 266298.
+
+diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
+index 0b2e46b..4854519 100644
+--- a/share/mk/bsd.compiler.mk
++++ b/share/mk/bsd.compiler.mk
+@@ -1,7 +1,7 @@
+ # $FreeBSD: stable/9/share/mk/bsd.compiler.mk 253220 2013-07-11 20:09:46Z dim $
+
+ .if !defined(COMPILER_TYPE)
+-. if ${CC:T:Mgcc*}
++. if ${CC:T:M*gcc*}
+ COMPILER_TYPE:= gcc
+ . elif ${CC:T:Mclang}
+ COMPILER_TYPE:= clang
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
+index ccc6aaa..579eb76 100644
+--- a/share/mk/bsd.doc.mk
++++ b/share/mk/bsd.doc.mk
+@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
+ 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
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
+index cf77893..85d1c78 100644
+--- a/share/mk/bsd.files.mk
++++ b/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:T}}
+ ${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
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
+index 51200a6..efa04cc 100644
+--- a/share/mk/bsd.incs.mk
++++ b/share/mk/bsd.incs.mk
+@@ -41,6 +41,9 @@ ${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}} \
++ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ ${.ALLSRC} \
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
+ installincludes: _${group}INS
+ _${group}INS: ${_${group}INCS}
+ .if defined(${group}NAME)
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++ ${DESTDIR}${${group}DIR}
+ ${INSTALL} -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} -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 285a778..c09a8dd 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
+
+@@ -144,15 +145,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 c6ff20a..7c2a816 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
+ .endif
+-.else
+-STRIP?= -s
+ .endif
+
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
+@@ -302,14 +300,17 @@ realinstall: _libinstall
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
+ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
+ .endif
+ .if ${MK_PROFILE} != "no" && 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}
+@@ -363,10 +364,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} -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} -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 fce7e2a..4ee6f81 100644
+--- a/share/mk/bsd.libnames.mk
++++ b/share/mk/bsd.libnames.mk
+@@ -50,7 +50,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
+ LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
+ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
+ LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
+-LIBFL?= "don't use LIBFL, use LIBL"
++LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
+ LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
+ LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
+ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
+@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
+ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
+ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
+ LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
+-LIBL?= ${DESTDIR}${LIBDIR}/libl.a
++LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
+ LIBLN?= "don't use LIBLN, use LIBL"
+ .if ${MK_BIND} != "no"
+ LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 1e848c5..035f5aa 100644
+--- a/share/mk/bsd.links.mk
++++ b/share/mk/bsd.links.mk
+@@ -15,6 +15,8 @@ _installlinks:
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
++ d=`dirname $$t`; \
++ test -d $$d || mkdir $$d; \
+ ${INSTALL_LINK} $$l $$t; \
+ done; true
+ .endif
+@@ -26,6 +28,8 @@ _installlinks:
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
++ d=`dirname $$t`; \
++ test -d $$d || mkdir $$d; \
+ ${INSTALL_SYMLINK} $$l $$t; \
+ done; true
+ .endif
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
+index d76fb48..a93c3b8 100644
+--- a/share/mk/bsd.man.mk
++++ b/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
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
+index 2d18ad4..1f06753 100644
+--- a/share/mk/bsd.nls.mk
++++ b/share/mk/bsd.nls.mk
+@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
+ # installation rules
+ #
+ .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})
+ NLSLINKS+= ${file:R}
+ .endif
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
+index 11a63cf..37ff0f2 100644
+--- a/share/mk/bsd.own.mk
++++ b/share/mk/bsd.own.mk
+@@ -202,9 +202,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
+
+ # 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 34937f8..d2ae145 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_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
+ LDFLAGS+= -static
+ .endif
+@@ -201,6 +197,7 @@ realinstall: _proginstall
+ .ORDER: beforeinstall _proginstall
+ _proginstall:
+ .if defined(PROG)
++ ${INSTALL} -d ${DESTDIR}${BINDIR}
+ ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
+ .if ${MK_DEBUG_FILES} != "no"
+@@ -234,6 +231,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} \
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index 519143c..358371d 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+ CWARNFLAGS+= -Wsystem-headers
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+- || !defined(NO_WERROR.clang))
+-CWARNFLAGS+= -Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WARNS >= 1
+ .if ${WARNS} >= 2
+ CWARNFLAGS+= -Wall -Wno-format-y2k
+@@ -95,10 +91,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
+ CWARNFLAGS+= -Wno-format-nonliteral
+ .endif # WARNS <= 3
+ .endif # CLANG
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+- || !defined(NO_WERROR.clang))
+-CWARNFLAGS+= -Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WFORMAT > 0
+ .endif # WFORMAT
+ .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk
+index 3d61918..5b841ff 100644
+--- a/share/mk/sys.mk
++++ b/share/mk/sys.mk
+@@ -311,12 +311,6 @@ YFLAGS ?= -d
+ rm -f ${.PREFIX}.tmp.c
+ ${CTFCONVERT_CMD}
+
+-# 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
+-
+ .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
+ SHELL= ${__MAKE_SHELL}
+ .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999.ebuild
index ef80add..198add9 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999.ebuild
@@ -24,7 +24,7 @@ RESTRICT="strip"
S="${WORKDIR}/share/mk"
src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-9.3-gentoo.patch"
use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch"
}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-10-15 12:03 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-10-15 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 35a7b72d61d387b608459efaf0f8e8d6478264b8
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Oct 15 12:01:26 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Oct 15 12:01:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=35a7b72d
added freebsd-mk-defs-10.0-gnu.patch.
---
sys-freebsd/freebsd-mk-defs/Manifest | 3 +-
.../files/freebsd-mk-defs-10.0-gnu.patch | 79 ++++++++++++++++++++++
.../freebsd-mk-defs-10.9999_p256420.ebuild | 2 +-
3 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 26ff7e8..1e5e205 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,9 +1,10 @@
AUX freebsd-mk-defs-10.0-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
+AUX freebsd-mk-defs-10.0-gnu.patch 2290 SHA256 c393eacd7abc98e74d9c6d222a1edb9fd8fb3ef300dd88ae1805962d40bbfb9d SHA512 06bee5f219f7650041a48558ba3447125179ba501a8e5cf767533cd8fb972ef73eb68bbe8099b429326a5ca9ece4afa54d97fabf915b21d46d0574aeaa1e1e18 WHIRLPOOL f594d656a27a4ffe2b3613d74b7997bd91f01e3a254932217654720fe35bb1dcebb425685837c939a1fdd1d0f36d074d011ca99811c36e59654307421dd2b152
AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a5796282dff28e8b48d728905eaba343dd1d9232 SHA512 c5ff71797f771c334560364270d9e01fa35c1368e713057c559d86b05992d2ca3a19bc65beec240cae2f5ca07391e32c127211a3b577bc9e573104843c34942e WHIRLPOOL a22613d188c27d28de8ebbea9440d4a6333a4c19fa1bcdf6061cc468e150556f5cbe472dc3f6c3f29947827817ba6dd5af933a8a117793293118bcc9bb0f5362
AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
-EBUILD freebsd-mk-defs-10.9999_p256420.ebuild 771 SHA256 eddde084530a6d433ed8b3313beae610cca056ba234f676e6105dc5e4b6def38 SHA512 4d9557632c931a04d04c092e617cc8d7addda15cc4f1f5cbaa4c7fbec079aedcc9103bfaa9e3a8d9fbf9048190a859312550c888597c6d6c6c88f3bb556f4b1f WHIRLPOOL d362aaa95ad288d8475a5682fdfcbc51dcb74f6cdd6ff7a4743c3d7313ccd5252391e33115b9abc60261b2f722e9c8c2599471dda5a4ace0040dc90e34d2a415
+EBUILD freebsd-mk-defs-10.9999_p256420.ebuild 772 SHA256 5302bdb93608cc7c4c8edc6267879ce9944c1f7a0653d08bfa25bb590c0449d6 SHA512 327f30cd748165d7d932ab744c4183df601c57cdb46af39af76d3187dd6fc0adccce5d824e83d915133535330ca93de16398d9ad24f98b2af5f1cc40a8fe0ce1 WHIRLPOOL 4e0b4ad721f594b73d51e46e566050abcd621e700f03bf095f4449656809b45486f2e3dd8b9811b595e765e48f010a8fc5480ed90455f3e9aaebec9d1a868447
EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
new file mode 100644
index 0000000..acce807
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gnu.patch
@@ -0,0 +1,79 @@
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index 0a33fdb..cd7ca2f 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -165,11 +165,7 @@ _LIBS= lib${LIB}.a
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ @${ECHO} building static ${LIB} library
+ @rm -f ${.TARGET}
+-.if !defined(NM)
+- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.else
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.endif
++ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
+ ${RANLIB} ${.TARGET}
+ .endif
+
+@@ -182,11 +178,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
+ lib${LIB}_p.a: ${POBJS}
+ @${ECHO} building profiled ${LIB} library
+ @rm -f ${.TARGET}
+-.if !defined(NM)
+- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+-.else
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+-.endif
++ @${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
+ ${RANLIB} ${.TARGET}
+ .endif
+
+@@ -213,15 +205,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
+ .if defined(SHLIB_LINK)
+ @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
+ .endif
+-.if !defined(NM)
+ @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ -o ${.TARGET} -Wl,-soname,${SONAME} \
+- `lorder ${SOBJS} | tsort -q` ${LDADD}
+-.else
+- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+- -o ${.TARGET} -Wl,-soname,${SONAME} \
+- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+-.endif
++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
+ .if ${MK_CTF} != "no"
+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+ .endif
+@@ -279,13 +265,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 02024e0..0f9010d 100644
+--- a/share/mk/bsd.prog.mk
++++ b/share/mk/bsd.prog.mk
+@@ -180,13 +180,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/freebsd-mk-defs-10.9999_p256420.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.9999_p256420.ebuild
index 5baeafe..6bc1344 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.9999_p256420.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.9999_p256420.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/share/mk"
src_prepare() {
epatch "${FILESDIR}/${PN}-10.0-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch"
+ use userland_GNU && epatch "${FILESDIR}/${PN}-10.0-gnu.patch"
}
src_compile() { :; }
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-09-15 13:25 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-09-15 13:25 UTC (permalink / raw
To: gentoo-commits
commit: add264e9a284b07fc6711679e465e08c19522843
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sun Sep 15 13:25:32 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sun Sep 15 13:25:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=add264e9
freebsd-mk-defs-9999-gentoo.patch: update FreeBSD-10.0 ALPHA1
---
sys-freebsd/freebsd-mk-defs/Manifest | 2 +-
.../files/freebsd-mk-defs-9999-gentoo.patch | 44 +++++++++++-----------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 8eaeecb..1db79e3 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -4,6 +4,6 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
-AUX freebsd-mk-defs-9999-gentoo.patch 12163 SHA256 bcbb924cf7ff0a85ad9458f7943ec311789a4eb2ca8fde1d937ef4e11c5bdc9e SHA512 1a1a483ddf58a2c90bd86251b3a998af3460aac485261491f2541daa92432d7c9a9f1efd8655e0603eab1ce03c9708ba40f50b10a9deb02526c97fa2730891db WHIRLPOOL 4e4546e1d4dc5b8936b74fa0f3b591313501576e34b0fbf44fe729389e2905191f04cc68e162a9459dab83c4ebc44f4a090e5ee631c9485595a3e4f28fb49b8b
+AUX freebsd-mk-defs-9999-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
EBUILD freebsd-mk-defs-9999_p255489.ebuild 771 SHA256 9946d51246a9240b8fb20913c2d5ba51d24329f6ea4ec9f5eba818dd1196294e SHA512 20c1ac8db64b7b8633ee1f606bfa443b83f2077b57d165ee810170fe5e980e45453eab53302a84d262c2075ecce0809834366846ba697286a09919f69d91126e WHIRLPOOL a593e21bdb8358a88430da985542cecf5bc59e88f218fcc4995bb603e752360d1b06ddd37334e1ad32398a2b82248be9ce5b36d90f824c54d6bf100e5b5cc8f5
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
index 27d3b06..2b99754 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
@@ -1,4 +1,4 @@
-tested revision 255023.
+tested revision 255489
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
index 2d648de..e456a4b 100644
@@ -118,7 +118,7 @@ index c54b435..d283240 100644
.endif
.endfor
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 66d0a29..3ac8706 100644
+index bb3db64..dbb9bf4 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
@@ -130,31 +130,31 @@ index 66d0a29..3ac8706 100644
.endif
.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-@@ -290,14 +288,17 @@ realinstall: _libinstall
+@@ -302,14 +300,17 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
.endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
++ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
+ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(SHLIB_NAME)
-+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR}
++ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -351,10 +352,12 @@ _libinstall:
+ ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
+@@ -363,10 +364,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} -d ${DESTDIR}${_LIBDIR}
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
+ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
@@ -162,26 +162,26 @@ index 66d0a29..3ac8706 100644
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
.endif
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index f78a656..59e3511 100644
+index 00d38ff..86792f4 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
-@@ -52,7 +52,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
+@@ -53,7 +53,7 @@ LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
+ LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
-LIBFL?= "don't use LIBFL, use LIBL"
+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a
-@@ -85,7 +85,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
+@@ -88,7 +88,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
-LIBL?= ${DESTDIR}${LIBDIR}/libl.a
+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
.if ${MK_LDNS} != "no"
- LIBLDNS?= ${DESTDIR}${LIBDIR}/libldns.a
+ LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
.endif
diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
index 1e4d57e..fcb81fe 100644
@@ -263,10 +263,10 @@ index 48093eb..69f56bc 100644
NLSLINKS+= ${file:R}
.endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index da758d5..7461f68 100644
+index 8f7f0b9..189ccec 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
-@@ -199,9 +199,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+@@ -202,9 +202,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
# Common variables
@@ -277,7 +277,7 @@ index da758d5..7461f68 100644
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index f4546dc..372bb98 100644
+index 22ddfb5..f6a4939 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -44,10 +44,6 @@ CTFFLAGS+= -g
@@ -291,7 +291,7 @@ index f4546dc..372bb98 100644
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
LDFLAGS+= -static
.endif
-@@ -197,6 +193,7 @@ realinstall: _proginstall
+@@ -201,6 +197,7 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
@@ -299,7 +299,7 @@ index f4546dc..372bb98 100644
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
.if ${MK_DEBUG_FILES} != "no"
-@@ -230,6 +227,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
+@@ -234,6 +231,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-08-30 18:30 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-08-30 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 8dbcd7fb3e5bb2de5278a7a07faa7cc4c944d64c
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 11:53:12 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 11:53:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=8dbcd7fb
freebsd-mk-defs-9999_p255023: added freebsd-mk-defs-9999-gentoo.patch
---
sys-freebsd/freebsd-mk-defs/Manifest | 3 +-
.../files/freebsd-mk-defs-9999-gentoo.patch | 352 +++++++++++++++++++++
.../freebsd-mk-defs-9999_p255023.ebuild | 2 +-
3 files changed, 355 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 47fb920..672a7fb 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -4,5 +4,6 @@ AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
AUX freebsd-mk-defs-9.2-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
AUX freebsd-mk-defs-9.2-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
+AUX freebsd-mk-defs-9999-gentoo.patch 12163 SHA256 bcbb924cf7ff0a85ad9458f7943ec311789a4eb2ca8fde1d937ef4e11c5bdc9e SHA512 1a1a483ddf58a2c90bd86251b3a998af3460aac485261491f2541daa92432d7c9a9f1efd8655e0603eab1ce03c9708ba40f50b10a9deb02526c97fa2730891db WHIRLPOOL 4e4546e1d4dc5b8936b74fa0f3b591313501576e34b0fbf44fe729389e2905191f04cc68e162a9459dab83c4ebc44f4a090e5ee631c9485595a3e4f28fb49b8b
EBUILD freebsd-mk-defs-9.9999.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
-EBUILD freebsd-mk-defs-9999_p255023.ebuild 770 SHA256 b4fe90bb30dbb83d4d91b873851a7ee33d91268119bcbc9db097aa9b590e9f4c SHA512 1bee20b5d49ecefafc8403161b78bb53bcbd093445752a6583d42f784b012faeb49a2ec909b611904f85e3f57be7f3289dac3726cf3c8b469ce0adfe2607e9cc WHIRLPOOL 2540a7f00794a99f7b2deeab6954f21cbca69d372854c7c9998da460f90cf363f5246235391a245897d9e58c816989ce320573d444ff153f9b3f99153aa86cc3
+EBUILD freebsd-mk-defs-9999_p255023.ebuild 771 SHA256 9946d51246a9240b8fb20913c2d5ba51d24329f6ea4ec9f5eba818dd1196294e SHA512 20c1ac8db64b7b8633ee1f606bfa443b83f2077b57d165ee810170fe5e980e45453eab53302a84d262c2075ecce0809834366846ba697286a09919f69d91126e WHIRLPOOL a593e21bdb8358a88430da985542cecf5bc59e88f218fcc4995bb603e752360d1b06ddd37334e1ad32398a2b82248be9ce5b36d90f824c54d6bf100e5b5cc8f5
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
new file mode 100644
index 0000000..27d3b06
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9999-gentoo.patch
@@ -0,0 +1,352 @@
+tested revision 255023.
+
+diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
+index 2d648de..e456a4b 100644
+--- a/share/mk/bsd.compiler.mk
++++ b/share/mk/bsd.compiler.mk
+@@ -1,7 +1,7 @@
+ # $FreeBSD$
+
+ .if !defined(COMPILER_TYPE)
+-. if ${CC:T:Mgcc*}
++. if ${CC:T:M*gcc*}
+ COMPILER_TYPE:= gcc
+ . elif ${CC:T:Mclang}
+ COMPILER_TYPE:= clang
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
+index 49b2d9b..c2a8c5c 100644
+--- a/share/mk/bsd.doc.mk
++++ b/share/mk/bsd.doc.mk
+@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
+ 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
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
+index 240f958..67f0cf9 100644
+--- a/share/mk/bsd.files.mk
++++ b/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:T}}
+ ${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
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
+index 74c378b..7d2c7a0 100644
+--- a/share/mk/bsd.incs.mk
++++ b/share/mk/bsd.incs.mk
+@@ -41,6 +41,9 @@ ${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}} \
++ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ ${.ALLSRC} \
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
+ installincludes: _${group}INS
+ _${group}INS: ${_${group}INCS}
+ .if defined(${group}NAME)
++ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
++ ${DESTDIR}${${group}DIR}
+ ${INSTALL} -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} -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 c54b435..d283240 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
+
+@@ -144,15 +145,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 66d0a29..3ac8706 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
+ .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
+ .endif
+-.else
+-STRIP?= -s
+ .endif
+
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
+@@ -290,14 +288,17 @@ realinstall: _libinstall
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
++ ${INSTALL} -d ${DESTDIR}${LIBDIR}
+ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ .endif
+ .if ${MK_PROFILE} != "no" && 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}
+@@ -351,10 +352,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} -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} -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 f78a656..59e3511 100644
+--- a/share/mk/bsd.libnames.mk
++++ b/share/mk/bsd.libnames.mk
+@@ -52,7 +52,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
+ LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
+ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
+ LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
+-LIBFL?= "don't use LIBFL, use LIBL"
++LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
+ LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
+ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
+ LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a
+@@ -85,7 +85,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
+ LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
+ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
+ LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
+-LIBL?= ${DESTDIR}${LIBDIR}/libl.a
++LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
+ .if ${MK_LDNS} != "no"
+ LIBLDNS?= ${DESTDIR}${LIBDIR}/libldns.a
+ .endif
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 1e4d57e..fcb81fe 100644
+--- a/share/mk/bsd.links.mk
++++ b/share/mk/bsd.links.mk
+@@ -15,6 +15,8 @@ _installlinks:
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
++ d=`dirname $$t`; \
++ test -d $$d || mkdir $$d; \
+ ${INSTALL_LINK} $$l $$t; \
+ done; true
+ .endif
+@@ -26,6 +28,8 @@ _installlinks:
+ t=${DESTDIR}$$1; \
+ shift; \
+ ${ECHO} $$t -\> $$l; \
++ d=`dirname $$t`; \
++ test -d $$d || mkdir $$d; \
+ ${INSTALL_SYMLINK} $$l $$t; \
+ done; true
+ .endif
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
+index 6445ba3..fabffa2 100644
+--- a/share/mk/bsd.man.mk
++++ b/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
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
+index 48093eb..69f56bc 100644
+--- a/share/mk/bsd.nls.mk
++++ b/share/mk/bsd.nls.mk
+@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
+ # installation rules
+ #
+ .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})
+ NLSLINKS+= ${file:R}
+ .endif
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
+index da758d5..7461f68 100644
+--- a/share/mk/bsd.own.mk
++++ b/share/mk/bsd.own.mk
+@@ -199,9 +199,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
+
+ # 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 f4546dc..372bb98 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_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
+ LDFLAGS+= -static
+ .endif
+@@ -197,6 +193,7 @@ realinstall: _proginstall
+ .ORDER: beforeinstall _proginstall
+ _proginstall:
+ .if defined(PROG)
++ ${INSTALL} -d ${DESTDIR}${BINDIR}
+ ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
+ .if ${MK_DEBUG_FILES} != "no"
+@@ -230,6 +227,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} \
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index 72dfa61..4f21af4 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+ CWARNFLAGS+= -Wsystem-headers
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+- || !defined(NO_WERROR.clang))
+-CWARNFLAGS+= -Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WARNS >= 1
+ .if ${WARNS} >= 2
+ CWARNFLAGS+= -Wall -Wno-format-y2k
+@@ -99,10 +95,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
+ CWARNFLAGS+= -Wno-format-nonliteral
+ .endif # WARNS <= 3
+ .endif # CLANG
+-.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+- || !defined(NO_WERROR.clang))
+-CWARNFLAGS+= -Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WFORMAT > 0
+ .endif # WFORMAT
+ .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk
+index eb9f2ca..09ad4cf 100644
+--- a/share/mk/sys.mk
++++ b/share/mk/sys.mk
+@@ -321,12 +321,6 @@ YFLAGS ?= -d
+ rm -f ${.PREFIX}.tmp.c
+ ${CTFCONVERT_CMD}
+
+-# 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
+-
+ .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
+ SHELL= ${__MAKE_SHELL}
+ .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild
index 2535487..62ceb58 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9999_p255023.ebuild
@@ -24,7 +24,7 @@ RESTRICT="strip"
S="${WORKDIR}/share/mk"
src_prepare() {
- epatch "${FILESDIR}/${PN}-9.2-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-9999-gentoo.patch"
use userland_GNU && epatch "${FILESDIR}/${PN}-9.2-gnu.patch"
}
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-07-17 11:16 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-07-17 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 666349d5e58fd96b21fecd12c15d2604876a6fc7
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Jul 17 11:16:27 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Jul 17 11:16:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=666349d5
added freebsd-mk-defs-9.9999-gnu.patch
---
sys-freebsd/freebsd-mk-defs/Manifest | 3 +-
.../files/freebsd-mk-defs-9.9999-gnu.patch | 79 ++++++++++++++++++++++
.../freebsd-mk-defs-9.9999_p253216.ebuild | 2 +-
3 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index e03204f..bb9416f 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,4 +3,5 @@ AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee7
AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
AUX freebsd-mk-defs-9.9999-gentoo.patch 12160 SHA256 a1f6fbf7815130790726022ea5c4b41ac6b01925c8f9641c4c3ceee9f9d7013f SHA512 7c7cd5d8baecda1188441bcca90ee2852e7c6d2434f4da5e72f08cca13102cac22c777a03d51dacc3a9b2f4cabd722d0f53878f88aff108aaab4719b878ff81a WHIRLPOOL 2163f6fca01490244cb813cd11373434bcec6cb825284e2c7deed98b0c4baea45eb0cf71da629908322dff2f2a093d8e61b9a96f4b724ec8d8e4998b2e7512cd
-EBUILD freebsd-mk-defs-9.9999_p253216.ebuild 773 SHA256 71d299b8108c607500cfa489d0d889ddabceee47bda1ffd731ee7e3923593d22 SHA512 c0a3da9b72ead3b00c9024e0743a2726ec64163dd562226ada159968efd8afcc078daf8cf4b99a9ca3864b9dd34b3908e397b35fb329a06c3fbc805ba167d25b WHIRLPOOL 5bacda2c2ff1b4f2dc40dc351320a49a088e1fff2022689d22d6a06f16bac85ae6e96083671f815cff5e0dcf2c9504c25c00728fa97c103768f2854e981fb980
+AUX freebsd-mk-defs-9.9999-gnu.patch 2242 SHA256 95305f335a360549703c73056898e778640c30a60c9f6b104709e7fc0cf75926 SHA512 a5b5c341972bee204d2a5b1f59cefda03aa48fdb7c7c713ceb9d4477e266aecfd137c2101988c48c73c527652ff0828e0a60b8c474904b146238c640c25d7416 WHIRLPOOL 7f7a45ad858a0b1c0cb099cedef05772fb90a752567ec778ec6f379f04e2cc86a8d4756c5c70d18685d42346fe43088622977eced076cf2c5bdbfb90fbb53362
+EBUILD freebsd-mk-defs-9.9999_p253216.ebuild 776 SHA256 0f4d781eaa9ad3f071cab656002d15631baf296c58ecdf0e7362fbd5ef28729e SHA512 c05b75c5d62c621cccaa94b34c328a3733866a3b15fc6cc2bc7a24c07528a0ce9f34bf9f47329531db6d2950e8d55cee70cd178d84141aca6116005307bf9dbf WHIRLPOOL f025bb01f24f90b72e7f9870ae1488005e9f85028faa6a1a6a4a1c51aabc050eeba9386781bd5011a0811aad0f171d5628049e4189e9309a5712ec5d9b53e51c
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch
new file mode 100644
index 0000000..1b2a207
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gnu.patch
@@ -0,0 +1,79 @@
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index 131b90e..60c7207 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -153,11 +153,7 @@ _LIBS= lib${LIB}.a
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ @${ECHO} building static ${LIB} library
+ @rm -f ${.TARGET}
+-.if !defined(NM)
+- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.else
+- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.endif
++ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
+ ${RANLIB} ${.TARGET}
+ .endif
+
+@@ -170,11 +166,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
+ lib${LIB}_p.a: ${POBJS}
+ @${ECHO} building profiled ${LIB} library
+ @rm -f ${.TARGET}
+-.if !defined(NM)
+- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+-.else
+- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+-.endif
++ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
+ ${RANLIB} ${.TARGET}
+ .endif
+
+@@ -201,15 +193,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
+ .if defined(SHLIB_LINK)
+ @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
+ .endif
+-.if !defined(NM)
+ @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ -o ${.TARGET} -Wl,-soname,${SONAME} \
+- `lorder ${SOBJS} | tsort -q` ${LDADD}
+-.else
+- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+- -o ${.TARGET} -Wl,-soname,${SONAME} \
+- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+-.endif
++ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
+ .if ${MK_CTF} != "no"
+ ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+ .endif
+@@ -267,13 +253,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 3c8fe5e..7916787 100644
+--- a/share/mk/bsd.prog.mk
++++ b/share/mk/bsd.prog.mk
+@@ -176,13 +176,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/freebsd-mk-defs-9.9999_p253216.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild
index 4e0796f..93b8a01 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.9999_p253216.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/share/mk"
src_prepare() {
epatch "${FILESDIR}/${PN}-9.9999-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-gnu.patch"
+ use userland_GNU && epatch "${FILESDIR}/${PN}-9.9999-gnu.patch"
}
src_compile() { :; }
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-05-16 11:17 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-05-16 11:17 UTC (permalink / raw
To: gentoo-commits
commit: 31eb367106285c6745b245cbe9e4c990adb23a7e
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu May 16 11:14:20 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu May 16 11:14:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=31eb3671
freebsd-mk-defs-9.9999-gentoo.patch: Since source code has been changed, update the patch.
---
sys-freebsd/freebsd-mk-defs/Manifest | 2 +-
.../files/freebsd-mk-defs-9.9999-gentoo.patch | 175 +++++++++++---------
2 files changed, 96 insertions(+), 81 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index bb30f47..e3a2a84 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,5 +2,5 @@ AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a57962
AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
-AUX freebsd-mk-defs-9.9999-gentoo.patch 12081 SHA256 a0540a1f186c4de58e27d7054b61fff987170068372fe0e5ecc4a7127b1fb4fb SHA512 a1ccd789a7378a35a45780ba4617be347ef3ebf8f0832a07ec034614090a5a84cd6d8ad59a91c7a3c20ceb7172e483637896dd5ed91ec8f044f6ebde66173e19 WHIRLPOOL 17718fca1a838be0dd129e693336592ec63bb2bc6659bee55d79e729318aac83b43a4882c6cf3c79cf4cc1ff565ceef24b4eb81534e07008aeb7910606ec390c
+AUX freebsd-mk-defs-9.9999-gentoo.patch 12207 SHA256 2d491dfda925ef04e3982dddc50ae8851ecbdf4e4c081c97c70b565c8834f52d SHA512 a99165302462f353e81f966174a473ec5a8189d62f5a21abc6c7ad67292705046d2be208f61acd545a315d4b57f3a97dff568000b9d3c97551e72571ea1a2de9 WHIRLPOOL 48be8e60479365528a18c4d4fbc933407fe7944fd5eb4588c202e61107e3ee59f6fcb4fcab89b61d58d3878f2891f1b0d120863ed8fbe5f333e7b1db2567e9c2
EBUILD freebsd-mk-defs-9.9999.ebuild 773 SHA256 71d299b8108c607500cfa489d0d889ddabceee47bda1ffd731ee7e3923593d22 SHA512 c0a3da9b72ead3b00c9024e0743a2726ec64163dd562226ada159968efd8afcc078daf8cf4b99a9ca3864b9dd34b3908e397b35fb329a06c3fbc805ba167d25b WHIRLPOOL 5bacda2c2ff1b4f2dc40dc351320a49a088e1fff2022689d22d6a06f16bac85ae6e96083671f815cff5e0dcf2c9504c25c00728fa97c103768f2854e981fb980
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
index c4061e8..0753043 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
@@ -1,9 +1,24 @@
-tested revision 244898
+tested revision 250694.
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.doc.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -135,10 +135,12 @@
+
+diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
+index d9f0ccf..9cf6b4f 100644
+--- a/share/mk/bsd.compiler.mk
++++ b/share/mk/bsd.compiler.mk
+@@ -1,7 +1,7 @@
+ # $FreeBSD$
+
+ .if !defined(COMPILER_TYPE)
+-. if ${CC:T:Mgcc*}
++. if ${CC:T:M*gcc*}
+ COMPILER_TYPE:= gcc
+ . elif ${CC:T:Mclang}
+ COMPILER_TYPE:= clang
+diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
+index 49b2d9b..c2a8c5c 100644
+--- a/share/mk/bsd.doc.mk
++++ b/share/mk/bsd.doc.mk
+@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
realinstall:
.for _dev in ${PRINTERDEVICE:Mhtml}
cd ${SRCDIR}; \
@@ -16,10 +31,11 @@ diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.files.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -39,6 +39,7 @@
+diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
+index 240f958..67f0cf9 100644
+--- a/share/mk/bsd.files.mk
++++ b/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}
@@ -27,7 +43,7 @@ diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
-@@ -51,10 +52,12 @@
+@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
installfiles: _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
@@ -40,10 +56,11 @@ diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
-diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.incs.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -41,6 +41,9 @@
+diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
+index 74c378b..7d2c7a0 100644
+--- a/share/mk/bsd.incs.mk
++++ b/share/mk/bsd.incs.mk
+@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T}
.endif
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}
@@ -53,7 +70,7 @@ diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
-@@ -53,9 +56,13 @@
+@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
@@ -67,10 +84,11 @@ diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
-diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.info.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -83,6 +83,7 @@
+diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
+index c54b435..d283240 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
@@ -78,7 +96,7 @@ diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
.SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
-@@ -144,15 +145,17 @@
+@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}:
.if !empty(.MAKEFLAGS:M-j)
@@ -100,10 +118,11 @@ diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
.endif
.endfor
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.lib.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -41,10 +41,6 @@
+diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
+index 6b99a4d..f53f655 100644
+--- a/share/mk/bsd.lib.mk
++++ b/share/mk/bsd.lib.mk
+@@ -41,10 +41,6 @@ CTFFLAGS+= -g
.endif
.endif
@@ -114,7 +133,7 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
.include <bsd.libnames.mk>
# prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
-@@ -259,14 +255,17 @@
+@@ -259,14 +255,17 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -132,7 +151,7 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
-@@ -304,10 +303,12 @@
+@@ -304,10 +303,12 @@ _libinstall:
.endif # SHLIB_LINK
.endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
@@ -145,10 +164,11 @@ diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
.endif
-diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share.orig/mk/bsd.libnames.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.libnames.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -50,7 +50,7 @@
+diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
+index a3dbf3b..2cf726c 100644
+--- a/share/mk/bsd.libnames.mk
++++ b/share/mk/bsd.libnames.mk
+@@ -50,7 +50,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
@@ -157,7 +177,7 @@ diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
@@ -166,31 +186,33 @@ diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
LIBLN?= "don't use LIBLN, use LIBL"
.if ${MK_BIND} != "no"
LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
---- share.orig/mk/bsd.links.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.links.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -15,6 +15,8 @@
+diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
+index 1e4d57e..fcb81fe 100644
+--- a/share/mk/bsd.links.mk
++++ b/share/mk/bsd.links.mk
+@@ -15,6 +15,8 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
+ d=`dirname $$t`; \
+ test -d $$d || mkdir $$d; \
- ln -f $$l $$t; \
+ ${INSTALL_LINK} $$l $$t; \
done; true
.endif
-@@ -26,6 +28,8 @@
+@@ -26,6 +28,8 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
+ d=`dirname $$t`; \
+ test -d $$d || mkdir $$d; \
- ln -fs $$l $$t; \
+ ${INSTALL_SYMLINK} $$l $$t; \
done; true
.endif
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.man.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -165,9 +165,11 @@
+diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
+index 6445ba3..fabffa2 100644
+--- a/share/mk/bsd.man.mk
++++ b/share/mk/bsd.man.mk
+@@ -165,9 +165,11 @@ _maninstall: ${MAN}
.if defined(NO_MANCOMPRESS)
.if defined(MANFILTER)
.for __page in ${MAN}
@@ -202,7 +224,7 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
.endif
-@@ -181,11 +183,14 @@
+@@ -181,11 +183,14 @@ _maninstall: ${MAN}
esac; \
page=$$1; shift; sect=$$1; shift; \
d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
@@ -217,7 +239,7 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
.endfor
-@@ -193,9 +198,11 @@
+@@ -193,9 +198,11 @@ _maninstall: ${MAN}
.endif
.else
.for __page in ${MAN}
@@ -229,10 +251,11 @@ diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
.endif
-diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
---- share.orig/mk/bsd.nls.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.nls.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -62,7 +62,8 @@
+diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
+index 48093eb..69f56bc 100644
+--- a/share/mk/bsd.nls.mk
++++ b/share/mk/bsd.nls.mk
+@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
# installation rules
#
.for file in ${NLS}
@@ -242,11 +265,12 @@ diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
NLSLINKS+= ${file:R}
.endif
-diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
---- share.orig/mk/bsd.own.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.own.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -182,9 +182,6 @@
- INCLUDEDIR?= /usr/include
+diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
+index b871f91..bbcd667 100644
+--- a/share/mk/bsd.own.mk
++++ b/share/mk/bsd.own.mk
+@@ -191,9 +191,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
# Common variables
-.if !defined(DEBUG_FLAGS)
@@ -255,10 +279,11 @@ diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.prog.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -28,10 +28,6 @@
+diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
+index 24f6e1c..48f62d4 100644
+--- a/share/mk/bsd.prog.mk
++++ b/share/mk/bsd.prog.mk
+@@ -28,10 +28,6 @@ CTFFLAGS+= -g
CFLAGS+=${CRUNCH_CFLAGS}
.endif
@@ -269,7 +294,7 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
LDFLAGS+= -static
.endif
-@@ -154,6 +150,7 @@
+@@ -153,6 +149,7 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
@@ -277,7 +302,7 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
.if defined(PROGNAME)
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -185,6 +182,7 @@
+@@ -184,6 +181,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
@@ -285,10 +310,11 @@ diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
${.ALLSRC} \
-diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
---- share.orig/mk/bsd.sys.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/bsd.sys.mk 2012-12-31 17:26:29.000000000 +0900
-@@ -30,10 +30,6 @@
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index 21c3352..5bfaa8e 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
.if defined(WARNS)
.if ${WARNS} >= 1
CWARNFLAGS+= -Wsystem-headers
@@ -299,7 +325,7 @@ diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
.endif # WARNS >= 1
.if ${WARNS} >= 2
CWARNFLAGS+= -Wall -Wno-format-y2k
-@@ -95,10 +91,6 @@
+@@ -95,10 +91,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
CWARNFLAGS+= -Wno-format-nonliteral
.endif # WARNS <= 3
.endif # CLANG
@@ -310,10 +336,11 @@ diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
.endif # WFORMAT > 0
.endif # WFORMAT
.if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk 2012-12-31 17:21:11.000000000 +0900
-+++ share/mk/sys.mk 2012-12-31 17:23:24.000000000 +0900
-@@ -305,12 +305,6 @@
+diff --git a/share/mk/sys.mk b/share/mk/sys.mk
+index e8ec4c1..e98501e 100644
+--- a/share/mk/sys.mk
++++ b/share/mk/sys.mk
+@@ -305,12 +305,6 @@ YFLAGS ?= -d
rm -f ${.PREFIX}.tmp.c
${CTFCONVERT_CMD}
@@ -326,15 +353,3 @@ diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
-diff -Nur share.orig/mk/bsd.compiler.mk share/mk/bsd.compiler.mk
---- share.orig/mk/bsd.compiler.mk 2013-01-01 00:35:05.000000000 +0900
-+++ share/mk/bsd.compiler.mk 2013-01-01 00:36:22.000000000 +0900
-@@ -1,7 +1,7 @@
- # $FreeBSD$
-
- .if !defined(COMPILER_TYPE)
--. if ${CC:T:Mgcc*}
-+. if ${CC:T:M*gcc*}
- COMPILER_TYPE:= gcc
- . elif ${CC:T:Mclang}
- COMPILER_TYPE:= clang
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2013-01-01 1:31 Yuta SATOH
0 siblings, 0 replies; 10+ messages in thread
From: Yuta SATOH @ 2013-01-01 1:31 UTC (permalink / raw
To: gentoo-commits
commit: fa507287484285545d02b095a4be2a5dd585412d
Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Jan 1 01:30:55 2013 +0000
Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Jan 1 01:30:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=fa507287
freebsd-mk-defs-9.9999-gentoo.patch: added support, like x86_64-gentoo-freebsd9.0-gcc
---
sys-freebsd/freebsd-mk-defs/Manifest | 2 +-
.../files/freebsd-mk-defs-9.9999-gentoo.patch | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index eb2e1d0..32e0dc2 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -2,7 +2,7 @@ AUX freebsd-mk-defs-9.0-gentoo.patch 11525 SHA256 da5204dc5f421d918fab06c6a57962
AUX freebsd-mk-defs-9.0-gnu.patch 2353 SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e SHA512 536745ae047ce1dd5ffacf46401e16218e7245efaef0d69b2a38dd907eddcef2089798dbe653d614aa34d71472a890e467a5c8fad79c1762d24a5a87a01d8cc8 WHIRLPOOL a617d4f956cbb6accc7f56dc28e341e233e1d3e24ed7526be5f89d59b555a0ebe18d9a74cc82ba1c65b1ec32cf8cee4675103ee49771dbd7754d6ea9dfdb6e7e
AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
-AUX freebsd-mk-defs-9.9999-gentoo.patch 11711 SHA256 67a4dfe65d700460e5e659e19b4046fa275accdf91a8824836509adcc3878e94 SHA512 bbdd97fe9a4a481236fb8253579c18b4d8972ee3b41e12c0833a9bff5440c4c91f05d5c0cc068d21bf83fbfbdbff8d5598d7473ec5d3769bb3d59a5e8cbefbe2 WHIRLPOOL d158354ca15c05f29bce6dcae2cb0afe95a958f42ad679b7a3802d97437b56ed84d43feb011874de061e7431d8a83cb5f7f915eac6f35f6509ad481268dea3df
+AUX freebsd-mk-defs-9.9999-gentoo.patch 12081 SHA256 a0540a1f186c4de58e27d7054b61fff987170068372fe0e5ecc4a7127b1fb4fb SHA512 a1ccd789a7378a35a45780ba4617be347ef3ebf8f0832a07ec034614090a5a84cd6d8ad59a91c7a3c20ceb7172e483637896dd5ed91ec8f044f6ebde66173e19 WHIRLPOOL 17718fca1a838be0dd129e693336592ec63bb2bc6659bee55d79e729318aac83b43a4882c6cf3c79cf4cc1ff565ceef24b4eb81534e07008aeb7910606ec390c
DIST freebsd-share-9.1_rc3.tar.bz2 6737671 SHA256 2def8da87433c0f25b8bf32b62c31bd391c2a49a6b4986d81c8301e1be232cdc SHA512 4043cfc2b70eb26d0bc73c698aee7c2b223e813499a4afc7352a232e85cab32c248fc65066b942db11ce2b2108e9fbcd739a71245ebe4f841cbb71bd9f729848 WHIRLPOOL 3088efed7520de1b9727cecfa3819cca753b1ef76fa943753f93f0bacc83e17434b45479e6b831bac0819ee43dcde6982c94d8a9d7c147b7222b639b7d6a8aa2
EBUILD freebsd-mk-defs-9.1.9999.ebuild 770 SHA256 c90f6bff8e828b4f032bda3e296eb6dde2ecae147144b54a918d5386a24ef8da SHA512 c55746a024097f0ef175132d8d1b192e4b588012b10025ed8601f5c64b99a04d4f7f24be064dd0605f03a12684b5ab1fc1df0a857dd88aadeec407f30f0fe6e1 WHIRLPOOL f355cf82c55846a5f230072ee9ec7c3e84c74d8753610d9717d32afe6b5144c20618ed751d1301bdc5209f385fe5d5f611a518f118364cf1eae6a10ec318e0ad
EBUILD freebsd-mk-defs-9.1_rc3.ebuild 734 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2 SHA512 5310173ea2d0b620989a8d158e3a3ef30019fc1303147629d0303f3a7ff146b64aeee474ffc908a3e1956132131558dec8e49f34ffb52645ff7b35e9864c4a2f WHIRLPOOL a825f8f32be0a9efdaaf42b0dd1da6d1d9bbe348a14d0eda6a85a432b94489e3375455b23cb1a5e4dce0c21ede691fe60c61d9969f47d16affedc2ca65f3ba4e
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
index 2fb423d..c4061e8 100644
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.9999-gentoo.patch
@@ -326,3 +326,15 @@ diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
+diff -Nur share.orig/mk/bsd.compiler.mk share/mk/bsd.compiler.mk
+--- share.orig/mk/bsd.compiler.mk 2013-01-01 00:35:05.000000000 +0900
++++ share/mk/bsd.compiler.mk 2013-01-01 00:36:22.000000000 +0900
+@@ -1,7 +1,7 @@
+ # $FreeBSD$
+
+ .if !defined(COMPILER_TYPE)
+-. if ${CC:T:Mgcc*}
++. if ${CC:T:M*gcc*}
+ COMPILER_TYPE:= gcc
+ . elif ${CC:T:Mclang}
+ COMPILER_TYPE:= clang
^ permalink raw reply related [flat|nested] 10+ messages in thread* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/
@ 2012-09-11 17:10 Alexis Ballier
0 siblings, 0 replies; 10+ messages in thread
From: Alexis Ballier @ 2012-09-11 17:10 UTC (permalink / raw
To: gentoo-commits
commit: e5abb18586f22a2d71299823608ab4920481183b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 16:40:00 2012 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 16:40:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e5abb185
Remove freebsd-mk-defs, merged to the main tree
---
sys-freebsd/freebsd-mk-defs/Manifest | 10 -
.../files/freebsd-mk-defs-7.1-gentoo.patch | 332 --------------------
.../files/freebsd-mk-defs-7.1-gnu.patch | 121 -------
.../files/freebsd-mk-defs-8.0-gentoo.patch | 332 --------------------
.../files/freebsd-mk-defs-8.0-gnu.patch | 121 -------
.../files/freebsd-mk-defs-9.0-gentoo.patch | 326 -------------------
.../files/freebsd-mk-defs-9.0-gnu.patch | 79 -----
.../files/freebsd-mk-defs-9.1-gentoo.patch | 326 -------------------
.../files/freebsd-mk-defs-9.1-gnu.patch | 77 -----
.../freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild | 38 ---
10 files changed, 0 insertions(+), 1762 deletions(-)
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
deleted file mode 100644
index 176e762..0000000
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX freebsd-mk-defs-7.1-gentoo.patch 11056 RMD160 1c6568153bce5f1193c14cc25e6313ba28dcb990 SHA1 18d859d243fbd21e39d76f0e3b65330ea165b507 SHA256 975c1dcd3bfd4a40410caf3ffa70bdf9707c843c07e9a6fb9281158e0595f336
-AUX freebsd-mk-defs-7.1-gnu.patch 4022 RMD160 cc82950abb0d798e99bbba6fb70b420756af8ff8 SHA1 ca5029934f253b9321f1af6fb9a82cade54a47ef SHA256 d10ac0750d533d42ca792584f393d0c2327e62aaf0fa2bf83636aebb68dc47ea
-AUX freebsd-mk-defs-8.0-gentoo.patch 11076 RMD160 96d87a4a2bf07278f7ef2c0b5c5dde73f1dc929d SHA1 f2d46e19d4b2f7d169652ff68c7d078f36185176 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5
-AUX freebsd-mk-defs-8.0-gnu.patch 4074 RMD160 a6571210e35ae4abe158b6231cd13aebe0046a0e SHA1 99c97fb846c811d940b59d610fc1db9767312611 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0
-AUX freebsd-mk-defs-9.0-gentoo.patch 11525 RMD160 4eaecca3d452fce3fcde7cb8ab91dee7794c1601 SHA1 a3e21355b16e815523fbd87c1eef52eb77b3b49b SHA256 da5204dc5f421d918fab06c6a5796282dff28e8b48d728905eaba343dd1d9232
-AUX freebsd-mk-defs-9.0-gnu.patch 2353 RMD160 78f1146fab7134a6e7f54c1433086152f8814c64 SHA1 f73a973e7de1f957f9b13cdc0beb0f43b1b37f4d SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e
-AUX freebsd-mk-defs-9.1-gentoo.patch 11769 RMD160 51f1fb0a055c6dd5aba131f615d46d5aaecd8ca4 SHA1 0272a97b63b611b139fdd53524ffab3a7e9370e8 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818
-AUX freebsd-mk-defs-9.1-gnu.patch 2273 RMD160 ce76f9775c2dfbb494aab4897c12ed9f89f382e2 SHA1 a4da2e11b008e19576f15c8dada76ae70ca7b96c SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18
-DIST freebsd-share-9.1_rc1.tar.bz2 6670560 RMD160 d2af901ff0aa70932d9ec2b6a31e9e25d2f560b2 SHA1 b685efb2b6019f7de941aa138eef0f6765674753 SHA256 b7d577784ae21f6e95b1f8e8befbdde4afa1f4e7e8cb209b055eaffabd315c75
-EBUILD freebsd-mk-defs-9.1_rc1.ebuild 734 RMD160 9640fe8f43dd213f4c3cab0ae28ee479309243d4 SHA1 ba54ccfcf3aec78f7cdaed298e04362b1dbe0c51 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch
deleted file mode 100644
index 39f84de..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-Index: share/mk/bsd.doc.mk
-===================================================================
---- share.orig/mk/bsd.doc.mk
-+++ 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: share/mk/bsd.files.mk
-===================================================================
---- share.orig/mk/bsd.files.mk
-+++ 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: share/mk/bsd.incs.mk
-===================================================================
---- share.orig/mk/bsd.incs.mk
-+++ share/mk/bsd.incs.mk
-@@ -41,6 +41,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} \
-@@ -53,9 +57,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: share/mk/bsd.info.mk
-===================================================================
---- share.orig/mk/bsd.info.mk
-+++ 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
-
-@@ -144,12 +145,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: share/mk/bsd.lib.mk
-===================================================================
---- share.orig/mk/bsd.lib.mk
-+++ share/mk/bsd.lib.mk
-@@ -37,10 +37,6 @@ NO_WERROR=
- 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
-@@ -236,14 +232,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && 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: share/mk/bsd.libnames.mk
-===================================================================
---- share.orig/mk/bsd.libnames.mk
-+++ 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
-@@ -68,7 +68,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 ${MK_BIND} != "no"
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-Index: share/mk/bsd.man.mk
-===================================================================
---- share.orig/mk/bsd.man.mk
-+++ 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}${MANDIR}${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: share/mk/bsd.prog.mk
-===================================================================
---- share.orig/mk/bsd.prog.mk
-+++ share/mk/bsd.prog.mk
-@@ -23,10 +23,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
-@@ -142,9 +138,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
-@@ -172,6 +170,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: share/mk/bsd.sys.mk
-===================================================================
---- share.orig/mk/bsd.sys.mk
-+++ share/mk/bsd.sys.mk
-@@ -30,9 +30,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
-@@ -66,9 +63,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
-Index: share/mk/sys.mk
-===================================================================
---- share.orig/mk/sys.mk
-+++ share/mk/sys.mk
-@@ -34,11 +34,11 @@
- CC ?= c89
- CFLAGS ?= -O
- .else
--CC ?= cc
-+CC ?= gcc
- .if ${MACHINE_ARCH} == "arm"
--CFLAGS ?= -O -fno-strict-aliasing -pipe
-+CFLAGS ?= -pipe
- .else
--CFLAGS ?= -O2 -fno-strict-aliasing -pipe
-+CFLAGS ?= -pipe
- .endif
- .endif
-
-@@ -61,7 +61,7 @@
- .endif
- .endif
-
--CXX ?= c++
-+CXX ?= g++
- CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
-
- CPP ?= cpp
-@@ -254,12 +254,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: share/mk/bsd.links.mk
-===================================================================
---- share.orig/mk/bsd.links.mk
-+++ share/mk/bsd.links.mk
-@@ -15,6 +15,8 @@ _installlinks:
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -f $$l $$t; \
- done; true
- .endif
-@@ -26,6 +28,8 @@ _installlinks:
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -fs $$l $$t; \
- done; true
- .endif
-Index: share/mk/bsd.own.mk
-===================================================================
---- share.orig/mk/bsd.own.mk
-+++ share/mk/bsd.own.mk
-@@ -166,11 +166,6 @@ DEFAULT_THREAD_LIB?= libthr
-
- INCLUDEDIR?= /usr/include
-
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
--
- COMPRESS_CMD?= gzip -cn
- COMPRESS_EXT?= .gz
-
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch
deleted file mode 100644
index 54747c8..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: mk/bsd.incs.mk
-===================================================================
---- mk.orig/bsd.incs.mk
-+++ mk/bsd.incs.mk
-@@ -45,7 +45,7 @@ _${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}} \
-+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -58,11 +58,11 @@ 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} \
-+ ${INSTALL} -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} \
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-Index: mk/bsd.lib.mk
-===================================================================
---- mk.orig/bsd.lib.mk
-+++ mk/bsd.lib.mk
-@@ -119,11 +119,7 @@ _LIBS= lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -136,11 +132,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -195,15 +195,9 @@
- .if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- @${CC} ${LDFLAGS} -shared -Wl,-x \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
-- @${CC} ${LDFLAGS} -shared -Wl,-x \
-- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if defined(CTFMERGE)
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -211,13 +197,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}}
-@@ -233,12 +212,12 @@ realinstall: _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
- ${INSTALL} -d ${DESTDIR}${LIBDIR}
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
- ${INSTALL} -d ${DESTDIR}${LIBDIR}
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-Index: mk/bsd.prog.mk
-===================================================================
---- mk.orig/bsd.prog.mk
-+++ mk/bsd.prog.mk
-@@ -120,13 +120,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-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch
deleted file mode 100644
index f17f6c4..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-Index: share/mk/bsd.doc.mk
-===================================================================
---- share/mk/bsd.doc.mk.orig
-+++ 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: share/mk/bsd.files.mk
-===================================================================
---- share/mk/bsd.files.mk.orig
-+++ 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: share/mk/bsd.incs.mk
-===================================================================
---- share/mk/bsd.incs.mk.orig
-+++ share/mk/bsd.incs.mk
-@@ -41,6 +41,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} \
-@@ -53,9 +57,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: share/mk/bsd.info.mk
-===================================================================
---- share/mk/bsd.info.mk.orig
-+++ 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
-
-@@ -144,12 +145,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: share/mk/bsd.lib.mk
-===================================================================
---- share/mk/bsd.lib.mk.orig
-+++ share/mk/bsd.lib.mk
-@@ -41,10 +41,6 @@ CTFFLAGS+= -g
- .endif
- .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
-@@ -276,14 +272,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && 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: share/mk/bsd.libnames.mk
-===================================================================
---- share/mk/bsd.libnames.mk.orig
-+++ share/mk/bsd.libnames.mk
-@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.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
-@@ -77,7 +77,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 ${MK_BIND} != "no"
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-Index: share/mk/bsd.man.mk
-===================================================================
---- share/mk/bsd.man.mk.orig
-+++ 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}${MANDIR}${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: share/mk/bsd.prog.mk
-===================================================================
---- share/mk/bsd.prog.mk.orig
-+++ share/mk/bsd.prog.mk
-@@ -27,10 +27,6 @@ CTFFLAGS+= -g
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
-
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -152,9 +148,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
-@@ -182,6 +180,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: share/mk/bsd.sys.mk
-===================================================================
---- share/mk/bsd.sys.mk.orig
-+++ share/mk/bsd.sys.mk
-@@ -28,9 +28,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
-@@ -64,9 +61,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
-Index: share/mk/bsd.links.mk
-===================================================================
---- share/mk/bsd.links.mk.orig
-+++ share/mk/bsd.links.mk
-@@ -15,6 +15,8 @@ _installlinks:
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -f $$l $$t; \
- done; true
- .endif
-@@ -26,6 +28,8 @@ _installlinks:
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -fs $$l $$t; \
- done; true
- .endif
-Index: share/mk/bsd.own.mk
-===================================================================
---- share/mk/bsd.own.mk.orig
-+++ share/mk/bsd.own.mk
-@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE}
-
- INCLUDEDIR?= /usr/include
-
--# Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
--
- COMPRESS_CMD?= gzip -cn
- COMPRESS_EXT?= .gz
-
-Index: share/mk/sys.mk
-===================================================================
---- share/mk/sys.mk.orig
-+++ share/mk/sys.mk
-@@ -34,11 +34,11 @@ AFLAGS ?=
- CC ?= c89
- CFLAGS ?= -O
- .else
--CC ?= cc
-+CC ?= gcc
- .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips"
--CFLAGS ?= -O -pipe
-+CFLAGS ?= -pipe
- .else
--CFLAGS ?= -O2 -pipe
-+CFLAGS ?= -pipe
- .endif
- .if defined(NO_STRICT_ALIASING)
- CFLAGS += -fno-strict-aliasing
-@@ -64,7 +64,7 @@ CFLAGS += -g
- .endif
- .endif
-
--CXX ?= c++
-+CXX ?= g++
- CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
-
- CPP ?= cpp
-@@ -333,12 +333,6 @@ YFLAGS ?= -d
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
- .endif
-
--# 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
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL= ${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch
deleted file mode 100644
index 41c4de4..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: mk/bsd.incs.mk
-===================================================================
---- mk/bsd.incs.mk.orig
-+++ mk/bsd.incs.mk
-@@ -45,7 +45,7 @@ _${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}} \
-+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -58,11 +58,11 @@ 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} \
-+ ${INSTALL} -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} \
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-Index: mk/bsd.lib.mk
-===================================================================
---- mk/bsd.lib.mk.orig
-+++ mk/bsd.lib.mk
-@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS}
- .if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
-- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if defined(CTFMERGE)
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -251,13 +237,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}}
-@@ -273,12 +252,12 @@ realinstall: _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
- ${INSTALL} -d ${DESTDIR}${LIBDIR}
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
- ${INSTALL} -d ${DESTDIR}${LIBDIR}
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-Index: mk/bsd.prog.mk
-===================================================================
---- mk/bsd.prog.mk.orig
-+++ mk/bsd.prog.mk
-@@ -130,13 +130,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-9.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
deleted file mode 100644
index f5e6568..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -ur share/mk.old/bsd.doc.mk share/mk/bsd.doc.mk
---- share/mk.old/bsd.doc.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.doc.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -135,10 +135,12 @@
- 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
-diff -ur share/mk.old/bsd.files.mk share/mk/bsd.files.mk
---- share/mk.old/bsd.files.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.files.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
-@@ -51,10 +52,12 @@
- 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
-diff -ur share/mk.old/bsd.incs.mk share/mk/bsd.incs.mk
---- share/mk.old/bsd.incs.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.incs.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -41,7 +41,10 @@
- .endif
- 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} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -53,10 +56,14 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+ ${DESTDIR}${${group}DIR}
- ${INSTALL} -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} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-diff -ur share/mk.old/bsd.info.mk share/mk/bsd.info.mk
---- share/mk.old/bsd.info.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.info.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -83,6 +83,7 @@
- TEX?= tex
- DVIPS?= dvips
- DVIPS2ASCII?= dvips2ascii
-+INSTALL?= install
-
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
-
-@@ -144,15 +145,17 @@
- 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 -ur share/mk.old/bsd.lib.mk share/mk/bsd.lib.mk
---- share/mk.old/bsd.lib.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.lib.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -46,10 +46,6 @@
- .endif
- .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
-@@ -270,14 +266,17 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && 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}
-@@ -295,10 +294,12 @@
- .endif
- .endif
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -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} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff -ur share/mk.old/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share/mk.old/bsd.libnames.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.libnames.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -46,7 +46,7 @@
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?= "don't use LIBFL, use LIBL"
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
-@@ -77,7 +77,7 @@
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?= "don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-diff -ur share/mk.old/bsd.links.mk share/mk/bsd.links.mk
---- share/mk.old/bsd.links.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.links.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -15,6 +15,8 @@
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -f $$l $$t; \
- done; true
- .endif
-@@ -26,6 +28,8 @@
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -fs $$l $$t; \
- done; true
- .endif
-diff -ur share/mk.old/bsd.man.mk share/mk/bsd.man.mk
---- share/mk.old/bsd.man.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.man.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -165,9 +165,11 @@
- .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 @@
- 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 @@
- .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
-diff -ur share/mk.old/bsd.nls.mk share/mk/bsd.nls.mk
---- share/mk.old/bsd.nls.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.nls.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -62,7 +62,8 @@
- # installation rules
- #
- .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})
- NLSLINKS+= ${file:R}
- .endif
-diff -ur share/mk.old/bsd.own.mk share/mk/bsd.own.mk
---- share/mk.old/bsd.own.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.own.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -182,9 +182,6 @@
- INCLUDEDIR?= /usr/include
-
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
-
- COMPRESS_CMD?= gzip -cn
- COMPRESS_EXT?= .gz
-diff -ur share/mk.old/bsd.prog.mk share/mk/bsd.prog.mk
---- share/mk.old/bsd.prog.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.prog.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
-
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- 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} \
-diff -ur share/mk.old/bsd.sys.mk share/mk/bsd.sys.mk
---- share/mk.old/bsd.sys.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/bsd.sys.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -28,9 +28,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
-@@ -66,9 +63,6 @@
- . 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
- . if defined(NO_WFORMAT)
-diff -ur share/mk.old/sys.mk share/mk/sys.mk
---- share/mk.old/sys.mk 2011-10-18 14:42:26.000000000 +0000
-+++ share/mk/sys.mk 2011-11-06 15:45:08.000000000 +0000
-@@ -349,12 +349,6 @@
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
-
--# 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
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL= ${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
deleted file mode 100644
index bd7d7e6..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: work/share/mk/bsd.lib.mk
-===================================================================
---- work.orig/share/mk/bsd.lib.mk
-+++ work/share/mk/bsd.lib.mk
-@@ -146,11 +146,7 @@ _LIBS= lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -163,11 +159,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS}
- .if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
-- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -245,13 +231,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}}
-Index: work/share/mk/bsd.prog.mk
-===================================================================
---- work.orig/share/mk/bsd.prog.mk
-+++ work/share/mk/bsd.prog.mk
-@@ -134,13 +134,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-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
deleted file mode 100644
index 598d0b9..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
---- share.orig/mk/bsd.doc.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.doc.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -135,10 +135,12 @@
- 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
-diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
---- share.orig/mk/bsd.files.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.files.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -39,6 +39,7 @@
- .endif
- installfiles: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
-@@ -51,10 +52,12 @@
- 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
-diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
---- share.orig/mk/bsd.incs.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.incs.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -41,6 +41,9 @@
- .endif
- 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} \
-@@ -53,9 +56,13 @@
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+ ${DESTDIR}${${group}DIR}
- ${INSTALL} -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} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
---- share.orig/mk/bsd.info.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.info.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -83,6 +83,7 @@
- TEX?= tex
- DVIPS?= dvips
- DVIPS2ASCII?= dvips2ascii
-+INSTALL?= install
-
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
-
-@@ -144,15 +145,17 @@
- 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 -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.lib.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -46,10 +46,6 @@
- .endif
- .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
-@@ -284,14 +280,17 @@
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && 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}
-@@ -329,10 +328,12 @@
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
- ${INSTALL} -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} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
---- share.orig/mk/bsd.libnames.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.libnames.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -48,7 +48,7 @@
- LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
- LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
--LIBFL?= "don't use LIBFL, use LIBL"
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
- LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
-@@ -79,7 +79,7 @@
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?= "don't use LIBLN, use LIBL"
- .if ${MK_BIND} != "no"
- LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
-diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
---- share.orig/mk/bsd.links.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.links.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -15,6 +15,8 @@
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -f $$l $$t; \
- done; true
- .endif
-@@ -26,6 +28,8 @@
- t=${DESTDIR}$$1; \
- shift; \
- ${ECHO} $$t -\> $$l; \
-+ d=`dirname $$t`; \
-+ test -d $$d || mkdir $$d; \
- ln -fs $$l $$t; \
- done; true
- .endif
-diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
---- share.orig/mk/bsd.man.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.man.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -165,9 +165,11 @@
- .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 @@
- 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 @@
- .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
-diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
---- share.orig/mk/bsd.nls.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.nls.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -62,7 +62,8 @@
- # installation rules
- #
- .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})
- NLSLINKS+= ${file:R}
- .endif
-diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
---- share.orig/mk/bsd.own.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.own.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -182,9 +182,6 @@
- INCLUDEDIR?= /usr/include
-
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
-
- COMPRESS_CMD?= gzip -cn
- COMPRESS_EXT?= .gz
-diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.prog.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -33,10 +33,6 @@
- CFLAGS+=${CRUNCH_CFLAGS}
- .endif
-
--.if !defined(DEBUG_FLAGS)
--STRIP?= -s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -155,6 +151,7 @@
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}
- .if defined(PROGNAME)
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
-@@ -186,6 +183,7 @@
- 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} \
-diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
---- share.orig/mk/bsd.sys.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/bsd.sys.mk 2012-07-16 00:04:14.000000000 +0900
-@@ -28,10 +28,6 @@
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+= -Wsystem-headers
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
-- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
--CWARNFLAGS+= -Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+= -Wall -Wno-format-y2k
-@@ -95,10 +91,6 @@
- CWARNFLAGS+= -Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
-- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
--CWARNFLAGS+= -Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
-diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
---- share.orig/mk/sys.mk 2012-07-12 13:25:44.000000000 +0900
-+++ share/mk/sys.mk 2012-07-16 00:01:55.000000000 +0900
-@@ -349,12 +349,6 @@
- (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
-
--# 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
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL= ${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
deleted file mode 100644
index f986ed9..0000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
---- share.orig/mk/bsd.lib.mk 2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.lib.mk 2012-07-16 02:41:40.000000000 +0900
-@@ -155,11 +155,7 @@
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -172,11 +168,7 @@
- lib${LIB}_p.a: ${POBJS}
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
--.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
--.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
--.endif
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -203,15 +195,9 @@
- .if defined(SHLIB_LINK)
- @ln -fs ${.TARGET} ${SHLIB_LINK}
- .endif
--.if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
--.else
-- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
--.endif
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
-@@ -259,13 +245,6 @@
-
- .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 -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
---- share.orig/mk/bsd.prog.mk 2012-07-16 02:40:07.000000000 +0900
-+++ share/mk/bsd.prog.mk 2012-07-16 02:40:24.000000000 +0900
-@@ -134,13 +134,6 @@
-
- .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/freebsd-mk-defs-9.1_rc1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild
deleted file mode 100644
index d70e1d3..0000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-
-IUSE="userland_GNU"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
- use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- if [[ ${CHOST} != *-freebsd* ]]; then
- insinto /usr/share/mk/freebsd
- else
- insinto /usr/share/mk
- fi
- doins *.mk *.awk
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-09-30 11:40 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-18 12:57 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/ Yuta SATOH
-- strict thread matches above, loose matches on Subject: below --
2016-09-30 11:40 Yuta SATOH
2014-07-13 3:14 Yuta SATOH
2013-10-15 12:03 Yuta SATOH
2013-09-15 13:25 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2013-07-17 11:16 Yuta SATOH
2013-05-16 11:17 Yuta SATOH
2013-01-01 1:31 Yuta SATOH
2012-09-11 17:10 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox