From 81e4fbcb846ed1cabdad699c0029b166dd7273b7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Jan 2018 19:17:21 +0000 Subject: gentoo resync : 03.01.2018 --- sys-freebsd/Manifest.gz | Bin 3051 -> 3052 bytes sys-freebsd/boot0/Manifest | 10 - sys-freebsd/boot0/boot0-10.3.ebuild | 82 --- sys-freebsd/boot0/boot0-11.0-r1.ebuild | 86 --- sys-freebsd/boot0/files/boot0-10.1-gcc46.patch | 67 --- sys-freebsd/boot0/files/boot0-10.3-clang.patch | 30 - .../files/boot0-10.3-drop-unsupport-cflags.patch | 28 - .../boot0/files/boot0-10.3-uefi-support.patch | 33 -- .../boot0/files/boot0-11.0-uefi-support.patch | 21 - sys-freebsd/freebsd-bin/Manifest | 4 - sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild | 41 -- sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild | 41 -- sys-freebsd/freebsd-cddl/Manifest | 6 - .../files/freebsd-cddl-10.2-libpaths.patch | 220 ------- .../files/freebsd-cddl-10.3-underlink.patch | 12 - sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild | 74 --- sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 78 --- sys-freebsd/freebsd-lib/Manifest | 14 - .../files/freebsd-lib-10.0-atfcxx.patch | 49 -- .../files/freebsd-lib-10.0-liblink.patch | 98 ---- .../files/freebsd-lib-10.0-libproc-libcxx.patch | 16 - .../files/freebsd-lib-10.2-bsdxml2expat.patch | 39 -- .../files/freebsd-lib-10.2-liblink.patch | 26 - .../files/freebsd-lib-10.3-libusb.patch | 13 - .../files/freebsd-lib-11.0-libsysdecode.patch | 22 - sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild | 648 --------------------- sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild | 644 -------------------- sys-freebsd/freebsd-libexec/Manifest | 6 - .../files/freebsd-libexec-10.2-atf-check.patch | 28 - .../files/freebsd-libexec-9.2-no_ld32.patch | 15 - .../freebsd-libexec/freebsd-libexec-10.3.ebuild | 111 ---- .../freebsd-libexec/freebsd-libexec-11.0.ebuild | 130 ----- sys-freebsd/freebsd-mk-defs/Manifest | 7 - .../files/freebsd-mk-defs-10.2-gnu.patch | 63 -- .../files/freebsd-mk-defs-10.3-gentoo.patch | 337 ----------- .../files/freebsd-mk-defs-11.0-gentoo.patch | 343 ----------- .../freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild | 41 -- .../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 54 -- sys-freebsd/freebsd-pam-modules/Manifest | 4 - .../freebsd-pam-modules-10.3.ebuild | 47 -- .../freebsd-pam-modules-11.0.ebuild | 45 -- sys-freebsd/freebsd-pf/Manifest | 8 - .../files/freebsd-pf-10.0-libevent.patch | 16 - .../freebsd-pf/files/freebsd-pf-10.0-pflogd.patch | 15 - .../files/freebsd-pf-11.0-libevent.patch | 13 - .../freebsd-pf/files/freebsd-pf-11.0-pflogd.patch | 13 - sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild | 72 --- sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 70 --- sys-freebsd/freebsd-rescue/Manifest | 4 - .../freebsd-rescue/freebsd-rescue-10.3.ebuild | 81 --- .../freebsd-rescue/freebsd-rescue-11.0.ebuild | 84 --- sys-freebsd/freebsd-sbin/Manifest | 4 - sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild | 100 ---- sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild | 99 ---- sys-freebsd/freebsd-share/Manifest | 4 - .../freebsd-share/freebsd-share-10.3.ebuild | 112 ---- .../freebsd-share/freebsd-share-11.0.ebuild | 113 ---- sys-freebsd/freebsd-sources/Manifest | 22 +- .../files/freebsd-sources-10.0-gentoo.patch | 22 - .../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 - .../freebsd-sources/freebsd-sources-10.3-r6.ebuild | 175 ------ .../freebsd-sources/freebsd-sources-11.0-r1.ebuild | 169 ------ .../freebsd-sources/freebsd-sources-11.1_p2.ebuild | 17 +- sys-freebsd/freebsd-ubin/Manifest | 12 - .../freebsd-ubin/files/freebsd-ubin-10.0-atf.patch | 15 - .../files/freebsd-ubin-10.0-dtc-gcc46.patch | 25 - .../files/freebsd-ubin-10.0-kdump-ioctl.patch | 26 - .../files/freebsd-ubin-10.0-mandoc.patch | 13 - .../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 - .../freebsd-ubin/freebsd-ubin-10.3-r2.ebuild | 212 ------- .../freebsd-ubin/freebsd-ubin-11.0-r1.ebuild | 212 ------- sys-freebsd/freebsd-usbin/Manifest | 7 - .../files/freebsd-usbin-10.0-bsdxml2expat.patch | 24 - .../freebsd-usbin/freebsd-usbin-10.3-r1.ebuild | 189 ------ .../freebsd-usbin/freebsd-usbin-11.0-r1.ebuild | 188 ------ 75 files changed, 3 insertions(+), 5792 deletions(-) delete mode 100644 sys-freebsd/boot0/boot0-10.3.ebuild delete mode 100644 sys-freebsd/boot0/boot0-11.0-r1.ebuild delete mode 100644 sys-freebsd/boot0/files/boot0-10.1-gcc46.patch delete mode 100644 sys-freebsd/boot0/files/boot0-10.3-clang.patch delete mode 100644 sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch delete mode 100644 sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch delete mode 100644 sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch delete mode 100644 sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch delete mode 100644 sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch delete mode 100644 sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch delete mode 100644 sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch delete mode 100644 sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild delete mode 100644 sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild delete mode 100644 sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch delete mode 100644 sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch delete mode 100644 sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch delete mode 100644 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch delete mode 100644 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch delete mode 100644 sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch delete mode 100644 sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch delete mode 100644 sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch delete mode 100644 sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch delete mode 100644 sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild delete mode 100644 sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch delete mode 100644 sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild delete mode 100644 sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild delete mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch delete mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch delete mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch delete mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch delete mode 100644 sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch delete mode 100644 sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild delete mode 100644 sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild delete mode 100644 sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild delete mode 100644 sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild (limited to 'sys-freebsd') diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz index 3668188a43f5..5493c989af77 100644 Binary files a/sys-freebsd/Manifest.gz and b/sys-freebsd/Manifest.gz differ diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest index 85eab665d24e..b4572d84c46a 100644 --- a/sys-freebsd/boot0/Manifest +++ b/sys-freebsd/boot0/Manifest @@ -1,22 +1,12 @@ -AUX boot0-10.1-gcc46.patch 2180 BLAKE2B 2fd74e20f058c6d4f2e5d019aa88ef88dae95f11cc6ecf3705814668854f1252cc4a029861162acb1f7709f4704c7e30f0d0b5038b17a259c9c0843c09d6e248 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 -AUX boot0-10.3-clang.patch 847 BLAKE2B 4b4ff19bb0f0c845b1ee140ddb7ab4013e6c4f0b571a6bffb3ba874deb4b6ecfbf9b69502f686252ec18635b8d5dbb56e81d617fe0721c64fc41cebbf6459b77 SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 -AUX boot0-10.3-drop-unsupport-cflags.patch 971 BLAKE2B be04b3db0d6e586034e8ff48adfa1bfa178268043e52737f1b7f95cdcb655181f9ed87e8f4fd669080158151fe425f4cf5cc8927cc49412fd9265558bd92757a SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 -AUX boot0-10.3-uefi-support.patch 762 BLAKE2B 8454f4578387dd877fe7699765bd06c74e25e012c62d49d7fccd8faf93228bf621468bb4f58c6c3d87695ba7b667c45435ab50c263dc807968fa135af55249d8 SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a AUX boot0-11.0-gcc46.patch 481 BLAKE2B 32b905518fbb8c4016afe4296715369b344ab0397d4df7c3255d5b64d2600d1b1715a071ff720de74f44bb89bd623b850f0e11d7f7acd587c550b30d4dfe704c SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01 -AUX boot0-11.0-uefi-support.patch 715 BLAKE2B 77368abd5691e6a2dcc90fd574cfd218141e7d787f252a2f86924c23fc8dee58d4d37c7ccdc8862f46f9e79ae20f428062cd2282acb35367bb2267e5d74dc813 SHA512 e6b4b48e5442ad4d948389aa4862484947fce5f15deedd6603cf5616054ccf9fa61a0c190443cdbe76502225a44da37675d1bccf49476ffedd633fe8128a2db6 AUX boot0-8.2-zfsboot-makefile.patch 436 BLAKE2B 20ebd3be758778b24c56e23c8dbb70dc354ef9cbb9265e2c6359162db3e5a79836dbc82b9dc1d76e4fa329190b51ca832858a5f0cc5d8b4312bca916bdcdfe49 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 AUX boot0-9.2-gcc46.patch 2119 BLAKE2B bbe757cddd6808b0df4769a63e78ef4e83364a7bbe9b2c738e80bff50bc7e90d5203fdadf8aa1ad96411564ce229818c286606d2cb1eed87e7dd577e626c3474 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 AUX boot0-add-nossp-cflags.patch 341 BLAKE2B 71eecc9af36e07b331ef842d1cd52688d5c8e152b54a44c7598253bc7078ab8f84a5b8aaa54a796ae88aae9d262546a65a86a35445f41ea1772b4434bf194e0d SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb -DIST boot0-EN-1618-loader.patch 1092 BLAKE2B f96401394ca0b8a9ab364b5e4dbffeef49f75d86c0936067f4bcdf0e74598dad043d99b2dbf09dc5dd00e2f06cc338b7259d454aa56e1a501b66b176763fb74d SHA512 c2d28dc48289683c009a783db59ce62008a8d9231d4ea5b1ebe6dac2d6d0d86a285524195be9a806c23fbc2ceb6e159fcd7a7e8d01fe973b6ea6d154bfca298c DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d -EBUILD boot0-10.3.ebuild 1888 BLAKE2B 7a873f02c58eed56fe8238fa1a77566aaab250665d5fe5f7a3444878bf3fd93196b64d5d462a10859412778e9219ea50d2926d09bf811c501373346c2bebbb15 SHA512 65d46563288ccb402b22f3f722148d6bdb4d0ab209b69fe2c9fcd97abc6995127007a2f8b8b1fb276a7d5b60bdf74fa397227f77234c3b697a1d106f9ac6d345 -EBUILD boot0-11.0-r1.ebuild 1993 BLAKE2B aa22384f22020d80d6520ed1f2b6136ae6da557d87ae71c5813b9705e15d2ff56899159265f3fef22481006bfbff64d0aa614b26cf12b9bc1b30c2808e990e2c SHA512 c74a033c1c76277333fa707b0da9e4e27d10f6aa92ad797c628337db9293a497fb6f22df928bcd0bdcfb0c7df89bba24917ebe4aef7f5925674f6944da64bcb5 EBUILD boot0-11.1.ebuild 1940 BLAKE2B a3f1b3c8a6f2cacdc8b333ff5481653628f40ea1201bc680d0e3f61935839093dfec7888dda058f4db890a50d42442d8bfc25e4e408fe68fcd895cbf40448025 SHA512 8d8890bac720309a9ee5e56e950139ec0a3862d64643b73f92bb7783da8ac56db1d271fdd09bb7aa19f062ef6b9ffbac3b98d952d982911b3392fc59a4fd94eb EBUILD boot0-8.2.ebuild 1181 BLAKE2B 30c73d35331a20e505f2a912144734c8d4c0df42e41d65c1a90cc07ac1f0fbd40b971696f85d3ea7a78aee2f3deea486b76e9b563f2c0e9839117023653960ef SHA512 955c8d97b4ca370a9e8941ccec006d113c89baa25188abfb0e5e9d14ab1c9723ab3c2e32ccf58adbe2f3730c69f782abf645dd6931e1e6a689cba72b3651fb32 EBUILD boot0-9.1.ebuild 1477 BLAKE2B 20b29953677e513427bd3a332902cdbc2d1f5c4d0c57de96a878ac1750863b7fc68ad8ad9cfe6af50bf0564ddcc0d8d6e233b2a5d9949969d40f311a09f4f51c SHA512 fe21b5d7105aecf6419be9339f989f85112b7f4ef1c061c069a60789af202d49bec44123aaf5f69d8ea732d63d87d041272540ba988b054ff51fc08c0b43bf06 diff --git a/sys-freebsd/boot0/boot0-10.3.ebuild b/sys-freebsd/boot0/boot0-10.3.ebuild deleted file mode 100644 index d33328cf5f42..000000000000 --- a/sys-freebsd/boot0/boot0-10.3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" - -IUSE="bzip2 ieee1394 tftp zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - sys/ - lib/ - contrib/bzip2/ -" - -RDEPEND="" -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" - -S="${WORKDIR}/sys/boot" - -PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch" - "${FILESDIR}/${PN}-10.3-clang.patch" - "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" - "${FILESDIR}/${PN}-10.3-uefi-support.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) - -boot0_use_enable() { - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" - use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " -} - -pkg_setup() { - boot0_use_enable ieee1394 FIREWIRE - boot0_use_enable zfs ZFS - boot0_use_enable tftp TFTP - boot0_use_enable bzip2 BZIP2 -} - -src_prepare() { - sed -e '/-mno-align-long-strings/d' \ - -i "${S}"/i386/boot2/Makefile \ - -i "${S}"/i386/gptboot/Makefile \ - -i "${S}"/i386/gptzfsboot/Makefile \ - -i "${S}"/i386/zfsboot/Makefile || die - - export MAKEOBJDIRPREFIX="${WORKDIR}/build" -} - -src_compile() { - strip-flags - append-flags "-fno-strict-aliasing" - - cd "${WORKDIR}/lib/libstand" || die - freebsd_src_compile - - CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" - LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" - - cd "${S}" || die - NOFLAGSTRIP="yes" freebsd_src_compile -} - -src_install() { - dodir /boot/defaults - mkinstall FILESDIR=/boot || die "mkinstall failed" - - cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die - insinto /boot - newins GENERIC.hints device.hints - - echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 - doenvd "${T}"/50boot0 -} diff --git a/sys-freebsd/boot0/boot0-11.0-r1.ebuild b/sys-freebsd/boot0/boot0-11.0-r1.ebuild deleted file mode 100644 index 1b56c9159994..000000000000 --- a/sys-freebsd/boot0/boot0-11.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" - -IUSE="bzip2 ieee1394 tftp zfs" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "EN-16:18/loader.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - sys/ - lib/ - contrib/bzip2/ -" - -RDEPEND="" -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" - -S="${WORKDIR}/sys/boot" - -PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch" - "${FILESDIR}/${PN}-11.0-uefi-support.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) - -boot0_use_enable() { - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" - use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " -} - -pkg_setup() { - boot0_use_enable ieee1394 FIREWIRE - boot0_use_enable zfs ZFS - boot0_use_enable tftp TFTP - boot0_use_enable bzip2 BZIP2 -} - -src_prepare() { - sed -e '/-mno-align-long-strings/d' \ - -i "${S}"/i386/boot2/Makefile \ - -i "${S}"/i386/gptboot/Makefile \ - -i "${S}"/i386/gptzfsboot/Makefile \ - -i "${S}"/i386/zfsboot/Makefile || die - - mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" - export MAKEOBJDIRPREFIX="${WORKDIR}/build" -} - -src_compile() { - strip-flags - append-flags "-fno-strict-aliasing" - - cd "${WORKDIR}/lib/libstand" || die - freebsd_src_compile - - CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" - LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" - - cd "${S}" || die - NOFLAGSTRIP="yes" freebsd_src_compile -} - -src_install() { - dodir /boot/defaults - freebsd_src_install FILESDIR=/boot - - cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die - insinto /boot - newins GENERIC.hints device.hints - - echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 - doenvd "${T}"/50boot0 -} diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch deleted file mode 100644 index 9b31e7c0d1ba..000000000000 --- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc -index 472b275..0c9409d 100644 ---- a/sys/boot/i386/Makefile.inc -+++ b/sys/boot/i386/Makefile.inc -@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib - .if ${MACHINE_CPUARCH} == "amd64" - CFLAGS+= -m32 - ACFLAGS+= -m32 --# LD_FLAGS is passed directly to ${LD}, not via ${CC}: --LD_FLAGS+= -m elf_i386_fbsd - AFLAGS+= --32 - .endif - -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index 428950e..6a15450 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -113,3 +113,10 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.boot1.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. -+CFLAGS+= -fno-asynchronous-unwind-tables -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile -index a90e712..d60ae00 100644 ---- a/sys/boot/i386/gptboot/Makefile -+++ b/sys/boot/i386/gptboot/Makefile -@@ -81,3 +81,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile -index 5eb2383..c10a917 100644 ---- a/sys/boot/i386/gptzfsboot/Makefile -+++ b/sys/boot/i386/gptzfsboot/Makefile -@@ -78,3 +78,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.gptldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile -index 149f43a..be1e46a 100644 ---- a/sys/boot/i386/zfsboot/Makefile -+++ b/sys/boot/i386/zfsboot/Makefile -@@ -91,3 +91,8 @@ machine: - # XXX: clang integrated-as doesn't grok .codeNN directives yet - CFLAGS.zfsldr.S= ${CLANG_NO_IAS} - CFLAGS+= ${CFLAGS.${.IMPSRC:T}} -+ -+.if ${MACHINE_CPUARCH} == "amd64" -+LD_FLAGS+= -m elf_i386_fbsd -+.endif -+ diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch deleted file mode 100644 index 4245e21a96e1..000000000000 --- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch +++ /dev/null @@ -1,30 +0,0 @@ -Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676 - -https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479 - -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile -index 8a6e771..c030853 100644 ---- a/sys/boot/i386/boot2/Makefile -+++ b/sys/boot/i386/boot2/Makefile -@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 - #BOOT2_UFS?= UFS2_ONLY - #BOOT2_UFS?= UFS1_ONLY - --CFLAGS= -Os \ -- -fomit-frame-pointer \ -+CFLAGS= -fomit-frame-pointer \ - -mrtd \ - -mregparm=3 \ - -DUSE_XREAD \ -@@ -40,7 +39,10 @@ CFLAGS= -Os \ - -Winline \ - ${CLANG_OPT_SMALL} - --CFLAGS.gcc+= -fno-guess-branch-probability \ -+CFLAGS.clang+= -Oz -+ -+CFLAGS.gcc+= -Os \ -+ -fno-guess-branch-probability \ - -fno-unit-at-a-time \ - --param max-inline-insns-single=100 - .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch deleted file mode 100644 index af1d3512e7da..000000000000 --- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile -index fc66e01..470453d 100644 ---- a/sys/boot/efi/libefi/Makefile -+++ b/sys/boot/efi/libefi/Makefile -@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand - # Pick up the bootstrap header for some interface items - CFLAGS+= -I${.CURDIR}/../../common - -- --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions - CFLAGS+= -DTERM_EMU - - .include -diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile -index 24cc4c1..e5d2bae 100644 ---- a/sys/boot/i386/libi386/Makefile -+++ b/sys/boot/i386/libi386/Makefile -@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ - # the location of libstand - CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ - --# Suppress warning from clang for FreeBSD %b and %D formats --CFLAGS+= -fformat-extensions -- - .if ${MACHINE_CPUARCH} == "amd64" - CLEANFILES+= machine - machine: diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch deleted file mode 100644 index fdafe74252bc..000000000000 --- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/efi/Makefile b/efi/Makefile -index 30024e3..a33efb2 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -2,15 +2,10 @@ - - .include - --# In-tree GCC does not support __attribute__((ms_abi)). --.if ${COMPILER_TYPE} != "gcc" -- - .if ${MACHINE_CPUARCH} == "amd64" - SUBDIR+= libefi loader boot1 - .endif - --.endif # ${COMPILER_TYPE} != "gcc" -- - .if ${MACHINE_CPUARCH} == "ia64" - SUBDIR+= libefi - .endif -diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile -index 4ffdfda..8ec0e00 100644 ---- a/efi/boot1/Makefile -+++ b/efi/boot1/Makefile -@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc - # Add libstand for required string and memory functions for all platforms. - # - DPADD+= ${LIBSTAND} --LDADD+= -lstand -+LDADD+= ${LIBSTAND} - - DPADD+= ${LDSCRIPT} - diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch deleted file mode 100644 index c7a69d62aa8b..000000000000 --- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile -index 79ee9a9..f7789f1 100644 ---- a/sys/boot/efi/Makefile -+++ b/sys/boot/efi/Makefile -@@ -4,7 +4,7 @@ - - # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer - # than 4.5 supports it. --.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 -+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 - - .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" - .if ${MK_FDT} != "no" -@@ -18,6 +18,6 @@ SUBDIR+= fdt - SUBDIR+= libefi loader boot1 - .endif - --.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 -+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 - - .include diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest index c7a2f90aaf95..252bc32e0c03 100644 --- a/sys-freebsd/freebsd-bin/Manifest +++ b/sys-freebsd/freebsd-bin/Manifest @@ -4,12 +4,8 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e -EBUILD freebsd-bin-10.3.ebuild 793 BLAKE2B 76a483ecadea2b9d467864a95f6c62632969aa8180d86c16c4094421bcdf578ffee5035b69322a6d81f753e23b59baab3e6e7deec1d8a558fcd84cd811b533df SHA512 8944cf5943d5832f1b54d876a1d392c35a90a78b0327d47d59fd1bf3dd1a69e492f3233eff3d5aef47686d7a2aa8baefd444240c3359d70159d1c88f355df198 -EBUILD freebsd-bin-11.0.ebuild 793 BLAKE2B 76a483ecadea2b9d467864a95f6c62632969aa8180d86c16c4094421bcdf578ffee5035b69322a6d81f753e23b59baab3e6e7deec1d8a558fcd84cd811b533df SHA512 8944cf5943d5832f1b54d876a1d392c35a90a78b0327d47d59fd1bf3dd1a69e492f3233eff3d5aef47686d7a2aa8baefd444240c3359d70159d1c88f355df198 EBUILD freebsd-bin-11.1.ebuild 793 BLAKE2B 6cd1a92c1428396b0e0db005783643dc60224d9337175074470fa7592cc1773babbdf1e0a3eec42bd0f706cb32daacc2f5b5641b21f9621fff8aff09923f95a2 SHA512 bd94a54161944bf37c9cbd3e45d00d01328340952e379d168f47ff0b951f77b96f47606b8fec03d31e29b6086a8d3822b065873fccb793114dbc5beaa1b697bb EBUILD freebsd-bin-8.2.ebuild 763 BLAKE2B 4a5ecc79225e09ddd3dc487f3ada444aef4beacdb95b42247ef33c06e70a430f47abf9599cb4360b9618a3d0fa155597ecfc8b23e12c39ee4244b1635cf1d66b SHA512 90cd9abe75073f7b8af399637cb7e0f022200b91a83dfe5623c0d9e7def4d62f5b45128bda87b47f4a28fec3fce3c0bff8ea25640106edbab0635388537afe28 EBUILD freebsd-bin-9.1.ebuild 827 BLAKE2B 32f5ddca5528cee8438a0ccc7551526b1219d2cde5dfeda0a094adce82b164c1a47f2b48d8287e5746aa5327d71b5cc3913b07decaadcb8142ef2a01a6c75366 SHA512 fc658efd1a1c38bb07af1b47a194cc4b6a8cf78eb5f8c8119aa8a2ef07c84b16b498acf676119752928aa919f1e8e181b4908395f7b10c88b7540ae785c47fff diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild deleted file mode 100644 index 964c4d64f9e4..000000000000 --- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD /bin tools" -SLOT="0" - -IUSE="" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - bin/ - usr.bin/ - sbin/ - lib/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/ncurses:0= - sys-apps/ed - !app-misc/realpath - ! -diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile -index 83cefca..55c56d5 100644 ---- a/cddl/lib/libzpool/Makefile -+++ b/cddl/lib/libzpool/Makefile -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+ - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBUMEM} - LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem -diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile -index 1f909aa..2590302 100644 ---- a/cddl/sbin/zfs/Makefile -+++ b/cddl/sbin/zfs/Makefile -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile -index 4b5b898..f89d010 100644 ---- a/cddl/sbin/zpool/Makefile -+++ b/cddl/sbin/zpool/Makefile -@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs -diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile -index 6cb9529..e76fbc4 100644 ---- a/cddl/usr.bin/ctfconvert/Makefile -+++ b/cddl/usr.bin/ctfconvert/Makefile -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile -index 673c7e3..5fff940 100644 ---- a/cddl/usr.bin/ctfmerge/Makefile -+++ b/cddl/usr.bin/ctfmerge/Makefile -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common - -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} - LDADD= -lctf -ldwarf -lelf -lz -lpthread - -diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile -index b6605cb..7028630 100644 ---- a/cddl/usr.bin/zinject/Makefile -+++ b/cddl/usr.bin/zinject/Makefile -@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile -index 888b9af..523ba44 100644 ---- a/cddl/usr.bin/zstreamdump/Makefile -+++ b/cddl/usr.bin/zstreamdump/Makefile -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+ - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl -diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile -index f6f7e03..6fed691 100644 ---- a/cddl/usr.bin/ztest/Makefile -+++ b/cddl/usr.bin/ztest/Makefile -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ -diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile -index fb5729f..ea9a752 100644 ---- a/cddl/usr.sbin/dtrace/Makefile -+++ b/cddl/usr.sbin/dtrace/Makefile -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ - -lrtld_db - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - .include -diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile -index ccd8189..827a197 100644 ---- a/cddl/usr.sbin/lockstat/Makefile -+++ b/cddl/usr.sbin/lockstat/Makefile -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ - - CFLAGS+= -DNEED_ERRLOC -g - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - #YFLAGS+= -d - - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ -diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile -index c2a6b1d..f411fc0 100644 ---- a/cddl/usr.sbin/zdb/Makefile -+++ b/cddl/usr.sbin/zdb/Makefile -@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile -index 1957aad..9a5570a 100644 ---- a/cddl/usr.sbin/zhack/Makefile -+++ b/cddl/usr.sbin/zhack/Makefile -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head - CFLAGS+= -I${.CURDIR}/../../lib/libumem - -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core -+ - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch deleted file mode 100644 index c8ce8e1a2943..000000000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile -index 2a66337..04988d7 100644 ---- a/cddl/lib/libzfs/Makefile -+++ b/cddl/lib/libzfs/Makefile -@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - - LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lz -lzfs_core -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl - - SRCS= deviceid.c \ - fsshare.c \ diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild deleted file mode 100644 index 44c9ae6d6386..000000000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" - -IUSE="build" -LICENSE="CDDL GPL-2" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -# sys is required. -EXTRACTONLY=" - cddl/ - contrib/ - usr.bin/ - lib/ - sbin/ - sys/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout )" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( - "${FILESDIR}/${PN}-10.2-libpaths.patch" - "${FILESDIR}/${PN}-10.3-underlink.patch" - ) - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="include/ " -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/include" ]]; then - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi -} - -src_compile() { - # Disable parallel make. - freebsd_src_compile -j1 -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -} diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild deleted file mode 100644 index cebbb02e7f49..000000000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs multilib - -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" -SLOT="0" - -IUSE="build" -LICENSE="CDDL GPL-2" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -# sys is required. -EXTRACTONLY=" - cddl/ - contrib/ - usr.bin/ - lib/ - sbin/ - sys/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout )" - -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - !build? ( =sys-freebsd/freebsd-sources-${RV}* )" - -S="${WORKDIR}/cddl" - -PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" - "${FILESDIR}/${PN}-11.0-add-libs.patch" ) - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="include/ " - [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/include" ]]; then - # Link in include headers. - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do - LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" - done -} - -src_compile() { - cd "${S}"/lib || die - freebsd_src_compile - cd "${S}" || die - freebsd_src_compile -} - -src_install() { - # Install libraries proper place - local mylibdir=$(get_libdir) - freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" - - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core - - # Install zfs volinit script. - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol - - # Install zfs script - newinitd "${FILESDIR}"/zfs.initd zfs - - keepdir /etc/zfs -} diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index 7fd219e669ea..be999fd59d62 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -1,14 +1,7 @@ AUX bootpd.confd 183 BLAKE2B 76fb1b41204f2b3d07cc974ec996ff9127945dc638796b176cd8809ca46fb69fa307f3fa313d48d79a7deb532d393ab58839ed7ae53927280f0178c20c4df3c4 SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10559912f30effb189f55e7f34ef37b496d8f9f8eb8726ab6af2ca179cb215809d76d1293ffb338 SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66 -AUX freebsd-lib-10.0-atfcxx.patch 1545 BLAKE2B 76d568e47855c043549ad300709ae8e89ddd3911476e93e1caac8d68817948bb698f0e5d8d073d556d26a4f22645b369ee554b6884423b0e201883c54e2ab0cb SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 -AUX freebsd-lib-10.0-liblink.patch 2448 BLAKE2B 9ef9806d9c204983cf8001e9e714ccd4c03164c1c634ccb5367914416cb4626deb9e1c8e4808f5461616e0f5ddd2635a0e924972ec6db831dc1df724a13261f5 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d -AUX freebsd-lib-10.0-libproc-libcxx.patch 393 BLAKE2B 8fe13aa1b03c642b3425577cf874bae1c393eecea251991a69400967c705302570d03b0f9363a80160fb577a20a4a15626f171845447070cfa4694f8ab02ac85 SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f -AUX freebsd-lib-10.2-bsdxml2expat.patch 982 BLAKE2B 7a236f699eac2fc1a91c531c5fe0c3f80e446e8f4d2d8c3cca6b27ccc6bc0979f44343de34853fac9ca618c781cb962d11525ae3bd556a80aee9a26c6a28b72f SHA512 b65fd732825e2813d499bd519bc5ef69b4c603ad57b047d2716405cc47a221c6e137a1f2e890b79a23bc26036834f7696dc9ac5953400f26975a0139fedad7c5 -AUX freebsd-lib-10.2-liblink.patch 653 BLAKE2B c041b9dc7f34465da40917a461d09f8c9a6490c93c1d1388a2f5a643c892b7bad61e065a5cdea2a82a41bd602f4eacbade4b39fe0b3b09b4952e7a4901cd4cb9 SHA512 c75c1fd81bd826685db5258ce0cd2407e385990dd576973fad361206271eda678d1fbe95a406909904bfee22890c79eb0f4cbfab09ddbee579552d003df2e6b1 -AUX freebsd-lib-10.3-libusb.patch 339 BLAKE2B a51a0d9ad24777a85bd1791fc81d0c524e3a616b2df7389d0e64122992328582219368a8ccad3c5fbd2abf6b3ae2efc0224cb5ec05271495433c236a96957caf SHA512 15ad67c805c34e5a67f21de0db9ec3826aa96fadb880f2cca8110d4b26ed3722eea8aa9ee2c8e1976288b5e9be5e6046e4bd60d515305fff283ad50cc01d3d0f AUX freebsd-lib-11.0-bsdxml2expat.patch 1103 BLAKE2B 7dd06eca9f528b2cbd7741c6f977b3580eb6231395be376d0bcdbcc767d9ff9bb585eb2579d65e6ad851eb68c77ccb71af95e8aeef58fa2a757f559c07c7f79f SHA512 a0e9d99ff47ce813a98a5c1fd3605dd757ceb6c4f68e3784f1b48192c9f0966cbf1c769387a808ae4511f004b00242fc47f7fd3a2971e371de587cac6827533e AUX freebsd-lib-11.0-libproc-libcxx.patch 350 BLAKE2B 0b0a9886567b9c81c8159266eba2f5957d81b90b816e76b21cd2a5c90e9eeb008acda1f7d2338167d20ee8a4b57e45ddd92ab978dd472e0752bbc8c055332240 SHA512 c9ace882ac2fb2a077839a02a4307ce7df1dd0699cef081e6a99f12f9c2b443e4a4e4f85415a59d208859442dc665d7b9cae22de8d61f80ab8a5875d423c5795 -AUX freebsd-lib-11.0-libsysdecode.patch 680 BLAKE2B 50cde482c0651c9f3150a57d86a383d77d32ec2901ec2a7ee3470e4dbc7eac86308e7b361cfcd2922c4268e501ec71da0ebbea47899cbef42770507259ed870a SHA512 2601924267ea0efc1fee4bb582fa22918aa83964cbe519eec69c6e6bf09b6943b025d65833982fdfea01b74726ee5fba3f78ecf6ed2877f22965141c78074fd8 AUX freebsd-lib-11.0-workaround.patch 295 BLAKE2B 3e0fa9e7c981caeb11c75e5c7ccfef597a6129c0ea098f2d6945aac4439cfc9f937463b989078f4148e995efeee28cfc81de77e8a1acd7da9a3d913c5dfe82e5 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a AUX freebsd-lib-11.1-liblink.patch 4233 BLAKE2B e088abc8f738475e09793cf59cb41257e2143a8daf7dbbdeb81190aec95e6d15b800862033353e556d87f757be43693e6b0895a6900fd58fff580ef8e6f1279a SHA512 23a875fa84685c7a98ddb08b1bcf831613239a6079c1711362bbbd19f27b67e61eb203bafc48c9ad06b9344258005e4d04756d4f8caba7c9545f3f86dcb52830 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 BLAKE2B df851549b6978ab7b59585fbaec7c3bcea19f8eb6b1a2882343618c21ef2533fb8a56f9c8a362b7c188c97e5d0091b02288a457fe114b8e2e6dbe4b69bfad62d SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec @@ -55,20 +48,13 @@ DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e -DIST freebsd-lib-EN-1606-libc.patch 249 BLAKE2B 79670a18a490e16a96d10c9d2230af3b076883a46bf56542ac6902e63112b1b6d00f6a9967cc9b99f56ee97aef5ba4931eaa0505b6da6b9cf0118801f46c7d57 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9 -DIST freebsd-lib-SA-1637-libc.patch 1567 BLAKE2B 84aff6ae2868c6cf7ac6b4a7e461115b9416bd0a30d86236d07048391bd1614d1be7ae2fbe632afa1e9fea50b1ecdf0863c378ee967744a1363d24bc93b001ae SHA512 8eaea9e01a7b224138da2cec559d8e925af3ecda4bf7d29340394f57204cd2460c7418a33dcca3db445436ac2985dba42478ad5595c25b9d83305552a04965f7 -DIST freebsd-lib-SA-1638-bhyve.patch 637 BLAKE2B 686c5b0f1ccfd6fa4f43b3e45139ffa64a1493110a32b5848671f14e75b076533fda5851a34da70599842842ab64d61b865181587135407014fb987831df1bb3 SHA512 4d8c45f4e2d729998a874023bf5bc8ca2904d3fd71e681180c3b4b2eabe2a34c086b806b86debcbc9ab24c6b5ab637f6ddae00fb577994359ed14edc3cac5aa4 DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-lib-10.3-r3.ebuild 19468 BLAKE2B 2ee0be3306ddfc4bdb60419e07b0098d536e76a78112face3bba3563727a26ca0b403de931c1b20203d9727ec996e8524f42a70f1bb9f25837bd037abcee8305 SHA512 f908c3e6c7cfb2f7e87481eaf10f0ad19e7e45eb0c12498a138a43244e82a103ff1387f2c34984aa3b659daaeefb9228562e1bae8049fdf5a7a9016dda5f82aa -EBUILD freebsd-lib-11.0-r1.ebuild 19438 BLAKE2B d23f1ac6e5051eede6f9448cab29337ed845033222666efd709b71d6af3cd55cbda7f9a900e2f7f2ce19ceea9a401a2143661a00868bbca3a88e2db6f697468e SHA512 9e2651c1a3b3e781c291fe9c8627b6fb6f5549431ffc1f680f146ee5fb34680d2edaba7e50364e4aa2dabe2f34c4aa7a224f9cce2ad8e10e7dbb06677f7bd5c6 EBUILD freebsd-lib-11.1.ebuild 21778 BLAKE2B 7cfe5b7cf5d657b8a5453111e1468de0b6d16b4051cf858f8f504cc5af91aa856ba51a653fffb4fa5f2f537ed665220f57304bf1ce46f6e8becf275e47a726f5 SHA512 d8a34d01ead4cca49c288f1604cda6dbbca57c2949d3f1eb48c1264f8b0f079fa77743f36c7212fdf1a67bf15ff57241ecd69d3c85469505847709ad9b87436e EBUILD freebsd-lib-8.2-r1.ebuild 15675 BLAKE2B 3b4747dc6126d7449e438b113b9bdeeb0d742814bde0e699ba437aaf54fa6476978723e52a18d8c857cb83e09902aa71c6adba0eb842eb0a0476d5dd0e894a1f SHA512 8ee3e2562a96f64cc2264bd315e0fc6faead639541fcb61c95a180f6d6283c8dee7d2289ee7efa477eb1324e0353be94f220c7909c34ac67bc5487892e007364 EBUILD freebsd-lib-9.1-r11.ebuild 18831 BLAKE2B 91f374f1f7093edf830ffe83fbb981ab2446fd3d8dd1c47e6b30cd69efe3c13a175fad44180aa357d944d6fa83f79a1553abb708ca2976eb763d51791417ccca SHA512 5deb3676f9b97adf1a68dc252e4d7e7294f3eca8ff359492ec0a3ba7f5edf547270386d591be2df15935a96df7bbd2e7a4e0f8c59c13885ed224da30ef617b95 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch deleted file mode 100644 index 42b64b572322..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc -index 937187a..d5277f3 100644 ---- a/lib/atf/Makefile.inc -+++ b/lib/atf/Makefile.inc -@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' - CFLAGS+= -DATF_SHELL='"/bin/sh"' - CFLAGS+= -DATF_WORKDIR='"/tmp"' - -+CXXFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' -+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' -+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' -+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' -+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' -+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' -+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' -+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' -+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' -+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' -+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' -+CXXFLAGS+= -DATF_WORKDIR='"/tmp"' -+ - WARNS?= 3 - - # vim: syntax=make -diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile -index 37d6073..90a2687 100644 ---- a/lib/atf/libatf-c++/Makefile -+++ b/lib/atf/libatf-c++/Makefile -@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c - .PATH: ${ATF}/atf-c++ - .PATH: ${ATF}/atf-c++/detail - --CFLAGS+= -I${ATF} --CFLAGS+= -I${.CURDIR}/../libatf-c --CFLAGS+= -I. -+CXXFLAGS+= -I${ATF} -+CXXFLAGS+= -I${.CURDIR}/../libatf-c -+CXXFLAGS+= -I. - --CFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DHAVE_CONFIG_H - - SRCS= application.cpp \ - build.cpp \ diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch deleted file mode 100644 index 6ef3f07de0fd..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile -index 9a21dde..0815f0a 100644 ---- a/lib/libcam/Makefile -+++ b/lib/libcam/Makefile -@@ -8,6 +8,7 @@ INCS= camlib.h - - DPADD= ${LIBSBUF} - LDADD= -lsbuf -+LDFLAGS+= -L${.OBJDIR}/../libsbuf - - MAN= cam.3 cam_cdbparse.3 - -diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile -index dbd7895..607b1f6 100644 ---- a/lib/libdwarf/Makefile -+++ b/lib/libdwarf/Makefile -@@ -21,6 +21,7 @@ SRCS= \ - INCS= dwarf.h libdwarf.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - SHLIB_MAJOR= 3 - -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index 4449c06..f024cf0 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \ - INCS= libproc.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf - - .if ${MK_LIBCPLUSPLUS} != "no" - LDADD+= -lcxxrt -@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2 - - WITHOUT_MAN= - -+LDADD+= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf -+ - .include -diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile -index af5a775..c01aa05 100644 ---- a/lib/libprocstat/Makefile -+++ b/lib/libprocstat/Makefile -@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def - SYMBOL_MAPS= ${.CURDIR}/Symbol.map - - INCS= libprocstat.h -+CFLAGS+= -I${.CURDIR}/../libelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE - SHLIB_MAJOR= 1 - -diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile -index 2815a07..e992662 100644 ---- a/lib/librtld_db/Makefile -+++ b/lib/librtld_db/Makefile -@@ -10,5 +10,8 @@ SRCS= rtld_db.c - INCS= rtld_db.h - - CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR}/../libelf -+LDADD+= -lutil -lproc -+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc - - .include -diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile -index 1cf52a0..3d25fae 100644 ---- a/lib/libtelnet/Makefile -+++ b/lib/libtelnet/Makefile -@@ -13,6 +13,8 @@ INTERNALLIB= - SRCS= genget.c getent.c misc.c - CFLAGS+= -I${TELNETDIR} - -+CFLAGS+= -I${.CURDIR}/../libmp -+ - WARNS?= 2 - - .if !defined(RELEASE_CRUNCH) -diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile -index 30a1dfb..9f8a99c 100644 ---- a/lib/libexecinfo/Makefile -+++ b/lib/libexecinfo/Makefile -@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1 - INCS= execinfo.h - SRCS= backtrace.c symtab.c unwind.c - -+CFLAGS+= -I${.CURDIR}/../libelf - DPADD= ${LIBELF} - LDADD= -lelf -+LDFLAGS+= -L${.OBJDIR}/../libelf - - MAN= backtrace.3 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch deleted file mode 100644 index 55987aa44fa1..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile -index f9e01ab..15b27d8 100644 ---- a/lib/libproc/Makefile -+++ b/lib/libproc/Makefile -@@ -15,7 +15,10 @@ INCS= libproc.h - - CFLAGS+= -I${.CURDIR} - --.if ${MK_LIBCPLUSPLUS} != "no" -+.if ${CXX:T:M*-stdlib=libc++*} -+LDADD+= -lcxxrt -+DPADD+= ${LIBCXXRT} -+.elif ${CXXFLAGS:T:M*-stdlib=libc++*} - LDADD+= -lcxxrt - DPADD+= ${LIBCXXRT} - .else diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch deleted file mode 100644 index 303f422651f3..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile -index bbfb57b..a7c17e3 100644 ---- a/lib/libgeom/Makefile -+++ b/lib/libgeom/Makefile -@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR} - - WARNS?= 3 - --DPADD= ${LIBBSDXML} ${LIBSBUF} -+DPADD= ${LIBSBUF} - LDADD= -lbsdxml -lsbuf - - MAN= libgeom.3 -diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c -index 9dedb8e..d96420c 100644 ---- a/lib/libgeom/geom_xml2tree.c -+++ b/lib/libgeom/geom_xml2tree.c -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - - struct mystate { -diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c -index d1fc0b1..89ac55e 100644 ---- a/lib/libmt/mtlib.c -+++ b/lib/libmt/mtlib.c -@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken - #include - #include - #include --#include -+#include - #include - - /* diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch deleted file mode 100644 index b08d95f714f3..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile -index cb1da71..43de5a5 100644 ---- a/lib/libmt/Makefile -+++ b/lib/libmt/Makefile -@@ -5,6 +5,7 @@ SHLIBDIR?= /lib - SRCS= mtlib.c - INCS= mtlib.h - -+CFLAGS+= -I${.CURDIR} - DPADD= ${LIBSBUF} - LDADD= -lsbuf - -diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile -index e9384b7..085ef62 100644 ---- a/lib/libdpv/Makefile -+++ b/lib/libdpv/Makefile -@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil - - SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c - --CFLAGS+= -I${.CURDIR} -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar -+LDFLAGS+= -L${.OBJDIR}/../libfigpar - - WARNS?= 6 - diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch deleted file mode 100644 index 813a42b50171..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile -index 88ec3fe..076b8d4 100644 ---- a/lib/libusb/Makefile -+++ b/lib/libusb/Makefile -@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c - CFLAGS+= -DCOMPAT_32BIT - .else - FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc --FILESDIR= ${LIBDATADIR}/pkgconfig -+FILESDIR= ${LIBDIR}/pkgconfig - .endif - - # diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch deleted file mode 100644 index d90aa3163dae..000000000000 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile -index e3bfe00..51fc5f0 100644 ---- a/lib/libsysdecode/Makefile -+++ b/lib/libsysdecode/Makefile -@@ -8,7 +8,7 @@ LIB= sysdecode - SRCS= errno.c ioctl.c syscallnames.c utrace.c - INCS= sysdecode.h - --CFLAGS+= -I${.CURDIR}/../../sys -+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} - - MAN+= sysdecode.3 \ - sysdecode_abi_to_freebsd_errno.3 \ -@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} - - ioctl.c: mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} -+ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} - - beforedepend: ioctl.c - diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild deleted file mode 100644 index 96b625022684..000000000000 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild +++ /dev/null @@ -1,648 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "EN-16:06/libc.patch" - "SA-16:37/libc.patch" - "SA-16:38/bhyve.patch" ) - -# Crypto is needed to have an internal OpenSSL header -# sys is needed for libalias, probably we can just extract that instead of -# extracting the whole tarball -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - lib/ - contrib/ - crypto/ - libexec/ - etc/ - include/ - usr.sbin/ - gnu/ - secure/ -" - -if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then - RDEPEND="ssl? ( dev-libs/openssl:0= ) - hesiod? ( net-dns/hesiod ) - kerberos? ( app-crypt/heimdal ) - usb? ( !dev-libs/libusb ) - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) - >=dev-libs/expat-2.0.1 - >=dev-util/dialog-1.2.20150225 - =sys-freebsd/freebsd-libexec-${RV}* - !sys-libs/libutempter - !dev-libs/libelf - !dev-libs/libexecinfo - !dev-libs/libiconv - !sys-freebsd/freebsd-headers" - DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - >=sys-freebsd/freebsd-sources-10.3-r5" - RDEPEND="${RDEPEND} - =sys-freebsd/freebsd-share-${RV}* - >=virtual/libiconv-0-r2" -else - EXTRACTONLY+="sys/ " -fi - -DEPEND="${DEPEND} - userland_GNU? ( sys-apps/mtree ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/lib" - -export CTARGET=${CTARGET:-${CHOST}} -if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then - export CTARGET=${CATEGORY/cross-} -fi - -IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs - userland_GNU userland_BSD" - -QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - use zfs && EXTRACTONLY+="cddl/ " - - [ -c /dev/zero ] || \ - die "You forgot to mount /dev; the compiled libc would break." - - if ! use ssl && use kerberos; then - eerror "If you want kerberos support you need to enable ssl support, too." - fi - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " - - if [ "${CTARGET}" != "${CHOST}" ]; then - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-6.0-pmc.patch" - "${FILESDIR}/${PN}-6.1-csu.patch" - "${FILESDIR}/${PN}-10.0-liblink.patch" - "${FILESDIR}/${PN}-10.2-liblink.patch" - "${FILESDIR}/${PN}-10.0-atfcxx.patch" - "${FILESDIR}/${PN}-10.3-libusb.patch" - "${FILESDIR}/${PN}-10.0-libproc-libcxx.patch" - "${FILESDIR}/${PN}-10.2-bsdxml2expat.patch" - "${FILESDIR}/${PN}-9.0-bluetooth.patch" - "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" - ) -# Here we disable and remove source which we don't need or want -# In order: -# - ncurses stuff -# - libexpat creates a bsdxml library which is the same as expat -# - archiving libraries (have their own ebuild) -# - sendmail libraries (they are installed by sendmail) -# - SNMP library and dependency (have their own ebuilds) -# - libstand: static library, 32bits on amd64 used for boot0, we build it from -# boot0 instead. -# -# The rest are libraries we already have somewhere else because -# they are contribution. -REMOVE_SUBDIRS="ncurses \ - libexpat \ - libz libbz2 libarchive liblzma \ - libsm libsmdb libsmutil \ - libbegemot libbsnmp \ - libpam libpcap libwrap libmagic \ - libcom_err - libedit - libstand - libgssapi" - -# Are we building a cross-compiler? -is_crosscompile() { - [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" - - # Upstream Display Managers default to using VT7 - # We should make FreeBSD allow this by default - local x= - for x in "${WORKDIR}"/etc/etc.*/ttys ; do - sed -i.bak \ - -e '/ttyv5[[:space:]]/ a\ -# Display Managers default to VT7.\ -# If you use the xdm init script, keep ttyv6 commented out\ -# unless you force a different VT for the DM being used.' \ - -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ - || die "Failed to sed ${x}" - rm "${x}".bak - done - - # This one is here because it also - # patches "${WORKDIR}/include" - cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}-includes.patch" - epatch "${FILESDIR}/${PN}-8.0-gcc45.patch" - epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch" - - # Don't install the hesiod man page or header - rm "${WORKDIR}"/include/hesiod.h || die - sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die - sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ - "${WORKDIR}"/lib/libc/net/Makefile.inc || die - - # Fix the Makefiles of these few libraries that will overwrite our LDADD. - cd "${S}" - for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ - libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ - die "Problem fixing \"${dir}/Makefile" - done - # Call LD with LDFLAGS, rename them to RAW_LDFLAGS - sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ - -i "${S}/csu/i386-elf/Makefile" \ - -i "${S}/csu/ia64/Makefile" || die - - if install --version 2> /dev/null | grep -q GNU; then - sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - fi - - # Try to fix sed calls for GNU sed. Do it only with GNU userland and force - # BSD's sed on BSD. - cd "${S}" - if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then - find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; - sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die - fi - - if use build; then - cd "${WORKDIR}" - # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it - # shouldn't be a symlink to /usr/src/sys (which should be already patched) - epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch - return 0 - fi - - if ! is_crosscompile ; then - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" - fi - else - sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ - "${S}/libc/rpc/Makefile.inc" \ - "${S}/libc/yp/Makefile.inc" - fi -} - -bootstrap_lib() { - for i ; do - cd "${WORKDIR}/${i}" || die "missing ${i}" - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" - done -} - -get_csudir() { - if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then - echo "lib/csu/$1-elf" - else - echo "lib/csu/$1" - fi -} - -bootstrap_csu() { - local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" - export RAW_LDFLAGS=$(raw-ldflags) - bootstrap_lib "${csudir}" - - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - - bootstrap_lib "gnu/lib/csu" - - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - for i in *.So ; do - ln -s $i ${i%.So}S.o - done - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" -} - -# Compile libssp_nonshared.a and add it's path to LDFLAGS. -bootstrap_libssp_nonshared() { - bootstrap_lib "gnu/lib/libssp/libssp_nonshared" - export LDADD="-lssp_nonshared" -} - -bootstrap_libgcc() { - bootstrap_lib "lib/libcompiler_rt" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die - ln -s libcompiler_rt.a libgcc.a || die - - bootstrap_lib "lib/libc" "gnu/lib/libgcc" -} - -bootstrap_libthr() { - bootstrap_lib "lib/libthr" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die - ln -s libthr.so libpthread.so -} - -# What to build for a cross-compiler. -# We also need the csu but this has to be handled separately. -CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" - -# What to build for non-default ABIs. -NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules" - -# Subdirs for a native build: -NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" - -# Is my $ABI native ? -is_native_abi() { - is_crosscompile && return 1 - multilib_is_native_abi -} - -# Do we need to bootstrap the csu and libssp_nonshared? -need_bootstrap() { - is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}" -} - -# Get the subdirs we are building. -get_subdirs() { - local ret="" - if is_native_abi ; then - # If we are building for the native ABI, build everything - ret="${NATIVE_SUBDIRS}" - elif is_crosscompile ; then - # With a cross-compiler we only build the very core parts. - ret="${CROSS_SUBDIRS}" - if [ "${EBUILD_PHASE}" = "install" ]; then - # Add the csu dir first when installing. We treat it separately for - # compiling. - ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" - fi - else - # For the non-native ABIs we only build the csu parts and very core - # libraries for now. - ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" - fi - echo "${ret}" -} - -# Bootstrap the core libraries and setup the flags so that the other parts can -# build against it. -do_bootstrap() { - einfo "Bootstrapping on ${CHOST} for ${CTARGET}" - if ! is_crosscompile ; then - # Pre-install headers, but not when building a cross-compiler since we - # assume they have been installed in the previous pass. - einfo "Pre-installing includes in include_proper_${ABI}" - mkdir "${WORKDIR}/include_proper_${ABI}" || die - CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" - CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" - fi - bootstrap_csu - bootstrap_libssp_nonshared - is_crosscompile && bootstrap_lib "lib/libc" - is_crosscompile || is_native_abi || bootstrap_libgcc - is_native_abi || bootstrap_libthr -} - -# Compile it. Assume we have the toolchain setup correctly. -do_compile() { - # Bootstrap if needed, otherwise assume the system headers are in - # /usr/include. - if need_bootstrap ; then - do_bootstrap - else - CFLAGS="${CFLAGS} -isystem /usr/include" - CXXFLAGS="${CXXFLAGS} -isystem /usr/include" - fi - - export RAW_LDFLAGS=$(raw-ldflags) - - # Everything is now setup, build it! - for i in $(get_subdirs) ; do - einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_compile || die "make ${i} failed" - done -} - -src_compile() { - # Does not work with GNU sed - # Force BSD's sed on BSD. - if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then - export ESED=/usr/bin/sed - unalias sed - fi - - use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" - - cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" - - use crosscompile_opts_headers-only && return 0 - - # Bug #270098 - append-flags $(test-flags -fno-strict-aliasing) - - # Bug #324445 - append-flags $(test-flags -fno-strict-overflow) - - # strip flags and do not do it later, we only add safe, and in fact - # needed flags after all - strip-flags - export NOFLAGSTRIP=yes - if is_crosscompile ; then - export YACC='yacc -by' - CHOST=${CTARGET} tc-export CC LD CXX RANLIB - mymakeopts="${mymakeopts} NLS=" - CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" - CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" - append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" - fi - - if is_crosscompile ; then - do_compile - else - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile - fi -} - -gen_libc_ldscript() { - # Parameters: - # $1 = target libdir - # $2 = source libc dir - # $3 = source libssp_nonshared dir - - # Clear the symlink. - rm -f "${DESTDIR}/$2/libc.so" || die - - # Move the library if needed - if [ "$1" != "$2" ] ; then - mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die - fi - - # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking - # this is done to avoid having to touch gcc spec file as it is currently - # done on FreeBSD upstream, mostly because their binutils aren't able to - # cope with linker scripts yet. - # Taken from toolchain-funcs.eclass: - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - # iconv symbol provided by libc_nonshared.a. - # http://svnweb.freebsd.org/base?view=revision&revision=258283 - cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT -/* GNU ld script - SSP (-fstack-protector) requires __stack_chk_fail_local to be local. - GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if - this symbol was provided by a shared libc. So we link in - libssp_nonshared.a from here. - */ -${output_format} -GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) -END_LDSCRIPT -} - -header_list="" - -move_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ ! -d "${dirname}/${ABI}" ] ; then - mkdir "${dirname}/${ABI}" || die - fi - - mv "${1}" "${dirname}/${ABI}/" || die - - export header_list="${header_list} ${1}" -} - -make_header_template() { - cat <<-END_HEADER -/* - * Wrapped header for multilib support. - * See the real headers included below. - */ - -#if defined(__x86_64__) - @ABI_amd64_fbsd@ -#elif defined(__i386__) - @ABI_x86_fbsd@ -#else - @ABI_${DEFAULT_ABI}@ -#endif -END_HEADER -} - -wrap_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ -n "${dirname#.}" ] ; then - dirname="${dirname}/${2}" - else - dirname="${2}" - fi - - if [ -f "${dirname}/${filename}" ] ; then - sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} - else - cat ${1} - fi -} - -wrap_header_end() { - sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} -} - -do_install() { - if is_crosscompile ; then - INCLUDEDIR="/usr/${CTARGET}/usr/include" - else - INCLUDEDIR="/usr/include" - fi - - dodir ${INCLUDEDIR} - CTARGET="${CHOST}" \ - install_includes ${INCLUDEDIR} - - is_crosscompile && use crosscompile_opts_headers-only && return 0 - - # Install a libusb.pc for better compat with Linux's libusb - if use usb ; then - dodir /usr/$(get_libdir)/pkgconfig - sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc - fi - - for i in $(get_subdirs) ; do - if [[ ${i} != *libiconv_modules* ]] ; then - einfo "Installing in ${i}..." - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_install || die "Install ${i} failed" - fi - done - - if ! is_crosscompile; then - local mymakeopts_save="${mymakeopts}" - mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" - - einfo "Installing in lib/libiconv_modules..." - cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." - freebsd_src_install || die "Install lib/libiconv_modules failed" - - mymakeopts="${mymakeopts_save}" - fi - - if ! is_crosscompile ; then - if ! multilib_is_native_abi ; then - DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - else - dodir "$(get_libdir)" - DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - fi - else - CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" - # We're done for the cross libc here. - return 0 - fi - - # Generate ldscripts for core libraries that will go in / - multilib_is_native_abi && \ - gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ - kvm m md procstat sbuf thr ufs util elf - - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then - cd "${D}/usr/include" - for i in machine/*.h fenv.h ; do - move_header ${i} - done - if multilib_is_native_abi ; then - # Supposedly the last one! - local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" - for j in ${uniq_headers} ; do - make_header_template > ${j} - for i in $(get_all_abis) ; do - wrap_header ${j} ${i} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - wrap_header_end ${j} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - fi - fi -} - -src_install() { - if is_crosscompile ; then - einfo "Installing for ${CTARGET} in ${CHOST}.." - # From this point we need to force: get stripped with the correct tools, - # get tc-arch-kernel to return the right value, etc. - export CHOST=${CTARGET} - - mymakeopts="${mymakeopts} NO_MAN= \ - INCLUDEDIR=/usr/${CTARGET}/usr/include \ - SHLIBDIR=/usr/${CTARGET}/usr/lib \ - LIBDIR=/usr/${CTARGET}/usr/lib" - - dosym "usr/include" "/usr/${CTARGET}/sys-include" - do_install - - return 0 - else - export STRIP_MASK="*/usr/lib*/*crt*.o" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install - fi - - cd "${WORKDIR}/etc/" - insinto /etc - doins nls.alias mac.conf netconfig - - # Install ttys file - local MACHINE="$(tc-arch-kernel)" - doins "etc.${MACHINE}"/* -} - -install_includes() -{ - local INCLUDEDIR="$1" - - # The idea is to be called from either install or unpack. - # During unpack it's required to install them as portage's user. - if [[ "${EBUILD_PHASE}" == "install" ]]; then - local DESTDIR="${D}" - BINOWN="root" - BINGRP="wheel" - else - local DESTDIR="${WORKDIR}" - [[ -z "${USER}" ]] && USER="portage" - BINOWN="${USER}" - [[ -z "${GROUPS}" ]] && GROUPS="portage" - BINGRP="${GROUPS}" - fi - - # Must exist before we use it. - [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." - cd "${WORKDIR}/include" - - local MACHINE="$(tc-arch-kernel)" - - einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - $(freebsd_get_bmake) installincludes \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - DESTDIR="${DESTDIR}" \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" \ - WITHOUT_GSSAPI= || die "install_includes() failed" - einfo "includes installed ok." - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" - for i in $EXTRA_INCLUDES; do - einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - cd "${WORKDIR}/$i" || die - $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" || die "problem installing $i includes." - einfo "$i includes installed ok." - done -} diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild deleted file mode 100644 index 24c62627e2a2..000000000000 --- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild +++ /dev/null @@ -1,644 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "SA-16:37/libc.patch" - "SA-16:38/bhyve.patch" ) - -# Crypto is needed to have an internal OpenSSL header -# sys is needed for libalias, probably we can just extract that instead of -# extracting the whole tarball -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - lib/ - contrib/ - crypto/ - libexec/ - etc/ - include/ - usr.sbin/ - gnu/ - secure/ -" - -if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then - RDEPEND="ssl? ( dev-libs/openssl:0= ) - hesiod? ( net-dns/hesiod ) - kerberos? ( app-crypt/heimdal ) - usb? ( !dev-libs/libusb ) - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) - >=dev-libs/expat-2.0.1 - >=dev-util/dialog-1.2.20150225 - =sys-freebsd/freebsd-libexec-${RV}* - !sys-libs/libutempter - !dev-libs/libelf - !dev-libs/libexecinfo - !dev-libs/libiconv - !sys-freebsd/freebsd-headers" - DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-sources-${RV}*" - RDEPEND="${RDEPEND} - =sys-freebsd/freebsd-share-${RV}* - >=virtual/libiconv-0-r2" -else - EXTRACTONLY+="sys/ " -fi - -DEPEND="${DEPEND} - userland_GNU? ( sys-apps/mtree ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/lib" - -export CTARGET=${CTARGET:-${CHOST}} -if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then - export CTARGET=${CATEGORY/cross-} -fi - -IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build crosscompile_opts_headers-only zfs - userland_GNU userland_BSD" - -QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - use zfs && EXTRACTONLY+="cddl/ " - - [ -c /dev/zero ] || \ - die "You forgot to mount /dev; the compiled libc would break." - - if ! use ssl && use kerberos; then - eerror "If you want kerberos support you need to enable ssl support, too." - fi - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " - - if [ "${CTARGET}" != "${CHOST}" ]; then - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-6.0-pmc.patch" - "${FILESDIR}/${PN}-10.0-atfcxx.patch" - "${FILESDIR}/${PN}-9.0-bluetooth.patch" - "${FILESDIR}/${PN}-11.0-workaround.patch" - "${FILESDIR}/${PN}-11.0-bsdxml2expat.patch" - "${FILESDIR}/${PN}-11.0-libsysdecode.patch" - "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" - "${FILESDIR}/${PN}-add-nossp-cflags.patch" - ) -# Here we disable and remove source which we don't need or want -# In order: -# - ncurses stuff -# - libexpat creates a bsdxml library which is the same as expat -# - archiving libraries (have their own ebuild) -# - sendmail libraries (they are installed by sendmail) -# - SNMP library and dependency (have their own ebuilds) -# - libstand: static library, 32bits on amd64 used for boot0, we build it from -# boot0 instead. -# -# The rest are libraries we already have somewhere else because -# they are contribution. -REMOVE_SUBDIRS="ncurses \ - libexpat \ - libz libbz2 libarchive liblzma \ - libsm libsmdb libsmutil \ - libbegemot libbsnmp \ - libpam libpcap libwrap libmagic \ - libcom_err - libedit - libstand - libgssapi" - -# Are we building a cross-compiler? -is_crosscompile() { - [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" - - # Upstream Display Managers default to using VT7 - # We should make FreeBSD allow this by default - local x= - for x in "${WORKDIR}"/etc/etc.*/ttys ; do - sed -i.bak \ - -e '/ttyv5[[:space:]]/ a\ -# Display Managers default to VT7.\ -# If you use the xdm init script, keep ttyv6 commented out\ -# unless you force a different VT for the DM being used.' \ - -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ - || die "Failed to sed ${x}" - rm "${x}".bak - done - - # This one is here because it also - # patches "${WORKDIR}/include" - cd "${WORKDIR}" - epatch "${FILESDIR}/${PN}-includes.patch" - - # Don't install the hesiod man page or header - rm "${WORKDIR}"/include/hesiod.h || die - sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die - sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ - "${WORKDIR}"/lib/libc/net/Makefile.inc || die - - # Fix the Makefiles of these few libraries that will overwrite our LDADD. - cd "${S}" - for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ - libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ - die "Problem fixing \"${dir}/Makefile" - done - # Call LD with LDFLAGS, rename them to RAW_LDFLAGS - sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ - -i "${S}/csu/i386/Makefile" || die - - if install --version 2> /dev/null | grep -q GNU; then - sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" - fi - - # Try to fix sed calls for GNU sed. Do it only with GNU userland and force - # BSD's sed on BSD. - cd "${S}" - if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then - find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; - sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die - fi - - if use build; then - cd "${WORKDIR}" - # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it - # shouldn't be a symlink to /usr/src/sys (which should be already patched) - epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch - return 0 - fi - - if ! is_crosscompile ; then - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" - fi - else - sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ - "${S}/libc/rpc/Makefile.inc" \ - "${S}/libc/yp/Makefile.inc" - fi -} - -bootstrap_lib() { - for i ; do - cd "${WORKDIR}/${i}" || die "missing ${i}" - freebsd_src_compile - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" - done -} - -get_csudir() { - if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then - echo "lib/csu/$1-elf" - else - echo "lib/csu/$1" - fi -} - -bootstrap_csu() { - local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" - export RAW_LDFLAGS=$(raw-ldflags) - bootstrap_lib "${csudir}" - - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" - - bootstrap_lib "gnu/lib/csu" - - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - for i in *.So ; do - ln -s $i ${i%.So}S.o - done - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" -} - -# Compile libssp_nonshared.a and add it's path to LDFLAGS. -bootstrap_libssp_nonshared() { - bootstrap_lib "gnu/lib/libssp/libssp_nonshared" -} - -bootstrap_libgcc() { - bootstrap_lib "lib/libcompiler_rt" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die - ln -s libcompiler_rt.a libgcc.a || die - - bootstrap_lib "lib/libc" "gnu/lib/libgcc" -} - -bootstrap_libthr() { - bootstrap_lib "lib/libthr" - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die - ln -s libthr.so libpthread.so -} - -# What to build for a cross-compiler. -# We also need the csu but this has to be handled separately. -CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" - -# What to build for non-default ABIs. -NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules" - -# Subdirs for a native build: -NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" - -# Is my $ABI native ? -is_native_abi() { - is_crosscompile && return 1 - multilib_is_native_abi -} - -# Do we need to bootstrap the csu and libssp_nonshared? -need_bootstrap() { - is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}" -} - -# Get the subdirs we are building. -get_subdirs() { - local ret="" - if is_native_abi ; then - # If we are building for the native ABI, build everything - ret="${NATIVE_SUBDIRS}" - elif is_crosscompile ; then - # With a cross-compiler we only build the very core parts. - ret="${CROSS_SUBDIRS}" - if [ "${EBUILD_PHASE}" = "install" ]; then - # Add the csu dir first when installing. We treat it separately for - # compiling. - ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" - fi - else - # For the non-native ABIs we only build the csu parts and very core - # libraries for now. - ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" - fi - echo "${ret}" -} - -# Bootstrap the core libraries and setup the flags so that the other parts can -# build against it. -do_bootstrap() { - einfo "Bootstrapping on ${CHOST} for ${CTARGET}" - if ! is_crosscompile ; then - # Pre-install headers, but not when building a cross-compiler since we - # assume they have been installed in the previous pass. - einfo "Pre-installing includes in include_proper_${ABI}" - mkdir "${WORKDIR}/include_proper_${ABI}" || die - CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" - CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" - CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" - mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" - fi - bootstrap_csu - bootstrap_libssp_nonshared - is_crosscompile && bootstrap_lib "lib/libc" - is_crosscompile || is_native_abi || bootstrap_libgcc - is_native_abi || bootstrap_libthr -} - -# Compile it. Assume we have the toolchain setup correctly. -do_compile() { - # Bootstrap if needed, otherwise assume the system headers are in - # /usr/include. - if need_bootstrap ; then - do_bootstrap - else - CFLAGS="${CFLAGS} -isystem /usr/include" - [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" - CXXFLAGS="${CXXFLAGS} -isystem /usr/include" - fi - - export RAW_LDFLAGS=$(raw-ldflags) - - # Everything is now setup, build it! - for i in $(get_subdirs) ; do - einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_compile || die "make ${i} failed" - done -} - -src_compile() { - # Does not work with GNU sed - # Force BSD's sed on BSD. - if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then - export ESED=/usr/bin/sed - unalias sed - fi - - use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" - - cd "${WORKDIR}/include" - $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" - - use crosscompile_opts_headers-only && return 0 - - # Bug #270098 - append-flags $(test-flags -fno-strict-aliasing) - - # Bug #324445 - append-flags $(test-flags -fno-strict-overflow) - - # strip flags and do not do it later, we only add safe, and in fact - # needed flags after all - strip-flags - export NOFLAGSTRIP=yes - if is_crosscompile ; then - export YACC='yacc -by' - CHOST=${CTARGET} tc-export CC LD CXX RANLIB - mymakeopts="${mymakeopts} NLS=" - CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" - CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" - append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" - fi - - if is_crosscompile ; then - do_compile - else - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile - fi -} - -gen_libc_ldscript() { - # Parameters: - # $1 = target libdir - # $2 = source libc dir - # $3 = source libssp_nonshared dir - - # Clear the symlink. - rm -f "${DESTDIR}/$2/libc.so" || die - - # Move the library if needed - if [ "$1" != "$2" ] ; then - mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die - fi - - # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking - # this is done to avoid having to touch gcc spec file as it is currently - # done on FreeBSD upstream, mostly because their binutils aren't able to - # cope with linker scripts yet. - # Taken from toolchain-funcs.eclass: - local output_format - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" - - # iconv symbol provided by libc_nonshared.a. - # http://svnweb.freebsd.org/base?view=revision&revision=258283 - cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT -/* GNU ld script - SSP (-fstack-protector) requires __stack_chk_fail_local to be local. - GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if - this symbol was provided by a shared libc. So we link in - libssp_nonshared.a from here. - */ -${output_format} -GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) -END_LDSCRIPT -} - -header_list="" - -move_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ ! -d "${dirname}/${ABI}" ] ; then - mkdir "${dirname}/${ABI}" || die - fi - - mv "${1}" "${dirname}/${ABI}/" || die - - export header_list="${header_list} ${1}" -} - -make_header_template() { - cat <<-END_HEADER -/* - * Wrapped header for multilib support. - * See the real headers included below. - */ - -#if defined(__x86_64__) - @ABI_amd64_fbsd@ -#elif defined(__i386__) - @ABI_x86_fbsd@ -#else - @ABI_${DEFAULT_ABI}@ -#endif -END_HEADER -} - -wrap_header() { - local dirname=$(dirname ${1}) - local filename=$(basename ${1}) - - if [ -n "${dirname#.}" ] ; then - dirname="${dirname}/${2}" - else - dirname="${2}" - fi - - if [ -f "${dirname}/${filename}" ] ; then - sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} - else - cat ${1} - fi -} - -wrap_header_end() { - sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} -} - -do_install() { - if is_crosscompile ; then - INCLUDEDIR="/usr/${CTARGET}/usr/include" - else - INCLUDEDIR="/usr/include" - fi - - dodir ${INCLUDEDIR} - CTARGET="${CHOST}" \ - install_includes ${INCLUDEDIR} - - is_crosscompile && use crosscompile_opts_headers-only && return 0 - - # Install a libusb.pc for better compat with Linux's libusb - if use usb ; then - dodir /usr/$(get_libdir)/pkgconfig - sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc - fi - - for i in $(get_subdirs) ; do - if [[ ${i} != *libiconv_modules* ]] ; then - einfo "Installing in ${i}..." - cd "${WORKDIR}/${i}/" || die "missing ${i}." - freebsd_src_install || die "Install ${i} failed" - fi - done - - if ! is_crosscompile; then - local mymakeopts_save="${mymakeopts}" - mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" - - einfo "Installing in lib/libiconv_modules..." - cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." - freebsd_src_install || die "Install lib/libiconv_modules failed" - - mymakeopts="${mymakeopts_save}" - fi - - if ! is_crosscompile ; then - if ! multilib_is_native_abi ; then - DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - else - dodir "$(get_libdir)" - DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" - fi - else - CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" - # We're done for the cross libc here. - return 0 - fi - - # Generate ldscripts for core libraries that will go in / - multilib_is_native_abi && \ - gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ - kvm m md procstat sbuf thr ufs util elf - - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then - cd "${D}/usr/include" - for i in machine/*.h fenv.h ; do - move_header ${i} - done - if multilib_is_native_abi ; then - # Supposedly the last one! - local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" - for j in ${uniq_headers} ; do - make_header_template > ${j} - for i in $(get_all_abis) ; do - wrap_header ${j} ${i} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - wrap_header_end ${j} > ${j}.new - cp ${j}.new ${j} - rm -f ${j}.new - done - fi - fi -} - -src_install() { - if is_crosscompile ; then - einfo "Installing for ${CTARGET} in ${CHOST}.." - # From this point we need to force: get stripped with the correct tools, - # get tc-arch-kernel to return the right value, etc. - export CHOST=${CTARGET} - - mymakeopts="${mymakeopts} WITHOUT_MAN= \ - INCLUDEDIR=/usr/${CTARGET}/usr/include \ - SHLIBDIR=/usr/${CTARGET}/usr/lib \ - LIBDIR=/usr/${CTARGET}/usr/lib" - - dosym "usr/include" "/usr/${CTARGET}/sys-include" - do_install - - return 0 - else - export STRIP_MASK="*/usr/lib*/*crt*.o" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install - fi - - cd "${WORKDIR}/etc/" - insinto /etc - doins nls.alias mac.conf netconfig - - # Install ttys file - local MACHINE="$(tc-arch-kernel)" - doins "etc.${MACHINE}"/* -} - -install_includes() -{ - local INCLUDEDIR="$1" - - # The idea is to be called from either install or unpack. - # During unpack it's required to install them as portage's user. - if [[ "${EBUILD_PHASE}" == "install" ]]; then - local DESTDIR="${D}" - BINOWN="root" - BINGRP="wheel" - else - local DESTDIR="${WORKDIR}" - [[ -z "${USER}" ]] && USER="portage" - BINOWN="${USER}" - [[ -z "${GROUPS}" ]] && GROUPS="portage" - BINGRP="${GROUPS}" - fi - - # Must exist before we use it. - [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." - cd "${WORKDIR}/include" - - local MACHINE="$(tc-arch-kernel)" - - einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - $(freebsd_get_bmake) installincludes \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - DESTDIR="${DESTDIR}" \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" \ - WITHOUT_GSSAPI= \ - SRCTOP="${WORKDIR}"|| die "install_includes() failed" - einfo "includes installed ok." - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp" - for i in $EXTRA_INCLUDES; do - einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." - cd "${WORKDIR}/$i" || die - $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ - BINGRP="${BINGRP}" \ - SRCTOP="${WORKDIR}" || die "problem installing $i includes." - einfo "$i includes installed ok." - done -} diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest index 978d94f280a9..4767583a3bb5 100644 --- a/sys-freebsd/freebsd-libexec/Manifest +++ b/sys-freebsd/freebsd-libexec/Manifest @@ -1,9 +1,7 @@ AUX bootpd.confd 183 BLAKE2B 76fb1b41204f2b3d07cc974ec996ff9127945dc638796b176cd8809ca46fb69fa307f3fa313d48d79a7deb532d393ab58839ed7ae53927280f0178c20c4df3c4 SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10559912f30effb189f55e7f34ef37b496d8f9f8eb8726ab6af2ca179cb215809d76d1293ffb338 SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66 -AUX freebsd-libexec-10.2-atf-check.patch 809 BLAKE2B 3fce1b54cb3710861aa8abe5d5cdb09039764124a3b179ddbe0836fc3df6d48760b89badf8b1706bd1551c89c5f978889e29eed059ffc4df59524c18ee4a5e0b SHA512 46b265db484d707e9e65906e8d5b3dbb06223c1c229c78b6cb92864f4a4a017b61cfd2de35e5533bae2eb8867adea5e1732c279bc5d90e60d07646b9a4b06681 AUX freebsd-libexec-7.2-pic.patch 348 BLAKE2B 38c8f2be3aafa6ff92055bd61c3d1a9691fa6137322adf966971b72bc78f50e25dfdbb9598fae94974b4a2788babf250dee50916b9bcc9a8684005107d1b6214 SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5 AUX freebsd-libexec-8.2-rtld.patch 1332 BLAKE2B c34d2e3a3f96ff619b86443b820b43d2d11c6ead43d5fa573b6541aed9dca116fbd92e94dff7504910dbbe7ee8447a8e398e56cdd3b0931abd1d41d3445e2350 SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6 -AUX freebsd-libexec-9.2-no_ld32.patch 634 BLAKE2B 909d0f2e694c2e1af7eece7f2f4bcf7fa9f39c91f95b3adae1160af00968b2edbb72c44a2ef2929e50b2203e9ee428ed87edbc122fe4d3bb8c219b276caf9025 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 AUX rquotad.xinetd 162 BLAKE2B 87633efa7d9732c498de807976fdc65e3ec15eaef596f7f3f52e3a065fd0b6a9d592c3823a3c84cb9d363df5870f81f00d4a140a6df6e54cbfe239157af05c6b SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f AUX rstatd.xinetd 218 BLAKE2B a998b50e4f3a49582529d0d1751a4111b0705f03e53e677395043db38b743a5d017799d4dbfa26eeb107d5d657d82af88198d6477452976b59458ce5f7912417 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e1791dee53a08b2ada06d2f740246bcf4e5c2a9665f612e7b613e5f437576df468ec6fd29712cb0d0f SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd @@ -19,14 +17,10 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-libexec-10.3.ebuild 3513 BLAKE2B 2af7e0e8a643da2d9de83eba8b68f03dd306b2f95f2a2e40c7631a532cf84351850a042fdbd846c07a823eddbf324dea30de35808cbc49d333e8c8e1cb54afbe SHA512 73d96f63e2c1a7e1f3d24e7bbca68777d69e5647a3e3bf5e4911df55ae53bc26e05459799d64413a31121d4dfbf438791339608cb41bf72df551f42b3738197c -EBUILD freebsd-libexec-11.0.ebuild 4149 BLAKE2B 4f30c7ddb211c6e08a68074b49ea5f5b663a63fbbcab794d31dd24d5236c2cff754d237f4d66e5318e9b36e0758d38a4b0cd013a930404b17c71ddad6b65a764 SHA512 75668b5ded29355db9f7e595a7cff32210ede67ca8ed29c8e5fd677d4ed66febcdaf003e841873ad8acbb69e3e85078653c421bde7ac724387f37704df540fe8 EBUILD freebsd-libexec-8.2-r1.ebuild 1762 BLAKE2B bdfd5c674d09618b3337d0a5922edbc8e962e442d3f943311c3f2106179e204d5dd64aae37ad85b6057041e5e21d3e0a2b3c3c471d21dcacc9bdcce10e2f4a1f SHA512 b5ff14afff032ebe2fc43fb4045d7705d6d0cf4b2853ef788ad0cc47dab343a19a655d881dd2965e4743d4c4212dc6ef7e5b3929885851fc2041ec97fc641cb8 EBUILD freebsd-libexec-8.2.ebuild 1726 BLAKE2B 81734a0958b6d0a44d0257a9e77534d15170404f01821fc97ff8fb2ecfe506fc6c3717b81df02f9f667231036fff70e0d81698a0e64872922627a91387ee96cf SHA512 3b825ac1c7d44a3f288483b5b7a212a60800a36c326a29dca90cbfe1898735fc4a43c13866bc95b4cbbfdf3eaaf845e9bd191933ec63f807a3bf6b43887dd8f4 EBUILD freebsd-libexec-9.1-r2.ebuild 2296 BLAKE2B ff662e3bbee7969539bf48139f6e921bef036dc003d2b4b5b16ba94c6d6de0291a54daccb81dc0856100f452202a2eb430b0d15fdedffb479365af18f545f0ac SHA512 e099494395ac06088175df3717f7936b2b41c4b98d176cecd6f345ce31c42e02401e60642f9919418fb0ef3f4944bebb7935432c920a080b503ef9fc2fef92c7 diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch deleted file mode 100644 index e9c092566303..000000000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc -index b50e14e..e59a413 100644 ---- a/libexec/atf/Makefile.inc -+++ b/libexec/atf/Makefile.inc -@@ -25,7 +25,7 @@ - # - # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $ - --CFLAGS+= -DHAVE_CONFIG_H -+CXXFLAGS+= -DHAVE_CONFIG_H - - WARNS?= 3 - -diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile -index 77c11db..7449ddb 100644 ---- a/libexec/atf/atf-check/Makefile -+++ b/libexec/atf/atf-check/Makefile -@@ -34,8 +34,8 @@ PROG_CXX= atf-check - SRCS= atf-check.cpp - MAN= atf-check.1 - --CFLAGS+= -I${ATF} --CFLAGS+= -DATF_SHELL='"/bin/sh"' -+CXXFLAGS+= -I${ATF} -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' - - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch deleted file mode 100644 index d33000927424..000000000000 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*. -We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue -about LD_32_* and thus fail to run from the build directory. - -diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h ---- libexec.old/rtld-elf/rtld.h 2013-08-24 12:30:26.000000000 -0400 -+++ libexec/rtld-elf/rtld.h 2013-08-26 17:10:19.000000000 -0400 -@@ -47,7 +47,6 @@ - #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" - /* For running 32 bit binaries */ - #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" --#define LD_ "LD_32_" - #endif - - #ifndef STANDARD_LIBRARY_PATH diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild deleted file mode 100644 index e915c5115503..000000000000 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs - -DESCRIPTION="FreeBSD libexec things" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - libexec/ - usr.bin/ - bin/ - contrib/hyperv/ - lib/ - etc/ - usr.sbin/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="${RDEPEND} - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/libexec" - -# Remove sendmail, tcp_wrapper and other useless stuff -REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" - -IUSE="pam ssl kerberos ipv6 nis xinetd" - -PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" - "${FILESDIR}/${PN}-10.2-atf-check.patch" ) - -pkg_setup() { - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - if [[ ! -e "${WORKDIR}/include" ]]; then - ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - # allow upgrade directly from 9.x to 10.2. - if has_version "> "${S}"/rtld-elf/rtld.h - echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h - echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h - echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h - echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/fcntl.h - echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/cdefs.h - echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/mman.h - echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h - fi -} - -setup_multilib_vars() { - if ! multilib_is_native_abi ; then - cd "${WORKDIR}/libexec/rtld-elf" || die - export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" - else - cd "${S}" || die - fi - "$@" -} - -src_compile() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -} - -src_install() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install - - insinto /etc - doins "${WORKDIR}/etc/gettytab" - newinitd "${FILESDIR}/bootpd.initd" bootpd - newconfd "${FILESDIR}/bootpd.confd" bootpd - - if use xinetd; then - for rpcd in rstatd rusersd walld rquotad sprayd; do - insinto /etc/xinetd.d - newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} - done - fi -} diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild deleted file mode 100644 index 59376c1713b0..000000000000 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs - -DESCRIPTION="FreeBSD libexec things" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - libexec/ - usr.bin/ - bin/ - contrib/blacklist/ - contrib/dma/ - contrib/hyperv/ - contrib/telnet/ - lib/ - etc/ - usr.sbin/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}* - >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] - pam? ( virtual/pam )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="${RDEPEND} - xinetd? ( sys-apps/xinetd )" - -S="${WORKDIR}/libexec" - -# Remove sendmail, tcp_wrapper and other useless stuff -REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" - -IUSE="pam ssl kerberos ipv6 nis xinetd" - -PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" ) - -pkg_setup() { - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " - - if has_version "=sys-freebsd/freebsd-share-${RV} is required." - fi -} - -src_prepare() { - # gcc-5.0 or later, Workaround for critical issue. bug 573358. - [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 - - if [[ ! -e "${WORKDIR}/include" ]]; then - ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." - fi - # allow upgrade directly from 9.x to 10.2. - if has_version "> "${S}"/rtld-elf/rtld.h - echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h - echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h - echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h - echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h - echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h - echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/fcntl.h - echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h - echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/cdefs.h - echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h - # taken from sys/sys/mman.h - echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h - echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h - - export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= " - fi -} - -setup_multilib_vars() { - if ! multilib_is_native_abi ; then - cd "${WORKDIR}/libexec/rtld-elf" || die - export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" - else - cd "${S}" || die - fi - "$@" -} - -src_compile() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -} - -src_install() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install - - insinto /etc - doins "${WORKDIR}/etc/gettytab" - newinitd "${FILESDIR}/bootpd.initd" bootpd - newconfd "${FILESDIR}/bootpd.confd" bootpd - - if use xinetd; then - for rpcd in rstatd rusersd walld rquotad sprayd; do - insinto /etc/xinetd.d - newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} - done - fi -} diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index da4576a017b0..9da68bf803ae 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -1,16 +1,9 @@ -AUX freebsd-mk-defs-10.2-gnu.patch 1853 BLAKE2B 0a3eb41eb954a560e3d94d40a8b5c01e11cbb01edf90e282a97166f18d34552fb3fa4f8528dc9323253616cf4300864190d2c160674520390ccd10c6253ec205 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e -AUX freebsd-mk-defs-10.3-gentoo.patch 11845 BLAKE2B 8fe1e628272db95e1de08315fec5bf21b8331ef027fe2942b05c169046f82fe0bae75c734e411aa393ae50adf780c152ff7f1a43e5238a5847d1869ebb77ea12 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 AUX freebsd-mk-defs-11.0-drop-unsupport-cflags.patch 461 BLAKE2B 9e27da87743872a3d4361a353c2864c00dacdbf33d7df2197507262769512e0f34e40aa3ff4247601e0393a0e2c4545a866448025ed6013a5e9ca283ff91a56d SHA512 82275fe36338a31f1da5ed7d60d72e3f7f5eb3c8e029700afbcb9bc6219dc3051f35a49d33694d553fb8bce0dcf2fbdfbead5bc6e074fa7d9aebda19da603168 -AUX freebsd-mk-defs-11.0-gentoo.patch 12840 BLAKE2B 348dda45e8fdf767ed0a25e880766bfb5e03faab052d081090020e751dc1c1e03c857db0ac6c63ff458e977549c1bd6db717357da1c146ff9024eb6b9c109c70 SHA512 1b070418a5cb5739c55dc8f3e146ccd1390031ec6c13283573900922cd547310e0ccc18093c81df8836c3f78d6ce4279c3b56d6ad059ecb1d09f2b55b781ff79 AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af43f8d278c1eb9fe1aed95df0aea36a291d85d6e143d74ce7ff65fb777258f31ec4138ac8dc2b00710254538ff95f743fa SHA512 bda6a5396c653b964426a3de80ed9c37205d30f3a863f7df231e0cc708ce3bca65ef46f2ca8bf63ea9a37309e2d3ac74ccbf0000e147688be686c998d940ded0 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2 AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 BLAKE2B 2093435dece5cfc8dbbcd1035ee4930c7b30d35b5450f7548c3fa9e34e6ac451731cd4f93c8acd3ba045150ba5674ea557ed7c1e8c79fa2fef1d3627c44afac5 SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca -EBUILD freebsd-mk-defs-10.3.ebuild 787 BLAKE2B c026f6210192845b6dfa1d7ee002a508c948bfe5fd007d5b6e94d644761db21f9c354ec37d0df14d68257dbf6bd28002c5032f639757c2d9056ab43f2053d8d9 SHA512 fbf44cfb7aaf7ba1afc00e8e6a63ccdd892da89dc33fdbec6cf268ff85d8170030bfc00c0612ef33c625515d057017ec8ae4f858a920e4b09f3eca63fd65b14e -EBUILD freebsd-mk-defs-11.0.ebuild 1148 BLAKE2B cb3d1d4bf485f33e972534886906b4647a6c3ac887bf62acbac85c71a6aa2b1854db23b79f012741a06953a6419190dc897e2a93ccf435d717e4d2cbd5938297 SHA512 d26f7bd93d912a1f2064d7e126e537c82e33e9513518a2f7d7457846cd47c288ec99c0bbc2555c5a67c874f35da20b441227e408e97e0dbc7ecd81198e5b1da8 EBUILD freebsd-mk-defs-11.1.ebuild 1148 BLAKE2B 5e0cfc31dbd47afb392c69125e3a29c251216436f6724dad42aabcc55f87f27fb0c687c325a284b18d3ef7ce470cf15356e05a057bad439485682ead320d7980 SHA512 d3bf63b18797b3eb4193859f3c61e5ed810f2fbd9d491b82b072655cf7f9a42d0b69c634b9877635455ef38ecc2e29fc6fdb9179a5a62cd31570d8469fd294bb MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch deleted file mode 100644 index b88fde255007..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index 80549d8..fd2aac5 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -173,7 +173,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} -+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -186,7 +186,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} -+ @${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} - ${RANLIB} ${RANLIBFLAGS} ${.TARGET} - .endif - -@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} - .endif - ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if ${MK_CTF} != "no" - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -273,13 +273,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 19ad99f..46c4b09 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -179,13 +179,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-10.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch deleted file mode 100644 index cdc244d6e059..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch +++ /dev/null @@ -1,337 +0,0 @@ -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk -index a8aa595..476b33b 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: - .if ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endif - .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 183cb1c..5b57594 100644 ---- a/share/mk/bsd.files.mk -+++ b/share/mk/bsd.files.mk -@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles-${group}: _${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} \ -@@ -52,10 +53,12 @@ _${group}FILES+= ${file} - installfiles-${group}: _${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 b938221..6b98e72 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 6275ce3..8d32289 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 c753afe..14f74aa 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -46,8 +46,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) && \ -@@ -296,14 +294,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} -@@ -357,10 +358,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 c097c77..c2994d8 100644 ---- a/share/mk/bsd.libnames.mk -+++ b/share/mk/bsd.libnames.mk -@@ -51,7 +51,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.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 -@@ -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 - .if ${MK_LDNS} != "no" - LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a - .endif -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk -index 574f0f5..b63b117 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 0212d3a..6435936 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 28255ea..2bc6546 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 73de02d..c6c30ca 100644 ---- a/share/mk/bsd.own.mk -+++ b/share/mk/bsd.own.mk -@@ -206,9 +206,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 d6d0fa5..93a9046 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -42,10 +42,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 -@@ -200,6 +196,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" -@@ -233,6 +230,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 fee6ccc..c2fe39a 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 -@@ -102,10 +98,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 c270260..68491ce 100644 ---- a/share/mk/sys.mk -+++ b/share/mk/sys.mk -@@ -327,12 +327,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/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch deleted file mode 100644 index e87bdbacd58b..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch +++ /dev/null @@ -1,343 +0,0 @@ -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk -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} \ - realinstall: - .if ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/ - .endif - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ - .endfor -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk -index bc123e1..4707b84 100644 ---- a/share/mk/bsd.files.mk -+++ b/share/mk/bsd.files.mk -@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} - - installfiles-${group}: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES} - installfiles-${group}: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/ - .endif -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk -index 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} - - 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} \ -@@ -77,9 +80,13 @@ stage_includes: stage_files.${group} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/ - .endif -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk -index 0544662..1a7aad7 100644 ---- a/share/mk/bsd.info.mk -+++ b/share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk -index bd93e57..92df111 100644 ---- a/share/mk/bsd.lib.mk -+++ b/share/mk/bsd.lib.mk -@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS} - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" - CTFFLAGS+= -g - .endif --.else --STRIP?= -s - .endif - - .if ${SHLIBDIR:M*lib32*} -@@ -335,14 +333,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ - .endif - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} - ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ -@@ -387,10 +388,12 @@ _libinstall: - .endif # SHLIB_LINK - .endif # SHIB_NAME - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/ - .endif -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk -index 0844ae2..caec715 100644 ---- a/share/mk/bsd.libnames.mk -+++ b/share/mk/bsd.libnames.mk -@@ -63,7 +63,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a - LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a -@@ -92,7 +92,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" - 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 6f78501..bc9a1a6 100644 ---- a/share/mk/bsd.man.mk -+++ b/share/mk/bsd.man.mk -@@ -188,9 +188,11 @@ maninstall: ${MAN} - .if ${MK_MANCOMPRESS} == "no" - .if defined(MANFILTER) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} - .endif -@@ -204,11 +206,14 @@ maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} - .endfor -@@ -216,9 +221,11 @@ maninstall: ${MAN} - .endif # defined(MANFILTER) - .else # ${MK_MANCOMPRESS} == "yes" - .for __page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/ - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT} - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} - .endif -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk -index 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} - SYMLINKS+= ${NLSSYMLINKS} - .endif - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - .if !empty(NLSLINKS_${file:R}:M${file:R}) - .error NLSLINKS_${file:R} contains itself: ${file:R} -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk -index c10e492..5984215 100644 ---- a/share/mk/bsd.own.mk -+++ b/share/mk/bsd.own.mk -@@ -233,9 +233,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} - INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk -index f1a5c65..3b1ecf8 100644 ---- a/share/mk/bsd.prog.mk -+++ b/share/mk/bsd.prog.mk -@@ -44,10 +44,6 @@ CTFFLAGS+= -g - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_ROOT) - .if !defined(TAGS) || ! ${TAGS:Mpackage=*} - TAGS+= package=${PACKAGE:Uruntime} -@@ -217,6 +213,7 @@ realinstall: _proginstall - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .if ${MK_DEBUG_FILES} != "no" -@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk -index 0ae45c5..37c4d01 100644 ---- a/share/mk/bsd.sys.mk -+++ b/share/mk/bsd.sys.mk -@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD} - .if defined(WARNS) - .if ${WARNS} >= 1 - CWARNFLAGS+= -Wsystem-headers --.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} - .endif # WARNS >= 1 - .if ${WARNS} >= 2 - CWARNFLAGS+= -Wall -Wno-format-y2k -@@ -100,9 +97,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args - .if ${WARNS} <= 3 - CWARNFLAGS.clang+= -Wno-format-nonliteral - .endif # WARNS <= 3 --.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} - .endif # WFORMAT > 0 - .endif # WFORMAT - .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE}) -@@ -151,6 +145,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm - # but not yet. - CXXFLAGS.clang+= -Wno-c++11-extensions - -+.if ${MK_SSP} == "no" -+# gcc-4.9, -fstack-protector-strong is enabled by default. -+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. -+SSP_CFLAGS?= -fno-stack-protector -+CFLAGS+= ${SSP_CFLAGS} -+.endif -+ - .if ${MK_SSP} != "no" && \ - ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" - .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ -diff --git a/share/mk/sys.mk b/share/mk/sys.mk -index 5cfd0bb..25abf8e 100644 ---- a/share/mk/sys.mk -+++ b/share/mk/sys.mk -@@ -418,12 +418,6 @@ YFLAGS ?= -d - rm -f ${.PREFIX}.tmp.c - ${CTFCONVERT_CMD} - --# Pull in global settings. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # late include for customization - .sinclude - diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild deleted file mode 100644 index fdbdef6957b8..000000000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="Makefile definitions used for building and installing libraries and system files" -SLOT="0" - -IUSE="userland_GNU" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="share/" - -RDEPEND="" -DEPEND="" - -RESTRICT="strip" - -S="${WORKDIR}/share/mk" - -src_prepare() { - epatch "${FILESDIR}/${PN}-10.3-gentoo.patch" - epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" -} - -src_compile() { :; } - -src_install() { - if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd - else - insinto /usr/share/mk - fi - doins *.mk *.awk -} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild deleted file mode 100644 index 85da1616d6ca..000000000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="Makefile definitions used for building and installing libraries and system files" -SLOT="0" - -IUSE="userland_GNU" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="share/" - -RDEPEND="" -DEPEND="" - -RESTRICT="strip" - -S="${WORKDIR}/share/mk" - -src_prepare() { - local installdir - - epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" - epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" - epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" - epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" - - if [[ ${CHOST} != *-freebsd* ]]; then - installdir="/usr/share/mk/freebsd" - else - installdir="/usr/share/mk" - fi - - sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die -} - -src_compile() { :; } - -src_install() { - freebsd_src_install - if [[ ${CHOST} != *-freebsd* ]]; then - insinto /usr/share/mk/freebsd/system - else - insinto /usr/share/mk/system - fi - doins *.mk *.awk -} diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest index 3a03e5078dd0..20ec95d71ac5 100644 --- a/sys-freebsd/freebsd-pam-modules/Manifest +++ b/sys-freebsd/freebsd-pam-modules/Manifest @@ -3,11 +3,7 @@ AUX freebsd-pam-modules-6.0-gentoo.patch 701 BLAKE2B dc275160427933eb9d84faef066 AUX freebsd-pam-modules-9.0-gentoo.patch 622 BLAKE2B 10d9b14b96d777d8b9e6294b74a42f579a894053047391db79beab6aa9e413059c5f6ad217cc8c80573ac6bc836329aefd17bdd0a8f22b06422b78d0d3e815f4 SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca -EBUILD freebsd-pam-modules-10.3.ebuild 1099 BLAKE2B 44aa21f0286c3844c353dd9b95406f0732b48b0faf49d33b37bfa96431727a4bf51a021e18a50ed13930a56c9edd7e64dced6a480851cdedc5af430689b99fdd SHA512 d5214489e78d9c73d8f9700c34707f1e1509d45b89604f02ff12dbddc522e0feb1425cb96e7aca5dbc17bfb3dc3b2e5c8dabc000d2771bb719f6f0d3e0fd5a4b -EBUILD freebsd-pam-modules-11.0.ebuild 1035 BLAKE2B a49577fb953a25a699134c0455c70efc94a2fa10810657e071db88b6d8f946adec77c23948b2c530367390e5ac833b4a54a19f97541692eb16c6227da1a71e3b SHA512 ff5551e2bf795c77b143e389ea750e8641d314b147a070fa5ffe386bb3205da7c295963a3823c53be9afc66b0b0eeb663d17f401bf0a303ff9534ad2bf166b66 EBUILD freebsd-pam-modules-11.1.ebuild 1035 BLAKE2B 6dfe4a5fc5b8dd5e982db7fd5e5da872e2d4df83e1eb0c0b454d2e80b5d216d77dd094d1472eca7cf9244db9d50a93dad30a8c1d6eb9da86093473218a0526a1 SHA512 150ba570785b63e2fea121de424a7a8a5c0e6a74c4d498f743d4b7377d55f3eef7db10cfb5b0ded06f39913d32eb68565f17043863d16097ec9ce9f4cc5a04e2 EBUILD freebsd-pam-modules-8.2.ebuild 1123 BLAKE2B cf201d16028e3ee682279b33fbb22a92bdf567b28ad907478d6c533322116f7d32bb9bf58c144c2cf7f39e9201fd93e8dc0237ac558a926bcbe4898e4e2f1b62 SHA512 134d96116953ec37a82d8ca96673c9a83191c8cb6d5564800292f311fdd3d2f7c5b827bb7727855e6cad764850573345d88764a0b985704c2987cb58caa680f1 EBUILD freebsd-pam-modules-9.1-r1.ebuild 1072 BLAKE2B e050425fd980a9ae6aeb1f6513a66e4ad2bf96e05c728a490ab5e00cf2ba89c8716726ff676b4e8f2c93e4b795a841fd828dc8763923177e85ee1d43afcd73d0 SHA512 d5a4f80a980481f368e99c319b81a548fbfa20ea72b3044755a1065b09dbf63519f412328e4eaac8752de593a9e01b07eca0f0187e98e588cf5f38c04d528273 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild deleted file mode 100644 index 3289409bc5c6..000000000000 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd multilib pam - -DESCRIPTION="FreeBSD's PAM authentication modules" -SLOT="0" - -IUSE="kerberos nis" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="lib/" - -RDEPEND=">=sys-auth/openpam-20050201-r1 - kerberos? ( dev-libs/openssl:0= - virtual/krb5 )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S=${WORKDIR}/lib/libpam/modules - -PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch ) - -pkg_setup() { - # Avoid installing pam_ssh as that has its own ebuild. - mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " -} - -src_prepare() { - for module in pam_deny pam_passwdqc pam_permit pam_krb5; do - sed -i -e "s:${module}::" "${S}"/modules.inc || die - done -} - -src_install() { - mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" - - dodoc "${FILESDIR}/README.pamd" -} diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild deleted file mode 100644 index 3d4ceae6b8db..000000000000 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd multilib pam - -DESCRIPTION="FreeBSD's PAM authentication modules" -SLOT="0" - -IUSE="kerberos nis" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY="lib/" - -RDEPEND=">=sys-auth/openpam-20050201-r1 - kerberos? ( dev-libs/openssl:0= - virtual/krb5 )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S=${WORKDIR}/lib/libpam/modules - -pkg_setup() { - # Avoid installing pam_ssh as that has its own ebuild. - mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " -} - -src_prepare() { - for module in pam_deny pam_passwdqc pam_permit pam_krb5; do - sed -i -e "s:${module}::" "${S}"/modules.inc || die - done -} - -src_install() { - freebsd_src_install "LIBDIR=/$(get_libdir)/security" - - dodoc "${FILESDIR}/README.pamd" -} diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest index 274d67beb877..f28f901eeedc 100644 --- a/sys-freebsd/freebsd-pf/Manifest +++ b/sys-freebsd/freebsd-pf/Manifest @@ -1,7 +1,3 @@ -AUX freebsd-pf-10.0-libevent.patch 403 BLAKE2B 2d7c30c3e759a8f6367181eac7d67686f7253149e6bafe6878cbcdd10228dd62b2635f5acfe88488936539d93406bd7ce2f4fac00f48b3fb7b84c0acc4902034 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b -AUX freebsd-pf-10.0-pflogd.patch 349 BLAKE2B f642e6232edc1729304c5d64bb163ba865b5d1dead776a6c5b3e6a063cdace4d477142ad227469e3ea092f055a55469dd26218a5da7fac83f0c7d641e3f144a4 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 -AUX freebsd-pf-11.0-libevent.patch 312 BLAKE2B 1690f63b4c9a2a544ac52a86dc225768e750c56c89fec5213d071f49d82f33105d367b406e52fabf880c9d84fd0f6c781a80ad29314a703105dec9803d5a73fd SHA512 0c9eef97f7bfa5bcf4019a2449a096a6a6b66d3f0b5275181af86694cd0efd832788433d0203d3b9a54fc11c3eb728b6e67b143a622ce6f8b36f52299a9db85f -AUX freebsd-pf-11.0-pflogd.patch 326 BLAKE2B 378853146544fbe883a72697f1e9c1d42fde7c3b79598fafe4efc90d3f523b417432d66070d670453e93047861368dda2deb96413c36cadaee20f229434ae2fb SHA512 25327461327f01f1858e6d2108db973090c62c1dbccb09390d834cdfaff97d5258123b1162538e2d8faf7f452a8a7eb743ef72ebfddeac3c989aa43b96f05a90 AUX freebsd-pf-11.1-libevent.patch 305 BLAKE2B cce2abce33431885196c5bc44c7e38582b2c7db273ddd3b7d4c8b58dbd9902cbc6e2a5031f5cddd28db9361eafd75c98fc0ca8d14e822305ead12aa035990c5f SHA512 a75ff98e8d87ec5182bb1a7226b34d6223500c0a5659727392d97d69d1a66af6d439d4c23a6817740c25306654468e82e52ddfa591d4509001e407e099c83b44 AUX freebsd-pf-11.1-pflogd.patch 363 BLAKE2B fac873813332149adc13e5b1a77cd8532c12bae7ee1c93644af31e517e7697cdd8e7c59412e7dbb616c97baabb6308049bd7c995b5e803627f6cc3049056380e SHA512 bceaf0f234948acf30aab4391d73c7545bd860dc5b2bba8eb8da1a9791de905654450592674c75419a8dc0646215ba5bcdd885d61cac336d34c017a7c57039fd AUX freebsd-pf-7.0-libevent.patch 331 BLAKE2B 3bf0b950ad0669ac399a220e9411d7137243810f4b203a55a803421783ef200d2b0c435bbda499f8fa48d2011fb51db3c29769eae9adfcc991dfbfe50884481a SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61 @@ -19,13 +15,9 @@ DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e41 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-pf-10.3.ebuild 1586 BLAKE2B 65dbe8a03e64fd7efa3089543c30cb1d3e6f9e8c7f96be71c31f5774ff866aa0566059d3998d0a9540f04442bbf452600217c6b1e6ac2d0a88ac1815301be17d SHA512 232f37e4733f79b963ababf3152c17ec41358c0f0ef45e6e76136cb903d1d46826f4747f0563661ef3f26a07ff4517086da74723bef4a33c26bda1441a357434 -EBUILD freebsd-pf-11.0.ebuild 1491 BLAKE2B 045ab9e6b22a5e77f8f6edf97da72d4ddd701ba77c43e16503eee5e1a36e70cb40f062b2b8d39020ffd0d9fa0cebdd8e59047a3c9d99c6074cad89cf25eb59e7 SHA512 ae66d1c3a7cfe5dd6f43fd4933e4d8a36bd7d320cee6b2094312e00ca90c6de1f155725e942b23b5accac89f571ba356a7c0ee13a71b2f7d2458ec93d2d6ac44 EBUILD freebsd-pf-11.1.ebuild 1491 BLAKE2B 01e49509dc7f3528e0f14a01eebb2a8b5f0c9fa927844b98f8a9f4c89bbc1b103f01b972efa4a370b9765dd1cb6620d51de0c012a1b58b108434d7e247562f57 SHA512 2ace1ad0f89365b9b707a2b9b29f04dff926ad3a3340abd156862aa0c50396ce078d4f997d1298b498df1c52745b5216f2c112424254ae12abbb554783c276a8 EBUILD freebsd-pf-8.2.ebuild 1493 BLAKE2B 86a9eea616866fb9ed315fdf68ac314358599eb39ecb5257d684ceab0195bda67e6bc63b86e6689ba95c0f13de546339367c2f30a175c67e514705af681ac239 SHA512 cc1d221ffa6a763641c64802ae6d8a1f1a5598c48ce07e3bc7f1b1a70454c1ba7730a30c6881de7dc493bccf49dcfb7a64998162dda4d47165b088dc0a63bdff EBUILD freebsd-pf-9.1.ebuild 1614 BLAKE2B a22189ed6a16455b6f95dae6f7cfa064efa355c89d97a2b1e0e5947589979da059cc6fc3df609d702b188b6c85ebec031df4c35f6850e79b09fe6eb045d532be SHA512 db5c7a663f784b6fb73515312a91e7971da959b1b67fd40fd479b6f2b272f5fbf2eebee1a29c4dfd63bbdfddaedb51ffca9b2297004ffc03851e1127fa3e890c diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch deleted file mode 100644 index 57474ea31dfb..000000000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile -index de49888..2ab32fb 100644 ---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile -+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile -@@ -7,10 +7,7 @@ MAN= ftp-proxy.8 - - SRCS= ftp-proxy.c filter.c - --CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent -- --LDADD+= ${LIBEVENT} --DPADD+= ${LIBEVENT} -+LDADD+= -levent - - WARNS?= 3 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch deleted file mode 100644 index 1316d3be832a..000000000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile -index fcff8eb..0da383d 100644 ---- a/sbin/pflogd/Makefile -+++ b/sbin/pflogd/Makefile -@@ -6,10 +6,7 @@ PROG= pflogd - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c - MAN= pflogd.8 - --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -- - LDADD= -lpcap --DPADD= ${LIBPCAP} - - WARNS?= 2 - diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch deleted file mode 100644 index 0f3ecb1fc615..000000000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile -index 941505f..df5ccb2 100644 ---- a/usr.sbin/ftp-proxy/Makefile -+++ b/usr.sbin/ftp-proxy/Makefile -@@ -7,8 +7,6 @@ MAN= ftp-proxy.8 - - SRCS= ftp-proxy.c filter.c - --CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -- - LIBADD= event - - WARNS?= 3 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch deleted file mode 100644 index 6435280b7e96..000000000000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile -index b3822dd..5912ad2 100644 ---- a/sbin/pflogd/Makefile -+++ b/sbin/pflogd/Makefile -@@ -7,8 +7,6 @@ PROG= pflogd - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c - MAN= pflogd.8 - --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -- - LIBADD= pcap - - WARNS?= 2 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild deleted file mode 100644 index e0a26d65e2f1..000000000000 --- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd user - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" - -IUSE="" - -# Crypto is needed to have an internal OpenSSL header -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.sbin/ - sbin/ - contrib/pf/ - etc/ -" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - dev-libs/libevent - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S="${WORKDIR}" - -SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy" - -pkg_setup() { - enewgroup authpf 63 - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " -} - -src_prepare() { - # pcap-int.h redefines snprintf as pcap_snprintf - epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" - # Use system's libevent - epatch "${FILESDIR}/${PN}-10.0-libevent.patch" - epatch "${FILESDIR}/${PN}-10.0-pflogd.patch" - epatch "${FILESDIR}/${PN}-9.0-bpf.patch" - epatch "${FILESDIR}/${PN}-9.0-getline.patch" - # Link in kernel sources - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" -} - -src_compile() { - for dir in ${SUBDIRS}; do - einfo "Starting make in ${dir}" - cd "${S}/${dir}" || die - mkmake || die "Make ${dir} failed" - done -} - -src_install() { - for dir in ${SUBDIRS}; do - einfo "Starting install in ${dir}" - cd "${S}/${dir}" || die - mkinstall || die "Install ${dir} failed" - done - - cd "${WORKDIR}"/etc - insinto /etc - doins pf.os - # pf.initd provided by openrc, but no pf.confd - newconfd "${FILESDIR}/pf.confd" pf -} diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild deleted file mode 100644 index 49e2f293e51f..000000000000 --- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd user - -DESCRIPTION="FreeBSD's base system libraries" -SLOT="0" - -IUSE="" - -# Crypto is needed to have an internal OpenSSL header -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.sbin/ - sbin/ - contrib/pf/ - etc/ -" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - dev-libs/libevent - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" - -S="${WORKDIR}" - -SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" - -pkg_setup() { - enewgroup authpf 63 -} - -src_prepare() { - # pcap-int.h redefines snprintf as pcap_snprintf - epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" - # Use system's libevent - epatch "${FILESDIR}/${PN}-11.0-libevent.patch" - epatch "${FILESDIR}/${PN}-11.0-pflogd.patch" - epatch "${FILESDIR}/${PN}-9.0-bpf.patch" - # Link in kernel sources - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" -} - -src_compile() { - for dir in ${SUBDIRS}; do - einfo "Starting make in ${dir}" - cd "${S}/${dir}" || die - freebsd_src_compile || die "Make ${dir} failed" - done -} - -src_install() { - for dir in ${SUBDIRS}; do - einfo "Starting install in ${dir}" - cd "${S}/${dir}" || die - freebsd_src_install || die "Install ${dir} failed" - done - - cd "${WORKDIR}"/etc - insinto /etc - doins pf.os - # pf.initd provided by openrc, but no pf.confd - newconfd "${FILESDIR}/pf.confd" pf -} diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest index 0b5660d78eae..edb3c7a5a04d 100644 --- a/sys-freebsd/freebsd-rescue/Manifest +++ b/sys-freebsd/freebsd-rescue/Manifest @@ -23,8 +23,6 @@ DIST freebsd-rescue-8.2.tar.bz2 5041 BLAKE2B bb75f3e71db9e81397d230f1bb604f20704 DIST freebsd-rescue-9.1.tar.bz2 3939 BLAKE2B f2756276c6018ded0e9b0f73bff25a606193c9da3e5348aefda3866308c3fb2ce046e35de6020dd0b28e0457b61a4864600ae40fa51042a64d93c712f9d85858 SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d @@ -32,8 +30,6 @@ DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-rescue-10.3.ebuild 1832 BLAKE2B cc1f1ff68c99f7d15ac02a4a70facfb0a73bef9b373624918fa578e1b6bd81b33760799fae5ba7668f65162df442c73563cfa8a1135ebf65532af6489b6556f3 SHA512 051aec60e165431c1b2c19489f43c36137c6de8d6a992a371e66369587dab321cea45a6667732b23e03c123a921dd888c25a8f1ffd94c349705295fb217da886 -EBUILD freebsd-rescue-11.0.ebuild 1869 BLAKE2B 10185f6ab246e991993a54eb96882c492024b414cca6fc793f3d860759f774150dbecfe3c1788eb6f9d8663215d06752b557ba04bd7de58a58ab512c874efa36 SHA512 8291dc4063691b846ee21a77ef5fdca9ee42c1918e7b67e766b3cbc2117fb6b7b60f6c23473a34fd1240ed728faa2c040d79fd17d3e075db153ef6441d07eb16 EBUILD freebsd-rescue-11.1.ebuild 1863 BLAKE2B 192ee47076a02df932500c4441ce38fc6f8a03c05d177d6964b8ec8df9dcc13117d408ed5a890533ea14f04eb4d3345f8a64669565b791ba0398508279740aee SHA512 38821a85f4e5f2efb6746b096b64c02b6534ce98ad743c44e45f65d8a6cafc3fba6cc452d3d465df1021fa2bf02063d3a5fa5be89ce7c667a9912626a7317591 EBUILD freebsd-rescue-8.2.ebuild 1488 BLAKE2B d0816a163bb298f10ed4826019312122f04ee2af04bf8fc52c316c4016e830d395e2b22a66807af5e3bce83f85b4130f6f8c133bb29b0ee82b25ce0061aba49e SHA512 6cf49d8ef4f62affa527d0339c56087d49576da2c27bce2ed25d72755ce8852ff43448e51382553d5605f8d8cdd5e124cd2ca00228b542ee9b85790152f6dba2 EBUILD freebsd-rescue-9.1.ebuild 1780 BLAKE2B 0a50df4fa297fbe54c7b68843a607f4eebc49af2bd60782f05b30cd6fffd88f9c32802d0dd81852ea61b7302a4f901acdb19396eddfe315a1277d6ddf6654f9f SHA512 0d463b226f9520d5d752a5de402e2d01bc6a7f778fb0747725f976053746685549c70ee59c78f2a53768ff1e0850f0c4fc479f8ecb611008af2b1e881e8c84a3 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild deleted file mode 100644 index a7e52e525efc..000000000000 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="atm netware nis zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.bin/ - contrib/ - lib/ - bin/ - sbin/ - usr.sbin/ - gnu/ - sys/ - libexec/ - rescue/ -" - -RDEPEND="" -DEPEND="sys-devel/flex - app-arch/xz-utils[static-libs] - sys-libs/ncurses[static-libs] - dev-libs/expat[static-libs] - app-arch/bzip2[static-libs] - dev-libs/libedit[static-libs] - dev-libs/libxml2:2[static-libs] - dev-libs/openssl:0=[static-libs] - sys-libs/zlib[static-libs] - sys-libs/readline[static-libs] - =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] - =sys-freebsd/freebsd-sources-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}* - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" - -S="${WORKDIR}/rescue" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} NO_PIC= " -} - -src_prepare() { - # As they are patches from ${WORKDIR} apply them by hand - cd "${WORKDIR}" || die - epatch "${FILESDIR}/${PN}"-10.0-zlib.patch - epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" - epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" -} - -src_compile() { - tc-export CC - # crunchgen is now checks env MAKE. - # Use to force BSD's make - export MAKE=/usr/bin/make - - cd "${WORKDIR}/lib/libarchive" || die - echo "#include " > bsdxml.h - freebsd_src_compile - export CC="${CC} -L${WORKDIR}/lib/libarchive" - - cd "${S}" || die - freebsd_src_compile -} diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild deleted file mode 100644 index 4f35e4425b18..000000000000 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd toolchain-funcs - -DESCRIPTION="FreeBSD's rescue binaries" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="atm netware nis zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - usr.bin/ - contrib/ - lib/ - bin/ - sbin/ - usr.sbin/ - gnu/ - sys/ - libexec/ - rescue/ -" - -RDEPEND="" -DEPEND="sys-devel/flex - app-arch/xz-utils[static-libs] - sys-libs/ncurses[static-libs] - dev-libs/expat[static-libs] - app-arch/bzip2[static-libs] - dev-libs/libedit[static-libs] - dev-libs/libxml2:2[static-libs] - dev-libs/openssl:0=[static-libs] - sys-libs/zlib[static-libs] - sys-libs/readline[static-libs] - =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] - =sys-freebsd/freebsd-sources-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}* - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" - -S="${WORKDIR}/rescue" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} NO_PIC= " -} - -src_prepare() { - # As they are patches from ${WORKDIR} apply them by hand - cd "${WORKDIR}" || die - epatch "${FILESDIR}/${PN}-10.0-zlib.patch" - epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" - epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" -} - -src_compile() { - export ESED=/usr/bin/sed - unalias sed - - tc-export CC - # crunchgen is now checks env MAKE. - # Use to force BSD's make - export MAKE=/usr/bin/make - - cd "${WORKDIR}/lib/libarchive" || die - echo "#include " > bsdxml.h - freebsd_src_compile - export CC="${CC} -L${WORKDIR}/lib/libarchive" - - cd "${S}" || die - freebsd_src_compile -} diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest index f74636b236ff..b6c281a2f8a0 100644 --- a/sys-freebsd/freebsd-sbin/Manifest +++ b/sys-freebsd/freebsd-sbin/Manifest @@ -16,15 +16,11 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-sbin-10.3.ebuild 2571 BLAKE2B eadd824da1346f5ec02662edf516394d6959f7ae835fe18ccc6bede19ac712b2ea78e003ff5b11e9a68938d407a7363f374d4d748d7f999501440cb163af41aa SHA512 5c35a35123fe063088db3c9f27f56e412fbd7dd155800ae8901d375a92ee6b11dcd2665aa134cb0eba534e3c3324988c7ab29b2a857b936c5b5d54b36c8ff483 -EBUILD freebsd-sbin-11.0.ebuild 2531 BLAKE2B 5b7ba2502cdd21c5b0ad566e7d6c3145b8e4b1dc6906b48b761702d09a1f1e5a0876a79f38f389baaeed20fc0ef49e17341dcab618ac391c606420f5071e6477 SHA512 4c1264e0596782f51b0bfade8184ca18d0cbc69a4539ddeb12cdc1b3e6c096d8f38f2aa850574fe55fb92ea13eb53bc884015856dc59bfa8510c137c549560df EBUILD freebsd-sbin-11.1.ebuild 2658 BLAKE2B 574dc52cdf48536c62a2928baed35d427385d2606264cd86d5317598fcec2b814c63169debec63aab4e9b500bc902866ef685405e191b0941c3019601ecb0890 SHA512 9f04e9c38c4040fc95075368e6a6133f8c98e48647249634fce0962372f032c48e82f76d7fe164efc4ff96ff73038875ee8d75445d33564b63df4229f7dfe0a4 EBUILD freebsd-sbin-8.2-r1.ebuild 2554 BLAKE2B 8fc7a5a50b8fc67b1d592697ba261ce7aa368f93e9481e512188249487ad4e4c4e6fd2da06324930bd256e9608e99e460cd9aa1b7dac85c403db8ea4ec3892ea SHA512 f8e7eb0416726aa824ab309b298f8d16a43694deecd8740fe9abe071f6bac40d5b2827bf74e0e89701684718a686a05a8586b093fe10d2a1b3b3138b9c3341d5 EBUILD freebsd-sbin-9.1.ebuild 2668 BLAKE2B df80b380b340455f88e0bc474aee32402ab26fe793e7df4c689b8b1b493d97c5396efadd69536c67432f859a8a06ac63cafbf0006ae8b8a1fbb03ca574db3627 SHA512 e6d9ac18f8ee6118228cdad1fc2b2a8ebe7237fa491873cdf37f894420d26b0244c25c7d9d24bfa25b417ed81523890ffc2bfd1b77260a622e5192379ef72b4e diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild deleted file mode 100644 index 99c4a3b6aed2..000000000000 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd multilib - -DESCRIPTION="FreeBSD sbin utils" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - sbin/ - contrib/ - lib/ - libexec/ - usr.sbin/ - etc/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - >=dev-libs/expat-2.0.1 - ssl? ( dev-libs/openssl:0= ) - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/readline:0= - || ( - sys-process/cronie - sys-process/vixie-cron - ) - atm? ( net-analyzer/bsnmp )" -DEPEND="${RDEPEND} - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/sbin" - -IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" - use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" -} - -REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" - -PATCHES=( "${FILESDIR}/${PN}-setXid.patch" - "${FILESDIR}/${PN}-10.0-zlib.patch" - "${FILESDIR}/${PN}-6.2-ldconfig.patch" - "${FILESDIR}/${PN}-6.1-pr102701.patch" - "${FILESDIR}/${PN}-bsdxml2expat.patch" ) - -src_prepare() { - if [[ ! -e "${WORKDIR}/sys" ]]; then - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" - fi -} - -src_install() { - mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " - freebsd_src_install - keepdir /var/log - # Needed by ldconfig: - keepdir /var/run - - # Maybe ship our own sysctl.conf so things like radvd work out of the box. - # New wireless config method requires regdomain.xml in /etc - cd "${WORKDIR}/etc/" || die - insinto /etc - doins minfree sysctl.conf regdomain.xml || die - - # Install a crontab for adjkerntz - insinto /etc/cron.d - newins "${FILESDIR}/adjkerntz-crontab" adjkerntz - - # Install the periodic stuff (needs probably to be ported in a more - # gentooish way) - cd "${WORKDIR}/etc/periodic" || die - - doperiodic security \ - security/*.ipfwlimit \ - security/*.ipfwdenied || die - - use ipfilter && { doperiodic security \ - security/*.ipfdenied || die ; } - - use pf && { doperiodic security \ - security/*.pfdenied || die ; } -} diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild deleted file mode 100644 index 5188b97c05b5..000000000000 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd multilib - -DESCRIPTION="FreeBSD sbin utils" -SLOT="0" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - sbin/ - contrib/ - lib/ - libexec/ - usr.sbin/ - etc/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - >=dev-libs/expat-2.0.1 - ssl? ( dev-libs/openssl:0= ) - >=dev-libs/libedit-20120311.3.0-r1 - sys-libs/readline:0= - || ( - sys-process/cronie - sys-process/vixie-cron - ) - atm? ( net-analyzer/bsnmp )" -DEPEND="${RDEPEND} - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-mk-defs-${RV}*" - -S="${WORKDIR}/sbin" - -IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" - -pkg_setup() { - # Add the required source files. - use build && EXTRACTONLY+="sys/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" - use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" -} - -REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" - -PATCHES=( "${FILESDIR}/${PN}-setXid.patch" - "${FILESDIR}/${PN}-10.0-zlib.patch" - "${FILESDIR}/${PN}-6.2-ldconfig.patch" - "${FILESDIR}/${PN}-6.1-pr102701.patch" ) - -src_prepare() { - if [[ ! -e "${WORKDIR}/sys" ]]; then - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" - fi -} - -src_install() { - mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " - freebsd_src_install - keepdir /var/log - # Needed by ldconfig: - keepdir /var/run - - # Maybe ship our own sysctl.conf so things like radvd work out of the box. - # New wireless config method requires regdomain.xml in /etc - cd "${WORKDIR}/etc/" || die - insinto /etc - doins minfree sysctl.conf regdomain.xml || die - - # Install a crontab for adjkerntz - insinto /etc/cron.d - newins "${FILESDIR}/adjkerntz-crontab" adjkerntz - - # Install the periodic stuff (needs probably to be ported in a more - # gentooish way) - cd "${WORKDIR}/etc/periodic" || die - - doperiodic security \ - security/*.ipfwlimit \ - security/*.ipfwdenied || die - - use ipfilter && { doperiodic security \ - security/*.ipfdenied || die ; } - - use pf && { doperiodic security \ - security/*.pfdenied || die ; } -} diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest index 35d99e403304..145704eb607f 100644 --- a/sys-freebsd/freebsd-share/Manifest +++ b/sys-freebsd/freebsd-share/Manifest @@ -18,15 +18,11 @@ DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc DIST freebsd-share-8.2.tar.bz2 3797560 BLAKE2B 411eae0c8da465cbfb61be450bc72218b97499aa8ce36abbafc8408aa85a10a144b48a0b3941d8049326f1afe9c0306c66ce176e8fb456981185c39671100cbb SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -EBUILD freebsd-share-10.3.ebuild 3106 BLAKE2B 9e4f122766dfd981f905607d5dd2bfcf8e6d09c091d6de351d6af74542c0ea7f29ba25fe47fac2932f9965700ab61995eb587fb71f5c2ed82e27bab8408c57e9 SHA512 8be33a1a2aa0e25225c4a310bbcf954a93b9adee72f3e58bca9e6516f61f6d6da9717c6ce249bea997314ec7c717f2bdb94bcb49b9015795b40d462f0fd55f55 -EBUILD freebsd-share-11.0.ebuild 3139 BLAKE2B 47863bdd2ef8f24c5124673d750fb6a708884dafbe8a21d6101340658c7830b197246330b759daada1258dc92c89ec178efd70b8efd97137a4cc8d162790433f SHA512 51adbb008184d71b2f8589af70eaf78dd76a1700fcdedca5027bce9b8526960d9e8ffe254b6928c79458bee1855171c5b243db7acc9b9e94fd28dd3982fa30eb EBUILD freebsd-share-11.1.ebuild 3336 BLAKE2B ccc17da18a5275cc592ce2adce80f2b024c7fad65bafd3e4b1341c1c1a001000f4862d89504c5030ec95c2c4ec3c5cb10c255cc9703ef2c48330968302b3ef11 SHA512 ab1b7653ec6db7deaf19d731adf27d40ff0eab88d7aa056714f63232ca40d0560e63b5850ee3341c47d150d5d64ad3e6031178d1923533f3c0a8ff2b7dc15ede EBUILD freebsd-share-8.2.ebuild 2445 BLAKE2B 10db1e63675fba4d35e6b1a582a7998e66ff802e51f990605ecbe243cda59887bd68c811da140de4848f152d9fe6219f3508477e13c0054ba453aa4eea7616d7 SHA512 9c5141a258faad0bd1bb3903f359ef0dad2ea88f73d5ae4e24ec7d2b86d2f0642bf7cd960f18785cca7b729b7082040641366b3207c21b69cc3da5a812b23b41 EBUILD freebsd-share-9.1.ebuild 2574 BLAKE2B 14a140c600040f967c871a916bf736e08bb5ae0d68754ae02bfe719b30e9c025a8102ca1edcd8dab91c331c6d4874379cd525cf7bb4f8032c19f5b3a7de3b80f SHA512 e0061942e6004beaf43e1f5fdcabfd9033b69e10ed29508c51a4fd8f917e68130d7a24ca6a4a0d92429245576847292989cf6f38290f840c06de8b7a7b87004d diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild deleted file mode 100644 index 071efda03a82..000000000000 --- a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD shared tools/files" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="doc usb zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - share/ - contrib/ - gnu/ - usr.bin/ - usr.sbin/ - sbin/ - bin/ - lib/ - etc/ -" - -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="sys-apps/miscfiles" - -RESTRICT="strip" - -S="${WORKDIR}/share" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " - - mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= WITHOUT_CLANG= " -} - -REMOVE_SUBDIRS="mk termcap zoneinfo tabset" - -PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) - -src_prepare() { - # Remove make.conf manpage as it describes bsdmk's make.conf. - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" - # Remove rc.conf manpage as it describes bsd's rc.conf. - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" - # Remove mailer.conf manpage - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" - # Remove pbm and moduli(ssh) manpages - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" - # Remove builtins manpage - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" - # Remove rc manpages - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" - - # Don't install the arch-specific directories in subdirectories - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile - - # Remove them so that they can't be included by error - rm -rf "${S}"/mk/*.mk - - # Make proper symlinks by defining the full target. - local sdir - for sdir in colldef mklocale monetdef msgdef numericdef timedef - do - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ - "${S}/${sdir}/Makefile" || \ - die "Error fixing ${sdir}/Makefile" - done - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" - fi -} - -src_compile() { - export ESED="/usr/bin/sed" - - # libiconv support. - # i18n/csmapper/APPLE requires mkcsmapper_static - # i18n/esdb/APPLE requires mkesdb_static - for pkg in mkcsmapper_static mkesdb_static - do - cd "${WORKDIR}"/usr.bin/${pkg} || die - freebsd_src_compile - done - - # This is a groff problem and not a -shared problem. - cd "${S}" || die - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" - freebsd_src_compile -j1 || die "emake failed" -} - -src_install() { - mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" -} diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild deleted file mode 100644 index 3e5bae2b14c2..000000000000 --- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD shared tools/files" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="doc usb zfs" - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -EXTRACTONLY=" - share/ - contrib/ - gnu/ - usr.bin/ - usr.sbin/ - sbin/ - bin/ - lib/ - etc/ - tools/tools/locale/ -" - -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-sources-${RV}*" -RDEPEND="sys-apps/miscfiles" - -RESTRICT="strip" - -S="${WORKDIR}/share" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - - use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " - [[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= " - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= " -} - -REMOVE_SUBDIRS="mk termcap zoneinfo tabset" - -PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) - -src_prepare() { - # Remove make.conf manpage as it describes bsdmk's make.conf. - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" - # Remove rc.conf manpage as it describes bsd's rc.conf. - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" - # Remove mailer.conf manpage - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" - # Remove pbm and moduli(ssh) manpages - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" - # Remove builtins manpage - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" - # Remove rc manpages - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" - - # Don't install the arch-specific directories in subdirectories - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile - - # Remove them so that they can't be included by error - rm -rf "${S}"/mk/*.mk - - # Make proper symlinks by defining the full target. - local sdir - for sdir in colldef monetdef msgdef numericdef timedef - do - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ - "${S}/${sdir}/Makefile" || \ - die "Error fixing ${sdir}/Makefile" - done - if [[ ! -e "${WORKDIR}/sys" ]]; then - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" - fi -} - -src_compile() { - export ESED="/usr/bin/sed" - - # libiconv support. - # i18n/csmapper/APPLE requires mkcsmapper_static - # i18n/esdb/APPLE requires mkesdb_static - for pkg in mkcsmapper_static mkesdb_static - do - cd "${WORKDIR}"/usr.bin/${pkg} || die - freebsd_src_compile - done - - # This is a groff problem and not a -shared problem. - cd "${S}" || die - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" - freebsd_src_compile -j1 || die "emake failed" -} - -src_install() { - freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF} -} diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest index 8c198dae6c1d..a2ab5c9d413c 100644 --- a/sys-freebsd/freebsd-sources/Manifest +++ b/sys-freebsd/freebsd-sources/Manifest @@ -1,5 +1,4 @@ AUX config-GENTOO 73 BLAKE2B fbe623f265438162db2f20edd9281752eee65fb3b55412b1427321668bf405f1d04523ba23959c0bf17742ca0128eebe71575827430434418a5724c89d4f8c02 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 -AUX freebsd-sources-10.0-gentoo.patch 713 BLAKE2B dce857da324f8a81f72e5338de2aee418ee1fac1563b841ec11a09b10f4effc44d2a2c8b305cc36190c094443557163188f438d7d1bcec4e7d7e593f5f9d1b05 SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d AUX freebsd-sources-10.1-gcc48.patch 452 BLAKE2B d1d9efc7be5bed287bbc2c9b05dc2db5a22671932ec01e436c2cd8fcd4ac6f5ce1584bc0faf64597787291bd9c4c26526bf0f8050de5d748a3a9af8d85c600f9 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 AUX freebsd-sources-11.0-gentoo-gcc.patch 430 BLAKE2B fadee46d0d675fe69d256d93c287f0cc11cfce7e9c7a5ba0e3bb7e51155ab1b8766df3508fc5672db10b8849fecb0cb1f32e4d2fa64e68ecd50f08b1d58bd9c2 SHA512 9869ba13091cc0975a7fe1a1b18a279835d19f1f57204dd3463798d3695a250ba6c96f2c1f6a2352dfce0022d7365257b0f938032b55e7090f68e58c4455bffe AUX freebsd-sources-11.0-gentoo.patch 852 BLAKE2B 81306d42748674cf550d5399a1ab02f183f2db82e1247a5d79acae77fee459a8f1a5265bc54a0d94f3310f1758e9bc97855b22c1c58d4f54cb573fcc9a8de6b7 SHA512 11f65627bb5436052b227d884c384e888bb8f44696c36b80a8715c912e41c953b57c1420b37030155c2751c72289470c4f681d14ed149e4f6aa82d8b63766ade @@ -33,34 +32,15 @@ AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770 AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e AUX freebsd-sources-9.2-gentoo-gcc.patch 506 BLAKE2B 29faa9418a739978652baed5a9412796b91fe2d77514fe8ee9022237dc74c4ef8f65c34edea72be3fe9bb76694c600749443c9c7d0afa41ceb290bd0d04c4a8e SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf AUX freebsd-sources-cve-2012-0217.patch 856 BLAKE2B 7dcbe58d7e58165fbdf734d59554c6e05f1248bdbafd0b5fa8b820de2aae50c9dd15938dc66603a683ba225e5e4e1271a7acea10fd1d43c6595226cea85f63b3 SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 -AUX freebsd-ubin-10.3-bmake-workaround.patch 301 BLAKE2B 1cc55c219ec9d40cec9e1ba0ae56e115caa298599c7b7ed3764ffe91c60103608278bce9719c553be2e2fba976c21cdde6037e298952359aa2eaf071837c7ed5 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc -DIST freebsd-sources-EN-1607-ipi.patch 2557 BLAKE2B 2387a6da039b5c52676cf8a1a963bda63bc7553b752495e9f5818deec14b12c04df51b526a199baa59ffe4f388d715e24ecbb164f381d5e6f04d909ef3b54a98 SHA512 41bee92ac36685ea81437befc07e1d1f7ba9d93b3d733981fce512e68a77eb3e9563a88e23fd9ae27a331e63c42966a55041cd5ae05d61895b8e20b1edae86dd -DIST freebsd-sources-EN-1608-zfs.patch 280 BLAKE2B 80b833c57b4d19c8844371032f66a24d9b1ab390ea6c94f9e26be2a60298a8a506fe1fd213d04e5e53438ebf0c27534582b25bd9ab1ccbb84083543c88418b73 SHA512 df2e133cfa565332da3c2b173c98e866bc1d9ddcfa06156da1f9a2f382186cafb130b7f0e19617482af71b730d95b9d8a7d81195a57760a93736bc2f49ed1c03 -DIST freebsd-sources-EN-1611-vmbus.patch 6755 BLAKE2B 2e5b972b686d8a9b9284ce645e1927da16c1d44ab5567487443363b9505a6296c1d430c082b817c63b1b9b3e063855647eef892a6b1cc33bcf14213553edfe85 SHA512 8a2296612f688692691765dbbd695f7aa75bf45fab8a569b3d6671aa5cf2d022e498f6f0266d89c999a1799a862f9cdeda8179a0e8eef85f5613bdaa792dcd41 -DIST freebsd-sources-EN-1612-hv_storvsc.patch 6459 BLAKE2B c86625831b8d7c4622f844c179e1c79a38d596bf869352fd31041c07e73de5bab0d75528d28188d50dddc15623b63d4832295949b49200c3c31eb6b449a66329 SHA512 90cc301222cb31d2c5cbb289666bea0291880a2c1236fe056c5c29b571fe656a39047e131eacf41af0b783e0c22f07681665e33046980f98f233a28baef18ade -DIST freebsd-sources-EN-1613-vmbus.patch 3886 BLAKE2B d58a5e0c9ada9f6e875f0103913bcc9f32e489e22ccf18fa9feae73ae9e2b1276aa2f6e2ac4a9e14f0aec233cde1da74ad9a2c659348f862fbfd01fdfb2a9df7 SHA512 14d7d6e1acf3e78b0b5653aa83dda8cb6fdbd8e2824624e093d73e217bad2600de157479e66f94248e38afa21ddc1292c30ba8381f76cac95b5d11caca1fee50 -DIST freebsd-sources-EN-1614-hv_storvsc.patch 1134 BLAKE2B 9c70536934791f6ba7fce367278cb22c7aae2cdc3cdfa5d13b9dd6d1cd1b008174d5d45ae01d317b456d86450617cb44dbf8cb56083ebff0a0548b66b0926cc1 SHA512 bcb687290b2a9572345e5e4c8d2408dadf2fe2f206d457ba8147bbc62fd6dff064b132b66b4e2ac6fa98c73c37eda7bf22538d51a29cbb773fb90c4af44f5986 -DIST freebsd-sources-EN-1615-vmbus.patch 2114 BLAKE2B b81217bc62c922f3706a21aa948e08da6a5f11fcfab9234feb6150bcb98b4e47a4697afac00733e681077c12dd2a26553abb3313f5fa311f991df87c79e247f2 SHA512 81477e9f5e4980d3e0c0487fbc7b760e7500ef37be42444782cd1fb5202d33e622109519e4bf4ba419a4d13c250e27e01f34d77c57b504584a2fab77b4f122c6 -DIST freebsd-sources-EN-1616-hv_storvsc.patch 5358 BLAKE2B 1641a1f44329490ad3002244a77e3ef5287212b8d2b5eb284a16717b02d2ff98141f25a3bf3d647e1f89b0d77cdb9423d6630f96fa56091bec0f707998628e1c SHA512 7364108737334ef7a12a8babf47b5139b973e68810b0cad335a6d8a7b7696fcfda047b1b7e85d28427f75001184a3c07418901ba0b9b152592d238bd392bf002 -DIST freebsd-sources-EN-1617-vm.patch 6332 BLAKE2B 526686e6ef410c5cd8acd0ea1cea2e0be1398db55da669eefd28f52cd2d81d4e08c4d52576b82596feb7e2d13fa3df61e2503f7bc6f04055a0ee7ac4a9b1069f SHA512 8d8112d1df50ef45311736cb24dc8be38bc93e6246ef1cb0535928a6a4cd4cecd58e755e0ef7992197a3995f3a92893141e01f3dd7d095b4e645528dc9e060ff DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15 -DIST freebsd-sources-SA-1615-sysarch-01.patch 655 BLAKE2B 5f0293dad23adf3b6113450e7de6bc971624df4c12ff49da2dbc0e6f3a318d73ee32e2d710322315bda2a0da2dd8ede228902b8a3b5e6fee645829655b61c2a1 SHA512 3ddc42f0e713a8f1753526b877141563b93d845e57cd111ef2219e969424efa88f3e726288bbd81fef7d4f06f2d68faa3f0c63c996a9579289236518e316739d -DIST freebsd-sources-SA-1618-atkbd.patch 352 BLAKE2B 30d4d0ceaba3ecf3a34d9bc0dcdc78e3f018f8aeaf8493f0fe8123d64fdf2d023d359cea73183bc1fca0a207cb5fbfd34bfce23b61136f056a3ddca1d262ffdf SHA512 aed4ee6b51905d04680181f571f0f89d60b66a2201c397f88931d9ce92b58148e2d638d93328a78ed53b4bf7a5040f1f646ba50566994252e73c13a09659ba3f -DIST freebsd-sources-SA-1619-sendmsg.patch 247 BLAKE2B 1d644bdb65855e7b3e09e0803bf04bc6806bd19e293b659e91163ed85be2210b7453e7f9d80c9a153f4bdb71ef847b6861f9037114abdd0d6e232a363f407277 SHA512 878e2b283358c050603cc32241077b25987696232bce3b9d41373c1186f5dbeb41881adc69e8754804054a57fffa71cad930b82ad8d5abd458779d5a3bd61978 -DIST freebsd-sources-SA-1620-linux.patch 492 BLAKE2B a1ac48d6a18ac6ae7f3a378ca175417abd1a80406ea832795809950a5764e9ba05cadbd67ee99de418eecc51e75770b3454a3eaaa2a13ce01113fb75ce34320e SHA512 1fb28b25ac5f89e2f7fa9a1f74ba83b4c949f2175217b669b5fcd2062c54307dcb50ad072acbe18162272b9bc29ba40ac4e19db1564a2959e885ac826a332ae5 -DIST freebsd-sources-SA-1621-stat.patch 223 BLAKE2B 9d18b3ac701b213e71e97965b1baa74ee9a89600267f1bcb4713170a96c9511c37f4a809818c4d1cf70d04d188906522c59b23a8393f3e1bd5d2e2e4885178a3 SHA512 501244c0831d2aeb37c8a8aaa762cc6c8c39929355e6695df23dc83c78d6bb499dcb903f50c17e3f7774306d53836a0633d65e284167590c015aa1f8e10e5e4a DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4 -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d -EBUILD freebsd-sources-10.3-r6.ebuild 4898 BLAKE2B 09d8686e253a8e643e6a7d0a499bd6c1b94839ebb6d34e957afc11c31935993492f0bfa64cfb1db5d1bc4810cb424a73eb4473d68181e25f87540a622d19df24 SHA512 9476b45b1c353df0fa9dc6b15665b666e8b1d24d5885647f63b94abde6cc5f4ca77175eccfacbf925e2d42895c5d683dfc7c40a3e450f03acae134bdceadbfd3 -EBUILD freebsd-sources-11.0-r1.ebuild 4846 BLAKE2B 3c81c113b7a6b0988e0b6e2350420ca573c0cc73185cfb91369cc8ed35d1237642f2be46ada7575043357395aa542799882905d704dc569080c4a09507cf1a0f SHA512 32302cf50a644d87df08f7e75b7e1fb6340ea925c31b9c701463f76975f5947b90899e101bba66d6b5610a797727f929806ae9c9637c1b35d19503c34121de76 -EBUILD freebsd-sources-11.1_p2.ebuild 4925 BLAKE2B 8ca07b70afa8142ebbc0b414c2035fb5ac01b48065ffc73c191fb33f43953246499380f05b5ed703966b034eb816f93245960854014ca39c2426f34b56fac885 SHA512 b4c8b5cb84dbc82cf48c51470ea2c239893fe5b26aa7295b5e13f18220b343197afd304d03eecf78b06a03695f2b2c6aeb96f221486c43e18e83068111708e5b +EBUILD freebsd-sources-11.1_p2.ebuild 4596 BLAKE2B 66b50e7b707962a367151246456e215af2456f579fe93fecea423f919555d74c6c11f80d9c72d02e334072b8632cee9275ba345bedeed2d9ab1d5fe413b0d1ef SHA512 b9cb8af695e5ef100cfd72dc852a0e5b90c2ffdeb6e7866d105286d18cc343645b7985e6c47fe80a5aa56bb05011a589293e8a754baa914285bad43807a260a4 EBUILD freebsd-sources-8.2-r2.ebuild 3671 BLAKE2B ffe430c6ad815d2135130de624acad622d9dfbee4ebc356d2e4d52fbcf67c979745067ebfbb331363f5b5859cb9e2cd11ecbbed018154bd3fabcd40e5d804d54 SHA512 4e2c7ff852639c0cc5124beb0a3b5f998780553892eae1d1c6bbc2b253a82e56838897062f6e55e4fb47be2f99060f1e9b7392e794b25a49a38d925774a1423a EBUILD freebsd-sources-9.1-r3.ebuild 2514 BLAKE2B 8365ccfc2287740cdbb4f1b59cdc105065edef4f44ec59b3051b506072210491f4468ecd52fcb7d071967b665590f467ef5c788985d9bd10c3c396cbff456683 SHA512 e21a899b3329ac8abfb1a167a56a71a6e37b0b3ec50af9f6274f2353c2a422805a62543105eeda21a1f7d7a4325de6bb749b08851ffe7f5e8b113d8e8571023d EBUILD freebsd-sources-9.1-r9.ebuild 3059 BLAKE2B 99e91d727964772bf769cecfadb152e917cec34858b20cfa9ad6401d0466b90c07f4cecb457b4740c4ed532f3ec933a7dd95fa868524aa4c060f27554b6e53c7 SHA512 5e241adb02fe3b5fedbd4dac59c1f38d815c2b1041bf6efdd0ed406ff9b380ff7b8ba72210539fc94a11dbb3d7b7422a162e03ee0fb393f8fa7a77df3b327d55 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch deleted file mode 100644 index c7e12bdf8a4e..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk -index 2939a59..124ef6f 100644 ---- a/sys/conf/kern.mk -+++ b/sys/conf/kern.mk -@@ -5,7 +5,7 @@ - # - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -+ -Wundef -Wno-pointer-sign \ - -Wmissing-include-dirs -fdiagnostics-show-option \ - ${CWARNEXTRA} - # -@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions - # - .if ${MACHINE_CPUARCH} == "i386" - .if ${COMPILER_TYPE} != "clang" --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 -+CFLAGS+= -mpreferred-stack-boundary=2 - .else - CFLAGS+= -mno-aes -mno-avx - .endif diff --git a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch deleted file mode 100644 index c0ca444b042d..000000000000 --- a/sys-freebsd/freebsd-sources/files/freebsd-ubin-10.3-bmake-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile -index 6c6d8c2..22fec7a 100644 ---- a/usr.bin/bmake/Makefile -+++ b/usr.bin/bmake/Makefile -@@ -5,7 +5,7 @@ - - .sinclude "Makefile.inc" - --SRCTOP?= ${.CURDIR:H:H} -+SRCTOP= ${.CURDIR:H:H} - - # look here first for config.h - CFLAGS+= -I${.CURDIR} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild deleted file mode 100644 index a5c5083ebc43..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD kernel sources" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -IUSE="+build-kernel debug dtrace zfs" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch" - "SA-16:18/atkbd.patch" - "SA-16:19/sendmsg.patch" - "SA-16:20/linux.patch" - "SA-16:21/stat.patch" - "EN-16:07/ipi.patch" - "EN-16:08/zfs.patch" - "EN-16:11/vmbus.patch" - "EN-16:12/hv_storvsc.patch" - "EN-16:13/vmbus.patch" - "EN-16:14/hv_storvsc.patch" - "EN-16:15/vmbus.patch" - "EN-16:16/hv_storvsc.patch" - "EN-16:17/vm.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - sys/ - contrib/bmake/ - usr.bin/bmake/ -" - -RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) - =sys-freebsd/freebsd-mk-defs-${RV}* - !sys-freebsd/virtio-kmod - !sys-fs/fuse4bsd - !> "${conf}" - use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" - - # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. - unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL -} - -src_configure() { - if use build-kernel ; then - tc-export CC - cd "${S}/$(tc-arch-kernel)/conf" || die - config ${KERN_BUILD} || die - fi -} - -src_compile() { - if use build-kernel ; then - if has_version "=sys-freebsd/freebsd-cddl-9.2_beta1' ; then - ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." - fi -} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild deleted file mode 100644 index 773c3f974a36..000000000000 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic toolchain-funcs - -DESCRIPTION="FreeBSD kernel sources" -SLOT="0" -LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" - -IUSE="+build-kernel debug dtrace zfs" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - sys/ - contrib/bmake/ - usr.bin/bmake/ -" - -RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) - =sys-freebsd/freebsd-mk-defs-${RV}* - !sys-freebsd/virtio-kmod - !sys-fs/fuse4bsd - !> "${conf}" - use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" - - # hyperv fails to compile on x86-fbsd. - if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then - echo 'nodevice hyperv' >> "${conf}" - dummy_mk modules/hyperv - fi - - # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. - unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL -} - -src_configure() { - if use build-kernel ; then - tc-export CC - cd "${S}/$(tc-arch-kernel)/conf" || die - config ${KERN_BUILD} || die - fi -} - -src_compile() { - if use build-kernel ; then - if has_version "=sys-freebsd/freebsd-cddl-9.2_beta1' ; then - ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." - fi -} diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild index 9e5d7d77934f..b4d22b6fc70e 100644 --- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild +++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,11 +23,7 @@ if [[ ${PV} != *9999* ]]; then $(freebsd_upstream_patches)" fi -EXTRACTONLY=" - sys/ - contrib/bmake/ - usr.bin/bmake/ -" +EXTRACTONLY="sys/" RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) =sys-freebsd/freebsd-mk-defs-${RV}* @@ -68,10 +64,6 @@ pkg_setup() { src_prepare() { local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" - cd "${WORKDIR}" || die - epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" - cd "${S}" || die - # This replaces the gentoover patch, it doesn't need reapply every time. sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ @@ -115,11 +107,6 @@ src_configure() { src_compile() { if use build-kernel ; then - if has_version " -+#include - #include "input_buffer.hh" - - namespace dtc -diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh -index 7f2ec67..8e13b1c 100644 ---- a/usr.bin/dtc/util.hh -+++ b/usr.bin/dtc/util.hh -@@ -33,6 +33,7 @@ - #ifndef _UTIL_HH_ - #define _UTIL_HH_ - -+#include - #include - - // If we aren't using C++11, then just ignore static asserts. diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch deleted file mode 100644 index e10685284cbb..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile -index 38e9df6..5e831c6 100644 ---- a/usr.bin/kdump/Makefile -+++ b/usr.bin/kdump/Makefile -@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c - - ioctl.c: mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} -+ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET} - - kdump_subr.h: mksubr - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ -diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile -index 7a49497..bc8b61f 100644 ---- a/usr.bin/truss/Makefile -+++ b/usr.bin/truss/Makefile -@@ -24,7 +24,7 @@ syscalls.h: syscalls.master - - ioctl.c: ${.CURDIR}/../kdump/mkioctls - env MACHINE=${MACHINE} CPP="${CPP}" \ -- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} -+ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET} - - .if ${MACHINE_CPUARCH} == "i386" - SRCS+= i386-linux.c linux_syscalls.h diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch deleted file mode 100644 index c5f7706024c4..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile -index 0995534..1bcb3e0 100644 ---- a/usr.bin/mandoc/Makefile -+++ b/usr.bin/mandoc/Makefile -@@ -1,7 +1,7 @@ - # $FreeBSD$ - - MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml --LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a -+LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a - .PATH: ${MDOCMLDIR} - - PROG= mandoc diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch deleted file mode 100644 index c0ca444b042d..000000000000 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile -index 6c6d8c2..22fec7a 100644 ---- a/usr.bin/bmake/Makefile -+++ b/usr.bin/bmake/Makefile -@@ -5,7 +5,7 @@ - - .sinclude "Makefile.inc" - --SRCTOP?= ${.CURDIR:H:H} -+SRCTOP= ${.CURDIR:H:H} - - # look here first for config.h - CFLAGS+= -I${.CURDIR} diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild deleted file mode 100644 index 8ecf7ec4fb98..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( - "SA-16:25/bspatch.patch" - "SA-16:29/bspatch.patch" -) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - usr.bin/ - contrib/ - lib/ - etc/ - bin/ - include/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:0= ) - kerberos? ( virtual/krb5 ) - ar? ( >=app-arch/libarchive-3 ) - virtual/pam - sys-libs/zlib - >=sys-libs/ncurses-5.9:0= - !sys-process/fuser-bsd - !dev-util/csup - !dev-libs/libiconv - !sys-freebsd/freebsd-contrib" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-sbin-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - >=sys-auth/pambase-20080219.1 - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" - "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" - "${FILESDIR}/${PN}-setXid.patch" - "${FILESDIR}/${PN}-lint-stdarg.patch" - "${FILESDIR}/${PN}-8.0-xinstall.patch" - "${FILESDIR}/${PN}-9.1-bsdar.patch" - "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-10.0-atf.patch" - "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" - "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch" - "${FILESDIR}/${PN}-10.0-mandoc.patch" - "${FILESDIR}/${PN}-10.2-bsdxml.patch" - "${FILESDIR}/${PN}-10.2-talk-workaround.patch" - "${FILESDIR}/${PN}-10.3-bmake-workaround.patch" ) - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# - binutils gprof -# - dc stuff -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio - gzip gprof - lzmainfo xz xzdec - unzip - tput tset tabs - less lessecho lesskey - hesinfo host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89 - bc dc - whois tftp man" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - use build && EXTRACTONLY+="sys/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= " -} - -pkg_preinst() { - # bison installs a /usr/bin/yacc symlink ... - # we need to remove it to avoid triggering - # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]]; then - rm -f "${ROOT}"/usr/bin/yacc || die - fi -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/sys" ]]; then - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" - fi - - # Rename manpage for renamed cmp - mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die - # Rename manpage for renamed ar - mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die - - # Build a dynamic make - sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die - - # Disable it here otherwise our patch wont apply - use ar || dummy_mk ar - - # Preparing to build xlint - export LINT=xlint -} - -setup_multilib_vars() { - if ! multilib_is_native_abi; then - cd "${WORKDIR}/usr.bin/ldd" || die - export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" - else - cd "${S}" || die - fi - "$@" -} - -src_compile() { - # Preparing to build mandoc - cd "${WORKDIR}/lib/libmandoc" || die - freebsd_src_compile -j1 - - cd "${S}" || die - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 -} - -src_install() { - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install - - # baselayout requires these in /bin - dodir /bin - for bin in sed printf ; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die - done - - cd "${WORKDIR}/etc" || die - insinto /etc - doins remote phones opieaccess fbtab || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die - - # tip requires /var/spool/lock/, bug #200700 - keepdir /var/spool/lock - - # create locate database #472468 - local f=/var/db/locate.database - mkdir "${ED}${f%/*}" || die - touch "${ED}${f}" || die - fowners nobody:nobody ${f} -} - -pkg_postinst() { - # We need to ensure that login.conf.db is up-to-date. - if [[ -e "${ROOT}"etc/login.conf ]] ; then - einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die - elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" - fi -} - -pkg_postrm() { - # and if we uninstall yacc but keep bison, - # lets restore the /usr/bin/yacc symlink - if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die - fi -} diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild deleted file mode 100644 index bf7da86b52e6..000000000000 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build - -DESCRIPTION="FreeBSD's base system source for /usr/bin" -SLOT="0" -IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "EN-16:21/localedef.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - usr.bin/ - contrib/ - lib/ - etc/ - bin/ - include/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] - ssl? ( dev-libs/openssl:0= ) - kerberos? ( virtual/krb5 ) - ar? ( >=app-arch/libarchive-3 ) - virtual/pam - sys-libs/zlib - >=sys-libs/ncurses-5.9:0= - !sys-process/fuser-bsd - !dev-util/csup - !dev-libs/libiconv - !sys-freebsd/freebsd-contrib" - -DEPEND="${RDEPEND} - sys-devel/flex - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - =sys-freebsd/freebsd-sbin-${RV}* - =sys-freebsd/freebsd-mk-defs-${RV}*" - -RDEPEND="${RDEPEND} - >=sys-auth/pambase-20080219.1 - sys-process/cronbase" - -S="${WORKDIR}/usr.bin" - -PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" - "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" - "${FILESDIR}/${PN}-11.0-setXid.patch" - "${FILESDIR}/${PN}-lint-stdarg.patch" - "${FILESDIR}/${PN}-9.1-bsdar.patch" - "${FILESDIR}/${PN}-9.1-minigzip.patch" - "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" - "${FILESDIR}/${PN}-10.2-talk-workaround.patch" - "${FILESDIR}/${PN}-10.2-bsdxml.patch" ) - -# Here we remove some sources we don't need because they are already -# provided by portage's packages or similar. In order: -# - Archiving tools, provided by their own ebuilds -# - ncurses stuff -# - less stuff -# - bind utils -# - rsh stuff -# - binutils gprof -# - dc stuff -# and the rest are misc utils we already provide somewhere else. -REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio - gzip gprof - lzmainfo xz xzdec - unzip - tput tset tabs - less lessecho lesskey - hesinfo host - rsh rlogin rusers rwho ruptime - compile_et lex vi smbutil file vacation nc ftp telnet - c99 c89 - bc dc - whois tftp man - addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings" - -pkg_setup() { - # Add the required source files. - use zfs && EXTRACTONLY+="cddl/ " - use build && EXTRACTONLY+="sys/ " - - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= " -} - -pkg_preinst() { - # bison installs a /usr/bin/yacc symlink ... - # we need to remove it to avoid triggering - # collision-protect errors - if [[ -L ${ROOT}/usr/bin/yacc ]]; then - rm -f "${ROOT}"/usr/bin/yacc || die - fi -} - -src_prepare() { - if [[ ! -e "${WORKDIR}/sys" ]]; then - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" - fi - - # Rename manpage for renamed cmp - mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die - # Rename manpage for renamed ar - mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die - # Fix whereis(1) manpath search. - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die - - # Build a dynamic make - sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die - - # Disable it here otherwise our patch wont apply - use ar || dummy_mk ar - - # Preparing to build xlint - export LINT=xlint -} - -setup_multilib_vars() { - if ! multilib_is_native_abi ; then - cd "${WORKDIR}/usr.bin/ldd" || die - export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" - else - cd "${S}" || die - fi - "$@" -} - -src_compile() { - local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" - # Preparing to build addr2line, elfcopy, m4 - for dir in libelftc libpe libopenbsd; do - cd "${WORKDIR}/lib/${dir}" || die - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 - done - - MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 -} - -src_install() { - cd "${S}"/calendar/calendars || die - for dir in $(find . -type d ! -name "." ) ; do - dodir /usr/share/calendar/"$(basename ${dir})" - done - - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install - - # baselayout requires these in /bin - dodir /bin - for bin in sed printf; do - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" - done - - for pamdfile in login passwd su; do - newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die - done - - cd "${WORKDIR}/etc" || die - insinto /etc - doins remote phones opieaccess fbtab || die - - exeinto /etc/cron.daily - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die - - # tip requires /var/spool/lock/, bug #200700 - keepdir /var/spool/lock - - # create locate database #472468 - local f=/var/db/locate.database - mkdir "${ED}${f%/*}" || die - touch "${ED}${f}" || die - fowners nobody:nobody ${f} -} - -pkg_postinst() { - # We need to ensure that login.conf.db is up-to-date. - if [[ -e "${ROOT}"etc/login.conf ]] ; then - einfo "Updating ${ROOT}etc/login.conf.db" - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die - elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" - fi -} - -pkg_postrm() { - # and if we uninstall yacc but keep bison, - # lets restore the /usr/bin/yacc symlink - if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then - ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die - fi -} diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest index 53178c055643..bbf4a673cb8a 100644 --- a/sys-freebsd/freebsd-usbin/Manifest +++ b/sys-freebsd/freebsd-usbin/Manifest @@ -1,4 +1,3 @@ -AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 BLAKE2B 7bc7d5fc3e8776645eb05298ba319f8a957dcb84e993e57842c39719f8c746a9d46a7cfdddc4513f5c641a452db1e6f564d696c862631624e492f8ad9d11d6cb SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 BLAKE2B bddbdf3869a084f4a3eed616398bbcad3759570ce25ff4467747f2ac1795a50cc082e5e2858f61faa3d70acecbf91c0f793d6a559622e3c8f8a07485138bfa79 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd AUX freebsd-usbin-11.0-workaround.patch 374 BLAKE2B 7e4b18ccddd1da87fc2d6bb8d8c98be45cc1b2d1d8b383316746a793b6eb3aa9d722e11ea600d0c49111b00c5ddb237eaa019b2babeed86da7d0beef6ff0189d SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518 AUX freebsd-usbin-11.1-bsdxml2expat.patch 841 BLAKE2B 89b5b0ed64dcf5c95eb727110651bb77079a4ccfc346fbd9ac1b26e3a4d53c452d657379ca876e6eb8b50dd90be59737b84405de873613dadf3bebeae7c788de SHA512 69f9055dc536132f1ec46389b53e25261632d726bc74857210ecb5511114f07d4b550e5e4a7a6e066a4a68c4a4bb4e44309d01f569b154fc773247dbd7f3fb23 @@ -31,8 +30,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc -DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f -DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d @@ -40,10 +37,6 @@ DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca -DIST freebsd-usbin-SA-1630-portsnap-10.patch 1660 BLAKE2B 39f16a422c20038c76ff2739d23a231a2e263321ea2a6a16166b1c2fa72424e9c2e3048fad653700c5b2ec6d22e543e753ed4ec718cadd6e80ab9f248ca394d0 SHA512 43814a98a29b8ef0176de949ad513f16f4ac2cbea23eb260a6c5484b16d0dcc525569e44cfd00bce1f7aa3ecf6c537220098f6514790457372849da941d38d4a -DIST freebsd-usbin-SA-1632-bhyve.patch 402 BLAKE2B d1d346e93400071bfa13391c418fc9bb67d17b75f11c88751e3e50e6f2df75c1b98502da130cbfdcd386d42d939fb6da13609c4ecf31fb1ed0cbe25d61086d64 SHA512 8261f070c282a4ff0123e90150bb5605615d86e74adc557b8d187dfc5acf74900751ac4f24e2b86bb1dbfeda34a86c694e31ec3a21788ce7994f1dacb21a9362 -EBUILD freebsd-usbin-10.3-r1.ebuild 5550 BLAKE2B 558dcc37957e846b11a61855deb345acd69658206e99f538919976f13c4a3e8f1a25e014fa6f61154fbdd417dca10a23ec2ba32310188f865fa108b987d7723c SHA512 510f683bce3db15bb346190f41e4bc46e450055c0979d3bb978a001e6c70aa1277cce7c06fdf115cf3d59f7942c74702b883a5e964dd3eca8ed2129b9957492e -EBUILD freebsd-usbin-11.0-r1.ebuild 5459 BLAKE2B 80c5c68f3f5e308cc7ce8e644eaa371a8c595c527d28889d833d723825f91c1eb0298c1003d899cfe65992c3342a350108131c4bed39ab41680da946f5da3dc9 SHA512 419972c7400a3434ccd7ab814b53966f68297122a77db151b12633f0c5d4ee6776e907f4ead0adb53614cbe975094012bf55badfc265a871edeccc2c583f1b1d EBUILD freebsd-usbin-11.1.ebuild 5454 BLAKE2B 388e4183cf15d1ec29dfb0e7c38e5bc4e8531c4b3aa192cd0368adad1f4450f89b1b44336fc7a6bafeb4368cd3022fe9fd12628d20d3d4641eccdc1e611b072e SHA512 6b37709519942d7dbe85f12c347838cd07de93d5f5bb2b3867e16b1b1da8af1a78745585b1d016989dac7692143433d96d6dbc68cb492ff9d315314f667ad43f EBUILD freebsd-usbin-8.2-r2.ebuild 5093 BLAKE2B b383f35bd8cc32c1a130240ed680591670b0274097934bab481d0e97d2226b5dcbbac33906f432306bea321ba7b421f2d41b4db8c1925c95722f1a9b83c11e5e SHA512 77a75c88f844eb51896b1021fbb9690771e80cdba214c6f3d7ae8dbfac9bfd9f5db2af587839612d485818243451b50a61596aa457bfa92b2f5008a5ae203ed2 EBUILD freebsd-usbin-9.1-r1.ebuild 5359 BLAKE2B 17673327f8f6498fec2bd9453a34830ebb1729c859a06243da4a00d130773b32688adfd74012607f2568a41d07249fb939e58cc81350838e0389dd2a377bbff6 SHA512 e59ef89170cde0cfa4802ee20c94c4bed6d71f695f0f961cdd7ff6667af719561f156f1f0f6ba5be5395a00020c4f419c354e8cb48fcaec307dd5247b3750dec diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch deleted file mode 100644 index a84f96d405b2..000000000000 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c ---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 -+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 -@@ -60,7 +60,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c ---- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900 -+++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900 -@@ -45,7 +45,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild deleted file mode 100644 index 54be148462f5..000000000000 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bsdmk freebsd flag-o-matic eutils - -DESCRIPTION="FreeBSD /usr/sbin tools" -SLOT="0" -LICENSE="BSD zfs? ( CDDL )" - -# Security Advisory and Errata patches. -UPSTREAM_PATCHES=( "SA-16:30/portsnap-10.patch" ) - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - SRC_URI="${SRC_URI} - $(freebsd_upstream_patches)" -fi - -EXTRACTONLY=" - usr.sbin/ - contrib/ - usr.bin/ - lib/ - sbin/ - etc/ - gnu/ -" - -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] - =sys-freebsd/freebsd-libexec-${RV}* - build? ( sys-apps/baselayout ) - ssl? ( dev-libs/openssl:0 ) - >=app-arch/libarchive-3 - sys-apps/tcp-wrappers - dev-util/dialog - >=dev-libs/libedit-20120311.3.0-r1 - net-libs/libpcap - kerberos? ( app-crypt/heimdal )" -DEPEND="${RDEPEND} - =sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-ubin-${RV}* - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) - !build? ( =sys-freebsd/freebsd-sources-${RV}* ) - sys-apps/texinfo - sys-devel/flex" - -S="${WORKDIR}/usr.sbin" - -IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs" - -pkg_setup() { - # Add the required source files. - use nis && EXTRACTONLY+="libexec/ " - use build && EXTRACTONLY+="sys/ include/ " - use zfs && EXTRACTONLY+="cddl/ " - - # Release crunch is something like minimal. It seems to remove everything - # which is not needed to work. - use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " - - use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " - use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " - use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " - - mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " - - append-flags $(test-flags -fno-strict-aliasing) -} - -PATCHES=( - "${FILESDIR}/${PN}-adduser.patch" - "${FILESDIR}/${PN}-9.0-newsyslog.patch" - "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" - "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" - ) - -REMOVE_SUBDIRS=" - tcpdchk tcpdmatch - sendmail praliases editmap mailstats makemap - pc-sysinstall cron mailwrapper ntp bsnmpd - tcpdump ndp inetd - wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase - zic amd - pkg pkg_install freebsd-update service sysrc bsdinstall" - -src_prepare() { - if ! use build; then - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" - [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" - else - dummy_mk mount_smbfs - fi - # Don't install mtree format manpage - # it's installed by libarchive. - sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile -} - -src_compile() { - # Preparing to build nmtree - cd "${WORKDIR}/lib/libnetbsd" || die - freebsd_src_compile - - cd "${S}" || die - freebsd_src_compile -} - -src_install() { - # By creating these directories we avoid having to do a - # more complex hack - dodir /usr/share/doc - dodir /sbin - dodir /usr/libexec - dodir /usr/bin - - # FILESDIR is used by some makefiles which will install files - # in the wrong place, just put it in the doc directory. - mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" - - # Most of these now come from openrc. - for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do - newinitd "${FILESDIR}/"${util}.initd ${util} - if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ - newconfd "${FILESDIR}"/${util}.confd ${util} - fi - done - - for class in daily monthly weekly; do - cat - > "${T}/periodic.${class}" < "${T}/periodic.${class}" <