1 |
commit: f7a1b8befe4d9e75e09387616a9d2aea57164727 |
2 |
Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 2 12:53:21 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 16:51:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a1b8be |
7 |
|
8 |
sys-freebsd: remove 10.3 and 11.0. |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
sys-freebsd/boot0/Manifest | 3 - |
13 |
sys-freebsd/boot0/boot0-10.3.ebuild | 82 --- |
14 |
sys-freebsd/boot0/boot0-11.0-r1.ebuild | 86 --- |
15 |
sys-freebsd/boot0/files/boot0-10.1-gcc46.patch | 67 --- |
16 |
sys-freebsd/boot0/files/boot0-10.3-clang.patch | 30 - |
17 |
.../files/boot0-10.3-drop-unsupport-cflags.patch | 28 - |
18 |
.../boot0/files/boot0-10.3-uefi-support.patch | 33 -- |
19 |
.../boot0/files/boot0-11.0-uefi-support.patch | 21 - |
20 |
sys-freebsd/freebsd-bin/Manifest | 2 - |
21 |
sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild | 41 -- |
22 |
sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild | 41 -- |
23 |
sys-freebsd/freebsd-cddl/Manifest | 2 - |
24 |
.../files/freebsd-cddl-10.2-libpaths.patch | 220 ------- |
25 |
.../files/freebsd-cddl-10.3-underlink.patch | 12 - |
26 |
sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild | 74 --- |
27 |
sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild | 78 --- |
28 |
sys-freebsd/freebsd-lib/Manifest | 5 - |
29 |
.../files/freebsd-lib-10.0-atfcxx.patch | 49 -- |
30 |
.../files/freebsd-lib-10.0-liblink.patch | 98 ---- |
31 |
.../files/freebsd-lib-10.0-libproc-libcxx.patch | 16 - |
32 |
.../files/freebsd-lib-10.2-bsdxml2expat.patch | 39 -- |
33 |
.../files/freebsd-lib-10.2-liblink.patch | 26 - |
34 |
.../files/freebsd-lib-10.3-libusb.patch | 13 - |
35 |
.../files/freebsd-lib-11.0-libsysdecode.patch | 22 - |
36 |
sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild | 648 --------------------- |
37 |
sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild | 644 -------------------- |
38 |
sys-freebsd/freebsd-libexec/Manifest | 2 - |
39 |
.../files/freebsd-libexec-10.2-atf-check.patch | 28 - |
40 |
.../files/freebsd-libexec-9.2-no_ld32.patch | 15 - |
41 |
.../freebsd-libexec/freebsd-libexec-10.3.ebuild | 111 ---- |
42 |
.../freebsd-libexec/freebsd-libexec-11.0.ebuild | 130 ----- |
43 |
sys-freebsd/freebsd-mk-defs/Manifest | 2 - |
44 |
.../files/freebsd-mk-defs-10.2-gnu.patch | 63 -- |
45 |
.../files/freebsd-mk-defs-10.3-gentoo.patch | 337 ----------- |
46 |
.../files/freebsd-mk-defs-11.0-gentoo.patch | 343 ----------- |
47 |
.../freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild | 41 -- |
48 |
.../freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild | 54 -- |
49 |
sys-freebsd/freebsd-pam-modules/Manifest | 2 - |
50 |
.../freebsd-pam-modules-10.3.ebuild | 47 -- |
51 |
.../freebsd-pam-modules-11.0.ebuild | 45 -- |
52 |
sys-freebsd/freebsd-pf/Manifest | 2 - |
53 |
.../files/freebsd-pf-10.0-libevent.patch | 16 - |
54 |
.../freebsd-pf/files/freebsd-pf-10.0-pflogd.patch | 15 - |
55 |
.../files/freebsd-pf-11.0-libevent.patch | 13 - |
56 |
.../freebsd-pf/files/freebsd-pf-11.0-pflogd.patch | 13 - |
57 |
sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild | 72 --- |
58 |
sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild | 70 --- |
59 |
sys-freebsd/freebsd-rescue/Manifest | 2 - |
60 |
.../freebsd-rescue/freebsd-rescue-10.3.ebuild | 81 --- |
61 |
.../freebsd-rescue/freebsd-rescue-11.0.ebuild | 84 --- |
62 |
sys-freebsd/freebsd-sbin/Manifest | 2 - |
63 |
sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild | 100 ---- |
64 |
sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild | 99 ---- |
65 |
sys-freebsd/freebsd-share/Manifest | 2 - |
66 |
.../freebsd-share/freebsd-share-10.3.ebuild | 112 ---- |
67 |
.../freebsd-share/freebsd-share-11.0.ebuild | 113 ---- |
68 |
sys-freebsd/freebsd-sources/Manifest | 16 - |
69 |
.../files/freebsd-sources-10.0-gentoo.patch | 22 - |
70 |
.../freebsd-sources/freebsd-sources-10.3-r6.ebuild | 175 ------ |
71 |
.../freebsd-sources/freebsd-sources-11.0-r1.ebuild | 169 ------ |
72 |
sys-freebsd/freebsd-ubin/Manifest | 5 - |
73 |
.../freebsd-ubin/files/freebsd-ubin-10.0-atf.patch | 15 - |
74 |
.../files/freebsd-ubin-10.0-dtc-gcc46.patch | 25 - |
75 |
.../files/freebsd-ubin-10.0-kdump-ioctl.patch | 26 - |
76 |
.../files/freebsd-ubin-10.0-mandoc.patch | 13 - |
77 |
.../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 - |
78 |
.../freebsd-ubin/freebsd-ubin-10.3-r2.ebuild | 212 ------- |
79 |
.../freebsd-ubin/freebsd-ubin-11.0-r1.ebuild | 212 ------- |
80 |
sys-freebsd/freebsd-usbin/Manifest | 4 - |
81 |
.../files/freebsd-usbin-10.0-bsdxml2expat.patch | 24 - |
82 |
.../freebsd-usbin/freebsd-usbin-10.3-r1.ebuild | 189 ------ |
83 |
.../freebsd-usbin/freebsd-usbin-11.0-r1.ebuild | 188 ------ |
84 |
72 files changed, 5704 deletions(-) |
85 |
|
86 |
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest |
87 |
index 51688a4ced8..a7da7dded3a 100644 |
88 |
--- a/sys-freebsd/boot0/Manifest |
89 |
+++ b/sys-freebsd/boot0/Manifest |
90 |
@@ -1,8 +1,5 @@ |
91 |
-DIST boot0-EN-1618-loader.patch 1092 BLAKE2B f96401394ca0b8a9ab364b5e4dbffeef49f75d86c0936067f4bcdf0e74598dad043d99b2dbf09dc5dd00e2f06cc338b7259d454aa56e1a501b66b176763fb74d SHA512 c2d28dc48289683c009a783db59ce62008a8d9231d4ea5b1ebe6dac2d6d0d86a285524195be9a806c23fbc2ceb6e159fcd7a7e8d01fe973b6ea6d154bfca298c |
92 |
DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 |
93 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
94 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
95 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
96 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
97 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
98 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
99 |
|
100 |
diff --git a/sys-freebsd/boot0/boot0-10.3.ebuild b/sys-freebsd/boot0/boot0-10.3.ebuild |
101 |
deleted file mode 100644 |
102 |
index d33328cf5f4..00000000000 |
103 |
--- a/sys-freebsd/boot0/boot0-10.3.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,82 +0,0 @@ |
106 |
-# Copyright 1999-2016 Gentoo Foundation |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
- |
109 |
-EAPI=5 |
110 |
- |
111 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
112 |
- |
113 |
-DESCRIPTION="FreeBSD's bootloader" |
114 |
-SLOT="0" |
115 |
- |
116 |
-IUSE="bzip2 ieee1394 tftp zfs" |
117 |
- |
118 |
-if [[ ${PV} != *9999* ]]; then |
119 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
120 |
-fi |
121 |
- |
122 |
-EXTRACTONLY=" |
123 |
- sys/ |
124 |
- lib/ |
125 |
- contrib/bzip2/ |
126 |
-" |
127 |
- |
128 |
-RDEPEND="" |
129 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
130 |
- =sys-freebsd/freebsd-lib-${RV}*" |
131 |
- |
132 |
-S="${WORKDIR}/sys/boot" |
133 |
- |
134 |
-PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch" |
135 |
- "${FILESDIR}/${PN}-10.3-clang.patch" |
136 |
- "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch" |
137 |
- "${FILESDIR}/${PN}-10.3-uefi-support.patch" |
138 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
139 |
- |
140 |
-boot0_use_enable() { |
141 |
- use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" |
142 |
- use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " |
143 |
-} |
144 |
- |
145 |
-pkg_setup() { |
146 |
- boot0_use_enable ieee1394 FIREWIRE |
147 |
- boot0_use_enable zfs ZFS |
148 |
- boot0_use_enable tftp TFTP |
149 |
- boot0_use_enable bzip2 BZIP2 |
150 |
-} |
151 |
- |
152 |
-src_prepare() { |
153 |
- sed -e '/-mno-align-long-strings/d' \ |
154 |
- -i "${S}"/i386/boot2/Makefile \ |
155 |
- -i "${S}"/i386/gptboot/Makefile \ |
156 |
- -i "${S}"/i386/gptzfsboot/Makefile \ |
157 |
- -i "${S}"/i386/zfsboot/Makefile || die |
158 |
- |
159 |
- export MAKEOBJDIRPREFIX="${WORKDIR}/build" |
160 |
-} |
161 |
- |
162 |
-src_compile() { |
163 |
- strip-flags |
164 |
- append-flags "-fno-strict-aliasing" |
165 |
- |
166 |
- cd "${WORKDIR}/lib/libstand" || die |
167 |
- freebsd_src_compile |
168 |
- |
169 |
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" |
170 |
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" |
171 |
- export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" |
172 |
- |
173 |
- cd "${S}" || die |
174 |
- NOFLAGSTRIP="yes" freebsd_src_compile |
175 |
-} |
176 |
- |
177 |
-src_install() { |
178 |
- dodir /boot/defaults |
179 |
- mkinstall FILESDIR=/boot || die "mkinstall failed" |
180 |
- |
181 |
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die |
182 |
- insinto /boot |
183 |
- newins GENERIC.hints device.hints |
184 |
- |
185 |
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 |
186 |
- doenvd "${T}"/50boot0 |
187 |
-} |
188 |
|
189 |
diff --git a/sys-freebsd/boot0/boot0-11.0-r1.ebuild b/sys-freebsd/boot0/boot0-11.0-r1.ebuild |
190 |
deleted file mode 100644 |
191 |
index 1b56c915999..00000000000 |
192 |
--- a/sys-freebsd/boot0/boot0-11.0-r1.ebuild |
193 |
+++ /dev/null |
194 |
@@ -1,86 +0,0 @@ |
195 |
-# Copyright 1999-2016 Gentoo Foundation |
196 |
-# Distributed under the terms of the GNU General Public License v2 |
197 |
- |
198 |
-EAPI=5 |
199 |
- |
200 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
201 |
- |
202 |
-DESCRIPTION="FreeBSD's bootloader" |
203 |
-SLOT="0" |
204 |
- |
205 |
-IUSE="bzip2 ieee1394 tftp zfs" |
206 |
- |
207 |
-# Security Advisory and Errata patches. |
208 |
-UPSTREAM_PATCHES=( "EN-16:18/loader.patch" ) |
209 |
- |
210 |
-if [[ ${PV} != *9999* ]]; then |
211 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
212 |
- SRC_URI="${SRC_URI} |
213 |
- $(freebsd_upstream_patches)" |
214 |
-fi |
215 |
- |
216 |
-EXTRACTONLY=" |
217 |
- sys/ |
218 |
- lib/ |
219 |
- contrib/bzip2/ |
220 |
-" |
221 |
- |
222 |
-RDEPEND="" |
223 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
224 |
- =sys-freebsd/freebsd-lib-${RV}*" |
225 |
- |
226 |
-S="${WORKDIR}/sys/boot" |
227 |
- |
228 |
-PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch" |
229 |
- "${FILESDIR}/${PN}-11.0-uefi-support.patch" |
230 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) |
231 |
- |
232 |
-boot0_use_enable() { |
233 |
- use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" |
234 |
- use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " |
235 |
-} |
236 |
- |
237 |
-pkg_setup() { |
238 |
- boot0_use_enable ieee1394 FIREWIRE |
239 |
- boot0_use_enable zfs ZFS |
240 |
- boot0_use_enable tftp TFTP |
241 |
- boot0_use_enable bzip2 BZIP2 |
242 |
-} |
243 |
- |
244 |
-src_prepare() { |
245 |
- sed -e '/-mno-align-long-strings/d' \ |
246 |
- -i "${S}"/i386/boot2/Makefile \ |
247 |
- -i "${S}"/i386/gptboot/Makefile \ |
248 |
- -i "${S}"/i386/gptzfsboot/Makefile \ |
249 |
- -i "${S}"/i386/zfsboot/Makefile || die |
250 |
- |
251 |
- mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes" |
252 |
- export MAKEOBJDIRPREFIX="${WORKDIR}/build" |
253 |
-} |
254 |
- |
255 |
-src_compile() { |
256 |
- strip-flags |
257 |
- append-flags "-fno-strict-aliasing" |
258 |
- |
259 |
- cd "${WORKDIR}/lib/libstand" || die |
260 |
- freebsd_src_compile |
261 |
- |
262 |
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" |
263 |
- LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand" |
264 |
- export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a" |
265 |
- |
266 |
- cd "${S}" || die |
267 |
- NOFLAGSTRIP="yes" freebsd_src_compile |
268 |
-} |
269 |
- |
270 |
-src_install() { |
271 |
- dodir /boot/defaults |
272 |
- freebsd_src_install FILESDIR=/boot |
273 |
- |
274 |
- cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die |
275 |
- insinto /boot |
276 |
- newins GENERIC.hints device.hints |
277 |
- |
278 |
- echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 |
279 |
- doenvd "${T}"/50boot0 |
280 |
-} |
281 |
|
282 |
diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch |
283 |
deleted file mode 100644 |
284 |
index 9b31e7c0d1b..00000000000 |
285 |
--- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch |
286 |
+++ /dev/null |
287 |
@@ -1,67 +0,0 @@ |
288 |
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc |
289 |
-index 472b275..0c9409d 100644 |
290 |
---- a/sys/boot/i386/Makefile.inc |
291 |
-+++ b/sys/boot/i386/Makefile.inc |
292 |
-@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib |
293 |
- .if ${MACHINE_CPUARCH} == "amd64" |
294 |
- CFLAGS+= -m32 |
295 |
- ACFLAGS+= -m32 |
296 |
--# LD_FLAGS is passed directly to ${LD}, not via ${CC}: |
297 |
--LD_FLAGS+= -m elf_i386_fbsd |
298 |
- AFLAGS+= --32 |
299 |
- .endif |
300 |
- |
301 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
302 |
-index 428950e..6a15450 100644 |
303 |
---- a/sys/boot/i386/boot2/Makefile |
304 |
-+++ b/sys/boot/i386/boot2/Makefile |
305 |
-@@ -113,3 +113,10 @@ machine: |
306 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
307 |
- CFLAGS.boot1.S= ${CLANG_NO_IAS} |
308 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
309 |
-+ |
310 |
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. |
311 |
-+CFLAGS+= -fno-asynchronous-unwind-tables |
312 |
-+ |
313 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
314 |
-+LD_FLAGS+= -m elf_i386_fbsd |
315 |
-+.endif |
316 |
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile |
317 |
-index a90e712..d60ae00 100644 |
318 |
---- a/sys/boot/i386/gptboot/Makefile |
319 |
-+++ b/sys/boot/i386/gptboot/Makefile |
320 |
-@@ -81,3 +81,8 @@ machine: |
321 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
322 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
323 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
324 |
-+ |
325 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
326 |
-+LD_FLAGS+= -m elf_i386_fbsd |
327 |
-+.endif |
328 |
-+ |
329 |
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile |
330 |
-index 5eb2383..c10a917 100644 |
331 |
---- a/sys/boot/i386/gptzfsboot/Makefile |
332 |
-+++ b/sys/boot/i386/gptzfsboot/Makefile |
333 |
-@@ -78,3 +78,8 @@ machine: |
334 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
335 |
- CFLAGS.gptldr.S= ${CLANG_NO_IAS} |
336 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
337 |
-+ |
338 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
339 |
-+LD_FLAGS+= -m elf_i386_fbsd |
340 |
-+.endif |
341 |
-+ |
342 |
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile |
343 |
-index 149f43a..be1e46a 100644 |
344 |
---- a/sys/boot/i386/zfsboot/Makefile |
345 |
-+++ b/sys/boot/i386/zfsboot/Makefile |
346 |
-@@ -91,3 +91,8 @@ machine: |
347 |
- # XXX: clang integrated-as doesn't grok .codeNN directives yet |
348 |
- CFLAGS.zfsldr.S= ${CLANG_NO_IAS} |
349 |
- CFLAGS+= ${CFLAGS.${.IMPSRC:T}} |
350 |
-+ |
351 |
-+.if ${MACHINE_CPUARCH} == "amd64" |
352 |
-+LD_FLAGS+= -m elf_i386_fbsd |
353 |
-+.endif |
354 |
-+ |
355 |
|
356 |
diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch |
357 |
deleted file mode 100644 |
358 |
index 4245e21a96e..00000000000 |
359 |
--- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch |
360 |
+++ /dev/null |
361 |
@@ -1,30 +0,0 @@ |
362 |
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676 |
363 |
- |
364 |
-https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479 |
365 |
- |
366 |
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile |
367 |
-index 8a6e771..c030853 100644 |
368 |
---- a/sys/boot/i386/boot2/Makefile |
369 |
-+++ b/sys/boot/i386/boot2/Makefile |
370 |
-@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2 |
371 |
- #BOOT2_UFS?= UFS2_ONLY |
372 |
- #BOOT2_UFS?= UFS1_ONLY |
373 |
- |
374 |
--CFLAGS= -Os \ |
375 |
-- -fomit-frame-pointer \ |
376 |
-+CFLAGS= -fomit-frame-pointer \ |
377 |
- -mrtd \ |
378 |
- -mregparm=3 \ |
379 |
- -DUSE_XREAD \ |
380 |
-@@ -40,7 +39,10 @@ CFLAGS= -Os \ |
381 |
- -Winline \ |
382 |
- ${CLANG_OPT_SMALL} |
383 |
- |
384 |
--CFLAGS.gcc+= -fno-guess-branch-probability \ |
385 |
-+CFLAGS.clang+= -Oz |
386 |
-+ |
387 |
-+CFLAGS.gcc+= -Os \ |
388 |
-+ -fno-guess-branch-probability \ |
389 |
- -fno-unit-at-a-time \ |
390 |
- --param max-inline-insns-single=100 |
391 |
- .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201 |
392 |
|
393 |
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 |
394 |
deleted file mode 100644 |
395 |
index af1d3512e7d..00000000000 |
396 |
--- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch |
397 |
+++ /dev/null |
398 |
@@ -1,28 +0,0 @@ |
399 |
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile |
400 |
-index fc66e01..470453d 100644 |
401 |
---- a/sys/boot/efi/libefi/Makefile |
402 |
-+++ b/sys/boot/efi/libefi/Makefile |
403 |
-@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand |
404 |
- # Pick up the bootstrap header for some interface items |
405 |
- CFLAGS+= -I${.CURDIR}/../../common |
406 |
- |
407 |
-- |
408 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
409 |
--CFLAGS+= -fformat-extensions |
410 |
- CFLAGS+= -DTERM_EMU |
411 |
- |
412 |
- .include <bsd.lib.mk> |
413 |
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile |
414 |
-index 24cc4c1..e5d2bae 100644 |
415 |
---- a/sys/boot/i386/libi386/Makefile |
416 |
-+++ b/sys/boot/i386/libi386/Makefile |
417 |
-@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ |
418 |
- # the location of libstand |
419 |
- CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ |
420 |
- |
421 |
--# Suppress warning from clang for FreeBSD %b and %D formats |
422 |
--CFLAGS+= -fformat-extensions |
423 |
-- |
424 |
- .if ${MACHINE_CPUARCH} == "amd64" |
425 |
- CLEANFILES+= machine |
426 |
- machine: |
427 |
|
428 |
diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch |
429 |
deleted file mode 100644 |
430 |
index fdafe74252b..00000000000 |
431 |
--- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch |
432 |
+++ /dev/null |
433 |
@@ -1,33 +0,0 @@ |
434 |
-diff --git a/efi/Makefile b/efi/Makefile |
435 |
-index 30024e3..a33efb2 100644 |
436 |
---- a/efi/Makefile |
437 |
-+++ b/efi/Makefile |
438 |
-@@ -2,15 +2,10 @@ |
439 |
- |
440 |
- .include <bsd.own.mk> |
441 |
- |
442 |
--# In-tree GCC does not support __attribute__((ms_abi)). |
443 |
--.if ${COMPILER_TYPE} != "gcc" |
444 |
-- |
445 |
- .if ${MACHINE_CPUARCH} == "amd64" |
446 |
- SUBDIR+= libefi loader boot1 |
447 |
- .endif |
448 |
- |
449 |
--.endif # ${COMPILER_TYPE} != "gcc" |
450 |
-- |
451 |
- .if ${MACHINE_CPUARCH} == "ia64" |
452 |
- SUBDIR+= libefi |
453 |
- .endif |
454 |
-diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile |
455 |
-index 4ffdfda..8ec0e00 100644 |
456 |
---- a/efi/boot1/Makefile |
457 |
-+++ b/efi/boot1/Makefile |
458 |
-@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc |
459 |
- # Add libstand for required string and memory functions for all platforms. |
460 |
- # |
461 |
- DPADD+= ${LIBSTAND} |
462 |
--LDADD+= -lstand |
463 |
-+LDADD+= ${LIBSTAND} |
464 |
- |
465 |
- DPADD+= ${LDSCRIPT} |
466 |
- |
467 |
|
468 |
diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch |
469 |
deleted file mode 100644 |
470 |
index c7a69d62aa8..00000000000 |
471 |
--- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch |
472 |
+++ /dev/null |
473 |
@@ -1,21 +0,0 @@ |
474 |
-diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile |
475 |
-index 79ee9a9..f7789f1 100644 |
476 |
---- a/sys/boot/efi/Makefile |
477 |
-+++ b/sys/boot/efi/Makefile |
478 |
-@@ -4,7 +4,7 @@ |
479 |
- |
480 |
- # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer |
481 |
- # than 4.5 supports it. |
482 |
--.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 |
483 |
-+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 |
484 |
- |
485 |
- .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" |
486 |
- .if ${MK_FDT} != "no" |
487 |
-@@ -18,6 +18,6 @@ SUBDIR+= fdt |
488 |
- SUBDIR+= libefi loader boot1 |
489 |
- .endif |
490 |
- |
491 |
--.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 |
492 |
-+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 |
493 |
- |
494 |
- .include <bsd.subdir.mk> |
495 |
|
496 |
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest |
497 |
index 2ce406a11fb..d72727158ab 100644 |
498 |
--- a/sys-freebsd/freebsd-bin/Manifest |
499 |
+++ b/sys-freebsd/freebsd-bin/Manifest |
500 |
@@ -4,7 +4,5 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 |
501 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
502 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
503 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
504 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
505 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
506 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
507 |
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e |
508 |
|
509 |
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild |
510 |
deleted file mode 100644 |
511 |
index 964c4d64f9e..00000000000 |
512 |
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild |
513 |
+++ /dev/null |
514 |
@@ -1,41 +0,0 @@ |
515 |
-# Copyright 1999-2016 Gentoo Foundation |
516 |
-# Distributed under the terms of the GNU General Public License v2 |
517 |
- |
518 |
-EAPI=5 |
519 |
- |
520 |
-inherit bsdmk freebsd |
521 |
- |
522 |
-DESCRIPTION="FreeBSD /bin tools" |
523 |
-SLOT="0" |
524 |
- |
525 |
-IUSE="" |
526 |
- |
527 |
-if [[ ${PV} != *9999* ]]; then |
528 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
529 |
-fi |
530 |
- |
531 |
-EXTRACTONLY=" |
532 |
- bin/ |
533 |
- usr.bin/ |
534 |
- sbin/ |
535 |
- lib/ |
536 |
-" |
537 |
- |
538 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
539 |
- >=dev-libs/libedit-20120311.3.0-r1 |
540 |
- sys-libs/ncurses:0= |
541 |
- sys-apps/ed |
542 |
- !app-misc/realpath |
543 |
- !<sys-freebsd/freebsd-ubin-8" |
544 |
-DEPEND="${RDEPEND} |
545 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
546 |
- >=sys-devel/flex-2.5.31-r2" |
547 |
- |
548 |
-S=${WORKDIR}/bin |
549 |
- |
550 |
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. |
551 |
-REMOVE_SUBDIRS="csh rmail ed freebsd-version" |
552 |
- |
553 |
-pkg_setup() { |
554 |
- mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " |
555 |
-} |
556 |
|
557 |
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
558 |
deleted file mode 100644 |
559 |
index 964c4d64f9e..00000000000 |
560 |
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild |
561 |
+++ /dev/null |
562 |
@@ -1,41 +0,0 @@ |
563 |
-# Copyright 1999-2016 Gentoo Foundation |
564 |
-# Distributed under the terms of the GNU General Public License v2 |
565 |
- |
566 |
-EAPI=5 |
567 |
- |
568 |
-inherit bsdmk freebsd |
569 |
- |
570 |
-DESCRIPTION="FreeBSD /bin tools" |
571 |
-SLOT="0" |
572 |
- |
573 |
-IUSE="" |
574 |
- |
575 |
-if [[ ${PV} != *9999* ]]; then |
576 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
577 |
-fi |
578 |
- |
579 |
-EXTRACTONLY=" |
580 |
- bin/ |
581 |
- usr.bin/ |
582 |
- sbin/ |
583 |
- lib/ |
584 |
-" |
585 |
- |
586 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
587 |
- >=dev-libs/libedit-20120311.3.0-r1 |
588 |
- sys-libs/ncurses:0= |
589 |
- sys-apps/ed |
590 |
- !app-misc/realpath |
591 |
- !<sys-freebsd/freebsd-ubin-8" |
592 |
-DEPEND="${RDEPEND} |
593 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
594 |
- >=sys-devel/flex-2.5.31-r2" |
595 |
- |
596 |
-S=${WORKDIR}/bin |
597 |
- |
598 |
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff. |
599 |
-REMOVE_SUBDIRS="csh rmail ed freebsd-version" |
600 |
- |
601 |
-pkg_setup() { |
602 |
- mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= " |
603 |
-} |
604 |
|
605 |
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest |
606 |
index b8cc1045daa..e179eb2396a 100644 |
607 |
--- a/sys-freebsd/freebsd-cddl/Manifest |
608 |
+++ b/sys-freebsd/freebsd-cddl/Manifest |
609 |
@@ -8,8 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 |
610 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
611 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
612 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
613 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
614 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
615 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
616 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
617 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
618 |
|
619 |
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch |
620 |
deleted file mode 100644 |
621 |
index 9af7cfbb8c3..00000000000 |
622 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch |
623 |
+++ /dev/null |
624 |
@@ -1,220 +0,0 @@ |
625 |
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
626 |
-index d8bcccb..2cebbcb 100644 |
627 |
---- a/cddl/lib/libzfs/Makefile |
628 |
-+++ b/cddl/lib/libzfs/Makefile |
629 |
-@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
630 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
631 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair |
632 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
633 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
634 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
635 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
636 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
637 |
-+ |
638 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
639 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
640 |
- |
641 |
-diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile |
642 |
-index 262d3e9..9643210 100644 |
643 |
---- a/cddl/lib/libzfs_core/Makefile |
644 |
-+++ b/cddl/lib/libzfs_core/Makefile |
645 |
-@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
646 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common |
647 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
648 |
- |
649 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
650 |
-+ |
651 |
- .include <bsd.lib.mk> |
652 |
-diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile |
653 |
-index 83cefca..55c56d5 100644 |
654 |
---- a/cddl/lib/libzpool/Makefile |
655 |
-+++ b/cddl/lib/libzpool/Makefile |
656 |
-@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread |
657 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys |
658 |
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
659 |
- |
660 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
661 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
662 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
663 |
-+ |
664 |
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ |
665 |
- ${LIBAVL} ${LIBUMEM} |
666 |
- LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem |
667 |
-diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
668 |
-index 1f909aa..2590302 100644 |
669 |
---- a/cddl/sbin/zfs/Makefile |
670 |
-+++ b/cddl/sbin/zfs/Makefile |
671 |
-@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs |
672 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
673 |
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
674 |
- |
675 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
676 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
677 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
678 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
679 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
680 |
-+ |
681 |
- DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ |
682 |
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
683 |
- LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
684 |
-diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
685 |
-index 4b5b898..f89d010 100644 |
686 |
---- a/cddl/sbin/zpool/Makefile |
687 |
-+++ b/cddl/sbin/zpool/Makefile |
688 |
-@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
689 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
690 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
691 |
- |
692 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
693 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
694 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
695 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
696 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
697 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
698 |
-+ |
699 |
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ |
700 |
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} |
701 |
- LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs |
702 |
-diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile |
703 |
-index 6cb9529..e76fbc4 100644 |
704 |
---- a/cddl/usr.bin/ctfconvert/Makefile |
705 |
-+++ b/cddl/usr.bin/ctfconvert/Makefile |
706 |
-@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
707 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
708 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
709 |
- |
710 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
711 |
-+ |
712 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
713 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
714 |
- |
715 |
-diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile |
716 |
-index 673c7e3..5fff940 100644 |
717 |
---- a/cddl/usr.bin/ctfmerge/Makefile |
718 |
-+++ b/cddl/usr.bin/ctfmerge/Makefile |
719 |
-@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
720 |
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
721 |
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
722 |
- |
723 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
724 |
-+ |
725 |
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
726 |
- LDADD= -lctf -ldwarf -lelf -lz -lpthread |
727 |
- |
728 |
-diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile |
729 |
-index b6605cb..7028630 100644 |
730 |
---- a/cddl/usr.bin/zinject/Makefile |
731 |
-+++ b/cddl/usr.bin/zinject/Makefile |
732 |
-@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ |
733 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
734 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
735 |
- |
736 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
737 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
738 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
739 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
740 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
741 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
742 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
743 |
-+ |
744 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
745 |
- ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
746 |
- LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool |
747 |
-diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile |
748 |
-index 888b9af..523ba44 100644 |
749 |
---- a/cddl/usr.bin/zstreamdump/Makefile |
750 |
-+++ b/cddl/usr.bin/zstreamdump/Makefile |
751 |
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
752 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
753 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
754 |
- |
755 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
756 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
757 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
758 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
759 |
-+ |
760 |
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
761 |
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
762 |
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
763 |
-diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile |
764 |
-index f6f7e03..6fed691 100644 |
765 |
---- a/cddl/usr.bin/ztest/Makefile |
766 |
-+++ b/cddl/usr.bin/ztest/Makefile |
767 |
-@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common |
768 |
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
769 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
770 |
- |
771 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
772 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
773 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
774 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
775 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
776 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
777 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
778 |
-+ |
779 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
780 |
- ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} |
781 |
- LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ |
782 |
-diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile |
783 |
-index fb5729f..ea9a752 100644 |
784 |
---- a/cddl/usr.sbin/dtrace/Makefile |
785 |
-+++ b/cddl/usr.sbin/dtrace/Makefile |
786 |
-@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ |
787 |
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ |
788 |
- -lrtld_db |
789 |
- |
790 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
791 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
792 |
-+ |
793 |
- .include <bsd.prog.mk> |
794 |
-diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile |
795 |
-index ccd8189..827a197 100644 |
796 |
---- a/cddl/usr.sbin/lockstat/Makefile |
797 |
-+++ b/cddl/usr.sbin/lockstat/Makefile |
798 |
-@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ |
799 |
- |
800 |
- CFLAGS+= -DNEED_ERRLOC -g |
801 |
- |
802 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace |
803 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
804 |
-+ |
805 |
- #YFLAGS+= -d |
806 |
- |
807 |
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \ |
808 |
-diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
809 |
-index c2a6b1d..f411fc0 100644 |
810 |
---- a/cddl/usr.sbin/zdb/Makefile |
811 |
-+++ b/cddl/usr.sbin/zdb/Makefile |
812 |
-@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
813 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
814 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
815 |
- |
816 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
817 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
818 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
819 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
820 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
821 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
822 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
823 |
-+ |
824 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
825 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
826 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
827 |
-diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile |
828 |
-index 1957aad..9a5570a 100644 |
829 |
---- a/cddl/usr.sbin/zhack/Makefile |
830 |
-+++ b/cddl/usr.sbin/zhack/Makefile |
831 |
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
832 |
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
833 |
- CFLAGS+= -I${.CURDIR}/../../lib/libumem |
834 |
- |
835 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
836 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
837 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
838 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
839 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
840 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core |
841 |
-+ |
842 |
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
843 |
- ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} |
844 |
- LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool |
845 |
|
846 |
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 |
847 |
deleted file mode 100644 |
848 |
index c8ce8e1a294..00000000000 |
849 |
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch |
850 |
+++ /dev/null |
851 |
@@ -1,12 +0,0 @@ |
852 |
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
853 |
-index 2a66337..04988d7 100644 |
854 |
---- a/cddl/lib/libzfs/Makefile |
855 |
-+++ b/cddl/lib/libzfs/Makefile |
856 |
-@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ |
857 |
- |
858 |
- LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ |
859 |
- -lbsdxml -lgeom -lnvpair -lz -lzfs_core |
860 |
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
861 |
- |
862 |
- SRCS= deviceid.c \ |
863 |
- fsshare.c \ |
864 |
|
865 |
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild |
866 |
deleted file mode 100644 |
867 |
index 44c9ae6d638..00000000000 |
868 |
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild |
869 |
+++ /dev/null |
870 |
@@ -1,74 +0,0 @@ |
871 |
-# Copyright 1999-2016 Gentoo Foundation |
872 |
-# Distributed under the terms of the GNU General Public License v2 |
873 |
- |
874 |
-EAPI=5 |
875 |
- |
876 |
-inherit bsdmk freebsd toolchain-funcs multilib |
877 |
- |
878 |
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" |
879 |
-SLOT="0" |
880 |
- |
881 |
-IUSE="build" |
882 |
-LICENSE="CDDL GPL-2" |
883 |
- |
884 |
-if [[ ${PV} != *9999* ]]; then |
885 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
886 |
-fi |
887 |
- |
888 |
-# sys is required. |
889 |
-EXTRACTONLY=" |
890 |
- cddl/ |
891 |
- contrib/ |
892 |
- usr.bin/ |
893 |
- lib/ |
894 |
- sbin/ |
895 |
- sys/ |
896 |
-" |
897 |
- |
898 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
899 |
- =sys-freebsd/freebsd-libexec-${RV}* |
900 |
- build? ( sys-apps/baselayout )" |
901 |
- |
902 |
-DEPEND="${RDEPEND} |
903 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
904 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )" |
905 |
- |
906 |
-S="${WORKDIR}/cddl" |
907 |
- |
908 |
-PATCHES=( |
909 |
- "${FILESDIR}/${PN}-10.2-libpaths.patch" |
910 |
- "${FILESDIR}/${PN}-10.3-underlink.patch" |
911 |
- ) |
912 |
- |
913 |
-pkg_setup() { |
914 |
- # Add the required source files. |
915 |
- use build && EXTRACTONLY+="include/ " |
916 |
-} |
917 |
- |
918 |
-src_prepare() { |
919 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
920 |
- # Link in include headers. |
921 |
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." |
922 |
- fi |
923 |
-} |
924 |
- |
925 |
-src_compile() { |
926 |
- # Disable parallel make. |
927 |
- freebsd_src_compile -j1 |
928 |
-} |
929 |
- |
930 |
-src_install() { |
931 |
- # Install libraries proper place |
932 |
- local mylibdir=$(get_libdir) |
933 |
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die |
934 |
- |
935 |
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core |
936 |
- |
937 |
- # Install zfs volinit script. |
938 |
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol |
939 |
- |
940 |
- # Install zfs script |
941 |
- newinitd "${FILESDIR}"/zfs.initd zfs |
942 |
- |
943 |
- keepdir /etc/zfs |
944 |
-} |
945 |
|
946 |
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
947 |
deleted file mode 100644 |
948 |
index cebbb02e7f4..00000000000 |
949 |
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild |
950 |
+++ /dev/null |
951 |
@@ -1,78 +0,0 @@ |
952 |
-# Copyright 1999-2016 Gentoo Foundation |
953 |
-# Distributed under the terms of the GNU General Public License v2 |
954 |
- |
955 |
-EAPI=5 |
956 |
- |
957 |
-inherit bsdmk freebsd toolchain-funcs multilib |
958 |
- |
959 |
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software" |
960 |
-SLOT="0" |
961 |
- |
962 |
-IUSE="build" |
963 |
-LICENSE="CDDL GPL-2" |
964 |
- |
965 |
-if [[ ${PV} != *9999* ]]; then |
966 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
967 |
-fi |
968 |
- |
969 |
-# sys is required. |
970 |
-EXTRACTONLY=" |
971 |
- cddl/ |
972 |
- contrib/ |
973 |
- usr.bin/ |
974 |
- lib/ |
975 |
- sbin/ |
976 |
- sys/ |
977 |
-" |
978 |
- |
979 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
980 |
- =sys-freebsd/freebsd-libexec-${RV}* |
981 |
- build? ( sys-apps/baselayout )" |
982 |
- |
983 |
-DEPEND="${RDEPEND} |
984 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
985 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )" |
986 |
- |
987 |
-S="${WORKDIR}/cddl" |
988 |
- |
989 |
-PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch" |
990 |
- "${FILESDIR}/${PN}-11.0-add-libs.patch" ) |
991 |
- |
992 |
-pkg_setup() { |
993 |
- # Add the required source files. |
994 |
- use build && EXTRACTONLY+="include/ " |
995 |
- [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd" |
996 |
-} |
997 |
- |
998 |
-src_prepare() { |
999 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
1000 |
- # Link in include headers. |
1001 |
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.." |
1002 |
- fi |
1003 |
- for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do |
1004 |
- LDFLAGS="${LDFLAGS} -L${S}/lib/${d}" |
1005 |
- done |
1006 |
-} |
1007 |
- |
1008 |
-src_compile() { |
1009 |
- cd "${S}"/lib || die |
1010 |
- freebsd_src_compile |
1011 |
- cd "${S}" || die |
1012 |
- freebsd_src_compile |
1013 |
-} |
1014 |
- |
1015 |
-src_install() { |
1016 |
- # Install libraries proper place |
1017 |
- local mylibdir=$(get_libdir) |
1018 |
- freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" |
1019 |
- |
1020 |
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core |
1021 |
- |
1022 |
- # Install zfs volinit script. |
1023 |
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol |
1024 |
- |
1025 |
- # Install zfs script |
1026 |
- newinitd "${FILESDIR}"/zfs.initd zfs |
1027 |
- |
1028 |
- keepdir /etc/zfs |
1029 |
-} |
1030 |
|
1031 |
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest |
1032 |
index 090e7a388e0..b4bcd4aa6e7 100644 |
1033 |
--- a/sys-freebsd/freebsd-lib/Manifest |
1034 |
+++ b/sys-freebsd/freebsd-lib/Manifest |
1035 |
@@ -11,13 +11,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c |
1036 |
DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 |
1037 |
DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 |
1038 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
1039 |
-DIST freebsd-lib-EN-1606-libc.patch 249 BLAKE2B 79670a18a490e16a96d10c9d2230af3b076883a46bf56542ac6902e63112b1b6d00f6a9967cc9b99f56ee97aef5ba4931eaa0505b6da6b9cf0118801f46c7d57 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9 |
1040 |
-DIST freebsd-lib-SA-1637-libc.patch 1567 BLAKE2B 84aff6ae2868c6cf7ac6b4a7e461115b9416bd0a30d86236d07048391bd1614d1be7ae2fbe632afa1e9fea50b1ecdf0863c378ee967744a1363d24bc93b001ae SHA512 8eaea9e01a7b224138da2cec559d8e925af3ecda4bf7d29340394f57204cd2460c7418a33dcca3db445436ac2985dba42478ad5595c25b9d83305552a04965f7 |
1041 |
-DIST freebsd-lib-SA-1638-bhyve.patch 637 BLAKE2B 686c5b0f1ccfd6fa4f43b3e45139ffa64a1493110a32b5848671f14e75b076533fda5851a34da70599842842ab64d61b865181587135407014fb987831df1bb3 SHA512 4d8c45f4e2d729998a874023bf5bc8ca2904d3fd71e681180c3b4b2eabe2a34c086b806b86debcbc9ab24c6b5ab637f6ddae00fb577994359ed14edc3cac5aa4 |
1042 |
DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d |
1043 |
DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 |
1044 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
1045 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
1046 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
1047 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
1048 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
1049 |
|
1050 |
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 |
1051 |
deleted file mode 100644 |
1052 |
index 42b64b57232..00000000000 |
1053 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch |
1054 |
+++ /dev/null |
1055 |
@@ -1,49 +0,0 @@ |
1056 |
-diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc |
1057 |
-index 937187a..d5277f3 100644 |
1058 |
---- a/lib/atf/Makefile.inc |
1059 |
-+++ b/lib/atf/Makefile.inc |
1060 |
-@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' |
1061 |
- CFLAGS+= -DATF_SHELL='"/bin/sh"' |
1062 |
- CFLAGS+= -DATF_WORKDIR='"/tmp"' |
1063 |
- |
1064 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
1065 |
-+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"' |
1066 |
-+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"' |
1067 |
-+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' |
1068 |
-+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"' |
1069 |
-+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"' |
1070 |
-+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"' |
1071 |
-+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"' |
1072 |
-+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"' |
1073 |
-+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' |
1074 |
-+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"' |
1075 |
-+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"' |
1076 |
-+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"' |
1077 |
-+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"' |
1078 |
-+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"' |
1079 |
-+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' |
1080 |
-+CXXFLAGS+= -DATF_WORKDIR='"/tmp"' |
1081 |
-+ |
1082 |
- WARNS?= 3 |
1083 |
- |
1084 |
- # vim: syntax=make |
1085 |
-diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile |
1086 |
-index 37d6073..90a2687 100644 |
1087 |
---- a/lib/atf/libatf-c++/Makefile |
1088 |
-+++ b/lib/atf/libatf-c++/Makefile |
1089 |
-@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c |
1090 |
- .PATH: ${ATF}/atf-c++ |
1091 |
- .PATH: ${ATF}/atf-c++/detail |
1092 |
- |
1093 |
--CFLAGS+= -I${ATF} |
1094 |
--CFLAGS+= -I${.CURDIR}/../libatf-c |
1095 |
--CFLAGS+= -I. |
1096 |
-+CXXFLAGS+= -I${ATF} |
1097 |
-+CXXFLAGS+= -I${.CURDIR}/../libatf-c |
1098 |
-+CXXFLAGS+= -I. |
1099 |
- |
1100 |
--CFLAGS+= -DHAVE_CONFIG_H |
1101 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
1102 |
- |
1103 |
- SRCS= application.cpp \ |
1104 |
- build.cpp \ |
1105 |
|
1106 |
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 |
1107 |
deleted file mode 100644 |
1108 |
index 6ef3f07de0f..00000000000 |
1109 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch |
1110 |
+++ /dev/null |
1111 |
@@ -1,98 +0,0 @@ |
1112 |
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile |
1113 |
-index 9a21dde..0815f0a 100644 |
1114 |
---- a/lib/libcam/Makefile |
1115 |
-+++ b/lib/libcam/Makefile |
1116 |
-@@ -8,6 +8,7 @@ INCS= camlib.h |
1117 |
- |
1118 |
- DPADD= ${LIBSBUF} |
1119 |
- LDADD= -lsbuf |
1120 |
-+LDFLAGS+= -L${.OBJDIR}/../libsbuf |
1121 |
- |
1122 |
- MAN= cam.3 cam_cdbparse.3 |
1123 |
- |
1124 |
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile |
1125 |
-index dbd7895..607b1f6 100644 |
1126 |
---- a/lib/libdwarf/Makefile |
1127 |
-+++ b/lib/libdwarf/Makefile |
1128 |
-@@ -21,6 +21,7 @@ SRCS= \ |
1129 |
- INCS= dwarf.h libdwarf.h |
1130 |
- |
1131 |
- CFLAGS+= -I${.CURDIR} |
1132 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
1133 |
- |
1134 |
- SHLIB_MAJOR= 3 |
1135 |
- |
1136 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
1137 |
-index 4449c06..f024cf0 100644 |
1138 |
---- a/lib/libproc/Makefile |
1139 |
-+++ b/lib/libproc/Makefile |
1140 |
-@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \ |
1141 |
- INCS= libproc.h |
1142 |
- |
1143 |
- CFLAGS+= -I${.CURDIR} |
1144 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
1145 |
- |
1146 |
- .if ${MK_LIBCPLUSPLUS} != "no" |
1147 |
- LDADD+= -lcxxrt |
1148 |
-@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2 |
1149 |
- |
1150 |
- WITHOUT_MAN= |
1151 |
- |
1152 |
-+LDADD+= -lelf |
1153 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
1154 |
-+ |
1155 |
- .include <bsd.lib.mk> |
1156 |
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile |
1157 |
-index af5a775..c01aa05 100644 |
1158 |
---- a/lib/libprocstat/Makefile |
1159 |
-+++ b/lib/libprocstat/Makefile |
1160 |
-@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def |
1161 |
- SYMBOL_MAPS= ${.CURDIR}/Symbol.map |
1162 |
- |
1163 |
- INCS= libprocstat.h |
1164 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
1165 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
1166 |
- CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE |
1167 |
- SHLIB_MAJOR= 1 |
1168 |
- |
1169 |
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile |
1170 |
-index 2815a07..e992662 100644 |
1171 |
---- a/lib/librtld_db/Makefile |
1172 |
-+++ b/lib/librtld_db/Makefile |
1173 |
-@@ -10,5 +10,8 @@ SRCS= rtld_db.c |
1174 |
- INCS= rtld_db.h |
1175 |
- |
1176 |
- CFLAGS+= -I${.CURDIR} |
1177 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
1178 |
-+LDADD+= -lutil -lproc |
1179 |
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc |
1180 |
- |
1181 |
- .include <bsd.lib.mk> |
1182 |
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile |
1183 |
-index 1cf52a0..3d25fae 100644 |
1184 |
---- a/lib/libtelnet/Makefile |
1185 |
-+++ b/lib/libtelnet/Makefile |
1186 |
-@@ -13,6 +13,8 @@ INTERNALLIB= |
1187 |
- SRCS= genget.c getent.c misc.c |
1188 |
- CFLAGS+= -I${TELNETDIR} |
1189 |
- |
1190 |
-+CFLAGS+= -I${.CURDIR}/../libmp |
1191 |
-+ |
1192 |
- WARNS?= 2 |
1193 |
- |
1194 |
- .if !defined(RELEASE_CRUNCH) |
1195 |
-diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile |
1196 |
-index 30a1dfb..9f8a99c 100644 |
1197 |
---- a/lib/libexecinfo/Makefile |
1198 |
-+++ b/lib/libexecinfo/Makefile |
1199 |
-@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1 |
1200 |
- INCS= execinfo.h |
1201 |
- SRCS= backtrace.c symtab.c unwind.c |
1202 |
- |
1203 |
-+CFLAGS+= -I${.CURDIR}/../libelf |
1204 |
- DPADD= ${LIBELF} |
1205 |
- LDADD= -lelf |
1206 |
-+LDFLAGS+= -L${.OBJDIR}/../libelf |
1207 |
- |
1208 |
- MAN= backtrace.3 |
1209 |
- |
1210 |
|
1211 |
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 |
1212 |
deleted file mode 100644 |
1213 |
index 55987aa44fa..00000000000 |
1214 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch |
1215 |
+++ /dev/null |
1216 |
@@ -1,16 +0,0 @@ |
1217 |
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile |
1218 |
-index f9e01ab..15b27d8 100644 |
1219 |
---- a/lib/libproc/Makefile |
1220 |
-+++ b/lib/libproc/Makefile |
1221 |
-@@ -15,7 +15,10 @@ INCS= libproc.h |
1222 |
- |
1223 |
- CFLAGS+= -I${.CURDIR} |
1224 |
- |
1225 |
--.if ${MK_LIBCPLUSPLUS} != "no" |
1226 |
-+.if ${CXX:T:M*-stdlib=libc++*} |
1227 |
-+LDADD+= -lcxxrt |
1228 |
-+DPADD+= ${LIBCXXRT} |
1229 |
-+.elif ${CXXFLAGS:T:M*-stdlib=libc++*} |
1230 |
- LDADD+= -lcxxrt |
1231 |
- DPADD+= ${LIBCXXRT} |
1232 |
- .else |
1233 |
|
1234 |
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 |
1235 |
deleted file mode 100644 |
1236 |
index 303f422651f..00000000000 |
1237 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch |
1238 |
+++ /dev/null |
1239 |
@@ -1,39 +0,0 @@ |
1240 |
-diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile |
1241 |
-index bbfb57b..a7c17e3 100644 |
1242 |
---- a/lib/libgeom/Makefile |
1243 |
-+++ b/lib/libgeom/Makefile |
1244 |
-@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR} |
1245 |
- |
1246 |
- WARNS?= 3 |
1247 |
- |
1248 |
--DPADD= ${LIBBSDXML} ${LIBSBUF} |
1249 |
-+DPADD= ${LIBSBUF} |
1250 |
- LDADD= -lbsdxml -lsbuf |
1251 |
- |
1252 |
- MAN= libgeom.3 |
1253 |
-diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c |
1254 |
-index 9dedb8e..d96420c 100644 |
1255 |
---- a/lib/libgeom/geom_xml2tree.c |
1256 |
-+++ b/lib/libgeom/geom_xml2tree.c |
1257 |
-@@ -43,7 +43,7 @@ |
1258 |
- #include <sys/sbuf.h> |
1259 |
- #include <sys/sysctl.h> |
1260 |
- #include <err.h> |
1261 |
--#include <bsdxml.h> |
1262 |
-+#include <expat.h> |
1263 |
- #include <libgeom.h> |
1264 |
- |
1265 |
- struct mystate { |
1266 |
-diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c |
1267 |
-index d1fc0b1..89ac55e 100644 |
1268 |
---- a/lib/libmt/mtlib.c |
1269 |
-+++ b/lib/libmt/mtlib.c |
1270 |
-@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken |
1271 |
- #include <unistd.h> |
1272 |
- #include <stdint.h> |
1273 |
- #include <errno.h> |
1274 |
--#include <bsdxml.h> |
1275 |
-+#include <expat.h> |
1276 |
- #include <mtlib.h> |
1277 |
- |
1278 |
- /* |
1279 |
|
1280 |
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 |
1281 |
deleted file mode 100644 |
1282 |
index b08d95f714f..00000000000 |
1283 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch |
1284 |
+++ /dev/null |
1285 |
@@ -1,26 +0,0 @@ |
1286 |
-diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile |
1287 |
-index cb1da71..43de5a5 100644 |
1288 |
---- a/lib/libmt/Makefile |
1289 |
-+++ b/lib/libmt/Makefile |
1290 |
-@@ -5,6 +5,7 @@ SHLIBDIR?= /lib |
1291 |
- SRCS= mtlib.c |
1292 |
- INCS= mtlib.h |
1293 |
- |
1294 |
-+CFLAGS+= -I${.CURDIR} |
1295 |
- DPADD= ${LIBSBUF} |
1296 |
- LDADD= -lsbuf |
1297 |
- |
1298 |
-diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile |
1299 |
-index e9384b7..085ef62 100644 |
1300 |
---- a/lib/libdpv/Makefile |
1301 |
-+++ b/lib/libdpv/Makefile |
1302 |
-@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil |
1303 |
- |
1304 |
- SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c |
1305 |
- |
1306 |
--CFLAGS+= -I${.CURDIR} |
1307 |
-+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar |
1308 |
-+LDFLAGS+= -L${.OBJDIR}/../libfigpar |
1309 |
- |
1310 |
- WARNS?= 6 |
1311 |
- |
1312 |
|
1313 |
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 |
1314 |
deleted file mode 100644 |
1315 |
index 813a42b5017..00000000000 |
1316 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch |
1317 |
+++ /dev/null |
1318 |
@@ -1,13 +0,0 @@ |
1319 |
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile |
1320 |
-index 88ec3fe..076b8d4 100644 |
1321 |
---- a/lib/libusb/Makefile |
1322 |
-+++ b/lib/libusb/Makefile |
1323 |
-@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c |
1324 |
- CFLAGS+= -DCOMPAT_32BIT |
1325 |
- .else |
1326 |
- FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc |
1327 |
--FILESDIR= ${LIBDATADIR}/pkgconfig |
1328 |
-+FILESDIR= ${LIBDIR}/pkgconfig |
1329 |
- .endif |
1330 |
- |
1331 |
- # |
1332 |
|
1333 |
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 |
1334 |
deleted file mode 100644 |
1335 |
index d90aa3163da..00000000000 |
1336 |
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch |
1337 |
+++ /dev/null |
1338 |
@@ -1,22 +0,0 @@ |
1339 |
-diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile |
1340 |
-index e3bfe00..51fc5f0 100644 |
1341 |
---- a/lib/libsysdecode/Makefile |
1342 |
-+++ b/lib/libsysdecode/Makefile |
1343 |
-@@ -8,7 +8,7 @@ LIB= sysdecode |
1344 |
- SRCS= errno.c ioctl.c syscallnames.c utrace.c |
1345 |
- INCS= sysdecode.h |
1346 |
- |
1347 |
--CFLAGS+= -I${.CURDIR}/../../sys |
1348 |
-+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR} |
1349 |
- |
1350 |
- MAN+= sysdecode.3 \ |
1351 |
- sysdecode_abi_to_freebsd_errno.3 \ |
1352 |
-@@ -37,7 +37,7 @@ CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} |
1353 |
- |
1354 |
- ioctl.c: mkioctls |
1355 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
1356 |
-- /bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET} |
1357 |
-+ /bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} |
1358 |
- |
1359 |
- beforedepend: ioctl.c |
1360 |
- |
1361 |
|
1362 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild |
1363 |
deleted file mode 100644 |
1364 |
index 96b62502268..00000000000 |
1365 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild |
1366 |
+++ /dev/null |
1367 |
@@ -1,648 +0,0 @@ |
1368 |
-# Copyright 1999-2016 Gentoo Foundation |
1369 |
-# Distributed under the terms of the GNU General Public License v2 |
1370 |
- |
1371 |
-EAPI=5 |
1372 |
- |
1373 |
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build |
1374 |
- |
1375 |
-DESCRIPTION="FreeBSD's base system libraries" |
1376 |
-SLOT="0" |
1377 |
-LICENSE="BSD zfs? ( CDDL )" |
1378 |
- |
1379 |
-# Security Advisory and Errata patches. |
1380 |
-UPSTREAM_PATCHES=( "EN-16:06/libc.patch" |
1381 |
- "SA-16:37/libc.patch" |
1382 |
- "SA-16:38/bhyve.patch" ) |
1383 |
- |
1384 |
-# Crypto is needed to have an internal OpenSSL header |
1385 |
-# sys is needed for libalias, probably we can just extract that instead of |
1386 |
-# extracting the whole tarball |
1387 |
-if [[ ${PV} != *9999* ]]; then |
1388 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
1389 |
- SRC_URI="${SRC_URI} |
1390 |
- $(freebsd_upstream_patches)" |
1391 |
-fi |
1392 |
- |
1393 |
-EXTRACTONLY=" |
1394 |
- lib/ |
1395 |
- contrib/ |
1396 |
- crypto/ |
1397 |
- libexec/ |
1398 |
- etc/ |
1399 |
- include/ |
1400 |
- usr.sbin/ |
1401 |
- gnu/ |
1402 |
- secure/ |
1403 |
-" |
1404 |
- |
1405 |
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
1406 |
- RDEPEND="ssl? ( dev-libs/openssl:0= ) |
1407 |
- hesiod? ( net-dns/hesiod ) |
1408 |
- kerberos? ( app-crypt/heimdal ) |
1409 |
- usb? ( !dev-libs/libusb ) |
1410 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
1411 |
- >=dev-libs/expat-2.0.1 |
1412 |
- >=dev-util/dialog-1.2.20150225 |
1413 |
- =sys-freebsd/freebsd-libexec-${RV}* |
1414 |
- !sys-libs/libutempter |
1415 |
- !dev-libs/libelf |
1416 |
- !dev-libs/libexecinfo |
1417 |
- !dev-libs/libiconv |
1418 |
- !sys-freebsd/freebsd-headers" |
1419 |
- DEPEND="${RDEPEND} |
1420 |
- >=sys-devel/flex-2.5.31-r2 |
1421 |
- >=sys-freebsd/freebsd-sources-10.3-r5" |
1422 |
- RDEPEND="${RDEPEND} |
1423 |
- =sys-freebsd/freebsd-share-${RV}* |
1424 |
- >=virtual/libiconv-0-r2" |
1425 |
-else |
1426 |
- EXTRACTONLY+="sys/ " |
1427 |
-fi |
1428 |
- |
1429 |
-DEPEND="${DEPEND} |
1430 |
- userland_GNU? ( sys-apps/mtree ) |
1431 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
1432 |
- |
1433 |
-S="${WORKDIR}/lib" |
1434 |
- |
1435 |
-export CTARGET=${CTARGET:-${CHOST}} |
1436 |
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then |
1437 |
- export CTARGET=${CATEGORY/cross-} |
1438 |
-fi |
1439 |
- |
1440 |
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware |
1441 |
- build crosscompile_opts_headers-only zfs |
1442 |
- userland_GNU userland_BSD" |
1443 |
- |
1444 |
-QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" |
1445 |
- |
1446 |
-pkg_setup() { |
1447 |
- # Add the required source files. |
1448 |
- use build && EXTRACTONLY+="sys/ " |
1449 |
- use zfs && EXTRACTONLY+="cddl/ " |
1450 |
- |
1451 |
- [ -c /dev/zero ] || \ |
1452 |
- die "You forgot to mount /dev; the compiled libc would break." |
1453 |
- |
1454 |
- if ! use ssl && use kerberos; then |
1455 |
- eerror "If you want kerberos support you need to enable ssl support, too." |
1456 |
- fi |
1457 |
- |
1458 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
1459 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
1460 |
- use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
1461 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " |
1462 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " |
1463 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
1464 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
1465 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
1466 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
1467 |
- |
1468 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " |
1469 |
- |
1470 |
- if [ "${CTARGET}" != "${CHOST}" ]; then |
1471 |
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" |
1472 |
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" |
1473 |
- fi |
1474 |
-} |
1475 |
- |
1476 |
-PATCHES=( |
1477 |
- "${FILESDIR}/${PN}-6.0-pmc.patch" |
1478 |
- "${FILESDIR}/${PN}-6.1-csu.patch" |
1479 |
- "${FILESDIR}/${PN}-10.0-liblink.patch" |
1480 |
- "${FILESDIR}/${PN}-10.2-liblink.patch" |
1481 |
- "${FILESDIR}/${PN}-10.0-atfcxx.patch" |
1482 |
- "${FILESDIR}/${PN}-10.3-libusb.patch" |
1483 |
- "${FILESDIR}/${PN}-10.0-libproc-libcxx.patch" |
1484 |
- "${FILESDIR}/${PN}-10.2-bsdxml2expat.patch" |
1485 |
- "${FILESDIR}/${PN}-9.0-bluetooth.patch" |
1486 |
- "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch" |
1487 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" |
1488 |
- ) |
1489 |
-# Here we disable and remove source which we don't need or want |
1490 |
-# In order: |
1491 |
-# - ncurses stuff |
1492 |
-# - libexpat creates a bsdxml library which is the same as expat |
1493 |
-# - archiving libraries (have their own ebuild) |
1494 |
-# - sendmail libraries (they are installed by sendmail) |
1495 |
-# - SNMP library and dependency (have their own ebuilds) |
1496 |
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from |
1497 |
-# boot0 instead. |
1498 |
-# |
1499 |
-# The rest are libraries we already have somewhere else because |
1500 |
-# they are contribution. |
1501 |
-REMOVE_SUBDIRS="ncurses \ |
1502 |
- libexpat \ |
1503 |
- libz libbz2 libarchive liblzma \ |
1504 |
- libsm libsmdb libsmutil \ |
1505 |
- libbegemot libbsnmp \ |
1506 |
- libpam libpcap libwrap libmagic \ |
1507 |
- libcom_err |
1508 |
- libedit |
1509 |
- libstand |
1510 |
- libgssapi" |
1511 |
- |
1512 |
-# Are we building a cross-compiler? |
1513 |
-is_crosscompile() { |
1514 |
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] |
1515 |
-} |
1516 |
- |
1517 |
-src_prepare() { |
1518 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
1519 |
- use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
1520 |
- |
1521 |
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" |
1522 |
- |
1523 |
- # Upstream Display Managers default to using VT7 |
1524 |
- # We should make FreeBSD allow this by default |
1525 |
- local x= |
1526 |
- for x in "${WORKDIR}"/etc/etc.*/ttys ; do |
1527 |
- sed -i.bak \ |
1528 |
- -e '/ttyv5[[:space:]]/ a\ |
1529 |
-# Display Managers default to VT7.\ |
1530 |
-# If you use the xdm init script, keep ttyv6 commented out\ |
1531 |
-# unless you force a different VT for the DM being used.' \ |
1532 |
- -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ |
1533 |
- || die "Failed to sed ${x}" |
1534 |
- rm "${x}".bak |
1535 |
- done |
1536 |
- |
1537 |
- # This one is here because it also |
1538 |
- # patches "${WORKDIR}/include" |
1539 |
- cd "${WORKDIR}" |
1540 |
- epatch "${FILESDIR}/${PN}-includes.patch" |
1541 |
- epatch "${FILESDIR}/${PN}-8.0-gcc45.patch" |
1542 |
- epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch" |
1543 |
- |
1544 |
- # Don't install the hesiod man page or header |
1545 |
- rm "${WORKDIR}"/include/hesiod.h || die |
1546 |
- sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die |
1547 |
- sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ |
1548 |
- "${WORKDIR}"/lib/libc/net/Makefile.inc || die |
1549 |
- |
1550 |
- # Fix the Makefiles of these few libraries that will overwrite our LDADD. |
1551 |
- cd "${S}" |
1552 |
- for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ |
1553 |
- libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ |
1554 |
- die "Problem fixing \"${dir}/Makefile" |
1555 |
- done |
1556 |
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS |
1557 |
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ |
1558 |
- -i "${S}/csu/i386-elf/Makefile" \ |
1559 |
- -i "${S}/csu/ia64/Makefile" || die |
1560 |
- |
1561 |
- if install --version 2> /dev/null | grep -q GNU; then |
1562 |
- sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" |
1563 |
- fi |
1564 |
- |
1565 |
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force |
1566 |
- # BSD's sed on BSD. |
1567 |
- cd "${S}" |
1568 |
- if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then |
1569 |
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
1570 |
- sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die |
1571 |
- fi |
1572 |
- |
1573 |
- if use build; then |
1574 |
- cd "${WORKDIR}" |
1575 |
- # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it |
1576 |
- # shouldn't be a symlink to /usr/src/sys (which should be already patched) |
1577 |
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch |
1578 |
- return 0 |
1579 |
- fi |
1580 |
- |
1581 |
- if ! is_crosscompile ; then |
1582 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
1583 |
- ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" |
1584 |
- fi |
1585 |
- else |
1586 |
- sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ |
1587 |
- "${S}/libc/rpc/Makefile.inc" \ |
1588 |
- "${S}/libc/yp/Makefile.inc" |
1589 |
- fi |
1590 |
-} |
1591 |
- |
1592 |
-bootstrap_lib() { |
1593 |
- for i ; do |
1594 |
- cd "${WORKDIR}/${i}" || die "missing ${i}" |
1595 |
- freebsd_src_compile |
1596 |
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" |
1597 |
- done |
1598 |
-} |
1599 |
- |
1600 |
-get_csudir() { |
1601 |
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then |
1602 |
- echo "lib/csu/$1-elf" |
1603 |
- else |
1604 |
- echo "lib/csu/$1" |
1605 |
- fi |
1606 |
-} |
1607 |
- |
1608 |
-bootstrap_csu() { |
1609 |
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" |
1610 |
- export RAW_LDFLAGS=$(raw-ldflags) |
1611 |
- bootstrap_lib "${csudir}" |
1612 |
- |
1613 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
1614 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
1615 |
- |
1616 |
- bootstrap_lib "gnu/lib/csu" |
1617 |
- |
1618 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
1619 |
- for i in *.So ; do |
1620 |
- ln -s $i ${i%.So}S.o |
1621 |
- done |
1622 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
1623 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
1624 |
-} |
1625 |
- |
1626 |
-# Compile libssp_nonshared.a and add it's path to LDFLAGS. |
1627 |
-bootstrap_libssp_nonshared() { |
1628 |
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared" |
1629 |
- export LDADD="-lssp_nonshared" |
1630 |
-} |
1631 |
- |
1632 |
-bootstrap_libgcc() { |
1633 |
- bootstrap_lib "lib/libcompiler_rt" |
1634 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die |
1635 |
- ln -s libcompiler_rt.a libgcc.a || die |
1636 |
- |
1637 |
- bootstrap_lib "lib/libc" "gnu/lib/libgcc" |
1638 |
-} |
1639 |
- |
1640 |
-bootstrap_libthr() { |
1641 |
- bootstrap_lib "lib/libthr" |
1642 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die |
1643 |
- ln -s libthr.so libpthread.so |
1644 |
-} |
1645 |
- |
1646 |
-# What to build for a cross-compiler. |
1647 |
-# We also need the csu but this has to be handled separately. |
1648 |
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" |
1649 |
- |
1650 |
-# What to build for non-default ABIs. |
1651 |
-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" |
1652 |
- |
1653 |
-# Subdirs for a native build: |
1654 |
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" |
1655 |
- |
1656 |
-# Is my $ABI native ? |
1657 |
-is_native_abi() { |
1658 |
- is_crosscompile && return 1 |
1659 |
- multilib_is_native_abi |
1660 |
-} |
1661 |
- |
1662 |
-# Do we need to bootstrap the csu and libssp_nonshared? |
1663 |
-need_bootstrap() { |
1664 |
- 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}" |
1665 |
-} |
1666 |
- |
1667 |
-# Get the subdirs we are building. |
1668 |
-get_subdirs() { |
1669 |
- local ret="" |
1670 |
- if is_native_abi ; then |
1671 |
- # If we are building for the native ABI, build everything |
1672 |
- ret="${NATIVE_SUBDIRS}" |
1673 |
- elif is_crosscompile ; then |
1674 |
- # With a cross-compiler we only build the very core parts. |
1675 |
- ret="${CROSS_SUBDIRS}" |
1676 |
- if [ "${EBUILD_PHASE}" = "install" ]; then |
1677 |
- # Add the csu dir first when installing. We treat it separately for |
1678 |
- # compiling. |
1679 |
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" |
1680 |
- fi |
1681 |
- else |
1682 |
- # For the non-native ABIs we only build the csu parts and very core |
1683 |
- # libraries for now. |
1684 |
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" |
1685 |
- fi |
1686 |
- echo "${ret}" |
1687 |
-} |
1688 |
- |
1689 |
-# Bootstrap the core libraries and setup the flags so that the other parts can |
1690 |
-# build against it. |
1691 |
-do_bootstrap() { |
1692 |
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}" |
1693 |
- if ! is_crosscompile ; then |
1694 |
- # Pre-install headers, but not when building a cross-compiler since we |
1695 |
- # assume they have been installed in the previous pass. |
1696 |
- einfo "Pre-installing includes in include_proper_${ABI}" |
1697 |
- mkdir "${WORKDIR}/include_proper_${ABI}" || die |
1698 |
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" |
1699 |
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
1700 |
- CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
1701 |
- mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" |
1702 |
- fi |
1703 |
- bootstrap_csu |
1704 |
- bootstrap_libssp_nonshared |
1705 |
- is_crosscompile && bootstrap_lib "lib/libc" |
1706 |
- is_crosscompile || is_native_abi || bootstrap_libgcc |
1707 |
- is_native_abi || bootstrap_libthr |
1708 |
-} |
1709 |
- |
1710 |
-# Compile it. Assume we have the toolchain setup correctly. |
1711 |
-do_compile() { |
1712 |
- # Bootstrap if needed, otherwise assume the system headers are in |
1713 |
- # /usr/include. |
1714 |
- if need_bootstrap ; then |
1715 |
- do_bootstrap |
1716 |
- else |
1717 |
- CFLAGS="${CFLAGS} -isystem /usr/include" |
1718 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/include" |
1719 |
- fi |
1720 |
- |
1721 |
- export RAW_LDFLAGS=$(raw-ldflags) |
1722 |
- |
1723 |
- # Everything is now setup, build it! |
1724 |
- for i in $(get_subdirs) ; do |
1725 |
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" |
1726 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
1727 |
- freebsd_src_compile || die "make ${i} failed" |
1728 |
- done |
1729 |
-} |
1730 |
- |
1731 |
-src_compile() { |
1732 |
- # Does not work with GNU sed |
1733 |
- # Force BSD's sed on BSD. |
1734 |
- if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then |
1735 |
- export ESED=/usr/bin/sed |
1736 |
- unalias sed |
1737 |
- fi |
1738 |
- |
1739 |
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" |
1740 |
- |
1741 |
- cd "${WORKDIR}/include" |
1742 |
- $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed" |
1743 |
- |
1744 |
- use crosscompile_opts_headers-only && return 0 |
1745 |
- |
1746 |
- # Bug #270098 |
1747 |
- append-flags $(test-flags -fno-strict-aliasing) |
1748 |
- |
1749 |
- # Bug #324445 |
1750 |
- append-flags $(test-flags -fno-strict-overflow) |
1751 |
- |
1752 |
- # strip flags and do not do it later, we only add safe, and in fact |
1753 |
- # needed flags after all |
1754 |
- strip-flags |
1755 |
- export NOFLAGSTRIP=yes |
1756 |
- if is_crosscompile ; then |
1757 |
- export YACC='yacc -by' |
1758 |
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB |
1759 |
- mymakeopts="${mymakeopts} NLS=" |
1760 |
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" |
1761 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" |
1762 |
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" |
1763 |
- fi |
1764 |
- |
1765 |
- if is_crosscompile ; then |
1766 |
- do_compile |
1767 |
- else |
1768 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
1769 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile |
1770 |
- fi |
1771 |
-} |
1772 |
- |
1773 |
-gen_libc_ldscript() { |
1774 |
- # Parameters: |
1775 |
- # $1 = target libdir |
1776 |
- # $2 = source libc dir |
1777 |
- # $3 = source libssp_nonshared dir |
1778 |
- |
1779 |
- # Clear the symlink. |
1780 |
- rm -f "${DESTDIR}/$2/libc.so" || die |
1781 |
- |
1782 |
- # Move the library if needed |
1783 |
- if [ "$1" != "$2" ] ; then |
1784 |
- mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die |
1785 |
- fi |
1786 |
- |
1787 |
- # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking |
1788 |
- # this is done to avoid having to touch gcc spec file as it is currently |
1789 |
- # done on FreeBSD upstream, mostly because their binutils aren't able to |
1790 |
- # cope with linker scripts yet. |
1791 |
- # Taken from toolchain-funcs.eclass: |
1792 |
- local output_format |
1793 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
1794 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
1795 |
- |
1796 |
- # iconv symbol provided by libc_nonshared.a. |
1797 |
- # http://svnweb.freebsd.org/base?view=revision&revision=258283 |
1798 |
- cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT |
1799 |
-/* GNU ld script |
1800 |
- SSP (-fstack-protector) requires __stack_chk_fail_local to be local. |
1801 |
- GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if |
1802 |
- this symbol was provided by a shared libc. So we link in |
1803 |
- libssp_nonshared.a from here. |
1804 |
- */ |
1805 |
-${output_format} |
1806 |
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) |
1807 |
-END_LDSCRIPT |
1808 |
-} |
1809 |
- |
1810 |
-header_list="" |
1811 |
- |
1812 |
-move_header() { |
1813 |
- local dirname=$(dirname ${1}) |
1814 |
- local filename=$(basename ${1}) |
1815 |
- |
1816 |
- if [ ! -d "${dirname}/${ABI}" ] ; then |
1817 |
- mkdir "${dirname}/${ABI}" || die |
1818 |
- fi |
1819 |
- |
1820 |
- mv "${1}" "${dirname}/${ABI}/" || die |
1821 |
- |
1822 |
- export header_list="${header_list} ${1}" |
1823 |
-} |
1824 |
- |
1825 |
-make_header_template() { |
1826 |
- cat <<-END_HEADER |
1827 |
-/* |
1828 |
- * Wrapped header for multilib support. |
1829 |
- * See the real headers included below. |
1830 |
- */ |
1831 |
- |
1832 |
-#if defined(__x86_64__) |
1833 |
- @ABI_amd64_fbsd@ |
1834 |
-#elif defined(__i386__) |
1835 |
- @ABI_x86_fbsd@ |
1836 |
-#else |
1837 |
- @ABI_${DEFAULT_ABI}@ |
1838 |
-#endif |
1839 |
-END_HEADER |
1840 |
-} |
1841 |
- |
1842 |
-wrap_header() { |
1843 |
- local dirname=$(dirname ${1}) |
1844 |
- local filename=$(basename ${1}) |
1845 |
- |
1846 |
- if [ -n "${dirname#.}" ] ; then |
1847 |
- dirname="${dirname}/${2}" |
1848 |
- else |
1849 |
- dirname="${2}" |
1850 |
- fi |
1851 |
- |
1852 |
- if [ -f "${dirname}/${filename}" ] ; then |
1853 |
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} |
1854 |
- else |
1855 |
- cat ${1} |
1856 |
- fi |
1857 |
-} |
1858 |
- |
1859 |
-wrap_header_end() { |
1860 |
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} |
1861 |
-} |
1862 |
- |
1863 |
-do_install() { |
1864 |
- if is_crosscompile ; then |
1865 |
- INCLUDEDIR="/usr/${CTARGET}/usr/include" |
1866 |
- else |
1867 |
- INCLUDEDIR="/usr/include" |
1868 |
- fi |
1869 |
- |
1870 |
- dodir ${INCLUDEDIR} |
1871 |
- CTARGET="${CHOST}" \ |
1872 |
- install_includes ${INCLUDEDIR} |
1873 |
- |
1874 |
- is_crosscompile && use crosscompile_opts_headers-only && return 0 |
1875 |
- |
1876 |
- # Install a libusb.pc for better compat with Linux's libusb |
1877 |
- if use usb ; then |
1878 |
- dodir /usr/$(get_libdir)/pkgconfig |
1879 |
- sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc |
1880 |
- fi |
1881 |
- |
1882 |
- for i in $(get_subdirs) ; do |
1883 |
- if [[ ${i} != *libiconv_modules* ]] ; then |
1884 |
- einfo "Installing in ${i}..." |
1885 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
1886 |
- freebsd_src_install || die "Install ${i} failed" |
1887 |
- fi |
1888 |
- done |
1889 |
- |
1890 |
- if ! is_crosscompile; then |
1891 |
- local mymakeopts_save="${mymakeopts}" |
1892 |
- mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" |
1893 |
- |
1894 |
- einfo "Installing in lib/libiconv_modules..." |
1895 |
- cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." |
1896 |
- freebsd_src_install || die "Install lib/libiconv_modules failed" |
1897 |
- |
1898 |
- mymakeopts="${mymakeopts_save}" |
1899 |
- fi |
1900 |
- |
1901 |
- if ! is_crosscompile ; then |
1902 |
- if ! multilib_is_native_abi ; then |
1903 |
- DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
1904 |
- else |
1905 |
- dodir "$(get_libdir)" |
1906 |
- DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
1907 |
- fi |
1908 |
- else |
1909 |
- CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" |
1910 |
- # We're done for the cross libc here. |
1911 |
- return 0 |
1912 |
- fi |
1913 |
- |
1914 |
- # Generate ldscripts for core libraries that will go in / |
1915 |
- multilib_is_native_abi && \ |
1916 |
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ |
1917 |
- kvm m md procstat sbuf thr ufs util elf |
1918 |
- |
1919 |
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then |
1920 |
- cd "${D}/usr/include" |
1921 |
- for i in machine/*.h fenv.h ; do |
1922 |
- move_header ${i} |
1923 |
- done |
1924 |
- if multilib_is_native_abi ; then |
1925 |
- # Supposedly the last one! |
1926 |
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" |
1927 |
- for j in ${uniq_headers} ; do |
1928 |
- make_header_template > ${j} |
1929 |
- for i in $(get_all_abis) ; do |
1930 |
- wrap_header ${j} ${i} > ${j}.new |
1931 |
- cp ${j}.new ${j} |
1932 |
- rm -f ${j}.new |
1933 |
- done |
1934 |
- wrap_header_end ${j} > ${j}.new |
1935 |
- cp ${j}.new ${j} |
1936 |
- rm -f ${j}.new |
1937 |
- done |
1938 |
- fi |
1939 |
- fi |
1940 |
-} |
1941 |
- |
1942 |
-src_install() { |
1943 |
- if is_crosscompile ; then |
1944 |
- einfo "Installing for ${CTARGET} in ${CHOST}.." |
1945 |
- # From this point we need to force: get stripped with the correct tools, |
1946 |
- # get tc-arch-kernel to return the right value, etc. |
1947 |
- export CHOST=${CTARGET} |
1948 |
- |
1949 |
- mymakeopts="${mymakeopts} NO_MAN= \ |
1950 |
- INCLUDEDIR=/usr/${CTARGET}/usr/include \ |
1951 |
- SHLIBDIR=/usr/${CTARGET}/usr/lib \ |
1952 |
- LIBDIR=/usr/${CTARGET}/usr/lib" |
1953 |
- |
1954 |
- dosym "usr/include" "/usr/${CTARGET}/sys-include" |
1955 |
- do_install |
1956 |
- |
1957 |
- return 0 |
1958 |
- else |
1959 |
- export STRIP_MASK="*/usr/lib*/*crt*.o" |
1960 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
1961 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install |
1962 |
- fi |
1963 |
- |
1964 |
- cd "${WORKDIR}/etc/" |
1965 |
- insinto /etc |
1966 |
- doins nls.alias mac.conf netconfig |
1967 |
- |
1968 |
- # Install ttys file |
1969 |
- local MACHINE="$(tc-arch-kernel)" |
1970 |
- doins "etc.${MACHINE}"/* |
1971 |
-} |
1972 |
- |
1973 |
-install_includes() |
1974 |
-{ |
1975 |
- local INCLUDEDIR="$1" |
1976 |
- |
1977 |
- # The idea is to be called from either install or unpack. |
1978 |
- # During unpack it's required to install them as portage's user. |
1979 |
- if [[ "${EBUILD_PHASE}" == "install" ]]; then |
1980 |
- local DESTDIR="${D}" |
1981 |
- BINOWN="root" |
1982 |
- BINGRP="wheel" |
1983 |
- else |
1984 |
- local DESTDIR="${WORKDIR}" |
1985 |
- [[ -z "${USER}" ]] && USER="portage" |
1986 |
- BINOWN="${USER}" |
1987 |
- [[ -z "${GROUPS}" ]] && GROUPS="portage" |
1988 |
- BINGRP="${GROUPS}" |
1989 |
- fi |
1990 |
- |
1991 |
- # Must exist before we use it. |
1992 |
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." |
1993 |
- cd "${WORKDIR}/include" |
1994 |
- |
1995 |
- local MACHINE="$(tc-arch-kernel)" |
1996 |
- |
1997 |
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
1998 |
- $(freebsd_get_bmake) installincludes \ |
1999 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
2000 |
- DESTDIR="${DESTDIR}" \ |
2001 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
2002 |
- BINGRP="${BINGRP}" \ |
2003 |
- WITHOUT_GSSAPI= || die "install_includes() failed" |
2004 |
- einfo "includes installed ok." |
2005 |
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex" |
2006 |
- for i in $EXTRA_INCLUDES; do |
2007 |
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
2008 |
- cd "${WORKDIR}/$i" || die |
2009 |
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
2010 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
2011 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
2012 |
- BINGRP="${BINGRP}" || die "problem installing $i includes." |
2013 |
- einfo "$i includes installed ok." |
2014 |
- done |
2015 |
-} |
2016 |
|
2017 |
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild |
2018 |
deleted file mode 100644 |
2019 |
index 24c62627e2a..00000000000 |
2020 |
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild |
2021 |
+++ /dev/null |
2022 |
@@ -1,644 +0,0 @@ |
2023 |
-# Copyright 1999-2016 Gentoo Foundation |
2024 |
-# Distributed under the terms of the GNU General Public License v2 |
2025 |
- |
2026 |
-EAPI=5 |
2027 |
- |
2028 |
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build |
2029 |
- |
2030 |
-DESCRIPTION="FreeBSD's base system libraries" |
2031 |
-SLOT="0" |
2032 |
-LICENSE="BSD zfs? ( CDDL )" |
2033 |
- |
2034 |
-# Security Advisory and Errata patches. |
2035 |
-UPSTREAM_PATCHES=( "SA-16:37/libc.patch" |
2036 |
- "SA-16:38/bhyve.patch" ) |
2037 |
- |
2038 |
-# Crypto is needed to have an internal OpenSSL header |
2039 |
-# sys is needed for libalias, probably we can just extract that instead of |
2040 |
-# extracting the whole tarball |
2041 |
-if [[ ${PV} != *9999* ]]; then |
2042 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
2043 |
- SRC_URI="${SRC_URI} |
2044 |
- $(freebsd_upstream_patches)" |
2045 |
-fi |
2046 |
- |
2047 |
-EXTRACTONLY=" |
2048 |
- lib/ |
2049 |
- contrib/ |
2050 |
- crypto/ |
2051 |
- libexec/ |
2052 |
- etc/ |
2053 |
- include/ |
2054 |
- usr.sbin/ |
2055 |
- gnu/ |
2056 |
- secure/ |
2057 |
-" |
2058 |
- |
2059 |
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then |
2060 |
- RDEPEND="ssl? ( dev-libs/openssl:0= ) |
2061 |
- hesiod? ( net-dns/hesiod ) |
2062 |
- kerberos? ( app-crypt/heimdal ) |
2063 |
- usb? ( !dev-libs/libusb ) |
2064 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
2065 |
- >=dev-libs/expat-2.0.1 |
2066 |
- >=dev-util/dialog-1.2.20150225 |
2067 |
- =sys-freebsd/freebsd-libexec-${RV}* |
2068 |
- !sys-libs/libutempter |
2069 |
- !dev-libs/libelf |
2070 |
- !dev-libs/libexecinfo |
2071 |
- !dev-libs/libiconv |
2072 |
- !sys-freebsd/freebsd-headers" |
2073 |
- DEPEND="${RDEPEND} |
2074 |
- >=sys-devel/flex-2.5.31-r2 |
2075 |
- =sys-freebsd/freebsd-sources-${RV}*" |
2076 |
- RDEPEND="${RDEPEND} |
2077 |
- =sys-freebsd/freebsd-share-${RV}* |
2078 |
- >=virtual/libiconv-0-r2" |
2079 |
-else |
2080 |
- EXTRACTONLY+="sys/ " |
2081 |
-fi |
2082 |
- |
2083 |
-DEPEND="${DEPEND} |
2084 |
- userland_GNU? ( sys-apps/mtree ) |
2085 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
2086 |
- |
2087 |
-S="${WORKDIR}/lib" |
2088 |
- |
2089 |
-export CTARGET=${CTARGET:-${CHOST}} |
2090 |
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then |
2091 |
- export CTARGET=${CATEGORY/cross-} |
2092 |
-fi |
2093 |
- |
2094 |
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware |
2095 |
- build crosscompile_opts_headers-only zfs |
2096 |
- userland_GNU userland_BSD" |
2097 |
- |
2098 |
-QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7" |
2099 |
- |
2100 |
-pkg_setup() { |
2101 |
- # Add the required source files. |
2102 |
- use build && EXTRACTONLY+="sys/ " |
2103 |
- use zfs && EXTRACTONLY+="cddl/ " |
2104 |
- |
2105 |
- [ -c /dev/zero ] || \ |
2106 |
- die "You forgot to mount /dev; the compiled libc would break." |
2107 |
- |
2108 |
- if ! use ssl && use kerberos; then |
2109 |
- eerror "If you want kerberos support you need to enable ssl support, too." |
2110 |
- fi |
2111 |
- |
2112 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
2113 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
2114 |
- use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= " |
2115 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= " |
2116 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= " |
2117 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
2118 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
2119 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
2120 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
2121 |
- |
2122 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= " |
2123 |
- |
2124 |
- if [ "${CTARGET}" != "${CHOST}" ]; then |
2125 |
- mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})" |
2126 |
- mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})" |
2127 |
- fi |
2128 |
-} |
2129 |
- |
2130 |
-PATCHES=( |
2131 |
- "${FILESDIR}/${PN}-6.0-pmc.patch" |
2132 |
- "${FILESDIR}/${PN}-10.0-atfcxx.patch" |
2133 |
- "${FILESDIR}/${PN}-9.0-bluetooth.patch" |
2134 |
- "${FILESDIR}/${PN}-11.0-workaround.patch" |
2135 |
- "${FILESDIR}/${PN}-11.0-bsdxml2expat.patch" |
2136 |
- "${FILESDIR}/${PN}-11.0-libsysdecode.patch" |
2137 |
- "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
2138 |
- "${FILESDIR}/${PN}-add-nossp-cflags.patch" |
2139 |
- ) |
2140 |
-# Here we disable and remove source which we don't need or want |
2141 |
-# In order: |
2142 |
-# - ncurses stuff |
2143 |
-# - libexpat creates a bsdxml library which is the same as expat |
2144 |
-# - archiving libraries (have their own ebuild) |
2145 |
-# - sendmail libraries (they are installed by sendmail) |
2146 |
-# - SNMP library and dependency (have their own ebuilds) |
2147 |
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from |
2148 |
-# boot0 instead. |
2149 |
-# |
2150 |
-# The rest are libraries we already have somewhere else because |
2151 |
-# they are contribution. |
2152 |
-REMOVE_SUBDIRS="ncurses \ |
2153 |
- libexpat \ |
2154 |
- libz libbz2 libarchive liblzma \ |
2155 |
- libsm libsmdb libsmutil \ |
2156 |
- libbegemot libbsnmp \ |
2157 |
- libpam libpcap libwrap libmagic \ |
2158 |
- libcom_err |
2159 |
- libedit |
2160 |
- libstand |
2161 |
- libgssapi" |
2162 |
- |
2163 |
-# Are we building a cross-compiler? |
2164 |
-is_crosscompile() { |
2165 |
- [ "${CATEGORY#*cross-}" != "${CATEGORY}" ] |
2166 |
-} |
2167 |
- |
2168 |
-src_prepare() { |
2169 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
2170 |
- use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
2171 |
- |
2172 |
- sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" |
2173 |
- |
2174 |
- # Upstream Display Managers default to using VT7 |
2175 |
- # We should make FreeBSD allow this by default |
2176 |
- local x= |
2177 |
- for x in "${WORKDIR}"/etc/etc.*/ttys ; do |
2178 |
- sed -i.bak \ |
2179 |
- -e '/ttyv5[[:space:]]/ a\ |
2180 |
-# Display Managers default to VT7.\ |
2181 |
-# If you use the xdm init script, keep ttyv6 commented out\ |
2182 |
-# unless you force a different VT for the DM being used.' \ |
2183 |
- -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \ |
2184 |
- || die "Failed to sed ${x}" |
2185 |
- rm "${x}".bak |
2186 |
- done |
2187 |
- |
2188 |
- # This one is here because it also |
2189 |
- # patches "${WORKDIR}/include" |
2190 |
- cd "${WORKDIR}" |
2191 |
- epatch "${FILESDIR}/${PN}-includes.patch" |
2192 |
- |
2193 |
- # Don't install the hesiod man page or header |
2194 |
- rm "${WORKDIR}"/include/hesiod.h || die |
2195 |
- sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die |
2196 |
- sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \ |
2197 |
- "${WORKDIR}"/lib/libc/net/Makefile.inc || die |
2198 |
- |
2199 |
- # Fix the Makefiles of these few libraries that will overwrite our LDADD. |
2200 |
- cd "${S}" |
2201 |
- for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \ |
2202 |
- libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \ |
2203 |
- die "Problem fixing \"${dir}/Makefile" |
2204 |
- done |
2205 |
- # Call LD with LDFLAGS, rename them to RAW_LDFLAGS |
2206 |
- sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \ |
2207 |
- -i "${S}/csu/i386/Makefile" || die |
2208 |
- |
2209 |
- if install --version 2> /dev/null | grep -q GNU; then |
2210 |
- sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" |
2211 |
- fi |
2212 |
- |
2213 |
- # Try to fix sed calls for GNU sed. Do it only with GNU userland and force |
2214 |
- # BSD's sed on BSD. |
2215 |
- cd "${S}" |
2216 |
- if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then |
2217 |
- find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; |
2218 |
- sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die |
2219 |
- fi |
2220 |
- |
2221 |
- if use build; then |
2222 |
- cd "${WORKDIR}" |
2223 |
- # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it |
2224 |
- # shouldn't be a symlink to /usr/src/sys (which should be already patched) |
2225 |
- epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch |
2226 |
- return 0 |
2227 |
- fi |
2228 |
- |
2229 |
- if ! is_crosscompile ; then |
2230 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
2231 |
- ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!" |
2232 |
- fi |
2233 |
- else |
2234 |
- sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \ |
2235 |
- "${S}/libc/rpc/Makefile.inc" \ |
2236 |
- "${S}/libc/yp/Makefile.inc" |
2237 |
- fi |
2238 |
-} |
2239 |
- |
2240 |
-bootstrap_lib() { |
2241 |
- for i ; do |
2242 |
- cd "${WORKDIR}/${i}" || die "missing ${i}" |
2243 |
- freebsd_src_compile |
2244 |
- append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}" |
2245 |
- done |
2246 |
-} |
2247 |
- |
2248 |
-get_csudir() { |
2249 |
- if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then |
2250 |
- echo "lib/csu/$1-elf" |
2251 |
- else |
2252 |
- echo "lib/csu/$1" |
2253 |
- fi |
2254 |
-} |
2255 |
- |
2256 |
-bootstrap_csu() { |
2257 |
- local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))" |
2258 |
- export RAW_LDFLAGS=$(raw-ldflags) |
2259 |
- bootstrap_lib "${csudir}" |
2260 |
- |
2261 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
2262 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}" |
2263 |
- |
2264 |
- bootstrap_lib "gnu/lib/csu" |
2265 |
- |
2266 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
2267 |
- for i in *.So ; do |
2268 |
- ln -s $i ${i%.So}S.o |
2269 |
- done |
2270 |
- CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
2271 |
- append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu" |
2272 |
-} |
2273 |
- |
2274 |
-# Compile libssp_nonshared.a and add it's path to LDFLAGS. |
2275 |
-bootstrap_libssp_nonshared() { |
2276 |
- bootstrap_lib "gnu/lib/libssp/libssp_nonshared" |
2277 |
-} |
2278 |
- |
2279 |
-bootstrap_libgcc() { |
2280 |
- bootstrap_lib "lib/libcompiler_rt" |
2281 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die |
2282 |
- ln -s libcompiler_rt.a libgcc.a || die |
2283 |
- |
2284 |
- bootstrap_lib "lib/libc" "gnu/lib/libgcc" |
2285 |
-} |
2286 |
- |
2287 |
-bootstrap_libthr() { |
2288 |
- bootstrap_lib "lib/libthr" |
2289 |
- cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die |
2290 |
- ln -s libthr.so libpthread.so |
2291 |
-} |
2292 |
- |
2293 |
-# What to build for a cross-compiler. |
2294 |
-# We also need the csu but this has to be handled separately. |
2295 |
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared" |
2296 |
- |
2297 |
-# What to build for non-default ABIs. |
2298 |
-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" |
2299 |
- |
2300 |
-# Subdirs for a native build: |
2301 |
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules" |
2302 |
- |
2303 |
-# Is my $ABI native ? |
2304 |
-is_native_abi() { |
2305 |
- is_crosscompile && return 1 |
2306 |
- multilib_is_native_abi |
2307 |
-} |
2308 |
- |
2309 |
-# Do we need to bootstrap the csu and libssp_nonshared? |
2310 |
-need_bootstrap() { |
2311 |
- 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}" |
2312 |
-} |
2313 |
- |
2314 |
-# Get the subdirs we are building. |
2315 |
-get_subdirs() { |
2316 |
- local ret="" |
2317 |
- if is_native_abi ; then |
2318 |
- # If we are building for the native ABI, build everything |
2319 |
- ret="${NATIVE_SUBDIRS}" |
2320 |
- elif is_crosscompile ; then |
2321 |
- # With a cross-compiler we only build the very core parts. |
2322 |
- ret="${CROSS_SUBDIRS}" |
2323 |
- if [ "${EBUILD_PHASE}" = "install" ]; then |
2324 |
- # Add the csu dir first when installing. We treat it separately for |
2325 |
- # compiling. |
2326 |
- ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}" |
2327 |
- fi |
2328 |
- else |
2329 |
- # For the non-native ABIs we only build the csu parts and very core |
2330 |
- # libraries for now. |
2331 |
- ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))" |
2332 |
- fi |
2333 |
- echo "${ret}" |
2334 |
-} |
2335 |
- |
2336 |
-# Bootstrap the core libraries and setup the flags so that the other parts can |
2337 |
-# build against it. |
2338 |
-do_bootstrap() { |
2339 |
- einfo "Bootstrapping on ${CHOST} for ${CTARGET}" |
2340 |
- if ! is_crosscompile ; then |
2341 |
- # Pre-install headers, but not when building a cross-compiler since we |
2342 |
- # assume they have been installed in the previous pass. |
2343 |
- einfo "Pre-installing includes in include_proper_${ABI}" |
2344 |
- mkdir "${WORKDIR}/include_proper_${ABI}" || die |
2345 |
- CTARGET="${CHOST}" install_includes "/include_proper_${ABI}" |
2346 |
- CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
2347 |
- [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
2348 |
- CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}" |
2349 |
- mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc" |
2350 |
- fi |
2351 |
- bootstrap_csu |
2352 |
- bootstrap_libssp_nonshared |
2353 |
- is_crosscompile && bootstrap_lib "lib/libc" |
2354 |
- is_crosscompile || is_native_abi || bootstrap_libgcc |
2355 |
- is_native_abi || bootstrap_libthr |
2356 |
-} |
2357 |
- |
2358 |
-# Compile it. Assume we have the toolchain setup correctly. |
2359 |
-do_compile() { |
2360 |
- # Bootstrap if needed, otherwise assume the system headers are in |
2361 |
- # /usr/include. |
2362 |
- if need_bootstrap ; then |
2363 |
- do_bootstrap |
2364 |
- else |
2365 |
- CFLAGS="${CFLAGS} -isystem /usr/include" |
2366 |
- [[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1" |
2367 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/include" |
2368 |
- fi |
2369 |
- |
2370 |
- export RAW_LDFLAGS=$(raw-ldflags) |
2371 |
- |
2372 |
- # Everything is now setup, build it! |
2373 |
- for i in $(get_subdirs) ; do |
2374 |
- einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}" |
2375 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
2376 |
- freebsd_src_compile || die "make ${i} failed" |
2377 |
- done |
2378 |
-} |
2379 |
- |
2380 |
-src_compile() { |
2381 |
- # Does not work with GNU sed |
2382 |
- # Force BSD's sed on BSD. |
2383 |
- if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then |
2384 |
- export ESED=/usr/bin/sed |
2385 |
- unalias sed |
2386 |
- fi |
2387 |
- |
2388 |
- use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid" |
2389 |
- |
2390 |
- cd "${WORKDIR}/include" |
2391 |
- $(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed" |
2392 |
- |
2393 |
- use crosscompile_opts_headers-only && return 0 |
2394 |
- |
2395 |
- # Bug #270098 |
2396 |
- append-flags $(test-flags -fno-strict-aliasing) |
2397 |
- |
2398 |
- # Bug #324445 |
2399 |
- append-flags $(test-flags -fno-strict-overflow) |
2400 |
- |
2401 |
- # strip flags and do not do it later, we only add safe, and in fact |
2402 |
- # needed flags after all |
2403 |
- strip-flags |
2404 |
- export NOFLAGSTRIP=yes |
2405 |
- if is_crosscompile ; then |
2406 |
- export YACC='yacc -by' |
2407 |
- CHOST=${CTARGET} tc-export CC LD CXX RANLIB |
2408 |
- mymakeopts="${mymakeopts} NLS=" |
2409 |
- CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include" |
2410 |
- CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include" |
2411 |
- append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc" |
2412 |
- fi |
2413 |
- |
2414 |
- if is_crosscompile ; then |
2415 |
- do_compile |
2416 |
- else |
2417 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2418 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile |
2419 |
- fi |
2420 |
-} |
2421 |
- |
2422 |
-gen_libc_ldscript() { |
2423 |
- # Parameters: |
2424 |
- # $1 = target libdir |
2425 |
- # $2 = source libc dir |
2426 |
- # $3 = source libssp_nonshared dir |
2427 |
- |
2428 |
- # Clear the symlink. |
2429 |
- rm -f "${DESTDIR}/$2/libc.so" || die |
2430 |
- |
2431 |
- # Move the library if needed |
2432 |
- if [ "$1" != "$2" ] ; then |
2433 |
- mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die |
2434 |
- fi |
2435 |
- |
2436 |
- # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking |
2437 |
- # this is done to avoid having to touch gcc spec file as it is currently |
2438 |
- # done on FreeBSD upstream, mostly because their binutils aren't able to |
2439 |
- # cope with linker scripts yet. |
2440 |
- # Taken from toolchain-funcs.eclass: |
2441 |
- local output_format |
2442 |
- output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
2443 |
- [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
2444 |
- |
2445 |
- # iconv symbol provided by libc_nonshared.a. |
2446 |
- # http://svnweb.freebsd.org/base?view=revision&revision=258283 |
2447 |
- cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT |
2448 |
-/* GNU ld script |
2449 |
- SSP (-fstack-protector) requires __stack_chk_fail_local to be local. |
2450 |
- GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if |
2451 |
- this symbol was provided by a shared libc. So we link in |
2452 |
- libssp_nonshared.a from here. |
2453 |
- */ |
2454 |
-${output_format} |
2455 |
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a ) |
2456 |
-END_LDSCRIPT |
2457 |
-} |
2458 |
- |
2459 |
-header_list="" |
2460 |
- |
2461 |
-move_header() { |
2462 |
- local dirname=$(dirname ${1}) |
2463 |
- local filename=$(basename ${1}) |
2464 |
- |
2465 |
- if [ ! -d "${dirname}/${ABI}" ] ; then |
2466 |
- mkdir "${dirname}/${ABI}" || die |
2467 |
- fi |
2468 |
- |
2469 |
- mv "${1}" "${dirname}/${ABI}/" || die |
2470 |
- |
2471 |
- export header_list="${header_list} ${1}" |
2472 |
-} |
2473 |
- |
2474 |
-make_header_template() { |
2475 |
- cat <<-END_HEADER |
2476 |
-/* |
2477 |
- * Wrapped header for multilib support. |
2478 |
- * See the real headers included below. |
2479 |
- */ |
2480 |
- |
2481 |
-#if defined(__x86_64__) |
2482 |
- @ABI_amd64_fbsd@ |
2483 |
-#elif defined(__i386__) |
2484 |
- @ABI_x86_fbsd@ |
2485 |
-#else |
2486 |
- @ABI_${DEFAULT_ABI}@ |
2487 |
-#endif |
2488 |
-END_HEADER |
2489 |
-} |
2490 |
- |
2491 |
-wrap_header() { |
2492 |
- local dirname=$(dirname ${1}) |
2493 |
- local filename=$(basename ${1}) |
2494 |
- |
2495 |
- if [ -n "${dirname#.}" ] ; then |
2496 |
- dirname="${dirname}/${2}" |
2497 |
- else |
2498 |
- dirname="${2}" |
2499 |
- fi |
2500 |
- |
2501 |
- if [ -f "${dirname}/${filename}" ] ; then |
2502 |
- sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1} |
2503 |
- else |
2504 |
- cat ${1} |
2505 |
- fi |
2506 |
-} |
2507 |
- |
2508 |
-wrap_header_end() { |
2509 |
- sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1} |
2510 |
-} |
2511 |
- |
2512 |
-do_install() { |
2513 |
- if is_crosscompile ; then |
2514 |
- INCLUDEDIR="/usr/${CTARGET}/usr/include" |
2515 |
- else |
2516 |
- INCLUDEDIR="/usr/include" |
2517 |
- fi |
2518 |
- |
2519 |
- dodir ${INCLUDEDIR} |
2520 |
- CTARGET="${CHOST}" \ |
2521 |
- install_includes ${INCLUDEDIR} |
2522 |
- |
2523 |
- is_crosscompile && use crosscompile_opts_headers-only && return 0 |
2524 |
- |
2525 |
- # Install a libusb.pc for better compat with Linux's libusb |
2526 |
- if use usb ; then |
2527 |
- dodir /usr/$(get_libdir)/pkgconfig |
2528 |
- sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc |
2529 |
- fi |
2530 |
- |
2531 |
- for i in $(get_subdirs) ; do |
2532 |
- if [[ ${i} != *libiconv_modules* ]] ; then |
2533 |
- einfo "Installing in ${i}..." |
2534 |
- cd "${WORKDIR}/${i}/" || die "missing ${i}." |
2535 |
- freebsd_src_install || die "Install ${i} failed" |
2536 |
- fi |
2537 |
- done |
2538 |
- |
2539 |
- if ! is_crosscompile; then |
2540 |
- local mymakeopts_save="${mymakeopts}" |
2541 |
- mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n" |
2542 |
- |
2543 |
- einfo "Installing in lib/libiconv_modules..." |
2544 |
- cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules." |
2545 |
- freebsd_src_install || die "Install lib/libiconv_modules failed" |
2546 |
- |
2547 |
- mymakeopts="${mymakeopts_save}" |
2548 |
- fi |
2549 |
- |
2550 |
- if ! is_crosscompile ; then |
2551 |
- if ! multilib_is_native_abi ; then |
2552 |
- DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
2553 |
- else |
2554 |
- dodir "$(get_libdir)" |
2555 |
- DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)" |
2556 |
- fi |
2557 |
- else |
2558 |
- CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib" |
2559 |
- # We're done for the cross libc here. |
2560 |
- return 0 |
2561 |
- fi |
2562 |
- |
2563 |
- # Generate ldscripts for core libraries that will go in / |
2564 |
- multilib_is_native_abi && \ |
2565 |
- gen_usr_ldscript -a alias cam geom ipsec jail kiconv \ |
2566 |
- kvm m md procstat sbuf thr ufs util elf |
2567 |
- |
2568 |
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then |
2569 |
- cd "${D}/usr/include" |
2570 |
- for i in machine/*.h fenv.h ; do |
2571 |
- move_header ${i} |
2572 |
- done |
2573 |
- if multilib_is_native_abi ; then |
2574 |
- # Supposedly the last one! |
2575 |
- local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')" |
2576 |
- for j in ${uniq_headers} ; do |
2577 |
- make_header_template > ${j} |
2578 |
- for i in $(get_all_abis) ; do |
2579 |
- wrap_header ${j} ${i} > ${j}.new |
2580 |
- cp ${j}.new ${j} |
2581 |
- rm -f ${j}.new |
2582 |
- done |
2583 |
- wrap_header_end ${j} > ${j}.new |
2584 |
- cp ${j}.new ${j} |
2585 |
- rm -f ${j}.new |
2586 |
- done |
2587 |
- fi |
2588 |
- fi |
2589 |
-} |
2590 |
- |
2591 |
-src_install() { |
2592 |
- if is_crosscompile ; then |
2593 |
- einfo "Installing for ${CTARGET} in ${CHOST}.." |
2594 |
- # From this point we need to force: get stripped with the correct tools, |
2595 |
- # get tc-arch-kernel to return the right value, etc. |
2596 |
- export CHOST=${CTARGET} |
2597 |
- |
2598 |
- mymakeopts="${mymakeopts} WITHOUT_MAN= \ |
2599 |
- INCLUDEDIR=/usr/${CTARGET}/usr/include \ |
2600 |
- SHLIBDIR=/usr/${CTARGET}/usr/lib \ |
2601 |
- LIBDIR=/usr/${CTARGET}/usr/lib" |
2602 |
- |
2603 |
- dosym "usr/include" "/usr/${CTARGET}/sys-include" |
2604 |
- do_install |
2605 |
- |
2606 |
- return 0 |
2607 |
- else |
2608 |
- export STRIP_MASK="*/usr/lib*/*crt*.o" |
2609 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2610 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install |
2611 |
- fi |
2612 |
- |
2613 |
- cd "${WORKDIR}/etc/" |
2614 |
- insinto /etc |
2615 |
- doins nls.alias mac.conf netconfig |
2616 |
- |
2617 |
- # Install ttys file |
2618 |
- local MACHINE="$(tc-arch-kernel)" |
2619 |
- doins "etc.${MACHINE}"/* |
2620 |
-} |
2621 |
- |
2622 |
-install_includes() |
2623 |
-{ |
2624 |
- local INCLUDEDIR="$1" |
2625 |
- |
2626 |
- # The idea is to be called from either install or unpack. |
2627 |
- # During unpack it's required to install them as portage's user. |
2628 |
- if [[ "${EBUILD_PHASE}" == "install" ]]; then |
2629 |
- local DESTDIR="${D}" |
2630 |
- BINOWN="root" |
2631 |
- BINGRP="wheel" |
2632 |
- else |
2633 |
- local DESTDIR="${WORKDIR}" |
2634 |
- [[ -z "${USER}" ]] && USER="portage" |
2635 |
- BINOWN="${USER}" |
2636 |
- [[ -z "${GROUPS}" ]] && GROUPS="portage" |
2637 |
- BINGRP="${GROUPS}" |
2638 |
- fi |
2639 |
- |
2640 |
- # Must exist before we use it. |
2641 |
- [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes." |
2642 |
- cd "${WORKDIR}/include" |
2643 |
- |
2644 |
- local MACHINE="$(tc-arch-kernel)" |
2645 |
- |
2646 |
- einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
2647 |
- $(freebsd_get_bmake) installincludes \ |
2648 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
2649 |
- DESTDIR="${DESTDIR}" \ |
2650 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
2651 |
- BINGRP="${BINGRP}" \ |
2652 |
- WITHOUT_GSSAPI= \ |
2653 |
- SRCTOP="${WORKDIR}"|| die "install_includes() failed" |
2654 |
- einfo "includes installed ok." |
2655 |
- EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp" |
2656 |
- for i in $EXTRA_INCLUDES; do |
2657 |
- einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." |
2658 |
- cd "${WORKDIR}/$i" || die |
2659 |
- $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \ |
2660 |
- MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \ |
2661 |
- INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ |
2662 |
- BINGRP="${BINGRP}" \ |
2663 |
- SRCTOP="${WORKDIR}" || die "problem installing $i includes." |
2664 |
- einfo "$i includes installed ok." |
2665 |
- done |
2666 |
-} |
2667 |
|
2668 |
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest |
2669 |
index f9f34ba4698..348874a0634 100644 |
2670 |
--- a/sys-freebsd/freebsd-libexec/Manifest |
2671 |
+++ b/sys-freebsd/freebsd-libexec/Manifest |
2672 |
@@ -8,8 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6 |
2673 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
2674 |
DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d |
2675 |
DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 |
2676 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
2677 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
2678 |
DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 |
2679 |
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e |
2680 |
DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 |
2681 |
|
2682 |
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 |
2683 |
deleted file mode 100644 |
2684 |
index e9c09256630..00000000000 |
2685 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch |
2686 |
+++ /dev/null |
2687 |
@@ -1,28 +0,0 @@ |
2688 |
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc |
2689 |
-index b50e14e..e59a413 100644 |
2690 |
---- a/libexec/atf/Makefile.inc |
2691 |
-+++ b/libexec/atf/Makefile.inc |
2692 |
-@@ -25,7 +25,7 @@ |
2693 |
- # |
2694 |
- # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $ |
2695 |
- |
2696 |
--CFLAGS+= -DHAVE_CONFIG_H |
2697 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
2698 |
- |
2699 |
- WARNS?= 3 |
2700 |
- |
2701 |
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile |
2702 |
-index 77c11db..7449ddb 100644 |
2703 |
---- a/libexec/atf/atf-check/Makefile |
2704 |
-+++ b/libexec/atf/atf-check/Makefile |
2705 |
-@@ -34,8 +34,8 @@ PROG_CXX= atf-check |
2706 |
- SRCS= atf-check.cpp |
2707 |
- MAN= atf-check.1 |
2708 |
- |
2709 |
--CFLAGS+= -I${ATF} |
2710 |
--CFLAGS+= -DATF_SHELL='"/bin/sh"' |
2711 |
-+CXXFLAGS+= -I${ATF} |
2712 |
-+CXXFLAGS+= -DATF_SHELL='"/bin/sh"' |
2713 |
- |
2714 |
- LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ |
2715 |
- LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c |
2716 |
|
2717 |
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 |
2718 |
deleted file mode 100644 |
2719 |
index d3300092742..00000000000 |
2720 |
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch |
2721 |
+++ /dev/null |
2722 |
@@ -1,15 +0,0 @@ |
2723 |
-Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*. |
2724 |
-We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue |
2725 |
-about LD_32_* and thus fail to run from the build directory. |
2726 |
- |
2727 |
-diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h |
2728 |
---- libexec.old/rtld-elf/rtld.h 2013-08-24 12:30:26.000000000 -0400 |
2729 |
-+++ libexec/rtld-elf/rtld.h 2013-08-26 17:10:19.000000000 -0400 |
2730 |
-@@ -47,7 +47,6 @@ |
2731 |
- #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints" |
2732 |
- /* For running 32 bit binaries */ |
2733 |
- #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32" |
2734 |
--#define LD_ "LD_32_" |
2735 |
- #endif |
2736 |
- |
2737 |
- #ifndef STANDARD_LIBRARY_PATH |
2738 |
|
2739 |
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild |
2740 |
deleted file mode 100644 |
2741 |
index e915c511550..00000000000 |
2742 |
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild |
2743 |
+++ /dev/null |
2744 |
@@ -1,111 +0,0 @@ |
2745 |
-# Copyright 1999-2016 Gentoo Foundation |
2746 |
-# Distributed under the terms of the GNU General Public License v2 |
2747 |
- |
2748 |
-EAPI=5 |
2749 |
- |
2750 |
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs |
2751 |
- |
2752 |
-DESCRIPTION="FreeBSD libexec things" |
2753 |
-SLOT="0" |
2754 |
- |
2755 |
-if [[ ${PV} != *9999* ]]; then |
2756 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
2757 |
-fi |
2758 |
- |
2759 |
-EXTRACTONLY=" |
2760 |
- libexec/ |
2761 |
- usr.bin/ |
2762 |
- bin/ |
2763 |
- contrib/hyperv/ |
2764 |
- lib/ |
2765 |
- etc/ |
2766 |
- usr.sbin/ |
2767 |
-" |
2768 |
- |
2769 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
2770 |
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] |
2771 |
- pam? ( virtual/pam )" |
2772 |
-DEPEND="${RDEPEND} |
2773 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
2774 |
- =sys-freebsd/freebsd-sources-${RV}*" |
2775 |
-RDEPEND="${RDEPEND} |
2776 |
- xinetd? ( sys-apps/xinetd )" |
2777 |
- |
2778 |
-S="${WORKDIR}/libexec" |
2779 |
- |
2780 |
-# Remove sendmail, tcp_wrapper and other useless stuff |
2781 |
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" |
2782 |
- |
2783 |
-IUSE="pam ssl kerberos ipv6 nis xinetd" |
2784 |
- |
2785 |
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch" |
2786 |
- "${FILESDIR}/${PN}-10.2-atf-check.patch" ) |
2787 |
- |
2788 |
-pkg_setup() { |
2789 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
2790 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
2791 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
2792 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
2793 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
2794 |
- |
2795 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " |
2796 |
-} |
2797 |
- |
2798 |
-src_prepare() { |
2799 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
2800 |
- [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
2801 |
- |
2802 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
2803 |
- ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." |
2804 |
- fi |
2805 |
- # allow upgrade directly from 9.x to 10.2. |
2806 |
- if has_version "<sys-freebsd/freebsd-lib-${RV}"; then |
2807 |
- # taken from sys/sys/elf_common.h |
2808 |
- echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h |
2809 |
- echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h |
2810 |
- echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h |
2811 |
- echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h |
2812 |
- echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h |
2813 |
- # taken from sys/sys/fcntl.h |
2814 |
- echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h |
2815 |
- # taken from sys/sys/cdefs.h |
2816 |
- echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h |
2817 |
- # taken from sys/sys/mman.h |
2818 |
- echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h |
2819 |
- echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h |
2820 |
- echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h |
2821 |
- echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h |
2822 |
- fi |
2823 |
-} |
2824 |
- |
2825 |
-setup_multilib_vars() { |
2826 |
- if ! multilib_is_native_abi ; then |
2827 |
- cd "${WORKDIR}/libexec/rtld-elf" || die |
2828 |
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" |
2829 |
- else |
2830 |
- cd "${S}" || die |
2831 |
- fi |
2832 |
- "$@" |
2833 |
-} |
2834 |
- |
2835 |
-src_compile() { |
2836 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2837 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile |
2838 |
-} |
2839 |
- |
2840 |
-src_install() { |
2841 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2842 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
2843 |
- |
2844 |
- insinto /etc |
2845 |
- doins "${WORKDIR}/etc/gettytab" |
2846 |
- newinitd "${FILESDIR}/bootpd.initd" bootpd |
2847 |
- newconfd "${FILESDIR}/bootpd.confd" bootpd |
2848 |
- |
2849 |
- if use xinetd; then |
2850 |
- for rpcd in rstatd rusersd walld rquotad sprayd; do |
2851 |
- insinto /etc/xinetd.d |
2852 |
- newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} |
2853 |
- done |
2854 |
- fi |
2855 |
-} |
2856 |
|
2857 |
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
2858 |
deleted file mode 100644 |
2859 |
index 59376c1713b..00000000000 |
2860 |
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild |
2861 |
+++ /dev/null |
2862 |
@@ -1,130 +0,0 @@ |
2863 |
-# Copyright 1999-2016 Gentoo Foundation |
2864 |
-# Distributed under the terms of the GNU General Public License v2 |
2865 |
- |
2866 |
-EAPI=5 |
2867 |
- |
2868 |
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs |
2869 |
- |
2870 |
-DESCRIPTION="FreeBSD libexec things" |
2871 |
-SLOT="0" |
2872 |
- |
2873 |
-if [[ ${PV} != *9999* ]]; then |
2874 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
2875 |
-fi |
2876 |
- |
2877 |
-EXTRACTONLY=" |
2878 |
- libexec/ |
2879 |
- usr.bin/ |
2880 |
- bin/ |
2881 |
- contrib/blacklist/ |
2882 |
- contrib/dma/ |
2883 |
- contrib/hyperv/ |
2884 |
- contrib/telnet/ |
2885 |
- lib/ |
2886 |
- etc/ |
2887 |
- usr.sbin/ |
2888 |
-" |
2889 |
- |
2890 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}* |
2891 |
- >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}] |
2892 |
- pam? ( virtual/pam )" |
2893 |
-DEPEND="${RDEPEND} |
2894 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
2895 |
- =sys-freebsd/freebsd-sources-${RV}*" |
2896 |
-RDEPEND="${RDEPEND} |
2897 |
- xinetd? ( sys-apps/xinetd )" |
2898 |
- |
2899 |
-S="${WORKDIR}/libexec" |
2900 |
- |
2901 |
-# Remove sendmail, tcp_wrapper and other useless stuff |
2902 |
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd" |
2903 |
- |
2904 |
-IUSE="pam ssl kerberos ipv6 nis xinetd" |
2905 |
- |
2906 |
-PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" ) |
2907 |
- |
2908 |
-pkg_setup() { |
2909 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
2910 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
2911 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
2912 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
2913 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
2914 |
- |
2915 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= " |
2916 |
- |
2917 |
- if has_version "<sys-freebsd/freebsd-libexec-11.0"; then |
2918 |
- REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper" |
2919 |
- fi |
2920 |
- |
2921 |
- if has_version "<sys-freebsd/freebsd-ubin-11.0"; then |
2922 |
- mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= " |
2923 |
- fi |
2924 |
- |
2925 |
- if has_version "<sys-freebsd/freebsd-share-${RV}"; then |
2926 |
- die ">=sys-freebsd/freebsd-share-${RV} is required." |
2927 |
- fi |
2928 |
-} |
2929 |
- |
2930 |
-src_prepare() { |
2931 |
- # gcc-5.0 or later, Workaround for critical issue. bug 573358. |
2932 |
- [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1 |
2933 |
- |
2934 |
- if [[ ! -e "${WORKDIR}/include" ]]; then |
2935 |
- ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.." |
2936 |
- fi |
2937 |
- # allow upgrade directly from 9.x to 10.2. |
2938 |
- if has_version "<sys-freebsd/freebsd-lib-${RV}"; then |
2939 |
- # taken from sys/sys/elf_common.h |
2940 |
- echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h |
2941 |
- echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h |
2942 |
- echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h |
2943 |
- echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h |
2944 |
- echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h |
2945 |
- echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h |
2946 |
- echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h |
2947 |
- # taken from sys/sys/fcntl.h |
2948 |
- echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h |
2949 |
- echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h |
2950 |
- # taken from sys/sys/cdefs.h |
2951 |
- echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h |
2952 |
- # taken from sys/sys/mman.h |
2953 |
- echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h |
2954 |
- echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h |
2955 |
- echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h |
2956 |
- echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h |
2957 |
- |
2958 |
- export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= " |
2959 |
- fi |
2960 |
-} |
2961 |
- |
2962 |
-setup_multilib_vars() { |
2963 |
- if ! multilib_is_native_abi ; then |
2964 |
- cd "${WORKDIR}/libexec/rtld-elf" || die |
2965 |
- export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1" |
2966 |
- else |
2967 |
- cd "${S}" || die |
2968 |
- fi |
2969 |
- "$@" |
2970 |
-} |
2971 |
- |
2972 |
-src_compile() { |
2973 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2974 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile |
2975 |
-} |
2976 |
- |
2977 |
-src_install() { |
2978 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
2979 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
2980 |
- |
2981 |
- insinto /etc |
2982 |
- doins "${WORKDIR}/etc/gettytab" |
2983 |
- newinitd "${FILESDIR}/bootpd.initd" bootpd |
2984 |
- newconfd "${FILESDIR}/bootpd.confd" bootpd |
2985 |
- |
2986 |
- if use xinetd; then |
2987 |
- for rpcd in rstatd rusersd walld rquotad sprayd; do |
2988 |
- insinto /etc/xinetd.d |
2989 |
- newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd} |
2990 |
- done |
2991 |
- fi |
2992 |
-} |
2993 |
|
2994 |
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest |
2995 |
index 0f580c25508..f3dcd89d595 100644 |
2996 |
--- a/sys-freebsd/freebsd-mk-defs/Manifest |
2997 |
+++ b/sys-freebsd/freebsd-mk-defs/Manifest |
2998 |
@@ -1,3 +1 @@ |
2999 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
3000 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
3001 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
3002 |
|
3003 |
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 |
3004 |
deleted file mode 100644 |
3005 |
index b88fde25500..00000000000 |
3006 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch |
3007 |
+++ /dev/null |
3008 |
@@ -1,63 +0,0 @@ |
3009 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
3010 |
-index 80549d8..fd2aac5 100644 |
3011 |
---- a/share/mk/bsd.lib.mk |
3012 |
-+++ b/share/mk/bsd.lib.mk |
3013 |
-@@ -173,7 +173,7 @@ _LIBS= lib${LIB}.a |
3014 |
- lib${LIB}.a: ${OBJS} ${STATICOBJS} |
3015 |
- @${ECHO} building static ${LIB} library |
3016 |
- @rm -f ${.TARGET} |
3017 |
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} |
3018 |
-+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} |
3019 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
3020 |
- .endif |
3021 |
- |
3022 |
-@@ -186,7 +186,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} |
3023 |
- lib${LIB}_p.a: ${POBJS} |
3024 |
- @${ECHO} building profiled ${LIB} library |
3025 |
- @rm -f ${.TARGET} |
3026 |
-- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} |
3027 |
-+ @${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD} |
3028 |
- ${RANLIB} ${RANLIBFLAGS} ${.TARGET} |
3029 |
- .endif |
3030 |
- |
3031 |
-@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} |
3032 |
- .endif |
3033 |
- ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ |
3034 |
- -o ${.TARGET} -Wl,-soname,${SONAME} \ |
3035 |
-- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} |
3036 |
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} |
3037 |
- .if ${MK_CTF} != "no" |
3038 |
- ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} |
3039 |
- .endif |
3040 |
-@@ -273,13 +273,6 @@ _EXTRADEPEND: |
3041 |
- |
3042 |
- .if !target(install) |
3043 |
- |
3044 |
--.if defined(PRECIOUSLIB) |
3045 |
--.if !defined(NO_FSCHG) |
3046 |
--SHLINSTALLFLAGS+= -fschg |
3047 |
--.endif |
3048 |
--SHLINSTALLFLAGS+= -S |
3049 |
--.endif |
3050 |
-- |
3051 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
3052 |
- .for ie in ${INSTALLFLAGS_EDIT} |
3053 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
3054 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
3055 |
-index 19ad99f..46c4b09 100644 |
3056 |
---- a/share/mk/bsd.prog.mk |
3057 |
-+++ b/share/mk/bsd.prog.mk |
3058 |
-@@ -179,13 +179,6 @@ _EXTRADEPEND: |
3059 |
- |
3060 |
- .if !target(install) |
3061 |
- |
3062 |
--.if defined(PRECIOUSPROG) |
3063 |
--.if !defined(NO_FSCHG) |
3064 |
--INSTALLFLAGS+= -fschg |
3065 |
--.endif |
3066 |
--INSTALLFLAGS+= -S |
3067 |
--.endif |
3068 |
-- |
3069 |
- _INSTALLFLAGS:= ${INSTALLFLAGS} |
3070 |
- .for ie in ${INSTALLFLAGS_EDIT} |
3071 |
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} |
3072 |
|
3073 |
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 |
3074 |
deleted file mode 100644 |
3075 |
index cdc244d6e05..00000000000 |
3076 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch |
3077 |
+++ /dev/null |
3078 |
@@ -1,337 +0,0 @@ |
3079 |
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
3080 |
-index a8aa595..476b33b 100644 |
3081 |
---- a/share/mk/bsd.doc.mk |
3082 |
-+++ b/share/mk/bsd.doc.mk |
3083 |
-@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
3084 |
- realinstall: |
3085 |
- .if ${PRINTERDEVICE:Mhtml} |
3086 |
- cd ${SRCDIR}; \ |
3087 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
3088 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3089 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} |
3090 |
- .endif |
3091 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
3092 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
3093 |
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3094 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} |
3095 |
- .endfor |
3096 |
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
3097 |
-index 183cb1c..5b57594 100644 |
3098 |
---- a/share/mk/bsd.files.mk |
3099 |
-+++ b/share/mk/bsd.files.mk |
3100 |
-@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T} |
3101 |
- .endif |
3102 |
- installfiles-${group}: _${group}INS_${file:T} |
3103 |
- _${group}INS_${file:T}: ${file} |
3104 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
3105 |
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ |
3106 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
3107 |
- ${.ALLSRC} \ |
3108 |
-@@ -52,10 +53,12 @@ _${group}FILES+= ${file} |
3109 |
- installfiles-${group}: _${group}INS |
3110 |
- _${group}INS: ${_${group}FILES} |
3111 |
- .if defined(${group}NAME) |
3112 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
3113 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
3114 |
- -m ${${group}MODE} ${.ALLSRC} \ |
3115 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
3116 |
- .else |
3117 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
3118 |
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ |
3119 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} |
3120 |
- .endif |
3121 |
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
3122 |
-index b938221..6b98e72 100644 |
3123 |
---- a/share/mk/bsd.incs.mk |
3124 |
-+++ b/share/mk/bsd.incs.mk |
3125 |
-@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T} |
3126 |
- .endif |
3127 |
- installincludes: _${group}INS_${header:T} |
3128 |
- _${group}INS_${header:T}: ${header} |
3129 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
3130 |
-+ -g ${${group}GRP_${.ALLSRC:T}} \ |
3131 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
3132 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
3133 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
3134 |
- ${.ALLSRC} \ |
3135 |
-@@ -53,9 +56,13 @@ _${group}INCS+= ${header} |
3136 |
- installincludes: _${group}INS |
3137 |
- _${group}INS: ${_${group}INCS} |
3138 |
- .if defined(${group}NAME) |
3139 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
3140 |
-+ ${DESTDIR}${${group}DIR} |
3141 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
3142 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
3143 |
- .else |
3144 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
3145 |
-+ ${DESTDIR}${${group}DIR} |
3146 |
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
3147 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR} |
3148 |
- .endif |
3149 |
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
3150 |
-index 6275ce3..8d32289 100644 |
3151 |
---- a/share/mk/bsd.info.mk |
3152 |
-+++ b/share/mk/bsd.info.mk |
3153 |
-@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
3154 |
- TEX?= tex |
3155 |
- DVIPS?= dvips |
3156 |
- DVIPS2ASCII?= dvips2ascii |
3157 |
-+INSTALL?= install |
3158 |
- |
3159 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
3160 |
- |
3161 |
-@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
3162 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
3163 |
- ${x:S/$/-install/}: |
3164 |
- .if !empty(.MAKEFLAGS:M-j) |
3165 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
3166 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
3167 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
3168 |
-- --defsection=${INFOSECTION} \ |
3169 |
-- --defentry=${INFOENTRY_${x}} \ |
3170 |
-+ --section=${INFOSECTION} \ |
3171 |
-+ --entry=${INFOENTRY_${x}} \ |
3172 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
3173 |
- .else |
3174 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
3175 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
3176 |
-- --defsection=${INFOSECTION} \ |
3177 |
-- --defentry=${INFOENTRY_${x}} \ |
3178 |
-+ --section=${INFOSECTION} \ |
3179 |
-+ --entry=${INFOENTRY_${x}} \ |
3180 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
3181 |
- .endif |
3182 |
- .endfor |
3183 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
3184 |
-index c753afe..14f74aa 100644 |
3185 |
---- a/share/mk/bsd.lib.mk |
3186 |
-+++ b/share/mk/bsd.lib.mk |
3187 |
-@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
3188 |
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
3189 |
- CTFFLAGS+= -g |
3190 |
- .endif |
3191 |
--.else |
3192 |
--STRIP?= -s |
3193 |
- .endif |
3194 |
- |
3195 |
- .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ |
3196 |
-@@ -296,14 +294,17 @@ realinstall: _libinstall |
3197 |
- .ORDER: beforeinstall _libinstall |
3198 |
- _libinstall: |
3199 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
3200 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3201 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3202 |
- ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} |
3203 |
- .endif |
3204 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
3205 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3206 |
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3207 |
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} |
3208 |
- .endif |
3209 |
- .if defined(SHLIB_NAME) |
3210 |
-+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} |
3211 |
- ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3212 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
3213 |
- ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR} |
3214 |
-@@ -357,10 +358,12 @@ _libinstall: |
3215 |
- .endif # SHLIB_LINK |
3216 |
- .endif # SHIB_NAME |
3217 |
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
3218 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3219 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3220 |
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR} |
3221 |
- .endif |
3222 |
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
3223 |
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
3224 |
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3225 |
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} |
3226 |
- .endif |
3227 |
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
3228 |
-index c097c77..c2994d8 100644 |
3229 |
---- a/share/mk/bsd.libnames.mk |
3230 |
-+++ b/share/mk/bsd.libnames.mk |
3231 |
-@@ -51,7 +51,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
3232 |
- LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a |
3233 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
3234 |
- LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a |
3235 |
--LIBFL?= "don't use LIBFL, use LIBL" |
3236 |
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
3237 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
3238 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
3239 |
- LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a |
3240 |
-@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
3241 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
3242 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
3243 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
3244 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
3245 |
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
3246 |
- .if ${MK_LDNS} != "no" |
3247 |
- LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a |
3248 |
- .endif |
3249 |
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk |
3250 |
-index 574f0f5..b63b117 100644 |
3251 |
---- a/share/mk/bsd.links.mk |
3252 |
-+++ b/share/mk/bsd.links.mk |
3253 |
-@@ -15,6 +15,8 @@ _installlinks: |
3254 |
- t=${DESTDIR}$$1; \ |
3255 |
- shift; \ |
3256 |
- ${ECHO} $$t -\> $$l; \ |
3257 |
-+ d=`dirname $$t`; \ |
3258 |
-+ test -d $$d || mkdir $$d; \ |
3259 |
- ${INSTALL_LINK} $$l $$t; \ |
3260 |
- done; true |
3261 |
- .endif |
3262 |
-@@ -26,6 +28,8 @@ _installlinks: |
3263 |
- t=${DESTDIR}$$1; \ |
3264 |
- shift; \ |
3265 |
- ${ECHO} $$t -\> $$l; \ |
3266 |
-+ d=`dirname $$t`; \ |
3267 |
-+ test -d $$d || mkdir $$d; \ |
3268 |
- ${INSTALL_SYMLINK} $$l $$t; \ |
3269 |
- done; true |
3270 |
- .endif |
3271 |
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
3272 |
-index 0212d3a..6435936 100644 |
3273 |
---- a/share/mk/bsd.man.mk |
3274 |
-+++ b/share/mk/bsd.man.mk |
3275 |
-@@ -165,9 +165,11 @@ _maninstall: ${MAN} |
3276 |
- .if defined(NO_MANCOMPRESS) |
3277 |
- .if defined(MANFILTER) |
3278 |
- .for __page in ${MAN} |
3279 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} |
3280 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
3281 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
3282 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3283 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} |
3284 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
3285 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
3286 |
- .endif |
3287 |
-@@ -181,11 +183,14 @@ _maninstall: ${MAN} |
3288 |
- esac; \ |
3289 |
- page=$$1; shift; sect=$$1; shift; \ |
3290 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
3291 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
3292 |
-+ ${INSTALL} -d $${d}; \ |
3293 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
3294 |
- ${MINSTALL} $${page} $${d}; \ |
3295 |
- done |
3296 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3297 |
- .for __page in ${MAN} |
3298 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} |
3299 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
3300 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
3301 |
- .endfor |
3302 |
-@@ -193,9 +198,11 @@ _maninstall: ${MAN} |
3303 |
- .endif |
3304 |
- .else |
3305 |
- .for __page in ${MAN} |
3306 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} |
3307 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
3308 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
3309 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3310 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT} |
3311 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
3312 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
3313 |
- .endif |
3314 |
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
3315 |
-index 28255ea..2bc6546 100644 |
3316 |
---- a/share/mk/bsd.nls.mk |
3317 |
-+++ b/share/mk/bsd.nls.mk |
3318 |
-@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls |
3319 |
- # installation rules |
3320 |
- # |
3321 |
- .for file in ${NLS} |
3322 |
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
3323 |
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
3324 |
-+NLSNAME_${file:T}= ${NLSNAME}.cat |
3325 |
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
3326 |
- NLSLINKS+= ${file:R} |
3327 |
- .endif |
3328 |
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
3329 |
-index 73de02d..c6c30ca 100644 |
3330 |
---- a/share/mk/bsd.own.mk |
3331 |
-+++ b/share/mk/bsd.own.mk |
3332 |
-@@ -206,9 +206,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK} |
3333 |
- INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
3334 |
- |
3335 |
- # Common variables |
3336 |
--.if !defined(DEBUG_FLAGS) |
3337 |
--STRIP?= -s |
3338 |
--.endif |
3339 |
- |
3340 |
- COMPRESS_CMD?= gzip -cn |
3341 |
- COMPRESS_EXT?= .gz |
3342 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
3343 |
-index d6d0fa5..93a9046 100644 |
3344 |
---- a/share/mk/bsd.prog.mk |
3345 |
-+++ b/share/mk/bsd.prog.mk |
3346 |
-@@ -42,10 +42,6 @@ CTFFLAGS+= -g |
3347 |
- .endif |
3348 |
- .endif |
3349 |
- |
3350 |
--.if !defined(DEBUG_FLAGS) |
3351 |
--STRIP?= -s |
3352 |
--.endif |
3353 |
-- |
3354 |
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") |
3355 |
- LDFLAGS+= -static |
3356 |
- .endif |
3357 |
-@@ -200,6 +196,7 @@ realinstall: _proginstall |
3358 |
- .ORDER: beforeinstall _proginstall |
3359 |
- _proginstall: |
3360 |
- .if defined(PROG) |
3361 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
3362 |
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3363 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
3364 |
- .if ${MK_DEBUG_FILES} != "no" |
3365 |
-@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} |
3366 |
- SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
3367 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
3368 |
- _SCRIPTSINS_${script:T}: ${script} |
3369 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
3370 |
- ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
3371 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
3372 |
- ${.ALLSRC} \ |
3373 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
3374 |
-index fee6ccc..c2fe39a 100644 |
3375 |
---- a/share/mk/bsd.sys.mk |
3376 |
-+++ b/share/mk/bsd.sys.mk |
3377 |
-@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD} |
3378 |
- .if defined(WARNS) |
3379 |
- .if ${WARNS} >= 1 |
3380 |
- CWARNFLAGS+= -Wsystem-headers |
3381 |
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
3382 |
-- || !defined(NO_WERROR.clang)) |
3383 |
--CWARNFLAGS+= -Werror |
3384 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
3385 |
- .endif # WARNS >= 1 |
3386 |
- .if ${WARNS} >= 2 |
3387 |
- CWARNFLAGS+= -Wall -Wno-format-y2k |
3388 |
-@@ -102,10 +98,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
3389 |
- CWARNFLAGS+= -Wno-format-nonliteral |
3390 |
- .endif # WARNS <= 3 |
3391 |
- .endif # CLANG |
3392 |
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ |
3393 |
-- || !defined(NO_WERROR.clang)) |
3394 |
--CWARNFLAGS+= -Werror |
3395 |
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) |
3396 |
- .endif # WFORMAT > 0 |
3397 |
- .endif # WFORMAT |
3398 |
- .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang)) |
3399 |
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
3400 |
-index c270260..68491ce 100644 |
3401 |
---- a/share/mk/sys.mk |
3402 |
-+++ b/share/mk/sys.mk |
3403 |
-@@ -327,12 +327,6 @@ YFLAGS ?= -d |
3404 |
- rm -f ${.PREFIX}.tmp.c |
3405 |
- ${CTFCONVERT_CMD} |
3406 |
- |
3407 |
--# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. |
3408 |
--__MAKE_CONF?=/etc/make.conf |
3409 |
--.if exists(${__MAKE_CONF}) |
3410 |
--.include "${__MAKE_CONF}" |
3411 |
--.endif |
3412 |
-- |
3413 |
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) |
3414 |
- SHELL= ${__MAKE_SHELL} |
3415 |
- .SHELL: path=${__MAKE_SHELL} |
3416 |
|
3417 |
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 |
3418 |
deleted file mode 100644 |
3419 |
index e87bdbacd58..00000000000 |
3420 |
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch |
3421 |
+++ /dev/null |
3422 |
@@ -1,343 +0,0 @@ |
3423 |
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk |
3424 |
-index 9f4ea2c..0f666bf 100644 |
3425 |
---- a/share/mk/bsd.doc.mk |
3426 |
-+++ b/share/mk/bsd.doc.mk |
3427 |
-@@ -144,10 +144,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ |
3428 |
- realinstall: |
3429 |
- .if ${PRINTERDEVICE:Mhtml} |
3430 |
- cd ${SRCDIR}; \ |
3431 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
3432 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3433 |
- ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/ |
3434 |
- .endif |
3435 |
- .for _dev in ${PRINTERDEVICE:Nhtml} |
3436 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \ |
3437 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3438 |
- ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/ |
3439 |
- .endfor |
3440 |
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk |
3441 |
-index bc123e1..4707b84 100644 |
3442 |
---- a/share/mk/bsd.files.mk |
3443 |
-+++ b/share/mk/bsd.files.mk |
3444 |
-@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file} |
3445 |
- |
3446 |
- installfiles-${group}: _${group}INS_${file:T} |
3447 |
- _${group}INS_${file:T}: ${file} |
3448 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
3449 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ |
3450 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
3451 |
- ${.ALLSRC} \ |
3452 |
-@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES} |
3453 |
- installfiles-${group}: _${group}INS |
3454 |
- _${group}INS: ${_${group}FILES} |
3455 |
- .if defined(${group}NAME) |
3456 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} |
3457 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
3458 |
- -m ${${group}MODE} ${.ALLSRC} \ |
3459 |
- ${DESTDIR}${${group}DIR}/${${group}NAME} |
3460 |
- .else |
3461 |
-+ ${INSTALL} -d ${DESTDIR}${${group}DIR} |
3462 |
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ |
3463 |
- -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
3464 |
- .endif |
3465 |
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk |
3466 |
-index 9636e8c..fc2751a 100644 |
3467 |
---- a/share/mk/bsd.incs.mk |
3468 |
-+++ b/share/mk/bsd.incs.mk |
3469 |
-@@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T} |
3470 |
- |
3471 |
- installincludes: _${group}INS_${header:T} |
3472 |
- _${group}INS_${header:T}: ${header} |
3473 |
-+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ |
3474 |
-+ -g ${${group}GRP_${.ALLSRC:T}} \ |
3475 |
-+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} |
3476 |
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ |
3477 |
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ |
3478 |
- ${.ALLSRC} \ |
3479 |
-@@ -77,9 +80,13 @@ stage_includes: stage_files.${group} |
3480 |
- installincludes: _${group}INS |
3481 |
- _${group}INS: ${_${group}INCS} |
3482 |
- .if defined(${group}NAME) |
3483 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
3484 |
-+ ${DESTDIR}${${group}DIR} |
3485 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
3486 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} |
3487 |
- .else |
3488 |
-+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ |
3489 |
-+ ${DESTDIR}${${group}DIR} |
3490 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ |
3491 |
- ${.ALLSRC} ${DESTDIR}${${group}DIR}/ |
3492 |
- .endif |
3493 |
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk |
3494 |
-index 0544662..1a7aad7 100644 |
3495 |
---- a/share/mk/bsd.info.mk |
3496 |
-+++ b/share/mk/bsd.info.mk |
3497 |
-@@ -83,6 +83,7 @@ INFO2HTML?= info2html |
3498 |
- TEX?= tex |
3499 |
- DVIPS?= dvips |
3500 |
- DVIPS2ASCII?= dvips2ascii |
3501 |
-+INSTALL?= install |
3502 |
- |
3503 |
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html |
3504 |
- |
3505 |
-@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} |
3506 |
- INSTALLINFODIRS+= ${x:S/$/-install/} |
3507 |
- ${x:S/$/-install/}: |
3508 |
- .if !empty(.MAKEFLAGS:M-j) |
3509 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
3510 |
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ |
3511 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
3512 |
-- --defsection=${INFOSECTION} \ |
3513 |
-- --defentry=${INFOENTRY_${x}} \ |
3514 |
-+ --section=${INFOSECTION} \ |
3515 |
-+ --entry=${INFOENTRY_${x}} \ |
3516 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
3517 |
- .else |
3518 |
-+ ${INSTALL} -d ${DESTDIR}${INFODIR} |
3519 |
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \ |
3520 |
-- --defsection=${INFOSECTION} \ |
3521 |
-- --defentry=${INFOENTRY_${x}} \ |
3522 |
-+ --section=${INFOSECTION} \ |
3523 |
-+ --entry=${INFOENTRY_${x}} \ |
3524 |
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} |
3525 |
- .endif |
3526 |
- .endfor |
3527 |
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk |
3528 |
-index bd93e57..92df111 100644 |
3529 |
---- a/share/mk/bsd.lib.mk |
3530 |
-+++ b/share/mk/bsd.lib.mk |
3531 |
-@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS} |
3532 |
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" |
3533 |
- CTFFLAGS+= -g |
3534 |
- .endif |
3535 |
--.else |
3536 |
--STRIP?= -s |
3537 |
- .endif |
3538 |
- |
3539 |
- .if ${SHLIBDIR:M*lib32*} |
3540 |
-@@ -335,14 +333,17 @@ realinstall: _libinstall |
3541 |
- .ORDER: beforeinstall _libinstall |
3542 |
- _libinstall: |
3543 |
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" |
3544 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3545 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3546 |
- ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ |
3547 |
- .endif |
3548 |
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) |
3549 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3550 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3551 |
- ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/ |
3552 |
- .endif |
3553 |
- .if defined(SHLIB_NAME) |
3554 |
-+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR} |
3555 |
- ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3556 |
- ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ |
3557 |
- ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/ |
3558 |
-@@ -387,10 +388,12 @@ _libinstall: |
3559 |
- .endif # SHLIB_LINK |
3560 |
- .endif # SHIB_NAME |
3561 |
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" |
3562 |
-+ ${INSTALL} -d ${DESTDIR}${_LIBDIR} |
3563 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3564 |
- ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/ |
3565 |
- .endif |
3566 |
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) |
3567 |
-+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} |
3568 |
- ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ |
3569 |
- ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/ |
3570 |
- .endif |
3571 |
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk |
3572 |
-index 0844ae2..caec715 100644 |
3573 |
---- a/share/mk/bsd.libnames.mk |
3574 |
-+++ b/share/mk/bsd.libnames.mk |
3575 |
-@@ -63,7 +63,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a |
3576 |
- LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a |
3577 |
- LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a |
3578 |
- LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a |
3579 |
--LIBFL?= "don't use LIBFL, use LIBL" |
3580 |
-+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a |
3581 |
- LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a |
3582 |
- LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a |
3583 |
- LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a |
3584 |
-@@ -92,7 +92,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a |
3585 |
- LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a |
3586 |
- LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a |
3587 |
- LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a |
3588 |
--LIBL?= ${DESTDIR}${LIBDIR}/libl.a |
3589 |
-+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a |
3590 |
- LIBLN?= "don't use LIBLN, use LIBL" |
3591 |
- LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a |
3592 |
- LIBM?= ${DESTDIR}${LIBDIR}/libm.a |
3593 |
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk |
3594 |
-index 0c7d063..f5d1779 100644 |
3595 |
---- a/share/mk/bsd.links.mk |
3596 |
-+++ b/share/mk/bsd.links.mk |
3597 |
-@@ -16,9 +16,11 @@ afterinstall: _installlinks |
3598 |
- _installlinks: |
3599 |
- .for s t in ${LINKS} |
3600 |
- @${ECHO} "${t} -> ${s}" ;\ |
3601 |
-+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ |
3602 |
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} |
3603 |
- .endfor |
3604 |
- .for s t in ${SYMLINKS} |
3605 |
- @${ECHO} "${t} -> ${s}" ;\ |
3606 |
-+ test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\ |
3607 |
- ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t} |
3608 |
- .endfor |
3609 |
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk |
3610 |
-index 6f78501..bc9a1a6 100644 |
3611 |
---- a/share/mk/bsd.man.mk |
3612 |
-+++ b/share/mk/bsd.man.mk |
3613 |
-@@ -188,9 +188,11 @@ maninstall: ${MAN} |
3614 |
- .if ${MK_MANCOMPRESS} == "no" |
3615 |
- .if defined(MANFILTER) |
3616 |
- .for __page in ${MAN} |
3617 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
3618 |
- ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \ |
3619 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page} |
3620 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3621 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
3622 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ |
3623 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} |
3624 |
- .endif |
3625 |
-@@ -204,11 +206,14 @@ maninstall: ${MAN} |
3626 |
- esac; \ |
3627 |
- page=$$1; shift; sect=$$1; shift; \ |
3628 |
- d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ |
3629 |
-+ ${ECHO} ${INSTALL} -d $${d}; \ |
3630 |
-+ ${INSTALL} -d $${d}; \ |
3631 |
- ${ECHO} ${MINSTALL} $${page} $${d}; \ |
3632 |
- ${MINSTALL} $${page} $${d}; \ |
3633 |
- done |
3634 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3635 |
- .for __page in ${MAN} |
3636 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
3637 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ |
3638 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} |
3639 |
- .endfor |
3640 |
-@@ -216,9 +221,11 @@ maninstall: ${MAN} |
3641 |
- .endif # defined(MANFILTER) |
3642 |
- .else # ${MK_MANCOMPRESS} == "yes" |
3643 |
- .for __page in ${MAN} |
3644 |
-+ ${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR} |
3645 |
- ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \ |
3646 |
- ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/ |
3647 |
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) |
3648 |
-+ ${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT} |
3649 |
- ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ |
3650 |
- ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} |
3651 |
- .endif |
3652 |
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk |
3653 |
-index 87a7347..c860c97 100644 |
3654 |
---- a/share/mk/bsd.nls.mk |
3655 |
-+++ b/share/mk/bsd.nls.mk |
3656 |
-@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP} |
3657 |
- SYMLINKS+= ${NLSSYMLINKS} |
3658 |
- .endif |
3659 |
- .for file in ${NLS} |
3660 |
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat |
3661 |
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ |
3662 |
-+NLSNAME_${file:T}= ${NLSNAME}.cat |
3663 |
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) |
3664 |
- .if !empty(NLSLINKS_${file:R}:M${file:R}) |
3665 |
- .error NLSLINKS_${file:R} contains itself: ${file:R} |
3666 |
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk |
3667 |
-index c10e492..5984215 100644 |
3668 |
---- a/share/mk/bsd.own.mk |
3669 |
-+++ b/share/mk/bsd.own.mk |
3670 |
-@@ -233,9 +233,6 @@ INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} |
3671 |
- INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} |
3672 |
- |
3673 |
- # Common variables |
3674 |
--.if !defined(DEBUG_FLAGS) |
3675 |
--STRIP?= -s |
3676 |
--.endif |
3677 |
- |
3678 |
- COMPRESS_CMD?= gzip -cn |
3679 |
- COMPRESS_EXT?= .gz |
3680 |
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk |
3681 |
-index f1a5c65..3b1ecf8 100644 |
3682 |
---- a/share/mk/bsd.prog.mk |
3683 |
-+++ b/share/mk/bsd.prog.mk |
3684 |
-@@ -44,10 +44,6 @@ CTFFLAGS+= -g |
3685 |
- .endif |
3686 |
- .endif |
3687 |
- |
3688 |
--.if !defined(DEBUG_FLAGS) |
3689 |
--STRIP?= -s |
3690 |
--.endif |
3691 |
-- |
3692 |
- .if defined(NO_ROOT) |
3693 |
- .if !defined(TAGS) || ! ${TAGS:Mpackage=*} |
3694 |
- TAGS+= package=${PACKAGE:Uruntime} |
3695 |
-@@ -217,6 +213,7 @@ realinstall: _proginstall |
3696 |
- .ORDER: beforeinstall _proginstall |
3697 |
- _proginstall: |
3698 |
- .if defined(PROG) |
3699 |
-+ ${INSTALL} -d ${DESTDIR}${BINDIR} |
3700 |
- ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |
3701 |
- ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} |
3702 |
- .if ${MK_DEBUG_FILES} != "no" |
3703 |
-@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} |
3704 |
- STAGE_AS_${script:T}= ${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}} |
3705 |
- _scriptsinstall: _SCRIPTSINS_${script:T} |
3706 |
- _SCRIPTSINS_${script:T}: ${script} |
3707 |
-+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} |
3708 |
- ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ |
3709 |
- -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ |
3710 |
- ${.ALLSRC} \ |
3711 |
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk |
3712 |
-index 0ae45c5..37c4d01 100644 |
3713 |
---- a/share/mk/bsd.sys.mk |
3714 |
-+++ b/share/mk/bsd.sys.mk |
3715 |
-@@ -29,9 +29,6 @@ CFLAGS+= -std=${CSTD} |
3716 |
- .if defined(WARNS) |
3717 |
- .if ${WARNS} >= 1 |
3718 |
- CWARNFLAGS+= -Wsystem-headers |
3719 |
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
3720 |
--CWARNFLAGS+= -Werror |
3721 |
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
3722 |
- .endif # WARNS >= 1 |
3723 |
- .if ${WARNS} >= 2 |
3724 |
- CWARNFLAGS+= -Wall -Wno-format-y2k |
3725 |
-@@ -100,9 +97,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args |
3726 |
- .if ${WARNS} <= 3 |
3727 |
- CWARNFLAGS.clang+= -Wno-format-nonliteral |
3728 |
- .endif # WARNS <= 3 |
3729 |
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE}) |
3730 |
--CWARNFLAGS+= -Werror |
3731 |
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE} |
3732 |
- .endif # WFORMAT > 0 |
3733 |
- .endif # WFORMAT |
3734 |
- .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE}) |
3735 |
-@@ -151,6 +145,13 @@ CFLAGS.clang+= -fno-dwarf2-cfi-asm |
3736 |
- # but not yet. |
3737 |
- CXXFLAGS.clang+= -Wno-c++11-extensions |
3738 |
- |
3739 |
-+.if ${MK_SSP} == "no" |
3740 |
-+# gcc-4.9, -fstack-protector-strong is enabled by default. |
3741 |
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698. |
3742 |
-+SSP_CFLAGS?= -fno-stack-protector |
3743 |
-+CFLAGS+= ${SSP_CFLAGS} |
3744 |
-+.endif |
3745 |
-+ |
3746 |
- .if ${MK_SSP} != "no" && \ |
3747 |
- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" |
3748 |
- .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \ |
3749 |
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk |
3750 |
-index 5cfd0bb..25abf8e 100644 |
3751 |
---- a/share/mk/sys.mk |
3752 |
-+++ b/share/mk/sys.mk |
3753 |
-@@ -418,12 +418,6 @@ YFLAGS ?= -d |
3754 |
- rm -f ${.PREFIX}.tmp.c |
3755 |
- ${CTFCONVERT_CMD} |
3756 |
- |
3757 |
--# Pull in global settings. |
3758 |
--__MAKE_CONF?=/etc/make.conf |
3759 |
--.if exists(${__MAKE_CONF}) |
3760 |
--.include "${__MAKE_CONF}" |
3761 |
--.endif |
3762 |
-- |
3763 |
- # late include for customization |
3764 |
- .sinclude <local.sys.mk> |
3765 |
- |
3766 |
|
3767 |
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 |
3768 |
deleted file mode 100644 |
3769 |
index fdbdef6957b..00000000000 |
3770 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild |
3771 |
+++ /dev/null |
3772 |
@@ -1,41 +0,0 @@ |
3773 |
-# Copyright 1999-2016 Gentoo Foundation |
3774 |
-# Distributed under the terms of the GNU General Public License v2 |
3775 |
- |
3776 |
-EAPI=5 |
3777 |
- |
3778 |
-inherit bsdmk freebsd |
3779 |
- |
3780 |
-DESCRIPTION="Makefile definitions used for building and installing libraries and system files" |
3781 |
-SLOT="0" |
3782 |
- |
3783 |
-IUSE="userland_GNU" |
3784 |
- |
3785 |
-if [[ ${PV} != *9999* ]]; then |
3786 |
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
3787 |
-fi |
3788 |
- |
3789 |
-EXTRACTONLY="share/" |
3790 |
- |
3791 |
-RDEPEND="" |
3792 |
-DEPEND="" |
3793 |
- |
3794 |
-RESTRICT="strip" |
3795 |
- |
3796 |
-S="${WORKDIR}/share/mk" |
3797 |
- |
3798 |
-src_prepare() { |
3799 |
- epatch "${FILESDIR}/${PN}-10.3-gentoo.patch" |
3800 |
- epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch" |
3801 |
- use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch" |
3802 |
-} |
3803 |
- |
3804 |
-src_compile() { :; } |
3805 |
- |
3806 |
-src_install() { |
3807 |
- if [[ ${CHOST} != *-freebsd* ]]; then |
3808 |
- insinto /usr/share/mk/freebsd |
3809 |
- else |
3810 |
- insinto /usr/share/mk |
3811 |
- fi |
3812 |
- doins *.mk *.awk |
3813 |
-} |
3814 |
|
3815 |
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 |
3816 |
deleted file mode 100644 |
3817 |
index 85da1616d6c..00000000000 |
3818 |
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild |
3819 |
+++ /dev/null |
3820 |
@@ -1,54 +0,0 @@ |
3821 |
-# Copyright 1999-2016 Gentoo Foundation |
3822 |
-# Distributed under the terms of the GNU General Public License v2 |
3823 |
- |
3824 |
-EAPI=5 |
3825 |
- |
3826 |
-inherit bsdmk freebsd |
3827 |
- |
3828 |
-DESCRIPTION="Makefile definitions used for building and installing libraries and system files" |
3829 |
-SLOT="0" |
3830 |
- |
3831 |
-IUSE="userland_GNU" |
3832 |
- |
3833 |
-if [[ ${PV} != *9999* ]]; then |
3834 |
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
3835 |
-fi |
3836 |
- |
3837 |
-EXTRACTONLY="share/" |
3838 |
- |
3839 |
-RDEPEND="" |
3840 |
-DEPEND="" |
3841 |
- |
3842 |
-RESTRICT="strip" |
3843 |
- |
3844 |
-S="${WORKDIR}/share/mk" |
3845 |
- |
3846 |
-src_prepare() { |
3847 |
- local installdir |
3848 |
- |
3849 |
- epatch "${FILESDIR}/${PN}-11.0-gentoo.patch" |
3850 |
- epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
3851 |
- epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch" |
3852 |
- epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch" |
3853 |
- use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch" |
3854 |
- |
3855 |
- if [[ ${CHOST} != *-freebsd* ]]; then |
3856 |
- installdir="/usr/share/mk/freebsd" |
3857 |
- else |
3858 |
- installdir="/usr/share/mk" |
3859 |
- fi |
3860 |
- |
3861 |
- sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die |
3862 |
-} |
3863 |
- |
3864 |
-src_compile() { :; } |
3865 |
- |
3866 |
-src_install() { |
3867 |
- freebsd_src_install |
3868 |
- if [[ ${CHOST} != *-freebsd* ]]; then |
3869 |
- insinto /usr/share/mk/freebsd/system |
3870 |
- else |
3871 |
- insinto /usr/share/mk/system |
3872 |
- fi |
3873 |
- doins *.mk *.awk |
3874 |
-} |
3875 |
|
3876 |
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest |
3877 |
index 61d7fcc5778..1de61948401 100644 |
3878 |
--- a/sys-freebsd/freebsd-pam-modules/Manifest |
3879 |
+++ b/sys-freebsd/freebsd-pam-modules/Manifest |
3880 |
@@ -1,5 +1,3 @@ |
3881 |
DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 |
3882 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
3883 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
3884 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
3885 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
3886 |
|
3887 |
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 |
3888 |
deleted file mode 100644 |
3889 |
index 3289409bc5c..00000000000 |
3890 |
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild |
3891 |
+++ /dev/null |
3892 |
@@ -1,47 +0,0 @@ |
3893 |
-# Copyright 1999-2016 Gentoo Foundation |
3894 |
-# Distributed under the terms of the GNU General Public License v2 |
3895 |
- |
3896 |
-EAPI=5 |
3897 |
- |
3898 |
-inherit bsdmk freebsd multilib pam |
3899 |
- |
3900 |
-DESCRIPTION="FreeBSD's PAM authentication modules" |
3901 |
-SLOT="0" |
3902 |
- |
3903 |
-IUSE="kerberos nis" |
3904 |
- |
3905 |
-if [[ ${PV} != *9999* ]]; then |
3906 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
3907 |
-fi |
3908 |
- |
3909 |
-EXTRACTONLY="lib/" |
3910 |
- |
3911 |
-RDEPEND=">=sys-auth/openpam-20050201-r1 |
3912 |
- kerberos? ( dev-libs/openssl:0= |
3913 |
- virtual/krb5 )" |
3914 |
-DEPEND="${RDEPEND} |
3915 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
3916 |
- =sys-freebsd/freebsd-sources-${RV}*" |
3917 |
- |
3918 |
-S=${WORKDIR}/lib/libpam/modules |
3919 |
- |
3920 |
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch ) |
3921 |
- |
3922 |
-pkg_setup() { |
3923 |
- # Avoid installing pam_ssh as that has its own ebuild. |
3924 |
- mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " |
3925 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " |
3926 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
3927 |
-} |
3928 |
- |
3929 |
-src_prepare() { |
3930 |
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do |
3931 |
- sed -i -e "s:${module}::" "${S}"/modules.inc || die |
3932 |
- done |
3933 |
-} |
3934 |
- |
3935 |
-src_install() { |
3936 |
- mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed" |
3937 |
- |
3938 |
- dodoc "${FILESDIR}/README.pamd" |
3939 |
-} |
3940 |
|
3941 |
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 |
3942 |
deleted file mode 100644 |
3943 |
index 3d4ceae6b8d..00000000000 |
3944 |
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild |
3945 |
+++ /dev/null |
3946 |
@@ -1,45 +0,0 @@ |
3947 |
-# Copyright 1999-2016 Gentoo Foundation |
3948 |
-# Distributed under the terms of the GNU General Public License v2 |
3949 |
- |
3950 |
-EAPI=5 |
3951 |
- |
3952 |
-inherit bsdmk freebsd multilib pam |
3953 |
- |
3954 |
-DESCRIPTION="FreeBSD's PAM authentication modules" |
3955 |
-SLOT="0" |
3956 |
- |
3957 |
-IUSE="kerberos nis" |
3958 |
- |
3959 |
-if [[ ${PV} != *9999* ]]; then |
3960 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
3961 |
-fi |
3962 |
- |
3963 |
-EXTRACTONLY="lib/" |
3964 |
- |
3965 |
-RDEPEND=">=sys-auth/openpam-20050201-r1 |
3966 |
- kerberos? ( dev-libs/openssl:0= |
3967 |
- virtual/krb5 )" |
3968 |
-DEPEND="${RDEPEND} |
3969 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
3970 |
- =sys-freebsd/freebsd-sources-${RV}*" |
3971 |
- |
3972 |
-S=${WORKDIR}/lib/libpam/modules |
3973 |
- |
3974 |
-pkg_setup() { |
3975 |
- # Avoid installing pam_ssh as that has its own ebuild. |
3976 |
- mymakeopts="${mymakeopts} WITHOUT_OPENSSH= " |
3977 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= " |
3978 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
3979 |
-} |
3980 |
- |
3981 |
-src_prepare() { |
3982 |
- for module in pam_deny pam_passwdqc pam_permit pam_krb5; do |
3983 |
- sed -i -e "s:${module}::" "${S}"/modules.inc || die |
3984 |
- done |
3985 |
-} |
3986 |
- |
3987 |
-src_install() { |
3988 |
- freebsd_src_install "LIBDIR=/$(get_libdir)/security" |
3989 |
- |
3990 |
- dodoc "${FILESDIR}/README.pamd" |
3991 |
-} |
3992 |
|
3993 |
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest |
3994 |
index d0fc2d5d8a9..bb73276d6d7 100644 |
3995 |
--- a/sys-freebsd/freebsd-pf/Manifest |
3996 |
+++ b/sys-freebsd/freebsd-pf/Manifest |
3997 |
@@ -4,8 +4,6 @@ DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e41 |
3998 |
DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314 |
3999 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
4000 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
4001 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
4002 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
4003 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
4004 |
DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 |
4005 |
DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca |
4006 |
|
4007 |
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 |
4008 |
deleted file mode 100644 |
4009 |
index 57474ea31df..00000000000 |
4010 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch |
4011 |
+++ /dev/null |
4012 |
@@ -1,16 +0,0 @@ |
4013 |
-diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
4014 |
-index de49888..2ab32fb 100644 |
4015 |
---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
4016 |
-+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile |
4017 |
-@@ -7,10 +7,7 @@ MAN= ftp-proxy.8 |
4018 |
- |
4019 |
- SRCS= ftp-proxy.c filter.c |
4020 |
- |
4021 |
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent |
4022 |
-- |
4023 |
--LDADD+= ${LIBEVENT} |
4024 |
--DPADD+= ${LIBEVENT} |
4025 |
-+LDADD+= -levent |
4026 |
- |
4027 |
- WARNS?= 3 |
4028 |
- |
4029 |
|
4030 |
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 |
4031 |
deleted file mode 100644 |
4032 |
index 1316d3be832..00000000000 |
4033 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch |
4034 |
+++ /dev/null |
4035 |
@@ -1,15 +0,0 @@ |
4036 |
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile |
4037 |
-index fcff8eb..0da383d 100644 |
4038 |
---- a/sbin/pflogd/Makefile |
4039 |
-+++ b/sbin/pflogd/Makefile |
4040 |
-@@ -6,10 +6,7 @@ PROG= pflogd |
4041 |
- SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
4042 |
- MAN= pflogd.8 |
4043 |
- |
4044 |
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
4045 |
-- |
4046 |
- LDADD= -lpcap |
4047 |
--DPADD= ${LIBPCAP} |
4048 |
- |
4049 |
- WARNS?= 2 |
4050 |
- |
4051 |
|
4052 |
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 |
4053 |
deleted file mode 100644 |
4054 |
index 0f3ecb1fc61..00000000000 |
4055 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch |
4056 |
+++ /dev/null |
4057 |
@@ -1,13 +0,0 @@ |
4058 |
-diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile |
4059 |
-index 941505f..df5ccb2 100644 |
4060 |
---- a/usr.sbin/ftp-proxy/Makefile |
4061 |
-+++ b/usr.sbin/ftp-proxy/Makefile |
4062 |
-@@ -7,8 +7,6 @@ MAN= ftp-proxy.8 |
4063 |
- |
4064 |
- SRCS= ftp-proxy.c filter.c |
4065 |
- |
4066 |
--CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent |
4067 |
-- |
4068 |
- LIBADD= event |
4069 |
- |
4070 |
- WARNS?= 3 |
4071 |
|
4072 |
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 |
4073 |
deleted file mode 100644 |
4074 |
index 6435280b7e9..00000000000 |
4075 |
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch |
4076 |
+++ /dev/null |
4077 |
@@ -1,13 +0,0 @@ |
4078 |
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile |
4079 |
-index b3822dd..5912ad2 100644 |
4080 |
---- a/sbin/pflogd/Makefile |
4081 |
-+++ b/sbin/pflogd/Makefile |
4082 |
-@@ -7,8 +7,6 @@ PROG= pflogd |
4083 |
- SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c |
4084 |
- MAN= pflogd.8 |
4085 |
- |
4086 |
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h |
4087 |
-- |
4088 |
- LIBADD= pcap |
4089 |
- |
4090 |
- WARNS?= 2 |
4091 |
|
4092 |
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild |
4093 |
deleted file mode 100644 |
4094 |
index e0a26d65e2f..00000000000 |
4095 |
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild |
4096 |
+++ /dev/null |
4097 |
@@ -1,72 +0,0 @@ |
4098 |
-# Copyright 1999-2016 Gentoo Foundation |
4099 |
-# Distributed under the terms of the GNU General Public License v2 |
4100 |
- |
4101 |
-EAPI=5 |
4102 |
- |
4103 |
-inherit bsdmk freebsd user |
4104 |
- |
4105 |
-DESCRIPTION="FreeBSD's base system libraries" |
4106 |
-SLOT="0" |
4107 |
- |
4108 |
-IUSE="" |
4109 |
- |
4110 |
-# Crypto is needed to have an internal OpenSSL header |
4111 |
-if [[ ${PV} != *9999* ]]; then |
4112 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
4113 |
-fi |
4114 |
- |
4115 |
-EXTRACTONLY=" |
4116 |
- usr.sbin/ |
4117 |
- sbin/ |
4118 |
- contrib/pf/ |
4119 |
- etc/ |
4120 |
-" |
4121 |
- |
4122 |
-RDEPEND="net-libs/libpcap" |
4123 |
-DEPEND="${RDEPEND} |
4124 |
- dev-libs/libevent |
4125 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
4126 |
- =sys-freebsd/freebsd-sources-${RV}*" |
4127 |
- |
4128 |
-S="${WORKDIR}" |
4129 |
- |
4130 |
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy" |
4131 |
- |
4132 |
-pkg_setup() { |
4133 |
- enewgroup authpf 63 |
4134 |
- mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= " |
4135 |
-} |
4136 |
- |
4137 |
-src_prepare() { |
4138 |
- # pcap-int.h redefines snprintf as pcap_snprintf |
4139 |
- epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" |
4140 |
- # Use system's libevent |
4141 |
- epatch "${FILESDIR}/${PN}-10.0-libevent.patch" |
4142 |
- epatch "${FILESDIR}/${PN}-10.0-pflogd.patch" |
4143 |
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch" |
4144 |
- epatch "${FILESDIR}/${PN}-9.0-getline.patch" |
4145 |
- # Link in kernel sources |
4146 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
4147 |
-} |
4148 |
- |
4149 |
-src_compile() { |
4150 |
- for dir in ${SUBDIRS}; do |
4151 |
- einfo "Starting make in ${dir}" |
4152 |
- cd "${S}/${dir}" || die |
4153 |
- mkmake || die "Make ${dir} failed" |
4154 |
- done |
4155 |
-} |
4156 |
- |
4157 |
-src_install() { |
4158 |
- for dir in ${SUBDIRS}; do |
4159 |
- einfo "Starting install in ${dir}" |
4160 |
- cd "${S}/${dir}" || die |
4161 |
- mkinstall || die "Install ${dir} failed" |
4162 |
- done |
4163 |
- |
4164 |
- cd "${WORKDIR}"/etc |
4165 |
- insinto /etc |
4166 |
- doins pf.os |
4167 |
- # pf.initd provided by openrc, but no pf.confd |
4168 |
- newconfd "${FILESDIR}/pf.confd" pf |
4169 |
-} |
4170 |
|
4171 |
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
4172 |
deleted file mode 100644 |
4173 |
index 49e2f293e51..00000000000 |
4174 |
--- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild |
4175 |
+++ /dev/null |
4176 |
@@ -1,70 +0,0 @@ |
4177 |
-# Copyright 1999-2016 Gentoo Foundation |
4178 |
-# Distributed under the terms of the GNU General Public License v2 |
4179 |
- |
4180 |
-EAPI=5 |
4181 |
- |
4182 |
-inherit bsdmk freebsd user |
4183 |
- |
4184 |
-DESCRIPTION="FreeBSD's base system libraries" |
4185 |
-SLOT="0" |
4186 |
- |
4187 |
-IUSE="" |
4188 |
- |
4189 |
-# Crypto is needed to have an internal OpenSSL header |
4190 |
-if [[ ${PV} != *9999* ]]; then |
4191 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
4192 |
-fi |
4193 |
- |
4194 |
-EXTRACTONLY=" |
4195 |
- usr.sbin/ |
4196 |
- sbin/ |
4197 |
- contrib/pf/ |
4198 |
- etc/ |
4199 |
-" |
4200 |
- |
4201 |
-RDEPEND="net-libs/libpcap" |
4202 |
-DEPEND="${RDEPEND} |
4203 |
- dev-libs/libevent |
4204 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
4205 |
- =sys-freebsd/freebsd-sources-${RV}*" |
4206 |
- |
4207 |
-S="${WORKDIR}" |
4208 |
- |
4209 |
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy" |
4210 |
- |
4211 |
-pkg_setup() { |
4212 |
- enewgroup authpf 63 |
4213 |
-} |
4214 |
- |
4215 |
-src_prepare() { |
4216 |
- # pcap-int.h redefines snprintf as pcap_snprintf |
4217 |
- epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch" |
4218 |
- # Use system's libevent |
4219 |
- epatch "${FILESDIR}/${PN}-11.0-libevent.patch" |
4220 |
- epatch "${FILESDIR}/${PN}-11.0-pflogd.patch" |
4221 |
- epatch "${FILESDIR}/${PN}-9.0-bpf.patch" |
4222 |
- # Link in kernel sources |
4223 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
4224 |
-} |
4225 |
- |
4226 |
-src_compile() { |
4227 |
- for dir in ${SUBDIRS}; do |
4228 |
- einfo "Starting make in ${dir}" |
4229 |
- cd "${S}/${dir}" || die |
4230 |
- freebsd_src_compile || die "Make ${dir} failed" |
4231 |
- done |
4232 |
-} |
4233 |
- |
4234 |
-src_install() { |
4235 |
- for dir in ${SUBDIRS}; do |
4236 |
- einfo "Starting install in ${dir}" |
4237 |
- cd "${S}/${dir}" || die |
4238 |
- freebsd_src_install || die "Install ${dir} failed" |
4239 |
- done |
4240 |
- |
4241 |
- cd "${WORKDIR}"/etc |
4242 |
- insinto /etc |
4243 |
- doins pf.os |
4244 |
- # pf.initd provided by openrc, but no pf.confd |
4245 |
- newconfd "${FILESDIR}/pf.confd" pf |
4246 |
-} |
4247 |
|
4248 |
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest |
4249 |
index b9e8a5035d0..0b7477a90e2 100644 |
4250 |
--- a/sys-freebsd/freebsd-rescue/Manifest |
4251 |
+++ b/sys-freebsd/freebsd-rescue/Manifest |
4252 |
@@ -14,8 +14,6 @@ DIST freebsd-rescue-8.2.tar.bz2 5041 BLAKE2B bb75f3e71db9e81397d230f1bb604f20704 |
4253 |
DIST freebsd-rescue-9.1.tar.bz2 3939 BLAKE2B f2756276c6018ded0e9b0f73bff25a606193c9da3e5348aefda3866308c3fb2ce046e35de6020dd0b28e0457b61a4864600ae40fa51042a64d93c712f9d85858 SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb |
4254 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
4255 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
4256 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
4257 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
4258 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
4259 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
4260 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
4261 |
|
4262 |
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild |
4263 |
deleted file mode 100644 |
4264 |
index a7e52e525ef..00000000000 |
4265 |
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild |
4266 |
+++ /dev/null |
4267 |
@@ -1,81 +0,0 @@ |
4268 |
-# Copyright 1999-2016 Gentoo Foundation |
4269 |
-# Distributed under the terms of the GNU General Public License v2 |
4270 |
- |
4271 |
-EAPI=5 |
4272 |
- |
4273 |
-inherit bsdmk freebsd toolchain-funcs |
4274 |
- |
4275 |
-DESCRIPTION="FreeBSD's rescue binaries" |
4276 |
-SLOT="0" |
4277 |
-LICENSE="BSD zfs? ( CDDL )" |
4278 |
- |
4279 |
-IUSE="atm netware nis zfs" |
4280 |
- |
4281 |
-if [[ ${PV} != *9999* ]]; then |
4282 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
4283 |
-fi |
4284 |
- |
4285 |
-EXTRACTONLY=" |
4286 |
- usr.bin/ |
4287 |
- contrib/ |
4288 |
- lib/ |
4289 |
- bin/ |
4290 |
- sbin/ |
4291 |
- usr.sbin/ |
4292 |
- gnu/ |
4293 |
- sys/ |
4294 |
- libexec/ |
4295 |
- rescue/ |
4296 |
-" |
4297 |
- |
4298 |
-RDEPEND="" |
4299 |
-DEPEND="sys-devel/flex |
4300 |
- app-arch/xz-utils[static-libs] |
4301 |
- sys-libs/ncurses[static-libs] |
4302 |
- dev-libs/expat[static-libs] |
4303 |
- app-arch/bzip2[static-libs] |
4304 |
- dev-libs/libedit[static-libs] |
4305 |
- dev-libs/libxml2:2[static-libs] |
4306 |
- dev-libs/openssl:0=[static-libs] |
4307 |
- sys-libs/zlib[static-libs] |
4308 |
- sys-libs/readline[static-libs] |
4309 |
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] |
4310 |
- =sys-freebsd/freebsd-sources-${RV}* |
4311 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
4312 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" |
4313 |
- |
4314 |
-S="${WORKDIR}/rescue" |
4315 |
- |
4316 |
-pkg_setup() { |
4317 |
- # Add the required source files. |
4318 |
- use zfs && EXTRACTONLY+="cddl/ " |
4319 |
- |
4320 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
4321 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " |
4322 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
4323 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
4324 |
- mymakeopts="${mymakeopts} NO_PIC= " |
4325 |
-} |
4326 |
- |
4327 |
-src_prepare() { |
4328 |
- # As they are patches from ${WORKDIR} apply them by hand |
4329 |
- cd "${WORKDIR}" || die |
4330 |
- epatch "${FILESDIR}/${PN}"-10.0-zlib.patch |
4331 |
- epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch" |
4332 |
- epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" |
4333 |
-} |
4334 |
- |
4335 |
-src_compile() { |
4336 |
- tc-export CC |
4337 |
- # crunchgen is now checks env MAKE. |
4338 |
- # Use to force BSD's make |
4339 |
- export MAKE=/usr/bin/make |
4340 |
- |
4341 |
- cd "${WORKDIR}/lib/libarchive" || die |
4342 |
- echo "#include <expat.h>" > bsdxml.h |
4343 |
- freebsd_src_compile |
4344 |
- export CC="${CC} -L${WORKDIR}/lib/libarchive" |
4345 |
- |
4346 |
- cd "${S}" || die |
4347 |
- freebsd_src_compile |
4348 |
-} |
4349 |
|
4350 |
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
4351 |
deleted file mode 100644 |
4352 |
index 4f35e4425b1..00000000000 |
4353 |
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild |
4354 |
+++ /dev/null |
4355 |
@@ -1,84 +0,0 @@ |
4356 |
-# Copyright 1999-2016 Gentoo Foundation |
4357 |
-# Distributed under the terms of the GNU General Public License v2 |
4358 |
- |
4359 |
-EAPI=5 |
4360 |
- |
4361 |
-inherit bsdmk freebsd toolchain-funcs |
4362 |
- |
4363 |
-DESCRIPTION="FreeBSD's rescue binaries" |
4364 |
-SLOT="0" |
4365 |
-LICENSE="BSD zfs? ( CDDL )" |
4366 |
- |
4367 |
-IUSE="atm netware nis zfs" |
4368 |
- |
4369 |
-if [[ ${PV} != *9999* ]]; then |
4370 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
4371 |
-fi |
4372 |
- |
4373 |
-EXTRACTONLY=" |
4374 |
- usr.bin/ |
4375 |
- contrib/ |
4376 |
- lib/ |
4377 |
- bin/ |
4378 |
- sbin/ |
4379 |
- usr.sbin/ |
4380 |
- gnu/ |
4381 |
- sys/ |
4382 |
- libexec/ |
4383 |
- rescue/ |
4384 |
-" |
4385 |
- |
4386 |
-RDEPEND="" |
4387 |
-DEPEND="sys-devel/flex |
4388 |
- app-arch/xz-utils[static-libs] |
4389 |
- sys-libs/ncurses[static-libs] |
4390 |
- dev-libs/expat[static-libs] |
4391 |
- app-arch/bzip2[static-libs] |
4392 |
- dev-libs/libedit[static-libs] |
4393 |
- dev-libs/libxml2:2[static-libs] |
4394 |
- dev-libs/openssl:0=[static-libs] |
4395 |
- sys-libs/zlib[static-libs] |
4396 |
- sys-libs/readline[static-libs] |
4397 |
- =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?] |
4398 |
- =sys-freebsd/freebsd-sources-${RV}* |
4399 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
4400 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )" |
4401 |
- |
4402 |
-S="${WORKDIR}/rescue" |
4403 |
- |
4404 |
-pkg_setup() { |
4405 |
- # Add the required source files. |
4406 |
- use zfs && EXTRACTONLY+="cddl/ " |
4407 |
- |
4408 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
4409 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= " |
4410 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
4411 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
4412 |
- mymakeopts="${mymakeopts} NO_PIC= " |
4413 |
-} |
4414 |
- |
4415 |
-src_prepare() { |
4416 |
- # As they are patches from ${WORKDIR} apply them by hand |
4417 |
- cd "${WORKDIR}" || die |
4418 |
- epatch "${FILESDIR}/${PN}-10.0-zlib.patch" |
4419 |
- epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch" |
4420 |
- epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch" |
4421 |
-} |
4422 |
- |
4423 |
-src_compile() { |
4424 |
- export ESED=/usr/bin/sed |
4425 |
- unalias sed |
4426 |
- |
4427 |
- tc-export CC |
4428 |
- # crunchgen is now checks env MAKE. |
4429 |
- # Use to force BSD's make |
4430 |
- export MAKE=/usr/bin/make |
4431 |
- |
4432 |
- cd "${WORKDIR}/lib/libarchive" || die |
4433 |
- echo "#include <expat.h>" > bsdxml.h |
4434 |
- freebsd_src_compile |
4435 |
- export CC="${CC} -L${WORKDIR}/lib/libarchive" |
4436 |
- |
4437 |
- cd "${S}" || die |
4438 |
- freebsd_src_compile |
4439 |
-} |
4440 |
|
4441 |
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest |
4442 |
index 96121308fd4..d9b2f36fba7 100644 |
4443 |
--- a/sys-freebsd/freebsd-sbin/Manifest |
4444 |
+++ b/sys-freebsd/freebsd-sbin/Manifest |
4445 |
@@ -8,8 +8,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4 |
4446 |
DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 |
4447 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
4448 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
4449 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
4450 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
4451 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
4452 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
4453 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
4454 |
|
4455 |
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild |
4456 |
deleted file mode 100644 |
4457 |
index 99c4a3b6aed..00000000000 |
4458 |
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild |
4459 |
+++ /dev/null |
4460 |
@@ -1,100 +0,0 @@ |
4461 |
-# Copyright 1999-2016 Gentoo Foundation |
4462 |
-# Distributed under the terms of the GNU General Public License v2 |
4463 |
- |
4464 |
-EAPI=5 |
4465 |
- |
4466 |
-inherit bsdmk freebsd multilib |
4467 |
- |
4468 |
-DESCRIPTION="FreeBSD sbin utils" |
4469 |
-SLOT="0" |
4470 |
- |
4471 |
-if [[ ${PV} != *9999* ]]; then |
4472 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
4473 |
-fi |
4474 |
- |
4475 |
-EXTRACTONLY=" |
4476 |
- sbin/ |
4477 |
- contrib/ |
4478 |
- lib/ |
4479 |
- libexec/ |
4480 |
- usr.sbin/ |
4481 |
- etc/ |
4482 |
-" |
4483 |
- |
4484 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] |
4485 |
- =sys-freebsd/freebsd-libexec-${RV}* |
4486 |
- >=dev-libs/expat-2.0.1 |
4487 |
- ssl? ( dev-libs/openssl:0= ) |
4488 |
- >=dev-libs/libedit-20120311.3.0-r1 |
4489 |
- sys-libs/readline:0= |
4490 |
- || ( |
4491 |
- sys-process/cronie |
4492 |
- sys-process/vixie-cron |
4493 |
- ) |
4494 |
- atm? ( net-analyzer/bsnmp )" |
4495 |
-DEPEND="${RDEPEND} |
4496 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
4497 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
4498 |
- |
4499 |
-S="${WORKDIR}/sbin" |
4500 |
- |
4501 |
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" |
4502 |
- |
4503 |
-pkg_setup() { |
4504 |
- # Add the required source files. |
4505 |
- use build && EXTRACTONLY+="sys/ " |
4506 |
- |
4507 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
4508 |
- use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" |
4509 |
- use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " |
4510 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" |
4511 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
4512 |
- use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " |
4513 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" |
4514 |
-} |
4515 |
- |
4516 |
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" |
4517 |
- |
4518 |
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch" |
4519 |
- "${FILESDIR}/${PN}-10.0-zlib.patch" |
4520 |
- "${FILESDIR}/${PN}-6.2-ldconfig.patch" |
4521 |
- "${FILESDIR}/${PN}-6.1-pr102701.patch" |
4522 |
- "${FILESDIR}/${PN}-bsdxml2expat.patch" ) |
4523 |
- |
4524 |
-src_prepare() { |
4525 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
4526 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
4527 |
- fi |
4528 |
-} |
4529 |
- |
4530 |
-src_install() { |
4531 |
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " |
4532 |
- freebsd_src_install |
4533 |
- keepdir /var/log |
4534 |
- # Needed by ldconfig: |
4535 |
- keepdir /var/run |
4536 |
- |
4537 |
- # Maybe ship our own sysctl.conf so things like radvd work out of the box. |
4538 |
- # New wireless config method requires regdomain.xml in /etc |
4539 |
- cd "${WORKDIR}/etc/" || die |
4540 |
- insinto /etc |
4541 |
- doins minfree sysctl.conf regdomain.xml || die |
4542 |
- |
4543 |
- # Install a crontab for adjkerntz |
4544 |
- insinto /etc/cron.d |
4545 |
- newins "${FILESDIR}/adjkerntz-crontab" adjkerntz |
4546 |
- |
4547 |
- # Install the periodic stuff (needs probably to be ported in a more |
4548 |
- # gentooish way) |
4549 |
- cd "${WORKDIR}/etc/periodic" || die |
4550 |
- |
4551 |
- doperiodic security \ |
4552 |
- security/*.ipfwlimit \ |
4553 |
- security/*.ipfwdenied || die |
4554 |
- |
4555 |
- use ipfilter && { doperiodic security \ |
4556 |
- security/*.ipfdenied || die ; } |
4557 |
- |
4558 |
- use pf && { doperiodic security \ |
4559 |
- security/*.pfdenied || die ; } |
4560 |
-} |
4561 |
|
4562 |
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
4563 |
deleted file mode 100644 |
4564 |
index 5188b97c05b..00000000000 |
4565 |
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild |
4566 |
+++ /dev/null |
4567 |
@@ -1,99 +0,0 @@ |
4568 |
-# Copyright 1999-2016 Gentoo Foundation |
4569 |
-# Distributed under the terms of the GNU General Public License v2 |
4570 |
- |
4571 |
-EAPI=5 |
4572 |
- |
4573 |
-inherit bsdmk freebsd multilib |
4574 |
- |
4575 |
-DESCRIPTION="FreeBSD sbin utils" |
4576 |
-SLOT="0" |
4577 |
- |
4578 |
-if [[ ${PV} != *9999* ]]; then |
4579 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
4580 |
-fi |
4581 |
- |
4582 |
-EXTRACTONLY=" |
4583 |
- sbin/ |
4584 |
- contrib/ |
4585 |
- lib/ |
4586 |
- libexec/ |
4587 |
- usr.sbin/ |
4588 |
- etc/ |
4589 |
-" |
4590 |
- |
4591 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?] |
4592 |
- =sys-freebsd/freebsd-libexec-${RV}* |
4593 |
- >=dev-libs/expat-2.0.1 |
4594 |
- ssl? ( dev-libs/openssl:0= ) |
4595 |
- >=dev-libs/libedit-20120311.3.0-r1 |
4596 |
- sys-libs/readline:0= |
4597 |
- || ( |
4598 |
- sys-process/cronie |
4599 |
- sys-process/vixie-cron |
4600 |
- ) |
4601 |
- atm? ( net-analyzer/bsnmp )" |
4602 |
-DEPEND="${RDEPEND} |
4603 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
4604 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
4605 |
- |
4606 |
-S="${WORKDIR}/sbin" |
4607 |
- |
4608 |
-IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware" |
4609 |
- |
4610 |
-pkg_setup() { |
4611 |
- # Add the required source files. |
4612 |
- use build && EXTRACTONLY+="sys/ " |
4613 |
- |
4614 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
4615 |
- use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX=" |
4616 |
- use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= " |
4617 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT=" |
4618 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
4619 |
- use pf || mymakeopts="${mymakeopts} WITHOUT_PF= " |
4620 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL=" |
4621 |
-} |
4622 |
- |
4623 |
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf" |
4624 |
- |
4625 |
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch" |
4626 |
- "${FILESDIR}/${PN}-10.0-zlib.patch" |
4627 |
- "${FILESDIR}/${PN}-6.2-ldconfig.patch" |
4628 |
- "${FILESDIR}/${PN}-6.1-pr102701.patch" ) |
4629 |
- |
4630 |
-src_prepare() { |
4631 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
4632 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
4633 |
- fi |
4634 |
-} |
4635 |
- |
4636 |
-src_install() { |
4637 |
- mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom " |
4638 |
- freebsd_src_install |
4639 |
- keepdir /var/log |
4640 |
- # Needed by ldconfig: |
4641 |
- keepdir /var/run |
4642 |
- |
4643 |
- # Maybe ship our own sysctl.conf so things like radvd work out of the box. |
4644 |
- # New wireless config method requires regdomain.xml in /etc |
4645 |
- cd "${WORKDIR}/etc/" || die |
4646 |
- insinto /etc |
4647 |
- doins minfree sysctl.conf regdomain.xml || die |
4648 |
- |
4649 |
- # Install a crontab for adjkerntz |
4650 |
- insinto /etc/cron.d |
4651 |
- newins "${FILESDIR}/adjkerntz-crontab" adjkerntz |
4652 |
- |
4653 |
- # Install the periodic stuff (needs probably to be ported in a more |
4654 |
- # gentooish way) |
4655 |
- cd "${WORKDIR}/etc/periodic" || die |
4656 |
- |
4657 |
- doperiodic security \ |
4658 |
- security/*.ipfwlimit \ |
4659 |
- security/*.ipfwdenied || die |
4660 |
- |
4661 |
- use ipfilter && { doperiodic security \ |
4662 |
- security/*.ipfdenied || die ; } |
4663 |
- |
4664 |
- use pf && { doperiodic security \ |
4665 |
- security/*.pfdenied || die ; } |
4666 |
-} |
4667 |
|
4668 |
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest |
4669 |
index ee4635205ef..a439205984e 100644 |
4670 |
--- a/sys-freebsd/freebsd-share/Manifest |
4671 |
+++ b/sys-freebsd/freebsd-share/Manifest |
4672 |
@@ -12,8 +12,6 @@ DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99 |
4673 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
4674 |
DIST freebsd-share-8.2.tar.bz2 3797560 BLAKE2B 411eae0c8da465cbfb61be450bc72218b97499aa8ce36abbafc8408aa85a10a144b48a0b3941d8049326f1afe9c0306c66ce176e8fb456981185c39671100cbb SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4 |
4675 |
DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43 |
4676 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
4677 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
4678 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
4679 |
DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 |
4680 |
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e |
4681 |
|
4682 |
diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild |
4683 |
deleted file mode 100644 |
4684 |
index 071efda03a8..00000000000 |
4685 |
--- a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild |
4686 |
+++ /dev/null |
4687 |
@@ -1,112 +0,0 @@ |
4688 |
-# Copyright 1999-2016 Gentoo Foundation |
4689 |
-# Distributed under the terms of the GNU General Public License v2 |
4690 |
- |
4691 |
-EAPI=5 |
4692 |
- |
4693 |
-inherit bsdmk freebsd |
4694 |
- |
4695 |
-DESCRIPTION="FreeBSD shared tools/files" |
4696 |
-SLOT="0" |
4697 |
-LICENSE="BSD zfs? ( CDDL )" |
4698 |
- |
4699 |
-IUSE="doc usb zfs" |
4700 |
- |
4701 |
-if [[ ${PV} != *9999* ]]; then |
4702 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
4703 |
-fi |
4704 |
- |
4705 |
-EXTRACTONLY=" |
4706 |
- share/ |
4707 |
- contrib/ |
4708 |
- gnu/ |
4709 |
- usr.bin/ |
4710 |
- usr.sbin/ |
4711 |
- sbin/ |
4712 |
- bin/ |
4713 |
- lib/ |
4714 |
- etc/ |
4715 |
-" |
4716 |
- |
4717 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
4718 |
- =sys-freebsd/freebsd-sources-${RV}*" |
4719 |
-RDEPEND="sys-apps/miscfiles" |
4720 |
- |
4721 |
-RESTRICT="strip" |
4722 |
- |
4723 |
-S="${WORKDIR}/share" |
4724 |
- |
4725 |
-pkg_setup() { |
4726 |
- # Add the required source files. |
4727 |
- use zfs && EXTRACTONLY+="cddl/ " |
4728 |
- |
4729 |
- use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " |
4730 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
4731 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
4732 |
- [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " |
4733 |
- |
4734 |
- mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= WITHOUT_CLANG= " |
4735 |
-} |
4736 |
- |
4737 |
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset" |
4738 |
- |
4739 |
-PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" |
4740 |
- "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" |
4741 |
- "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) |
4742 |
- |
4743 |
-src_prepare() { |
4744 |
- # Remove make.conf manpage as it describes bsdmk's make.conf. |
4745 |
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" |
4746 |
- # Remove rc.conf manpage as it describes bsd's rc.conf. |
4747 |
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" |
4748 |
- sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" |
4749 |
- # Remove mailer.conf manpage |
4750 |
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" |
4751 |
- # Remove pbm and moduli(ssh) manpages |
4752 |
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" |
4753 |
- # Remove builtins manpage |
4754 |
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" |
4755 |
- # Remove rc manpages |
4756 |
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" |
4757 |
- # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. |
4758 |
- sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" |
4759 |
- |
4760 |
- # Don't install the arch-specific directories in subdirectories |
4761 |
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile |
4762 |
- |
4763 |
- # Remove them so that they can't be included by error |
4764 |
- rm -rf "${S}"/mk/*.mk |
4765 |
- |
4766 |
- # Make proper symlinks by defining the full target. |
4767 |
- local sdir |
4768 |
- for sdir in colldef mklocale monetdef msgdef numericdef timedef |
4769 |
- do |
4770 |
- sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ |
4771 |
- "${S}/${sdir}/Makefile" || \ |
4772 |
- die "Error fixing ${sdir}/Makefile" |
4773 |
- done |
4774 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
4775 |
- ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" |
4776 |
- fi |
4777 |
-} |
4778 |
- |
4779 |
-src_compile() { |
4780 |
- export ESED="/usr/bin/sed" |
4781 |
- |
4782 |
- # libiconv support. |
4783 |
- # i18n/csmapper/APPLE requires mkcsmapper_static |
4784 |
- # i18n/esdb/APPLE requires mkesdb_static |
4785 |
- for pkg in mkcsmapper_static mkesdb_static |
4786 |
- do |
4787 |
- cd "${WORKDIR}"/usr.bin/${pkg} || die |
4788 |
- freebsd_src_compile |
4789 |
- done |
4790 |
- |
4791 |
- # This is a groff problem and not a -shared problem. |
4792 |
- cd "${S}" || die |
4793 |
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" |
4794 |
- freebsd_src_compile -j1 || die "emake failed" |
4795 |
-} |
4796 |
- |
4797 |
-src_install() { |
4798 |
- mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" |
4799 |
-} |
4800 |
|
4801 |
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
4802 |
deleted file mode 100644 |
4803 |
index 3e5bae2b14c..00000000000 |
4804 |
--- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild |
4805 |
+++ /dev/null |
4806 |
@@ -1,113 +0,0 @@ |
4807 |
-# Copyright 1999-2016 Gentoo Foundation |
4808 |
-# Distributed under the terms of the GNU General Public License v2 |
4809 |
- |
4810 |
-EAPI=5 |
4811 |
- |
4812 |
-inherit bsdmk freebsd |
4813 |
- |
4814 |
-DESCRIPTION="FreeBSD shared tools/files" |
4815 |
-SLOT="0" |
4816 |
-LICENSE="BSD zfs? ( CDDL )" |
4817 |
- |
4818 |
-IUSE="doc usb zfs" |
4819 |
- |
4820 |
-if [[ ${PV} != *9999* ]]; then |
4821 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
4822 |
-fi |
4823 |
- |
4824 |
-EXTRACTONLY=" |
4825 |
- share/ |
4826 |
- contrib/ |
4827 |
- gnu/ |
4828 |
- usr.bin/ |
4829 |
- usr.sbin/ |
4830 |
- sbin/ |
4831 |
- bin/ |
4832 |
- lib/ |
4833 |
- etc/ |
4834 |
- tools/tools/locale/ |
4835 |
-" |
4836 |
- |
4837 |
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* |
4838 |
- =sys-freebsd/freebsd-sources-${RV}*" |
4839 |
-RDEPEND="sys-apps/miscfiles" |
4840 |
- |
4841 |
-RESTRICT="strip" |
4842 |
- |
4843 |
-S="${WORKDIR}/share" |
4844 |
- |
4845 |
-pkg_setup() { |
4846 |
- # Add the required source files. |
4847 |
- use zfs && EXTRACTONLY+="cddl/ " |
4848 |
- |
4849 |
- use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= " |
4850 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
4851 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
4852 |
- [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= " |
4853 |
- [[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= " |
4854 |
- mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= " |
4855 |
-} |
4856 |
- |
4857 |
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset" |
4858 |
- |
4859 |
-PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch" |
4860 |
- "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch" |
4861 |
- "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" ) |
4862 |
- |
4863 |
-src_prepare() { |
4864 |
- # Remove make.conf manpage as it describes bsdmk's make.conf. |
4865 |
- sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" |
4866 |
- # Remove rc.conf manpage as it describes bsd's rc.conf. |
4867 |
- sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile" |
4868 |
- sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile" |
4869 |
- # Remove mailer.conf manpage |
4870 |
- sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" |
4871 |
- # Remove pbm and moduli(ssh) manpages |
4872 |
- sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" |
4873 |
- # Remove builtins manpage |
4874 |
- sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" |
4875 |
- # Remove rc manpages |
4876 |
- sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" |
4877 |
- # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin. |
4878 |
- sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile" |
4879 |
- |
4880 |
- # Don't install the arch-specific directories in subdirectories |
4881 |
- sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile |
4882 |
- |
4883 |
- # Remove them so that they can't be included by error |
4884 |
- rm -rf "${S}"/mk/*.mk |
4885 |
- |
4886 |
- # Make proper symlinks by defining the full target. |
4887 |
- local sdir |
4888 |
- for sdir in colldef monetdef msgdef numericdef timedef |
4889 |
- do |
4890 |
- sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ |
4891 |
- "${S}/${sdir}/Makefile" || \ |
4892 |
- die "Error fixing ${sdir}/Makefile" |
4893 |
- done |
4894 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
4895 |
- ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink" |
4896 |
- fi |
4897 |
-} |
4898 |
- |
4899 |
-src_compile() { |
4900 |
- export ESED="/usr/bin/sed" |
4901 |
- |
4902 |
- # libiconv support. |
4903 |
- # i18n/csmapper/APPLE requires mkcsmapper_static |
4904 |
- # i18n/esdb/APPLE requires mkesdb_static |
4905 |
- for pkg in mkcsmapper_static mkesdb_static |
4906 |
- do |
4907 |
- cd "${WORKDIR}"/usr.bin/${pkg} || die |
4908 |
- freebsd_src_compile |
4909 |
- done |
4910 |
- |
4911 |
- # This is a groff problem and not a -shared problem. |
4912 |
- cd "${S}" || die |
4913 |
- export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/" |
4914 |
- freebsd_src_compile -j1 || die "emake failed" |
4915 |
-} |
4916 |
- |
4917 |
-src_install() { |
4918 |
- freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF} |
4919 |
-} |
4920 |
|
4921 |
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest |
4922 |
index 251e4d6fb4c..cb987fb75a3 100644 |
4923 |
--- a/sys-freebsd/freebsd-sources/Manifest |
4924 |
+++ b/sys-freebsd/freebsd-sources/Manifest |
4925 |
@@ -1,24 +1,8 @@ |
4926 |
DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc |
4927 |
-DIST freebsd-sources-EN-1607-ipi.patch 2557 BLAKE2B 2387a6da039b5c52676cf8a1a963bda63bc7553b752495e9f5818deec14b12c04df51b526a199baa59ffe4f388d715e24ecbb164f381d5e6f04d909ef3b54a98 SHA512 41bee92ac36685ea81437befc07e1d1f7ba9d93b3d733981fce512e68a77eb3e9563a88e23fd9ae27a331e63c42966a55041cd5ae05d61895b8e20b1edae86dd |
4928 |
-DIST freebsd-sources-EN-1608-zfs.patch 280 BLAKE2B 80b833c57b4d19c8844371032f66a24d9b1ab390ea6c94f9e26be2a60298a8a506fe1fd213d04e5e53438ebf0c27534582b25bd9ab1ccbb84083543c88418b73 SHA512 df2e133cfa565332da3c2b173c98e866bc1d9ddcfa06156da1f9a2f382186cafb130b7f0e19617482af71b730d95b9d8a7d81195a57760a93736bc2f49ed1c03 |
4929 |
-DIST freebsd-sources-EN-1611-vmbus.patch 6755 BLAKE2B 2e5b972b686d8a9b9284ce645e1927da16c1d44ab5567487443363b9505a6296c1d430c082b817c63b1b9b3e063855647eef892a6b1cc33bcf14213553edfe85 SHA512 8a2296612f688692691765dbbd695f7aa75bf45fab8a569b3d6671aa5cf2d022e498f6f0266d89c999a1799a862f9cdeda8179a0e8eef85f5613bdaa792dcd41 |
4930 |
-DIST freebsd-sources-EN-1612-hv_storvsc.patch 6459 BLAKE2B c86625831b8d7c4622f844c179e1c79a38d596bf869352fd31041c07e73de5bab0d75528d28188d50dddc15623b63d4832295949b49200c3c31eb6b449a66329 SHA512 90cc301222cb31d2c5cbb289666bea0291880a2c1236fe056c5c29b571fe656a39047e131eacf41af0b783e0c22f07681665e33046980f98f233a28baef18ade |
4931 |
-DIST freebsd-sources-EN-1613-vmbus.patch 3886 BLAKE2B d58a5e0c9ada9f6e875f0103913bcc9f32e489e22ccf18fa9feae73ae9e2b1276aa2f6e2ac4a9e14f0aec233cde1da74ad9a2c659348f862fbfd01fdfb2a9df7 SHA512 14d7d6e1acf3e78b0b5653aa83dda8cb6fdbd8e2824624e093d73e217bad2600de157479e66f94248e38afa21ddc1292c30ba8381f76cac95b5d11caca1fee50 |
4932 |
-DIST freebsd-sources-EN-1614-hv_storvsc.patch 1134 BLAKE2B 9c70536934791f6ba7fce367278cb22c7aae2cdc3cdfa5d13b9dd6d1cd1b008174d5d45ae01d317b456d86450617cb44dbf8cb56083ebff0a0548b66b0926cc1 SHA512 bcb687290b2a9572345e5e4c8d2408dadf2fe2f206d457ba8147bbc62fd6dff064b132b66b4e2ac6fa98c73c37eda7bf22538d51a29cbb773fb90c4af44f5986 |
4933 |
-DIST freebsd-sources-EN-1615-vmbus.patch 2114 BLAKE2B b81217bc62c922f3706a21aa948e08da6a5f11fcfab9234feb6150bcb98b4e47a4697afac00733e681077c12dd2a26553abb3313f5fa311f991df87c79e247f2 SHA512 81477e9f5e4980d3e0c0487fbc7b760e7500ef37be42444782cd1fb5202d33e622109519e4bf4ba419a4d13c250e27e01f34d77c57b504584a2fab77b4f122c6 |
4934 |
-DIST freebsd-sources-EN-1616-hv_storvsc.patch 5358 BLAKE2B 1641a1f44329490ad3002244a77e3ef5287212b8d2b5eb284a16717b02d2ff98141f25a3bf3d647e1f89b0d77cdb9423d6630f96fa56091bec0f707998628e1c SHA512 7364108737334ef7a12a8babf47b5139b973e68810b0cad335a6d8a7b7696fcfda047b1b7e85d28427f75001184a3c07418901ba0b9b152592d238bd392bf002 |
4935 |
-DIST freebsd-sources-EN-1617-vm.patch 6332 BLAKE2B 526686e6ef410c5cd8acd0ea1cea2e0be1398db55da669eefd28f52cd2d81d4e08c4d52576b82596feb7e2d13fa3df61e2503f7bc6f04055a0ee7ac4a9b1069f SHA512 8d8112d1df50ef45311736cb24dc8be38bc93e6246ef1cb0535928a6a4cd4cecd58e755e0ef7992197a3995f3a92893141e01f3dd7d095b4e645528dc9e060ff |
4936 |
DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7 |
4937 |
DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15 |
4938 |
-DIST freebsd-sources-SA-1615-sysarch-01.patch 655 BLAKE2B 5f0293dad23adf3b6113450e7de6bc971624df4c12ff49da2dbc0e6f3a318d73ee32e2d710322315bda2a0da2dd8ede228902b8a3b5e6fee645829655b61c2a1 SHA512 3ddc42f0e713a8f1753526b877141563b93d845e57cd111ef2219e969424efa88f3e726288bbd81fef7d4f06f2d68faa3f0c63c996a9579289236518e316739d |
4939 |
-DIST freebsd-sources-SA-1618-atkbd.patch 352 BLAKE2B 30d4d0ceaba3ecf3a34d9bc0dcdc78e3f018f8aeaf8493f0fe8123d64fdf2d023d359cea73183bc1fca0a207cb5fbfd34bfce23b61136f056a3ddca1d262ffdf SHA512 aed4ee6b51905d04680181f571f0f89d60b66a2201c397f88931d9ce92b58148e2d638d93328a78ed53b4bf7a5040f1f646ba50566994252e73c13a09659ba3f |
4940 |
-DIST freebsd-sources-SA-1619-sendmsg.patch 247 BLAKE2B 1d644bdb65855e7b3e09e0803bf04bc6806bd19e293b659e91163ed85be2210b7453e7f9d80c9a153f4bdb71ef847b6861f9037114abdd0d6e232a363f407277 SHA512 878e2b283358c050603cc32241077b25987696232bce3b9d41373c1186f5dbeb41881adc69e8754804054a57fffa71cad930b82ad8d5abd458779d5a3bd61978 |
4941 |
-DIST freebsd-sources-SA-1620-linux.patch 492 BLAKE2B a1ac48d6a18ac6ae7f3a378ca175417abd1a80406ea832795809950a5764e9ba05cadbd67ee99de418eecc51e75770b3454a3eaaa2a13ce01113fb75ce34320e SHA512 1fb28b25ac5f89e2f7fa9a1f74ba83b4c949f2175217b669b5fcd2062c54307dcb50ad072acbe18162272b9bc29ba40ac4e19db1564a2959e885ac826a332ae5 |
4942 |
-DIST freebsd-sources-SA-1621-stat.patch 223 BLAKE2B 9d18b3ac701b213e71e97965b1baa74ee9a89600267f1bcb4713170a96c9511c37f4a809818c4d1cf70d04d188906522c59b23a8393f3e1bd5d2e2e4885178a3 SHA512 501244c0831d2aeb37c8a8aaa762cc6c8c39929355e6695df23dc83c78d6bb499dcb903f50c17e3f7774306d53836a0633d65e284167590c015aa1f8e10e5e4a |
4943 |
DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e |
4944 |
DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4 |
4945 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
4946 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
4947 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
4948 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
4949 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
4950 |
|
4951 |
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 |
4952 |
deleted file mode 100644 |
4953 |
index c7e12bdf8a4..00000000000 |
4954 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch |
4955 |
+++ /dev/null |
4956 |
@@ -1,22 +0,0 @@ |
4957 |
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk |
4958 |
-index 2939a59..124ef6f 100644 |
4959 |
---- a/sys/conf/kern.mk |
4960 |
-+++ b/sys/conf/kern.mk |
4961 |
-@@ -5,7 +5,7 @@ |
4962 |
- # |
4963 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
4964 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
4965 |
-- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ |
4966 |
-+ -Wundef -Wno-pointer-sign \ |
4967 |
- -Wmissing-include-dirs -fdiagnostics-show-option \ |
4968 |
- ${CWARNEXTRA} |
4969 |
- # |
4970 |
-@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions |
4971 |
- # |
4972 |
- .if ${MACHINE_CPUARCH} == "i386" |
4973 |
- .if ${COMPILER_TYPE} != "clang" |
4974 |
--CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 |
4975 |
-+CFLAGS+= -mpreferred-stack-boundary=2 |
4976 |
- .else |
4977 |
- CFLAGS+= -mno-aes -mno-avx |
4978 |
- .endif |
4979 |
|
4980 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild |
4981 |
deleted file mode 100644 |
4982 |
index a5c5083ebc4..00000000000 |
4983 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild |
4984 |
+++ /dev/null |
4985 |
@@ -1,175 +0,0 @@ |
4986 |
-# Copyright 1999-2016 Gentoo Foundation |
4987 |
-# Distributed under the terms of the GNU General Public License v2 |
4988 |
- |
4989 |
-EAPI=5 |
4990 |
- |
4991 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
4992 |
- |
4993 |
-DESCRIPTION="FreeBSD kernel sources" |
4994 |
-SLOT="0" |
4995 |
-LICENSE="BSD zfs? ( CDDL )" |
4996 |
- |
4997 |
-IUSE="+build-kernel debug dtrace zfs" |
4998 |
- |
4999 |
-# Security Advisory and Errata patches. |
5000 |
-UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch" |
5001 |
- "SA-16:18/atkbd.patch" |
5002 |
- "SA-16:19/sendmsg.patch" |
5003 |
- "SA-16:20/linux.patch" |
5004 |
- "SA-16:21/stat.patch" |
5005 |
- "EN-16:07/ipi.patch" |
5006 |
- "EN-16:08/zfs.patch" |
5007 |
- "EN-16:11/vmbus.patch" |
5008 |
- "EN-16:12/hv_storvsc.patch" |
5009 |
- "EN-16:13/vmbus.patch" |
5010 |
- "EN-16:14/hv_storvsc.patch" |
5011 |
- "EN-16:15/vmbus.patch" |
5012 |
- "EN-16:16/hv_storvsc.patch" |
5013 |
- "EN-16:17/vm.patch" ) |
5014 |
- |
5015 |
-if [[ ${PV} != *9999* ]]; then |
5016 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
5017 |
- SRC_URI="${SRC_URI} |
5018 |
- $(freebsd_upstream_patches)" |
5019 |
-fi |
5020 |
- |
5021 |
-EXTRACTONLY=" |
5022 |
- sys/ |
5023 |
- contrib/bmake/ |
5024 |
- usr.bin/bmake/ |
5025 |
-" |
5026 |
- |
5027 |
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
5028 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
5029 |
- !sys-freebsd/virtio-kmod |
5030 |
- !sys-fs/fuse4bsd |
5031 |
- !<sys-freebsd/freebsd-sources-9.2_beta1" |
5032 |
-DEPEND="build-kernel? ( |
5033 |
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
5034 |
- >=sys-freebsd/freebsd-usbin-9.1 |
5035 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
5036 |
- )" |
5037 |
- |
5038 |
-RESTRICT="strip binchecks" |
5039 |
- |
5040 |
-S="${WORKDIR}/sys" |
5041 |
- |
5042 |
-KERN_BUILD=GENTOO |
5043 |
- |
5044 |
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
5045 |
- "${FILESDIR}/${PN}-10.0-gentoo.patch" |
5046 |
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
5047 |
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
5048 |
- "${FILESDIR}/${PN}-7.1-includes.patch" |
5049 |
- "${FILESDIR}/${PN}-9.0-sysctluint.patch" |
5050 |
- "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch" |
5051 |
- "${FILESDIR}/${PN}-10.1-gcc48.patch" ) |
5052 |
- |
5053 |
-pkg_setup() { |
5054 |
- # Add the required source files. |
5055 |
- use zfs && EXTRACTONLY+="cddl/ " |
5056 |
- |
5057 |
- # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
5058 |
- [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP=" |
5059 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
5060 |
-} |
5061 |
- |
5062 |
-src_prepare() { |
5063 |
- local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
5064 |
- |
5065 |
- cd "${WORKDIR}" || die |
5066 |
- epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" |
5067 |
- cd "${S}" || die |
5068 |
- |
5069 |
- # This replaces the gentoover patch, it doesn't need reapply every time. |
5070 |
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
5071 |
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
5072 |
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ |
5073 |
- "${S}/conf/newvers.sh" |
5074 |
- |
5075 |
- # __FreeBSD_cc_version comes from FreeBSD's gcc. |
5076 |
- # on 10.0-RELEASE it's 1000001. |
5077 |
- # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
5078 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \ |
5079 |
- -i "${S}/conf/kern.pre.mk" \ |
5080 |
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
5081 |
- |
5082 |
- # Remove -Werror |
5083 |
- sed -e "s:-Werror:-Wno-error:g" \ |
5084 |
- -i "${S}/conf/kern.pre.mk" \ |
5085 |
- -i "${S}/conf/kmod.mk" || die |
5086 |
- |
5087 |
- # Set the kernel configuration using USE flags. |
5088 |
- cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die |
5089 |
- use debug || echo 'nomakeoptions DEBUG' >> "${conf}" |
5090 |
- use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" |
5091 |
- |
5092 |
- # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. |
5093 |
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL |
5094 |
-} |
5095 |
- |
5096 |
-src_configure() { |
5097 |
- if use build-kernel ; then |
5098 |
- tc-export CC |
5099 |
- cd "${S}/$(tc-arch-kernel)/conf" || die |
5100 |
- config ${KERN_BUILD} || die |
5101 |
- fi |
5102 |
-} |
5103 |
- |
5104 |
-src_compile() { |
5105 |
- if use build-kernel ; then |
5106 |
- if has_version "<sys-freebsd/freebsd-ubin-10.0"; then |
5107 |
- cd "${WORKDIR}"/usr.bin/bmake || die |
5108 |
- CC=${CHOST}-gcc freebsd_src_compile |
5109 |
- export BMAKE="${WORKDIR}/usr.bin/bmake/make" |
5110 |
- fi |
5111 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
5112 |
- freebsd_src_compile depend |
5113 |
- freebsd_src_compile |
5114 |
- else |
5115 |
- einfo "Nothing to compile.." |
5116 |
- fi |
5117 |
-} |
5118 |
- |
5119 |
-src_install() { |
5120 |
- if use build-kernel ; then |
5121 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
5122 |
- freebsd_src_install |
5123 |
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" |
5124 |
- cd "${S}" |
5125 |
- fi |
5126 |
- |
5127 |
- insinto "/usr/src/sys" |
5128 |
- doins -r "${S}/". |
5129 |
- if use zfs ; then |
5130 |
- insinto "/usr/src/cddl" |
5131 |
- doins -r "${WORKDIR}/cddl/". |
5132 |
- fi |
5133 |
-} |
5134 |
- |
5135 |
-pkg_preinst() { |
5136 |
- if [[ -L "${ROOT}/usr/src/sys" ]]; then |
5137 |
- einfo "/usr/src/sys is a symlink, removing it..." |
5138 |
- rm -f "${ROOT}/usr/src/sys" |
5139 |
- fi |
5140 |
- |
5141 |
- if use sparc-fbsd ; then |
5142 |
- ewarn "WARNING: kldload currently causes kernel panics" |
5143 |
- ewarn "on sparc64. This is probably a gcc-4.1 issue, but" |
5144 |
- ewarn "we need gcc-4.1 to compile the kernel correctly :/" |
5145 |
- ewarn "Please compile all modules you need into the kernel" |
5146 |
- fi |
5147 |
- |
5148 |
- ewarn "If you want manual compile (not recommended), please don't forget the following step." |
5149 |
- if ! use sparc-fbsd ; then |
5150 |
- ewarn "export CC=clang" |
5151 |
- ewarn "export CXX=clang++" |
5152 |
- fi |
5153 |
- if ! use zfs ; then |
5154 |
- ewarn "export WITHOUT_CDDL=" |
5155 |
- ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." |
5156 |
- fi |
5157 |
- if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
5158 |
- ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." |
5159 |
- fi |
5160 |
-} |
5161 |
|
5162 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild |
5163 |
deleted file mode 100644 |
5164 |
index 773c3f974a3..00000000000 |
5165 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild |
5166 |
+++ /dev/null |
5167 |
@@ -1,169 +0,0 @@ |
5168 |
-# Copyright 1999-2016 Gentoo Foundation |
5169 |
-# Distributed under the terms of the GNU General Public License v2 |
5170 |
- |
5171 |
-EAPI=5 |
5172 |
- |
5173 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
5174 |
- |
5175 |
-DESCRIPTION="FreeBSD kernel sources" |
5176 |
-SLOT="0" |
5177 |
-LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" |
5178 |
- |
5179 |
-IUSE="+build-kernel debug dtrace zfs" |
5180 |
- |
5181 |
-# Security Advisory and Errata patches. |
5182 |
-UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch" ) |
5183 |
- |
5184 |
-if [[ ${PV} != *9999* ]]; then |
5185 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
5186 |
- SRC_URI="${SRC_URI} |
5187 |
- $(freebsd_upstream_patches)" |
5188 |
-fi |
5189 |
- |
5190 |
-EXTRACTONLY=" |
5191 |
- sys/ |
5192 |
- contrib/bmake/ |
5193 |
- usr.bin/bmake/ |
5194 |
-" |
5195 |
- |
5196 |
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
5197 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
5198 |
- !sys-freebsd/virtio-kmod |
5199 |
- !sys-fs/fuse4bsd |
5200 |
- !<sys-freebsd/freebsd-sources-9.2_beta1" |
5201 |
-DEPEND="build-kernel? ( |
5202 |
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
5203 |
- >=sys-freebsd/freebsd-usbin-9.1 |
5204 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
5205 |
- )" |
5206 |
- |
5207 |
-RESTRICT="strip binchecks" |
5208 |
- |
5209 |
-S="${WORKDIR}/sys" |
5210 |
- |
5211 |
-KERN_BUILD=GENTOO |
5212 |
- |
5213 |
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
5214 |
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
5215 |
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
5216 |
- "${FILESDIR}/${PN}-7.1-includes.patch" |
5217 |
- "${FILESDIR}/${PN}-9.0-sysctluint.patch" |
5218 |
- "${FILESDIR}/${PN}-11.0-gentoo.patch" |
5219 |
- "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" |
5220 |
- "${FILESDIR}/${PN}-10.1-gcc48.patch" ) |
5221 |
- |
5222 |
-pkg_setup() { |
5223 |
- # Add the required source files. |
5224 |
- use dtrace && EXTRACTONLY+="cddl/ " |
5225 |
- |
5226 |
- # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
5227 |
- [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
5228 |
- use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
5229 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
5230 |
-} |
5231 |
- |
5232 |
-src_prepare() { |
5233 |
- local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
5234 |
- |
5235 |
- cd "${WORKDIR}" || die |
5236 |
- epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch" |
5237 |
- cd "${S}" || die |
5238 |
- |
5239 |
- # This replaces the gentoover patch, it doesn't need reapply every time. |
5240 |
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
5241 |
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
5242 |
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ |
5243 |
- "${S}/conf/newvers.sh" |
5244 |
- |
5245 |
- # __FreeBSD_cc_version comes from FreeBSD's gcc. |
5246 |
- # on 11.0-RELEASE it's 1100001. |
5247 |
- # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
5248 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ |
5249 |
- -i "${S}/conf/kern.pre.mk" \ |
5250 |
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
5251 |
- |
5252 |
- # Remove -Werror |
5253 |
- sed -e "s:-Werror:-Wno-error:g" \ |
5254 |
- -i "${S}/conf/kern.pre.mk" \ |
5255 |
- -i "${S}/conf/kmod.mk" || die |
5256 |
- |
5257 |
- # Set the kernel configuration using USE flags. |
5258 |
- cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die |
5259 |
- use debug || echo 'nomakeoptions DEBUG' >> "${conf}" |
5260 |
- use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" |
5261 |
- |
5262 |
- # hyperv fails to compile on x86-fbsd. |
5263 |
- if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then |
5264 |
- echo 'nodevice hyperv' >> "${conf}" |
5265 |
- dummy_mk modules/hyperv |
5266 |
- fi |
5267 |
- |
5268 |
- # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. |
5269 |
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL |
5270 |
-} |
5271 |
- |
5272 |
-src_configure() { |
5273 |
- if use build-kernel ; then |
5274 |
- tc-export CC |
5275 |
- cd "${S}/$(tc-arch-kernel)/conf" || die |
5276 |
- config ${KERN_BUILD} || die |
5277 |
- fi |
5278 |
-} |
5279 |
- |
5280 |
-src_compile() { |
5281 |
- if use build-kernel ; then |
5282 |
- if has_version "<sys-freebsd/freebsd-ubin-10.0"; then |
5283 |
- cd "${WORKDIR}"/usr.bin/bmake || die |
5284 |
- CC=${CHOST}-gcc freebsd_src_compile |
5285 |
- export BMAKE="${WORKDIR}/usr.bin/bmake/make" |
5286 |
- fi |
5287 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
5288 |
- freebsd_src_compile depend |
5289 |
- freebsd_src_compile |
5290 |
- else |
5291 |
- einfo "Nothing to compile.." |
5292 |
- fi |
5293 |
-} |
5294 |
- |
5295 |
-src_install() { |
5296 |
- if use build-kernel ; then |
5297 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
5298 |
- freebsd_src_install |
5299 |
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" |
5300 |
- cd "${S}" |
5301 |
- fi |
5302 |
- |
5303 |
- insinto "/usr/src/sys" |
5304 |
- doins -r "${S}/". |
5305 |
- if use dtrace ; then |
5306 |
- insinto "/usr/src/cddl" |
5307 |
- doins -r "${WORKDIR}/cddl/". |
5308 |
- fi |
5309 |
-} |
5310 |
- |
5311 |
-pkg_preinst() { |
5312 |
- if [[ -L "${ROOT}/usr/src/sys" ]]; then |
5313 |
- einfo "/usr/src/sys is a symlink, removing it..." |
5314 |
- rm -f "${ROOT}/usr/src/sys" |
5315 |
- fi |
5316 |
- |
5317 |
- if use sparc-fbsd ; then |
5318 |
- ewarn "WARNING: kldload currently causes kernel panics" |
5319 |
- ewarn "on sparc64. This is probably a gcc-4.1 issue, but" |
5320 |
- ewarn "we need gcc-4.1 to compile the kernel correctly :/" |
5321 |
- ewarn "Please compile all modules you need into the kernel" |
5322 |
- fi |
5323 |
- |
5324 |
- ewarn "If you want manual compile (not recommended), please don't forget the following step." |
5325 |
- if ! use sparc-fbsd ; then |
5326 |
- ewarn "export CC=clang" |
5327 |
- ewarn "export CXX=clang++" |
5328 |
- fi |
5329 |
- if ! use zfs ; then |
5330 |
- ewarn "export WITHOUT_CDDL=" |
5331 |
- ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." |
5332 |
- fi |
5333 |
- if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
5334 |
- ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." |
5335 |
- fi |
5336 |
-} |
5337 |
|
5338 |
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest |
5339 |
index 4e0f48102af..1047b2d6f99 100644 |
5340 |
--- a/sys-freebsd/freebsd-ubin/Manifest |
5341 |
+++ b/sys-freebsd/freebsd-ubin/Manifest |
5342 |
@@ -10,13 +10,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c |
5343 |
DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 |
5344 |
DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 |
5345 |
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e |
5346 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
5347 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
5348 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
5349 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
5350 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
5351 |
DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 |
5352 |
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e |
5353 |
-DIST freebsd-ubin-EN-1621-localedef.patch 1958 BLAKE2B 6a42a1736759e99b892f788f2ca2255963f1e429b07e481b8fe19b5be4e6b625ca0d91b755af3395688313e017610334f6f47f3480b07a14639e82c899cd9de8 SHA512 191661a189dbb33979de04f68cac1701ee0f3af52921be1e0566590b462e475e5883cd0495b001c42b7bfdaf60e0360ea53ddc2ea729cc1bc13cbf228aaa284a |
5354 |
-DIST freebsd-ubin-SA-1625-bspatch.patch 286 BLAKE2B f06e15e3804185057a1aa3fbba42e65c8825ec32667e92b41b4f8217579086881924e6f65681e2685895c24ba8be9b8d1530417e8f5d85e4a4dcbfa4dc9812f6 SHA512 f2a0210e582076bac93faa3a226cd9301b6d0245938d6c5a17e1aa275401934d7848bcb908f63a689f5e36f961dfbf1d0a0b5717ff54f67a76b5d1908ae39703 |
5355 |
-DIST freebsd-ubin-SA-1629-bspatch.patch 9323 BLAKE2B 73609a85ba21940cd68cd02c17429896978b303d43184f59c68417c1e99461f93ecec6353e302c72d93e8e06c8fcc476612a18fba941ff60a84976df4cac1137 SHA512 ae061869db3a01e0002b2159306ff72c5629147b8e594f0fda5f6d3aa956f4a73a4a3fbc299ef2c69231cf619049e8eb5bed34067be6d5d419f108958c97f59f |
5356 |
|
5357 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch |
5358 |
deleted file mode 100644 |
5359 |
index d758c48846e..00000000000 |
5360 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch |
5361 |
+++ /dev/null |
5362 |
@@ -1,15 +0,0 @@ |
5363 |
-diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile |
5364 |
-index 4ebdc33..37ff8fa 100644 |
5365 |
---- a/usr.bin/atf/atf-sh/Makefile |
5366 |
-+++ b/usr.bin/atf/atf-sh/Makefile |
5367 |
-@@ -33,8 +33,8 @@ PROG_CXX= atf-sh |
5368 |
- SRCS= atf-sh.cpp |
5369 |
- MAN= atf-sh.1 atf-sh-api.3 |
5370 |
- |
5371 |
--CFLAGS+= -DHAVE_CONFIG_H |
5372 |
--CFLAGS+= -I${ATF} |
5373 |
-+CXXFLAGS+= -DHAVE_CONFIG_H |
5374 |
-+CXXFLAGS+= -I${ATF} |
5375 |
- |
5376 |
- DPADD+= ${LIBATF_C} ${LIBATF_CXX} |
5377 |
- LDADD+= -latf-c++ -latf-c |
5378 |
|
5379 |
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch |
5380 |
deleted file mode 100644 |
5381 |
index 112523851f9..00000000000 |
5382 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch |
5383 |
+++ /dev/null |
5384 |
@@ -1,25 +0,0 @@ |
5385 |
-diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh |
5386 |
-index 45bc4fd..6eaf8e4 100644 |
5387 |
---- a/usr.bin/dtc/string.hh |
5388 |
-+++ b/usr.bin/dtc/string.hh |
5389 |
-@@ -32,6 +32,8 @@ |
5390 |
- |
5391 |
- #ifndef _STRING_HH_ |
5392 |
- #define _STRING_HH_ |
5393 |
-+#include <cstdio> |
5394 |
-+#include <cstring> |
5395 |
- #include "input_buffer.hh" |
5396 |
- |
5397 |
- namespace dtc |
5398 |
-diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh |
5399 |
-index 7f2ec67..8e13b1c 100644 |
5400 |
---- a/usr.bin/dtc/util.hh |
5401 |
-+++ b/usr.bin/dtc/util.hh |
5402 |
-@@ -33,6 +33,7 @@ |
5403 |
- #ifndef _UTIL_HH_ |
5404 |
- #define _UTIL_HH_ |
5405 |
- |
5406 |
-+#include <stdint.h> |
5407 |
- #include <vector> |
5408 |
- |
5409 |
- // If we aren't using C++11, then just ignore static asserts. |
5410 |
|
5411 |
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 |
5412 |
deleted file mode 100644 |
5413 |
index e10685284cb..00000000000 |
5414 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch |
5415 |
+++ /dev/null |
5416 |
@@ -1,26 +0,0 @@ |
5417 |
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile |
5418 |
-index 38e9df6..5e831c6 100644 |
5419 |
---- a/usr.bin/kdump/Makefile |
5420 |
-+++ b/usr.bin/kdump/Makefile |
5421 |
-@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c |
5422 |
- |
5423 |
- ioctl.c: mkioctls |
5424 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
5425 |
-- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET} |
5426 |
-+ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET} |
5427 |
- |
5428 |
- kdump_subr.h: mksubr |
5429 |
- sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \ |
5430 |
-diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile |
5431 |
-index 7a49497..bc8b61f 100644 |
5432 |
---- a/usr.bin/truss/Makefile |
5433 |
-+++ b/usr.bin/truss/Makefile |
5434 |
-@@ -24,7 +24,7 @@ syscalls.h: syscalls.master |
5435 |
- |
5436 |
- ioctl.c: ${.CURDIR}/../kdump/mkioctls |
5437 |
- env MACHINE=${MACHINE} CPP="${CPP}" \ |
5438 |
-- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET} |
5439 |
-+ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET} |
5440 |
- |
5441 |
- .if ${MACHINE_CPUARCH} == "i386" |
5442 |
- SRCS+= i386-linux.c linux_syscalls.h |
5443 |
|
5444 |
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 |
5445 |
deleted file mode 100644 |
5446 |
index c5f7706024c..00000000000 |
5447 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch |
5448 |
+++ /dev/null |
5449 |
@@ -1,13 +0,0 @@ |
5450 |
-diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile |
5451 |
-index 0995534..1bcb3e0 100644 |
5452 |
---- a/usr.bin/mandoc/Makefile |
5453 |
-+++ b/usr.bin/mandoc/Makefile |
5454 |
-@@ -1,7 +1,7 @@ |
5455 |
- # $FreeBSD$ |
5456 |
- |
5457 |
- MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml |
5458 |
--LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a |
5459 |
-+LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a |
5460 |
- .PATH: ${MDOCMLDIR} |
5461 |
- |
5462 |
- PROG= mandoc |
5463 |
|
5464 |
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 |
5465 |
deleted file mode 100644 |
5466 |
index c0ca444b042..00000000000 |
5467 |
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch |
5468 |
+++ /dev/null |
5469 |
@@ -1,13 +0,0 @@ |
5470 |
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile |
5471 |
-index 6c6d8c2..22fec7a 100644 |
5472 |
---- a/usr.bin/bmake/Makefile |
5473 |
-+++ b/usr.bin/bmake/Makefile |
5474 |
-@@ -5,7 +5,7 @@ |
5475 |
- |
5476 |
- .sinclude "Makefile.inc" |
5477 |
- |
5478 |
--SRCTOP?= ${.CURDIR:H:H} |
5479 |
-+SRCTOP= ${.CURDIR:H:H} |
5480 |
- |
5481 |
- # look here first for config.h |
5482 |
- CFLAGS+= -I${.CURDIR} |
5483 |
|
5484 |
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild |
5485 |
deleted file mode 100644 |
5486 |
index 8ecf7ec4fb9..00000000000 |
5487 |
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild |
5488 |
+++ /dev/null |
5489 |
@@ -1,212 +0,0 @@ |
5490 |
-# Copyright 1999-2017 Gentoo Foundation |
5491 |
-# Distributed under the terms of the GNU General Public License v2 |
5492 |
- |
5493 |
-EAPI=5 |
5494 |
- |
5495 |
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build |
5496 |
- |
5497 |
-DESCRIPTION="FreeBSD's base system source for /usr/bin" |
5498 |
-SLOT="0" |
5499 |
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" |
5500 |
-LICENSE="BSD zfs? ( CDDL )" |
5501 |
- |
5502 |
-# Security Advisory and Errata patches. |
5503 |
-UPSTREAM_PATCHES=( |
5504 |
- "SA-16:25/bspatch.patch" |
5505 |
- "SA-16:29/bspatch.patch" |
5506 |
-) |
5507 |
- |
5508 |
-if [[ ${PV} != *9999* ]]; then |
5509 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
5510 |
- SRC_URI="${SRC_URI} |
5511 |
- $(freebsd_upstream_patches)" |
5512 |
-fi |
5513 |
- |
5514 |
-EXTRACTONLY=" |
5515 |
- usr.bin/ |
5516 |
- contrib/ |
5517 |
- lib/ |
5518 |
- etc/ |
5519 |
- bin/ |
5520 |
- include/ |
5521 |
-" |
5522 |
- |
5523 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] |
5524 |
- ssl? ( dev-libs/openssl:0= ) |
5525 |
- kerberos? ( virtual/krb5 ) |
5526 |
- ar? ( >=app-arch/libarchive-3 ) |
5527 |
- virtual/pam |
5528 |
- sys-libs/zlib |
5529 |
- >=sys-libs/ncurses-5.9:0= |
5530 |
- !sys-process/fuser-bsd |
5531 |
- !dev-util/csup |
5532 |
- !dev-libs/libiconv |
5533 |
- !sys-freebsd/freebsd-contrib" |
5534 |
- |
5535 |
-DEPEND="${RDEPEND} |
5536 |
- sys-devel/flex |
5537 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
5538 |
- =sys-freebsd/freebsd-sbin-${RV}* |
5539 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
5540 |
- |
5541 |
-RDEPEND="${RDEPEND} |
5542 |
- >=sys-auth/pambase-20080219.1 |
5543 |
- sys-process/cronbase" |
5544 |
- |
5545 |
-S="${WORKDIR}/usr.bin" |
5546 |
- |
5547 |
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
5548 |
- "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" |
5549 |
- "${FILESDIR}/${PN}-setXid.patch" |
5550 |
- "${FILESDIR}/${PN}-lint-stdarg.patch" |
5551 |
- "${FILESDIR}/${PN}-8.0-xinstall.patch" |
5552 |
- "${FILESDIR}/${PN}-9.1-bsdar.patch" |
5553 |
- "${FILESDIR}/${PN}-9.1-minigzip.patch" |
5554 |
- "${FILESDIR}/${PN}-10.0-atf.patch" |
5555 |
- "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" |
5556 |
- "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch" |
5557 |
- "${FILESDIR}/${PN}-10.0-mandoc.patch" |
5558 |
- "${FILESDIR}/${PN}-10.2-bsdxml.patch" |
5559 |
- "${FILESDIR}/${PN}-10.2-talk-workaround.patch" |
5560 |
- "${FILESDIR}/${PN}-10.3-bmake-workaround.patch" ) |
5561 |
- |
5562 |
-# Here we remove some sources we don't need because they are already |
5563 |
-# provided by portage's packages or similar. In order: |
5564 |
-# - Archiving tools, provided by their own ebuilds |
5565 |
-# - ncurses stuff |
5566 |
-# - less stuff |
5567 |
-# - bind utils |
5568 |
-# - rsh stuff |
5569 |
-# - binutils gprof |
5570 |
-# - dc stuff |
5571 |
-# and the rest are misc utils we already provide somewhere else. |
5572 |
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
5573 |
- gzip gprof |
5574 |
- lzmainfo xz xzdec |
5575 |
- unzip |
5576 |
- tput tset tabs |
5577 |
- less lessecho lesskey |
5578 |
- hesinfo host |
5579 |
- rsh rlogin rusers rwho ruptime |
5580 |
- compile_et lex vi smbutil file vacation nc ftp telnet |
5581 |
- c99 c89 |
5582 |
- bc dc |
5583 |
- whois tftp man" |
5584 |
- |
5585 |
-pkg_setup() { |
5586 |
- # Add the required source files. |
5587 |
- use zfs && EXTRACTONLY+="cddl/ " |
5588 |
- use build && EXTRACTONLY+="sys/ " |
5589 |
- |
5590 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
5591 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
5592 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
5593 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
5594 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
5595 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
5596 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
5597 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
5598 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
5599 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
5600 |
- mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= " |
5601 |
-} |
5602 |
- |
5603 |
-pkg_preinst() { |
5604 |
- # bison installs a /usr/bin/yacc symlink ... |
5605 |
- # we need to remove it to avoid triggering |
5606 |
- # collision-protect errors |
5607 |
- if [[ -L ${ROOT}/usr/bin/yacc ]]; then |
5608 |
- rm -f "${ROOT}"/usr/bin/yacc || die |
5609 |
- fi |
5610 |
-} |
5611 |
- |
5612 |
-src_prepare() { |
5613 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
5614 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
5615 |
- fi |
5616 |
- |
5617 |
- # Rename manpage for renamed cmp |
5618 |
- mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die |
5619 |
- # Rename manpage for renamed ar |
5620 |
- mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die |
5621 |
- # Fix whereis(1) manpath search. |
5622 |
- sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die |
5623 |
- |
5624 |
- # Build a dynamic make |
5625 |
- sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die |
5626 |
- |
5627 |
- # Disable it here otherwise our patch wont apply |
5628 |
- use ar || dummy_mk ar |
5629 |
- |
5630 |
- # Preparing to build xlint |
5631 |
- export LINT=xlint |
5632 |
-} |
5633 |
- |
5634 |
-setup_multilib_vars() { |
5635 |
- if ! multilib_is_native_abi; then |
5636 |
- cd "${WORKDIR}/usr.bin/ldd" || die |
5637 |
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" |
5638 |
- else |
5639 |
- cd "${S}" || die |
5640 |
- fi |
5641 |
- "$@" |
5642 |
-} |
5643 |
- |
5644 |
-src_compile() { |
5645 |
- # Preparing to build mandoc |
5646 |
- cd "${WORKDIR}/lib/libmandoc" || die |
5647 |
- freebsd_src_compile -j1 |
5648 |
- |
5649 |
- cd "${S}" || die |
5650 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
5651 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 |
5652 |
-} |
5653 |
- |
5654 |
-src_install() { |
5655 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
5656 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
5657 |
- |
5658 |
- # baselayout requires these in /bin |
5659 |
- dodir /bin |
5660 |
- for bin in sed printf ; do |
5661 |
- mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" |
5662 |
- dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" |
5663 |
- done |
5664 |
- |
5665 |
- for pamdfile in login passwd su; do |
5666 |
- newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die |
5667 |
- done |
5668 |
- |
5669 |
- cd "${WORKDIR}/etc" || die |
5670 |
- insinto /etc |
5671 |
- doins remote phones opieaccess fbtab || die |
5672 |
- |
5673 |
- exeinto /etc/cron.daily |
5674 |
- newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die |
5675 |
- |
5676 |
- # tip requires /var/spool/lock/, bug #200700 |
5677 |
- keepdir /var/spool/lock |
5678 |
- |
5679 |
- # create locate database #472468 |
5680 |
- local f=/var/db/locate.database |
5681 |
- mkdir "${ED}${f%/*}" || die |
5682 |
- touch "${ED}${f}" || die |
5683 |
- fowners nobody:nobody ${f} |
5684 |
-} |
5685 |
- |
5686 |
-pkg_postinst() { |
5687 |
- # We need to ensure that login.conf.db is up-to-date. |
5688 |
- if [[ -e "${ROOT}"etc/login.conf ]] ; then |
5689 |
- einfo "Updating ${ROOT}etc/login.conf.db" |
5690 |
- "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die |
5691 |
- elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" |
5692 |
- fi |
5693 |
-} |
5694 |
- |
5695 |
-pkg_postrm() { |
5696 |
- # and if we uninstall yacc but keep bison, |
5697 |
- # lets restore the /usr/bin/yacc symlink |
5698 |
- if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then |
5699 |
- ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die |
5700 |
- fi |
5701 |
-} |
5702 |
|
5703 |
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild |
5704 |
deleted file mode 100644 |
5705 |
index bf7da86b52e..00000000000 |
5706 |
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild |
5707 |
+++ /dev/null |
5708 |
@@ -1,212 +0,0 @@ |
5709 |
-# Copyright 1999-2017 Gentoo Foundation |
5710 |
-# Distributed under the terms of the GNU General Public License v2 |
5711 |
- |
5712 |
-EAPI=5 |
5713 |
- |
5714 |
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build |
5715 |
- |
5716 |
-DESCRIPTION="FreeBSD's base system source for /usr/bin" |
5717 |
-SLOT="0" |
5718 |
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs" |
5719 |
-LICENSE="BSD zfs? ( CDDL )" |
5720 |
- |
5721 |
-# Security Advisory and Errata patches. |
5722 |
-UPSTREAM_PATCHES=( "EN-16:21/localedef.patch" ) |
5723 |
- |
5724 |
-if [[ ${PV} != *9999* ]]; then |
5725 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
5726 |
- SRC_URI="${SRC_URI} |
5727 |
- $(freebsd_upstream_patches)" |
5728 |
-fi |
5729 |
- |
5730 |
-EXTRACTONLY=" |
5731 |
- usr.bin/ |
5732 |
- contrib/ |
5733 |
- lib/ |
5734 |
- etc/ |
5735 |
- bin/ |
5736 |
- include/ |
5737 |
-" |
5738 |
- |
5739 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}] |
5740 |
- ssl? ( dev-libs/openssl:0= ) |
5741 |
- kerberos? ( virtual/krb5 ) |
5742 |
- ar? ( >=app-arch/libarchive-3 ) |
5743 |
- virtual/pam |
5744 |
- sys-libs/zlib |
5745 |
- >=sys-libs/ncurses-5.9:0= |
5746 |
- !sys-process/fuser-bsd |
5747 |
- !dev-util/csup |
5748 |
- !dev-libs/libiconv |
5749 |
- !sys-freebsd/freebsd-contrib" |
5750 |
- |
5751 |
-DEPEND="${RDEPEND} |
5752 |
- sys-devel/flex |
5753 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
5754 |
- =sys-freebsd/freebsd-sbin-${RV}* |
5755 |
- =sys-freebsd/freebsd-mk-defs-${RV}*" |
5756 |
- |
5757 |
-RDEPEND="${RDEPEND} |
5758 |
- >=sys-auth/pambase-20080219.1 |
5759 |
- sys-process/cronbase" |
5760 |
- |
5761 |
-S="${WORKDIR}/usr.bin" |
5762 |
- |
5763 |
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch" |
5764 |
- "${FILESDIR}/${PN}-9.0-fixmakefiles.patch" |
5765 |
- "${FILESDIR}/${PN}-11.0-setXid.patch" |
5766 |
- "${FILESDIR}/${PN}-lint-stdarg.patch" |
5767 |
- "${FILESDIR}/${PN}-9.1-bsdar.patch" |
5768 |
- "${FILESDIR}/${PN}-9.1-minigzip.patch" |
5769 |
- "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch" |
5770 |
- "${FILESDIR}/${PN}-10.2-talk-workaround.patch" |
5771 |
- "${FILESDIR}/${PN}-10.2-bsdxml.patch" ) |
5772 |
- |
5773 |
-# Here we remove some sources we don't need because they are already |
5774 |
-# provided by portage's packages or similar. In order: |
5775 |
-# - Archiving tools, provided by their own ebuilds |
5776 |
-# - ncurses stuff |
5777 |
-# - less stuff |
5778 |
-# - bind utils |
5779 |
-# - rsh stuff |
5780 |
-# - binutils gprof |
5781 |
-# - dc stuff |
5782 |
-# and the rest are misc utils we already provide somewhere else. |
5783 |
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio |
5784 |
- gzip gprof |
5785 |
- lzmainfo xz xzdec |
5786 |
- unzip |
5787 |
- tput tset tabs |
5788 |
- less lessecho lesskey |
5789 |
- hesinfo host |
5790 |
- rsh rlogin rusers rwho ruptime |
5791 |
- compile_et lex vi smbutil file vacation nc ftp telnet |
5792 |
- c99 c89 |
5793 |
- bc dc |
5794 |
- whois tftp man |
5795 |
- addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings" |
5796 |
- |
5797 |
-pkg_setup() { |
5798 |
- # Add the required source files. |
5799 |
- use zfs && EXTRACTONLY+="cddl/ " |
5800 |
- use build && EXTRACTONLY+="sys/ " |
5801 |
- |
5802 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
5803 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
5804 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
5805 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
5806 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= " |
5807 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
5808 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
5809 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
5810 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
5811 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
5812 |
- mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= " |
5813 |
-} |
5814 |
- |
5815 |
-pkg_preinst() { |
5816 |
- # bison installs a /usr/bin/yacc symlink ... |
5817 |
- # we need to remove it to avoid triggering |
5818 |
- # collision-protect errors |
5819 |
- if [[ -L ${ROOT}/usr/bin/yacc ]]; then |
5820 |
- rm -f "${ROOT}"/usr/bin/yacc || die |
5821 |
- fi |
5822 |
-} |
5823 |
- |
5824 |
-src_prepare() { |
5825 |
- if [[ ! -e "${WORKDIR}/sys" ]]; then |
5826 |
- use build || ln -s "/usr/src/sys" "${WORKDIR}/sys" |
5827 |
- fi |
5828 |
- |
5829 |
- # Rename manpage for renamed cmp |
5830 |
- mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die |
5831 |
- # Rename manpage for renamed ar |
5832 |
- mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die |
5833 |
- # Fix whereis(1) manpath search. |
5834 |
- sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die |
5835 |
- |
5836 |
- # Build a dynamic make |
5837 |
- sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die |
5838 |
- |
5839 |
- # Disable it here otherwise our patch wont apply |
5840 |
- use ar || dummy_mk ar |
5841 |
- |
5842 |
- # Preparing to build xlint |
5843 |
- export LINT=xlint |
5844 |
-} |
5845 |
- |
5846 |
-setup_multilib_vars() { |
5847 |
- if ! multilib_is_native_abi ; then |
5848 |
- cd "${WORKDIR}/usr.bin/ldd" || die |
5849 |
- export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN=" |
5850 |
- else |
5851 |
- cd "${S}" || die |
5852 |
- fi |
5853 |
- "$@" |
5854 |
-} |
5855 |
- |
5856 |
-src_compile() { |
5857 |
- local MULTIBUILD_VARIANTS="${DEFAULT_ABI}" |
5858 |
- # Preparing to build addr2line, elfcopy, m4 |
5859 |
- for dir in libelftc libpe libopenbsd; do |
5860 |
- cd "${WORKDIR}/lib/${dir}" || die |
5861 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1 |
5862 |
- done |
5863 |
- |
5864 |
- MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
5865 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1 |
5866 |
-} |
5867 |
- |
5868 |
-src_install() { |
5869 |
- cd "${S}"/calendar/calendars || die |
5870 |
- for dir in $(find . -type d ! -name "." ) ; do |
5871 |
- dodir /usr/share/calendar/"$(basename ${dir})" |
5872 |
- done |
5873 |
- |
5874 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
5875 |
- multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install |
5876 |
- |
5877 |
- # baselayout requires these in /bin |
5878 |
- dodir /bin |
5879 |
- for bin in sed printf; do |
5880 |
- mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed" |
5881 |
- dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed" |
5882 |
- done |
5883 |
- |
5884 |
- for pamdfile in login passwd su; do |
5885 |
- newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die |
5886 |
- done |
5887 |
- |
5888 |
- cd "${WORKDIR}/etc" || die |
5889 |
- insinto /etc |
5890 |
- doins remote phones opieaccess fbtab || die |
5891 |
- |
5892 |
- exeinto /etc/cron.daily |
5893 |
- newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die |
5894 |
- |
5895 |
- # tip requires /var/spool/lock/, bug #200700 |
5896 |
- keepdir /var/spool/lock |
5897 |
- |
5898 |
- # create locate database #472468 |
5899 |
- local f=/var/db/locate.database |
5900 |
- mkdir "${ED}${f%/*}" || die |
5901 |
- touch "${ED}${f}" || die |
5902 |
- fowners nobody:nobody ${f} |
5903 |
-} |
5904 |
- |
5905 |
-pkg_postinst() { |
5906 |
- # We need to ensure that login.conf.db is up-to-date. |
5907 |
- if [[ -e "${ROOT}"etc/login.conf ]] ; then |
5908 |
- einfo "Updating ${ROOT}etc/login.conf.db" |
5909 |
- "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die |
5910 |
- elog "Remember to run cap_mkdb /etc/login.conf after making changes to it" |
5911 |
- fi |
5912 |
-} |
5913 |
- |
5914 |
-pkg_postrm() { |
5915 |
- # and if we uninstall yacc but keep bison, |
5916 |
- # lets restore the /usr/bin/yacc symlink |
5917 |
- if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then |
5918 |
- ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die |
5919 |
- fi |
5920 |
-} |
5921 |
|
5922 |
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest |
5923 |
index 260ecdf88eb..917172245e9 100644 |
5924 |
--- a/sys-freebsd/freebsd-usbin/Manifest |
5925 |
+++ b/sys-freebsd/freebsd-usbin/Manifest |
5926 |
@@ -12,8 +12,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4 |
5927 |
DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92 |
5928 |
DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 |
5929 |
DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc |
5930 |
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f |
5931 |
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd |
5932 |
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
5933 |
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 |
5934 |
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d |
5935 |
@@ -21,5 +19,3 @@ DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3 |
5936 |
DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e |
5937 |
DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6 |
5938 |
DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca |
5939 |
-DIST freebsd-usbin-SA-1630-portsnap-10.patch 1660 BLAKE2B 39f16a422c20038c76ff2739d23a231a2e263321ea2a6a16166b1c2fa72424e9c2e3048fad653700c5b2ec6d22e543e753ed4ec718cadd6e80ab9f248ca394d0 SHA512 43814a98a29b8ef0176de949ad513f16f4ac2cbea23eb260a6c5484b16d0dcc525569e44cfd00bce1f7aa3ecf6c537220098f6514790457372849da941d38d4a |
5940 |
-DIST freebsd-usbin-SA-1632-bhyve.patch 402 BLAKE2B d1d346e93400071bfa13391c418fc9bb67d17b75f11c88751e3e50e6f2df75c1b98502da130cbfdcd386d42d939fb6da13609c4ecf31fb1ed0cbe25d61086d64 SHA512 8261f070c282a4ff0123e90150bb5605615d86e74adc557b8d187dfc5acf74900751ac4f24e2b86bb1dbfeda34a86c694e31ec3a21788ce7994f1dacb21a9362 |
5941 |
|
5942 |
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 |
5943 |
deleted file mode 100644 |
5944 |
index a84f96d405b..00000000000 |
5945 |
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch |
5946 |
+++ /dev/null |
5947 |
@@ -1,24 +0,0 @@ |
5948 |
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c |
5949 |
---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900 |
5950 |
-+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900 |
5951 |
-@@ -60,7 +60,7 @@ |
5952 |
- #include <errno.h> |
5953 |
- #include <err.h> |
5954 |
- #include <ctype.h> |
5955 |
--#include <bsdxml.h> |
5956 |
-+#include <expat.h> |
5957 |
- #include <cam/scsi/scsi_all.h> |
5958 |
- #include <cam/scsi/scsi_message.h> |
5959 |
- #include <cam/ctl/ctl.h> |
5960 |
-diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c |
5961 |
---- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900 |
5962 |
-+++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900 |
5963 |
-@@ -45,7 +45,7 @@ |
5964 |
- #include <sys/sbuf.h> |
5965 |
- #include <sys/capability.h> |
5966 |
- #include <assert.h> |
5967 |
--#include <bsdxml.h> |
5968 |
-+#include <expat.h> |
5969 |
- #include <ctype.h> |
5970 |
- #include <errno.h> |
5971 |
- #include <fcntl.h> |
5972 |
|
5973 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild |
5974 |
deleted file mode 100644 |
5975 |
index 54be148462f..00000000000 |
5976 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild |
5977 |
+++ /dev/null |
5978 |
@@ -1,189 +0,0 @@ |
5979 |
-# Copyright 1999-2017 Gentoo Foundation |
5980 |
-# Distributed under the terms of the GNU General Public License v2 |
5981 |
- |
5982 |
-EAPI=5 |
5983 |
- |
5984 |
-inherit bsdmk freebsd flag-o-matic eutils |
5985 |
- |
5986 |
-DESCRIPTION="FreeBSD /usr/sbin tools" |
5987 |
-SLOT="0" |
5988 |
-LICENSE="BSD zfs? ( CDDL )" |
5989 |
- |
5990 |
-# Security Advisory and Errata patches. |
5991 |
-UPSTREAM_PATCHES=( "SA-16:30/portsnap-10.patch" ) |
5992 |
- |
5993 |
-if [[ ${PV} != *9999* ]]; then |
5994 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
5995 |
- SRC_URI="${SRC_URI} |
5996 |
- $(freebsd_upstream_patches)" |
5997 |
-fi |
5998 |
- |
5999 |
-EXTRACTONLY=" |
6000 |
- usr.sbin/ |
6001 |
- contrib/ |
6002 |
- usr.bin/ |
6003 |
- lib/ |
6004 |
- sbin/ |
6005 |
- etc/ |
6006 |
- gnu/ |
6007 |
-" |
6008 |
- |
6009 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] |
6010 |
- =sys-freebsd/freebsd-libexec-${RV}* |
6011 |
- build? ( sys-apps/baselayout ) |
6012 |
- ssl? ( dev-libs/openssl:0 ) |
6013 |
- >=app-arch/libarchive-3 |
6014 |
- sys-apps/tcp-wrappers |
6015 |
- dev-util/dialog |
6016 |
- >=dev-libs/libedit-20120311.3.0-r1 |
6017 |
- net-libs/libpcap |
6018 |
- kerberos? ( app-crypt/heimdal )" |
6019 |
-DEPEND="${RDEPEND} |
6020 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
6021 |
- =sys-freebsd/freebsd-ubin-${RV}* |
6022 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
6023 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
6024 |
- sys-apps/texinfo |
6025 |
- sys-devel/flex" |
6026 |
- |
6027 |
-S="${WORKDIR}/usr.sbin" |
6028 |
- |
6029 |
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs" |
6030 |
- |
6031 |
-pkg_setup() { |
6032 |
- # Add the required source files. |
6033 |
- use nis && EXTRACTONLY+="libexec/ " |
6034 |
- use build && EXTRACTONLY+="sys/ include/ " |
6035 |
- use zfs && EXTRACTONLY+="cddl/ " |
6036 |
- |
6037 |
- # Release crunch is something like minimal. It seems to remove everything |
6038 |
- # which is not needed to work. |
6039 |
- use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " |
6040 |
- |
6041 |
- use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " |
6042 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
6043 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
6044 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
6045 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
6046 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
6047 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
6048 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
6049 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
6050 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
6051 |
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " |
6052 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " |
6053 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
6054 |
- |
6055 |
- mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " |
6056 |
- |
6057 |
- append-flags $(test-flags -fno-strict-aliasing) |
6058 |
-} |
6059 |
- |
6060 |
-PATCHES=( |
6061 |
- "${FILESDIR}/${PN}-adduser.patch" |
6062 |
- "${FILESDIR}/${PN}-9.0-newsyslog.patch" |
6063 |
- "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" |
6064 |
- "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" |
6065 |
- ) |
6066 |
- |
6067 |
-REMOVE_SUBDIRS=" |
6068 |
- tcpdchk tcpdmatch |
6069 |
- sendmail praliases editmap mailstats makemap |
6070 |
- pc-sysinstall cron mailwrapper ntp bsnmpd |
6071 |
- tcpdump ndp inetd |
6072 |
- wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase |
6073 |
- zic amd |
6074 |
- pkg pkg_install freebsd-update service sysrc bsdinstall" |
6075 |
- |
6076 |
-src_prepare() { |
6077 |
- if ! use build; then |
6078 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
6079 |
- [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" |
6080 |
- else |
6081 |
- dummy_mk mount_smbfs |
6082 |
- fi |
6083 |
- # Don't install mtree format manpage |
6084 |
- # it's installed by libarchive. |
6085 |
- sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile |
6086 |
-} |
6087 |
- |
6088 |
-src_compile() { |
6089 |
- # Preparing to build nmtree |
6090 |
- cd "${WORKDIR}/lib/libnetbsd" || die |
6091 |
- freebsd_src_compile |
6092 |
- |
6093 |
- cd "${S}" || die |
6094 |
- freebsd_src_compile |
6095 |
-} |
6096 |
- |
6097 |
-src_install() { |
6098 |
- # By creating these directories we avoid having to do a |
6099 |
- # more complex hack |
6100 |
- dodir /usr/share/doc |
6101 |
- dodir /sbin |
6102 |
- dodir /usr/libexec |
6103 |
- dodir /usr/bin |
6104 |
- |
6105 |
- # FILESDIR is used by some makefiles which will install files |
6106 |
- # in the wrong place, just put it in the doc directory. |
6107 |
- mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed" |
6108 |
- |
6109 |
- # Most of these now come from openrc. |
6110 |
- for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
6111 |
- newinitd "${FILESDIR}/"${util}.initd ${util} |
6112 |
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
6113 |
- newconfd "${FILESDIR}"/${util}.confd ${util} |
6114 |
- fi |
6115 |
- done |
6116 |
- |
6117 |
- for class in daily monthly weekly; do |
6118 |
- cat - > "${T}/periodic.${class}" <<EOS |
6119 |
-#!/bin/sh |
6120 |
-/usr/sbin/periodic ${class} |
6121 |
-EOS |
6122 |
- exeinto /etc/cron.${class} |
6123 |
- newexe "${T}/periodic.${class}" periodic |
6124 |
- done |
6125 |
- |
6126 |
- # Install the pw.conf file to let pw use Gentoo's skel location |
6127 |
- insinto /etc |
6128 |
- doins "${FILESDIR}/pw.conf" |
6129 |
- |
6130 |
- cd "${WORKDIR}/etc" || die |
6131 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf |
6132 |
- |
6133 |
- insinto /etc/ppp |
6134 |
- doins ppp/ppp.conf |
6135 |
- |
6136 |
- if use bluetooth; then |
6137 |
- insinto /etc/bluetooth |
6138 |
- doins bluetooth/* |
6139 |
- rm -f "${D}"/etc/bluetooth/Makefile |
6140 |
- fi |
6141 |
- |
6142 |
- # Install the periodic stuff (needs probably to be ported in a more |
6143 |
- # gentooish way) |
6144 |
- cd "${WORKDIR}/etc/periodic" || die |
6145 |
- |
6146 |
- doperiodic daily daily/*.accounting |
6147 |
- doperiodic monthly monthly/*.accounting |
6148 |
-} |
6149 |
- |
6150 |
-pkg_postinst() { |
6151 |
- # We need to run pwd_mkdb if key files are not present |
6152 |
- # If they are, then there is no need to run pwd_mkdb |
6153 |
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then |
6154 |
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then |
6155 |
- einfo "Generating passwd files from ${ROOT}etc/master.passwd" |
6156 |
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" |
6157 |
- else |
6158 |
- eerror "${ROOT}etc/master.passwd does not exist!" |
6159 |
- eerror "You will no be able to log into your system!" |
6160 |
- fi |
6161 |
- fi |
6162 |
- |
6163 |
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \ |
6164 |
- debug.log slip.log ppp.log; do |
6165 |
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" |
6166 |
- done |
6167 |
-} |
6168 |
|
6169 |
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild |
6170 |
deleted file mode 100644 |
6171 |
index a43897c528f..00000000000 |
6172 |
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild |
6173 |
+++ /dev/null |
6174 |
@@ -1,188 +0,0 @@ |
6175 |
-# Copyright 1999-2017 Gentoo Foundation |
6176 |
-# Distributed under the terms of the GNU General Public License v2 |
6177 |
- |
6178 |
-EAPI=5 |
6179 |
- |
6180 |
-inherit bsdmk freebsd flag-o-matic eutils |
6181 |
- |
6182 |
-DESCRIPTION="FreeBSD /usr/sbin tools" |
6183 |
-SLOT="0" |
6184 |
-LICENSE="BSD zfs? ( CDDL )" |
6185 |
- |
6186 |
-# Security Advisory and Errata patches. |
6187 |
-UPSTREAM_PATCHES=( "SA-16:32/bhyve.patch" ) |
6188 |
- |
6189 |
-if [[ ${PV} != *9999* ]]; then |
6190 |
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
6191 |
- SRC_URI="${SRC_URI} |
6192 |
- $(freebsd_upstream_patches)" |
6193 |
-fi |
6194 |
- |
6195 |
-EXTRACTONLY=" |
6196 |
- usr.sbin/ |
6197 |
- contrib/ |
6198 |
- usr.bin/ |
6199 |
- lib/ |
6200 |
- sbin/ |
6201 |
- etc/ |
6202 |
- gnu/ |
6203 |
-" |
6204 |
- |
6205 |
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?] |
6206 |
- =sys-freebsd/freebsd-libexec-${RV}* |
6207 |
- build? ( sys-apps/baselayout ) |
6208 |
- ssl? ( dev-libs/openssl:0 ) |
6209 |
- >=app-arch/libarchive-3 |
6210 |
- sys-apps/tcp-wrappers |
6211 |
- dev-util/dialog |
6212 |
- >=dev-libs/libedit-20120311.3.0-r1 |
6213 |
- net-libs/libpcap |
6214 |
- kerberos? ( app-crypt/heimdal )" |
6215 |
-DEPEND="${RDEPEND} |
6216 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
6217 |
- =sys-freebsd/freebsd-ubin-${RV}* |
6218 |
- zfs? ( =sys-freebsd/freebsd-cddl-${RV}* ) |
6219 |
- !build? ( =sys-freebsd/freebsd-sources-${RV}* ) |
6220 |
- sys-apps/texinfo |
6221 |
- sys-devel/flex" |
6222 |
- |
6223 |
-S="${WORKDIR}/usr.sbin" |
6224 |
- |
6225 |
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs" |
6226 |
- |
6227 |
-pkg_setup() { |
6228 |
- # Add the required source files. |
6229 |
- use nis && EXTRACTONLY+="libexec/ " |
6230 |
- use build && EXTRACTONLY+="sys/ include/ " |
6231 |
- use zfs && EXTRACTONLY+="cddl/ " |
6232 |
- |
6233 |
- # Release crunch is something like minimal. It seems to remove everything |
6234 |
- # which is not needed to work. |
6235 |
- use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= " |
6236 |
- |
6237 |
- use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= " |
6238 |
- use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= " |
6239 |
- use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= " |
6240 |
- use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= " |
6241 |
- use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= " |
6242 |
- use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= " |
6243 |
- use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= " |
6244 |
- use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= " |
6245 |
- use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= " |
6246 |
- use usb || mymakeopts="${mymakeopts} WITHOUT_USB= " |
6247 |
- use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= " |
6248 |
- use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= " |
6249 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= " |
6250 |
- |
6251 |
- mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= " |
6252 |
- |
6253 |
- append-flags $(test-flags -fno-strict-aliasing) |
6254 |
-} |
6255 |
- |
6256 |
-PATCHES=( |
6257 |
- "${FILESDIR}/${PN}-adduser.patch" |
6258 |
- "${FILESDIR}/${PN}-9.0-newsyslog.patch" |
6259 |
- "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch" |
6260 |
- "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch" |
6261 |
- "${FILESDIR}/${PN}-11.0-workaround.patch" |
6262 |
- ) |
6263 |
- |
6264 |
-REMOVE_SUBDIRS=" |
6265 |
- tcpdchk tcpdmatch |
6266 |
- sendmail praliases editmap mailstats makemap |
6267 |
- pc-sysinstall cron mailwrapper ntp bsnmpd |
6268 |
- tcpdump ndp inetd |
6269 |
- wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase |
6270 |
- zic amd |
6271 |
- pkg freebsd-update service sysrc bsdinstall" |
6272 |
- |
6273 |
-src_prepare() { |
6274 |
- if ! use build; then |
6275 |
- [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys" |
6276 |
- [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include" |
6277 |
- else |
6278 |
- dummy_mk mount_smbfs |
6279 |
- fi |
6280 |
-} |
6281 |
- |
6282 |
-src_compile() { |
6283 |
- # Preparing to build nmtree |
6284 |
- cd "${WORKDIR}/lib/libnetbsd" || die |
6285 |
- freebsd_src_compile |
6286 |
- |
6287 |
- cd "${S}" || die |
6288 |
- freebsd_src_compile |
6289 |
-} |
6290 |
- |
6291 |
-src_install() { |
6292 |
- # By creating these directories we avoid having to do a |
6293 |
- # more complex hack |
6294 |
- dodir /usr/share/doc |
6295 |
- dodir /sbin |
6296 |
- dodir /usr/libexec |
6297 |
- dodir /usr/bin |
6298 |
- |
6299 |
- # FILESDIR is used by some makefiles which will install files |
6300 |
- # in the wrong place, just put it in the doc directory. |
6301 |
- freebsd_src_install DOCDIR=/usr/share/doc/${PF} |
6302 |
- |
6303 |
- # Most of these now come from openrc. |
6304 |
- for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do |
6305 |
- newinitd "${FILESDIR}/"${util}.initd ${util} |
6306 |
- if [[ -e "${FILESDIR}"/${util}.confd ]]; then \ |
6307 |
- newconfd "${FILESDIR}"/${util}.confd ${util} |
6308 |
- fi |
6309 |
- done |
6310 |
- |
6311 |
- for class in daily monthly weekly; do |
6312 |
- cat - > "${T}/periodic.${class}" <<EOS |
6313 |
-#!/bin/sh |
6314 |
-/usr/sbin/periodic ${class} |
6315 |
-EOS |
6316 |
- exeinto /etc/cron.${class} |
6317 |
- newexe "${T}/periodic.${class}" periodic |
6318 |
- done |
6319 |
- |
6320 |
- # Install the pw.conf file to let pw use Gentoo's skel location |
6321 |
- insinto /etc |
6322 |
- doins "${FILESDIR}/pw.conf" |
6323 |
- |
6324 |
- cd "${WORKDIR}/etc" || die |
6325 |
- doins apmd.conf syslog.conf newsyslog.conf nscd.conf |
6326 |
- |
6327 |
- if use bluetooth; then |
6328 |
- insinto /etc/bluetooth |
6329 |
- doins bluetooth/* |
6330 |
- rm -f "${D}"/etc/bluetooth/Makefile |
6331 |
- fi |
6332 |
- |
6333 |
- cd "${S}"/ppp || die |
6334 |
- insinto /etc/ppp |
6335 |
- doins ppp.conf |
6336 |
- |
6337 |
- # Install the periodic stuff (needs probably to be ported in a more |
6338 |
- # gentooish way) |
6339 |
- cd "${WORKDIR}/etc/periodic" || die |
6340 |
- |
6341 |
- doperiodic daily daily/*.accounting |
6342 |
- doperiodic monthly monthly/*.accounting |
6343 |
-} |
6344 |
- |
6345 |
-pkg_postinst() { |
6346 |
- # We need to run pwd_mkdb if key files are not present |
6347 |
- # If they are, then there is no need to run pwd_mkdb |
6348 |
- if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then |
6349 |
- if [[ -e "${ROOT}etc/master.passwd" ]] ; then |
6350 |
- einfo "Generating passwd files from ${ROOT}etc/master.passwd" |
6351 |
- "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd" |
6352 |
- else |
6353 |
- eerror "${ROOT}etc/master.passwd does not exist!" |
6354 |
- eerror "You will no be able to log into your system!" |
6355 |
- fi |
6356 |
- fi |
6357 |
- |
6358 |
- for logfile in messages security auth.log maillog lpd-errs xferlog cron \ |
6359 |
- debug.log slip.log ppp.log; do |
6360 |
- [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}" |
6361 |
- done |
6362 |
-} |