Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro@×××××××××.jp>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-pam-modules/files/, sys-freebsd/boot0/files/, ...
Date: Wed, 28 Sep 2016 12:25:07
Message-Id: 1475063231.bf4b60103bd917abae58f151a19817114a3cf631.yuta_satoh@gentoo
1 commit: bf4b60103bd917abae58f151a19817114a3cf631
2 Author: Yuta SATOH <nigoro.dev <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 28 11:47:11 2016 +0000
4 Commit: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
5 CommitDate: Wed Sep 28 11:47:11 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-bsd.git/commit/?id=bf4b6010
7
8 sys-freebsd: remove 10.3_rc3 ebuilds
9
10 sys-freebsd/boot0/Manifest | 11 -
11 sys-freebsd/boot0/boot0-10.3_rc3.ebuild | 83 ---
12 .../files/boot0-10.1-drop-unsupport-cflags.patch | 26 -
13 sys-freebsd/boot0/files/boot0-10.1-gcc46.patch | 67 ---
14 sys-freebsd/boot0/files/boot0-10.3-clang.patch | 30 -
15 .../files/boot0-10.3-drop-unsupport-cflags.patch | 28 -
16 .../boot0/files/boot0-10.3-uefi-support.patch | 33 --
17 .../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 -
18 sys-freebsd/boot0/files/boot0-9.2-gcc46.patch | 66 ---
19 .../boot0/files/boot0-add-nossp-cflags.patch | 11 -
20 sys-freebsd/boot0/metadata.xml | 12 -
21 sys-freebsd/freebsd-bin/Manifest | 3 -
22 .../freebsd-bin/freebsd-bin-10.3_rc3.ebuild | 42 --
23 sys-freebsd/freebsd-bin/metadata.xml | 8 -
24 sys-freebsd/freebsd-cddl/Manifest | 16 -
25 .../files/freebsd-cddl-10.1-underlink.patch | 27 -
26 .../files/freebsd-cddl-10.2-libpaths.patch | 220 -------
27 .../files/freebsd-cddl-10.2-underlink.patch | 12 -
28 .../files/freebsd-cddl-10.3-underlink.patch | 12 -
29 .../files/freebsd-cddl-8.0-libpaths.patch | 114 ----
30 .../files/freebsd-cddl-8.2-libpaths.patch | 22 -
31 .../files/freebsd-cddl-9.0-bsdxml.patch | 28 -
32 .../files/freebsd-cddl-9.0-libpaths.patch | 167 ------
33 .../files/freebsd-cddl-9.0-underlink.patch | 22 -
34 .../files/freebsd-cddl-9.2-libpaths.patch | 220 -------
35 sys-freebsd/freebsd-cddl/files/zfs.initd | 24 -
36 sys-freebsd/freebsd-cddl/files/zvol.initd | 47 --
37 sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 | 45 --
38 .../freebsd-cddl/freebsd-cddl-10.3_rc3.ebuild | 75 ---
39 sys-freebsd/freebsd-cddl/metadata.xml | 8 -
40 sys-freebsd/freebsd-lib/Manifest | 38 --
41 .../files/freebsd-lib-10.0-atfcxx.patch | 49 --
42 .../files/freebsd-lib-10.0-liblink.patch | 98 ----
43 .../files/freebsd-lib-10.0-libproc-libcxx.patch | 16 -
44 .../files/freebsd-lib-10.0-libusb.patch | 19 -
45 .../files/freebsd-lib-10.2-bsdxml2expat.patch | 39 --
46 .../files/freebsd-lib-10.2-liblink.patch | 26 -
47 .../files/freebsd-lib-10.3-libusb.patch | 13 -
48 .../files/freebsd-lib-6.0-flex-2.5.31.patch | 13 -
49 .../files/freebsd-lib-6.0-gccfloat.patch | 16 -
50 .../freebsd-lib/files/freebsd-lib-6.0-pmc.patch | 13 -
51 .../freebsd-lib/files/freebsd-lib-6.1-csu.patch | 20 -
52 .../files/freebsd-lib-6.2-bluetooth.patch | 11 -
53 .../files/freebsd-lib-7.1-types.h-fix.patch | 15 -
54 .../freebsd-lib/files/freebsd-lib-8.0-gcc45.patch | 28 -
55 .../freebsd-lib/files/freebsd-lib-8.0-log2.patch | 21 -
56 .../files/freebsd-lib-8.0-rpcsec_gss.patch | 12 -
57 .../files/freebsd-lib-8.2-liblink.patch | 19 -
58 .../files/freebsd-lib-8.2-nlm_syscall.patch | 10 -
59 .../files/freebsd-lib-9.0-bluetooth.patch | 12 -
60 .../files/freebsd-lib-9.0-cve-2010-2632.patch | 215 -------
61 .../files/freebsd-lib-9.0-liblink.patch | 21 -
62 .../files/freebsd-lib-9.0-netware.patch | 11 -
63 .../files/freebsd-lib-9.0-opieincludes.patch | 122 ----
64 .../files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch | 17 -
65 .../files/freebsd-lib-9.1-aligned_alloc.patch | 51 --
66 .../files/freebsd-lib-9.1-rmgssapi.patch | 16 -
67 .../files/freebsd-lib-add-nossp-cflags.patch | 30 -
68 .../freebsd-lib/files/freebsd-lib-bsdxml.patch | 13 -
69 .../files/freebsd-lib-bsdxml2expat.patch | 26 -
70 .../freebsd-lib/files/freebsd-lib-includes.patch | 13 -
71 .../freebsd-lib/files/freebsd-lib-new_as.patch | 68 ---
72 .../files/freebsd-sources-9.0-sysctluint.patch | 13 -
73 sys-freebsd/freebsd-lib/files/libmap.conf | 8 -
74 sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in | 11 -
75 sys-freebsd/freebsd-lib/files/libusb.pc.in | 11 -
76 .../freebsd-lib/freebsd-lib-10.3_rc3.ebuild | 645 ---------------------
77 sys-freebsd/freebsd-lib/metadata.xml | 16 -
78 sys-freebsd/freebsd-libexec/Manifest | 16 -
79 sys-freebsd/freebsd-libexec/files/bootpd.confd | 7 -
80 sys-freebsd/freebsd-libexec/files/bootpd.initd | 27 -
81 .../files/freebsd-libexec-10.0-atf-check.patch | 25 -
82 .../files/freebsd-libexec-10.2-atf-check.patch | 28 -
83 .../files/freebsd-libexec-7.2-pic.patch | 13 -
84 .../files/freebsd-libexec-8.2-rtld.patch | 40 --
85 .../files/freebsd-libexec-9.2-no_ld32.patch | 15 -
86 sys-freebsd/freebsd-libexec/files/ftpd.pamd | 8 -
87 sys-freebsd/freebsd-libexec/files/rquotad.xinetd | 11 -
88 sys-freebsd/freebsd-libexec/files/rstatd.xinetd | 11 -
89 sys-freebsd/freebsd-libexec/files/rusersd.xinetd | 11 -
90 sys-freebsd/freebsd-libexec/files/sprayd.xinetd | 11 -
91 sys-freebsd/freebsd-libexec/files/walld.xinetd | 11 -
92 .../freebsd-libexec-10.3_rc3.ebuild | 109 ----
93 sys-freebsd/freebsd-libexec/metadata.xml | 8 -
94 sys-freebsd/freebsd-mk-defs/Manifest | 13 -
95 .../files/freebsd-mk-defs-10.0-gentoo.patch | 352 -----------
96 .../files/freebsd-mk-defs-10.1-gnu.patch | 79 ---
97 .../files/freebsd-mk-defs-10.2-gentoo.patch | 337 -----------
98 .../files/freebsd-mk-defs-10.2-gnu.patch | 63 --
99 .../files/freebsd-mk-defs-10.3-gentoo.patch | 337 -----------
100 .../files/freebsd-mk-defs-8.0-gentoo.patch | 332 -----------
101 .../files/freebsd-mk-defs-8.0-gnu.patch | 121 ----
102 .../files/freebsd-mk-defs-9.1-gentoo.patch | 326 -----------
103 .../files/freebsd-mk-defs-9.1-gnu.patch | 77 ---
104 .../files/freebsd-mk-defs-add-nossp-cflags.patch | 28 -
105 .../freebsd-mk-defs-10.3_rc3.ebuild | 42 --
106 sys-freebsd/freebsd-mk-defs/metadata.xml | 8 -
107 sys-freebsd/freebsd-pam-modules/Manifest | 6 -
108 sys-freebsd/freebsd-pam-modules/files/README.pamd | 63 --
109 .../files/freebsd-pam-modules-6.0-gentoo.patch | 24 -
110 .../files/freebsd-pam-modules-9.0-gentoo.patch | 22 -
111 .../freebsd-pam-modules-10.3_rc3.ebuild | 48 --
112 sys-freebsd/freebsd-pam-modules/metadata.xml | 8 -
113 sys-freebsd/freebsd-pf/Manifest | 14 -
114 .../files/freebsd-pf-10.0-libevent.patch | 16 -
115 .../freebsd-pf/files/freebsd-pf-10.0-pflogd.patch | 15 -
116 .../freebsd-pf/files/freebsd-pf-7.0-libevent.patch | 12 -
117 .../files/freebsd-pf-7.0-pcap_pollution.patch | 18 -
118 .../freebsd-pf/files/freebsd-pf-9.0-bpf.patch | 10 -
119 .../freebsd-pf/files/freebsd-pf-9.0-getline.patch | 38 --
120 .../freebsd-pf/files/freebsd-pf-9.0-libevent.patch | 15 -
121 .../files/freebsd-pf-9.0-pcap_pollution.patch | 17 -
122 .../freebsd-pf/files/freebsd-pf-9.0-pflogd.patch | 13 -
123 sys-freebsd/freebsd-pf/files/pf.confd | 9 -
124 sys-freebsd/freebsd-pf/files/pf.initd | 50 --
125 sys-freebsd/freebsd-pf/freebsd-pf-10.3_rc3.ebuild | 73 ---
126 sys-freebsd/freebsd-pf/metadata.xml | 8 -
127 sys-freebsd/freebsd-rescue/Manifest | 11 -
128 .../files/freebsd-rescue-10.0-zlib.patch | 22 -
129 .../files/freebsd-rescue-7.1-zlib.patch | 21 -
130 ...sd-rescue-8.0-pkgconfig_static_libarchive.patch | 11 -
131 .../files/freebsd-rescue-8.2-libzcleverlink.patch | 20 -
132 .../files/freebsd-rescue-9.1-bsdtar.patch | 12 -
133 .../files/freebsd-rescue-9.1-libcleverlink.patch | 21 -
134 .../files/freebsd-sbin-bsdxml2expat.patch | 13 -
135 .../files/freebsd-ubin-10.2-bsdxml.patch | 13 -
136 .../freebsd-rescue/freebsd-rescue-10.3_rc3.ebuild | 82 ---
137 sys-freebsd/freebsd-rescue/metadata.xml | 12 -
138 sys-freebsd/freebsd-sbin/Manifest | 17 -
139 sys-freebsd/freebsd-sbin/files/adjkerntz-crontab | 4 -
140 sys-freebsd/freebsd-sbin/files/devd.conf | 153 -----
141 sys-freebsd/freebsd-sbin/files/devd.initd | 47 --
142 sys-freebsd/freebsd-sbin/files/devd_queue | 50 --
143 .../files/freebsd-sbin-10.0-zlib.patch | 22 -
144 .../files/freebsd-sbin-6.1-pr102701.patch | 17 -
145 .../files/freebsd-sbin-6.2-ldconfig.patch | 13 -
146 .../freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch | 21 -
147 .../files/freebsd-sbin-bsdxml2expat.patch | 13 -
148 .../freebsd-sbin/files/freebsd-sbin-setXid.patch | 20 -
149 sys-freebsd/freebsd-sbin/files/idmapd.initd | 20 -
150 sys-freebsd/freebsd-sbin/files/ipfw.confd | 10 -
151 sys-freebsd/freebsd-sbin/files/ipfw.initd | 110 ----
152 sys-freebsd/freebsd-sbin/files/sysctl.initd | 28 -
153 .../freebsd-sbin/freebsd-sbin-10.3_rc3.ebuild | 101 ----
154 sys-freebsd/freebsd-sbin/metadata.xml | 20 -
155 sys-freebsd/freebsd-share/Manifest | 10 -
156 .../files/freebsd-share-10.0-gentoo-eapi3.patch | 17 -
157 .../files/freebsd-share-10.2-gnu-miscfiles.patch | 30 -
158 .../files/freebsd-share-10.3-gentoo-skel.patch | 20 -
159 .../files/freebsd-share-5.3-doc-locations.patch | 20 -
160 .../files/freebsd-share-5.4-gentoo-skel.patch | 20 -
161 .../files/freebsd-share-8.0-gnu-miscfiles.patch | 26 -
162 .../files/freebsd-share-9.2-gnu-miscfiles.patch | 28 -
163 .../freebsd-share/freebsd-share-10.3_rc3.ebuild | 113 ----
164 sys-freebsd/freebsd-share/metadata.xml | 12 -
165 sys-freebsd/freebsd-sources/Manifest | 36 --
166 sys-freebsd/freebsd-sources/files/config-GENTOO | 4 -
167 .../files/freebsd-sources-10.0-gentoo.patch | 22 -
168 .../files/freebsd-sources-10.1-gcc48.patch | 18 -
169 .../files/freebsd-sources-6.0-flex-2.5.31.patch | 22 -
170 .../files/freebsd-sources-6.1-ntfs.patch | 32 -
171 .../freebsd-sources-7.0-tmpfs_whiteout_stub.patch | 44 --
172 .../files/freebsd-sources-7.1-binutils_link.patch | 37 --
173 .../files/freebsd-sources-7.1-includes.patch | 13 -
174 .../files/freebsd-sources-7.1-types.h-fix.patch | 15 -
175 .../files/freebsd-sources-7.2-debug-O2.patch | 27 -
176 .../files/freebsd-sources-8.0-gentoo.patch | 33 --
177 .../freebsd-sources-8.0-subnet-route-pr40133.patch | 21 -
178 .../files/freebsd-sources-8.2-unix2.patch | 55 --
179 .../freebsd-sources-9.0-disable-optimization.patch | 32 -
180 .../files/freebsd-sources-9.0-ipv6refcount.patch | 128 ----
181 .../files/freebsd-sources-9.0-sysctluint.patch | 13 -
182 .../files/freebsd-sources-9.1-ciss.patch | 65 ---
183 .../files/freebsd-sources-9.1-cve-2013-3077.patch | 26 -
184 .../files/freebsd-sources-9.1-cve-2013-3266.patch | 13 -
185 .../files/freebsd-sources-9.1-cve-2013-5209.patch | 19 -
186 .../files/freebsd-sources-9.1-cve-2013-5691.patch | 89 ---
187 .../files/freebsd-sources-9.1-cve-2013-5710.patch | 28 -
188 .../files/freebsd-sources-9.1-cve-2014-1453.patch | 70 ---
189 .../files/freebsd-sources-9.1-exec.patch | 66 ---
190 .../files/freebsd-sources-9.1-gentoo.patch | 21 -
191 .../files/freebsd-sources-9.1-ktrace.patch | 12 -
192 .../files/freebsd-sources-9.1-mmap-2014.patch | 20 -
193 .../files/freebsd-sources-9.1-mmap.patch | 20 -
194 .../files/freebsd-sources-9.1-nfsserver.patch | 16 -
195 .../files/freebsd-sources-9.1-random.patch | 27 -
196 .../files/freebsd-sources-9.1-tcp.patch | 32 -
197 .../files/freebsd-sources-9.2-gentoo-gcc.patch | 13 -
198 .../files/freebsd-sources-cve-2012-0217.patch | 26 -
199 .../freebsd-sources-10.3_rc3.ebuild | 157 -----
200 sys-freebsd/freebsd-sources/metadata.xml | 13 -
201 sys-freebsd/freebsd-ubin/Manifest | 32 -
202 .../freebsd-ubin/files/freebsd-ubin-10.0-atf.patch | 15 -
203 .../files/freebsd-ubin-10.0-dtc-gcc46.patch | 25 -
204 .../files/freebsd-ubin-10.0-kdump-ioctl.patch | 26 -
205 .../files/freebsd-ubin-10.0-mandoc.patch | 13 -
206 .../files/freebsd-ubin-10.1-kdump-workaround.patch | 13 -
207 .../files/freebsd-ubin-10.2-bsdxml.patch | 13 -
208 .../files/freebsd-ubin-10.2-talk-workaround.patch | 12 -
209 .../files/freebsd-ubin-10.3-bmake-workaround.patch | 13 -
210 .../files/freebsd-ubin-6.0-bsdcmp.patch | 13 -
211 .../files/freebsd-ubin-6.0-fixmakefiles.patch | 35 --
212 .../files/freebsd-ubin-6.0-kdump-ioctl.patch | 28 -
213 .../files/freebsd-ubin-8.0-bsdar.patch | 21 -
214 .../files/freebsd-ubin-8.0-xinstall.patch | 26 -
215 .../files/freebsd-ubin-8.2-compress.patch | 55 --
216 .../files/freebsd-ubin-9.0-fixmakefiles.patch | 11 -
217 .../files/freebsd-ubin-9.1-ar-libarchive3.patch | 19 -
218 .../files/freebsd-ubin-9.1-bsdar.patch | 25 -
219 .../freebsd-ubin/files/freebsd-ubin-9.1-grep.patch | 17 -
220 .../files/freebsd-ubin-9.1-kdump-ioctl.patch | 24 -
221 .../files/freebsd-ubin-9.1-minigzip.patch | 10 -
222 .../files/freebsd-ubin-lint-stdarg.patch | 24 -
223 .../freebsd-ubin/files/freebsd-ubin-setXid.patch | 129 -----
224 .../freebsd-ubin/files/locate-updatedb-cron | 6 -
225 sys-freebsd/freebsd-ubin/files/login.1.pamd | 4 -
226 sys-freebsd/freebsd-ubin/files/login.pamd | 20 -
227 sys-freebsd/freebsd-ubin/files/passwd.1.pamd | 9 -
228 sys-freebsd/freebsd-ubin/files/passwd.pamd | 11 -
229 sys-freebsd/freebsd-ubin/files/su.1.pamd | 17 -
230 sys-freebsd/freebsd-ubin/files/su.pamd | 17 -
231 .../freebsd-ubin/freebsd-ubin-10.3_rc3.ebuild | 207 -------
232 sys-freebsd/freebsd-ubin/metadata.xml | 24 -
233 sys-freebsd/freebsd-usbin/Manifest | 32 -
234 .../files/freebsd-usbin-10.0-bsdxml2expat.patch | 24 -
235 .../files/freebsd-usbin-10.3-bsdxml2expat.patch | 13 -
236 .../files/freebsd-usbin-7.0-nowrap.patch | 45 --
237 .../files/freebsd-usbin-8.2-newsyslog.patch | 10 -
238 .../files/freebsd-usbin-9.0-libarchive.patch | 12 -
239 .../files/freebsd-usbin-9.0-newsyslog.patch | 12 -
240 .../files/freebsd-usbin-9.1-bsdxml2expat.patch | 12 -
241 .../files/freebsd-usbin-9.1-kldxref.patch | 30 -
242 .../files/freebsd-usbin-adduser.patch | 20 -
243 sys-freebsd/freebsd-usbin/files/iscsid.initd | 20 -
244 sys-freebsd/freebsd-usbin/files/mountd.patch | 15 -
245 sys-freebsd/freebsd-usbin/files/moused.confd | 20 -
246 sys-freebsd/freebsd-usbin/files/moused.initd | 66 ---
247 sys-freebsd/freebsd-usbin/files/nfs.confd | 10 -
248 sys-freebsd/freebsd-usbin/files/nfs.initd | 54 --
249 sys-freebsd/freebsd-usbin/files/nfsmount.initd | 63 --
250 sys-freebsd/freebsd-usbin/files/nfsuserd.confd | 5 -
251 sys-freebsd/freebsd-usbin/files/nfsuserd.initd | 20 -
252 sys-freebsd/freebsd-usbin/files/powerd.confd | 14 -
253 sys-freebsd/freebsd-usbin/files/powerd.initd | 27 -
254 sys-freebsd/freebsd-usbin/files/pw.conf | 5 -
255 sys-freebsd/freebsd-usbin/files/rarpd.confd | 7 -
256 sys-freebsd/freebsd-usbin/files/rarpd.initd | 35 --
257 sys-freebsd/freebsd-usbin/files/rpc.lockd.initd | 20 -
258 sys-freebsd/freebsd-usbin/files/rpc.statd.initd | 20 -
259 sys-freebsd/freebsd-usbin/files/rpcbind.initd | 30 -
260 sys-freebsd/freebsd-usbin/files/syscons.confd | 14 -
261 sys-freebsd/freebsd-usbin/files/syscons.initd | 78 ---
262 sys-freebsd/freebsd-usbin/files/syslogd.initd | 25 -
263 .../freebsd-usbin/freebsd-usbin-10.3_rc3.ebuild | 187 ------
264 sys-freebsd/freebsd-usbin/metadata.xml | 19 -
265 255 files changed, 10595 deletions(-)
266
267 diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
268 deleted file mode 100644
269 index b79892f..0000000
270 --- a/sys-freebsd/boot0/Manifest
271 +++ /dev/null
272 @@ -1,11 +0,0 @@
273 -AUX boot0-10.1-drop-unsupport-cflags.patch 893 SHA256 7d58c67b73ed6ae7326b03e7a4c1204d17808328de0ac904973604658bc1804c SHA512 c4d441c9538489585f27f292fa0acd921496cdd10e06a7de45f4db7f6a6300f41401a387c9e65bf909790e7755fb92001131d668c6246a2505756b8e9e10eeea WHIRLPOOL 9ce41efe802fc181fac9026eb310d3d48173df7db585f4ddb5424ced43f5e7081a8baefc12370588ba2979e0ef6234fa5718457e3e854f66c7d1309778d863f4
274 -AUX boot0-10.1-gcc46.patch 2180 SHA256 a664f792660fe1dc25b6e54a973ad6d8ac6c19ef309954f5bb7973b52832cc82 SHA512 a0633fe171c668b976277d26c3406d75ec5892cd6fe28845ea9faca03659689ad87fee6eeac5968b00026733e854bb0d2216e6f3987cf1ed9bcedb3bc2b210b6 WHIRLPOOL 2d5ba9602c93ab02aef29838478b578603b39e7d26dbf688e3fccd1cdd7e5fec3aec729db81b4548b69841ab330e8898eb445ee09d06ccd8500fb0f7387c3fc8
275 -AUX boot0-10.3-clang.patch 847 SHA256 6687fa92439ec0813a61221f5acfc6fe4588432c6660f9e6962437d2589f5a1c SHA512 74a64f9853dc28e5354d1d3d1a97c9543b6f80d48568d264874a23355c4bcab9e6a90a22630b2c7afea4b51c906db4745cb2773feaf42979a9192b8f995d7405 WHIRLPOOL 3a299ffc554ad91a763a974268978755dc7819a6e4c21736efca6df1c0e5a95b07184103724634af3eb634fb2da77abb40d6bfb493cb6effb7463abe2c339905
276 -AUX boot0-10.3-drop-unsupport-cflags.patch 971 SHA256 26a7aef66e0b436201698f0df262d8af50061da203f90e1bc8babd79815f62b9 SHA512 ca2d36c332515c0c7b89bae24213e5dd21065e7bdd689726e1777d4439dfc850918ad4312751cdc69a417f05724f484f14a8254895e673844245e69133b8cf46 WHIRLPOOL 6ff2f96c33857433ed3160241a7137aef9375d15533f7fd3db979ac8294ee28f21fc9e1c292450fac6a3dd515e86f5969b7b517d36636712ef921af5956faa0f
277 -AUX boot0-10.3-uefi-support.patch 762 SHA256 5089401accfd622091253ec652b0e86edaf00021ec7372829bec56d08ba4d83c SHA512 6ff9b34969475f9580b364c6fca591901554107ac0eacb7e19888a05411fc4e9928ec632525dba30449678bb14f22cef23605ca5843370f882ca90bb1dc32a1a WHIRLPOOL cb83d397f0a1660b6ee0154b1c2d6e7807e2c6e61d92790e5be37233fa6f8bec3947f9c49d5046329486654a648e758f0e4d9f6d2ce7b2cf448c181059745281
278 -AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
279 -AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
280 -AUX boot0-add-nossp-cflags.patch 341 SHA256 ed801285f9e9846c7fc4f334a2dfceec2d023be9b22e53aa3713d648cac899be SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb WHIRLPOOL 06ae4058fd8c39abe215e417fdffd1c13fdc641891fcb8f8a37af3ac31e781da666c3cd9cf2b800174439ebcc2ecb5b6efb9e9e5880a216878fb4ced7ffd9bfe
281 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
282 -EBUILD boot0-10.3_rc3.ebuild 1909 SHA256 adb4fe3da8c0301dd5b69b0ecd191612ce375e3e6f84a5a00e9a85e2298d2928 SHA512 19d5d0ce363ce4e332d8fba9c8e6fc1333498961e016bf07ec7259a6f3235bb2b879f3009c959606492f26d30a02fb0d70bc5302b33537277aa26b99647b53af WHIRLPOOL 48abbf2dce67014799dd1b599968a586191ff2d94c6152979c20dfa2c36fd7f43447dd2709d3c88abc5e35efaa92757e36b078fe372f0cdc7974ba48a9fe76f9
283 -MISC metadata.xml 385 SHA256 1b6dbb50d321102c9a48b5f6bce5825e88ce8dfcabd86892194b2fa10e540b11 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808 WHIRLPOOL f073e698718e05e55026bad3888ce2809d2a0a7f4d0e4090e5c1fb16be55846e0bbf81c09748b76ea960a77e74b96678031c888852b8e4e259640d67386cc655
284
285 diff --git a/sys-freebsd/boot0/boot0-10.3_rc3.ebuild b/sys-freebsd/boot0/boot0-10.3_rc3.ebuild
286 deleted file mode 100644
287 index a6361bf..0000000
288 --- a/sys-freebsd/boot0/boot0-10.3_rc3.ebuild
289 +++ /dev/null
290 @@ -1,83 +0,0 @@
291 -# Copyright 1999-2016 Gentoo Foundation
292 -# Distributed under the terms of the GNU General Public License v2
293 -# $Id$
294 -
295 -EAPI=5
296 -
297 -inherit bsdmk freebsd flag-o-matic toolchain-funcs
298 -
299 -DESCRIPTION="FreeBSD's bootloader"
300 -SLOT="0"
301 -
302 -IUSE="bzip2 ieee1394 tftp zfs"
303 -
304 -if [[ ${PV} != *9999* ]]; then
305 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
306 -fi
307 -
308 -EXTRACTONLY="
309 - sys/
310 - lib/
311 - contrib/bzip2/
312 -"
313 -
314 -RDEPEND=""
315 -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
316 - =sys-freebsd/freebsd-lib-${RV}*"
317 -
318 -S="${WORKDIR}/sys/boot"
319 -
320 -PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch"
321 - "${FILESDIR}/${PN}-10.3-clang.patch"
322 - "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch"
323 - "${FILESDIR}/${PN}-10.3-uefi-support.patch"
324 - "${FILESDIR}/${PN}-add-nossp-cflags.patch" )
325 -
326 -boot0_use_enable() {
327 - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
328 - use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
329 -}
330 -
331 -pkg_setup() {
332 - boot0_use_enable ieee1394 FIREWIRE
333 - boot0_use_enable zfs ZFS
334 - boot0_use_enable tftp TFTP
335 - boot0_use_enable bzip2 BZIP2
336 -}
337 -
338 -src_prepare() {
339 - sed -e '/-mno-align-long-strings/d' \
340 - -i "${S}"/i386/boot2/Makefile \
341 - -i "${S}"/i386/gptboot/Makefile \
342 - -i "${S}"/i386/gptzfsboot/Makefile \
343 - -i "${S}"/i386/zfsboot/Makefile || die
344 -
345 - export MAKEOBJDIRPREFIX="${WORKDIR}/build"
346 -}
347 -
348 -src_compile() {
349 - strip-flags
350 - append-flags "-fno-strict-aliasing"
351 -
352 - cd "${WORKDIR}/lib/libstand" || die
353 - freebsd_src_compile
354 -
355 - CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
356 - LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
357 - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
358 -
359 - cd "${S}" || die
360 - NOFLAGSTRIP="yes" freebsd_src_compile
361 -}
362 -
363 -src_install() {
364 - dodir /boot/defaults
365 - mkinstall FILESDIR=/boot || die "mkinstall failed"
366 -
367 - cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
368 - insinto /boot
369 - newins GENERIC.hints device.hints || die
370 -
371 - echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
372 - doenvd "${T}"/50boot0 || die
373 -}
374
375 diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
376 deleted file mode 100644
377 index 4ab415b..0000000
378 --- a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch
379 +++ /dev/null
380 @@ -1,26 +0,0 @@
381 -diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
382 -index 76ed0ca..2d1d39d 100644
383 ---- a/sys/boot/efi/libefi/Makefile
384 -+++ b/sys/boot/efi/libefi/Makefile
385 -@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
386 - CFLAGS+= -I${.CURDIR}/../../common
387 -
388 -
389 --# Suppress warning from clang for FreeBSD %b and %D formats
390 --CFLAGS+= -fformat-extensions
391 --
392 - .include <bsd.lib.mk>
393 -diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
394 -index d714c74..a5cfa3c 100644
395 ---- a/sys/boot/i386/libi386/Makefile
396 -+++ b/sys/boot/i386/libi386/Makefile
397 -@@ -52,9 +52,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \
398 - # the location of libstand
399 - CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
400 -
401 --# Suppress warning from clang for FreeBSD %b and %D formats
402 --CFLAGS+= -fformat-extensions
403 --
404 - .if ${MACHINE_CPUARCH} == "amd64"
405 - CLEANFILES+= machine
406 - machine:
407
408 diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
409 deleted file mode 100644
410 index 9b31e7c..0000000
411 --- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
412 +++ /dev/null
413 @@ -1,67 +0,0 @@
414 -diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
415 -index 472b275..0c9409d 100644
416 ---- a/sys/boot/i386/Makefile.inc
417 -+++ b/sys/boot/i386/Makefile.inc
418 -@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib
419 - .if ${MACHINE_CPUARCH} == "amd64"
420 - CFLAGS+= -m32
421 - ACFLAGS+= -m32
422 --# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
423 --LD_FLAGS+= -m elf_i386_fbsd
424 - AFLAGS+= --32
425 - .endif
426 -
427 -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
428 -index 428950e..6a15450 100644
429 ---- a/sys/boot/i386/boot2/Makefile
430 -+++ b/sys/boot/i386/boot2/Makefile
431 -@@ -113,3 +113,10 @@ machine:
432 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
433 - CFLAGS.boot1.S= ${CLANG_NO_IAS}
434 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
435 -+
436 -+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
437 -+CFLAGS+= -fno-asynchronous-unwind-tables
438 -+
439 -+.if ${MACHINE_CPUARCH} == "amd64"
440 -+LD_FLAGS+= -m elf_i386_fbsd
441 -+.endif
442 -diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
443 -index a90e712..d60ae00 100644
444 ---- a/sys/boot/i386/gptboot/Makefile
445 -+++ b/sys/boot/i386/gptboot/Makefile
446 -@@ -81,3 +81,8 @@ machine:
447 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
448 - CFLAGS.gptldr.S= ${CLANG_NO_IAS}
449 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
450 -+
451 -+.if ${MACHINE_CPUARCH} == "amd64"
452 -+LD_FLAGS+= -m elf_i386_fbsd
453 -+.endif
454 -+
455 -diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
456 -index 5eb2383..c10a917 100644
457 ---- a/sys/boot/i386/gptzfsboot/Makefile
458 -+++ b/sys/boot/i386/gptzfsboot/Makefile
459 -@@ -78,3 +78,8 @@ machine:
460 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
461 - CFLAGS.gptldr.S= ${CLANG_NO_IAS}
462 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
463 -+
464 -+.if ${MACHINE_CPUARCH} == "amd64"
465 -+LD_FLAGS+= -m elf_i386_fbsd
466 -+.endif
467 -+
468 -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
469 -index 149f43a..be1e46a 100644
470 ---- a/sys/boot/i386/zfsboot/Makefile
471 -+++ b/sys/boot/i386/zfsboot/Makefile
472 -@@ -91,3 +91,8 @@ machine:
473 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
474 - CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
475 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
476 -+
477 -+.if ${MACHINE_CPUARCH} == "amd64"
478 -+LD_FLAGS+= -m elf_i386_fbsd
479 -+.endif
480 -+
481
482 diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch
483 deleted file mode 100644
484 index 4245e21..0000000
485 --- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch
486 +++ /dev/null
487 @@ -1,30 +0,0 @@
488 -Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676
489 -
490 -https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479
491 -
492 -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
493 -index 8a6e771..c030853 100644
494 ---- a/sys/boot/i386/boot2/Makefile
495 -+++ b/sys/boot/i386/boot2/Makefile
496 -@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2
497 - #BOOT2_UFS?= UFS2_ONLY
498 - #BOOT2_UFS?= UFS1_ONLY
499 -
500 --CFLAGS= -Os \
501 -- -fomit-frame-pointer \
502 -+CFLAGS= -fomit-frame-pointer \
503 - -mrtd \
504 - -mregparm=3 \
505 - -DUSE_XREAD \
506 -@@ -40,7 +39,10 @@ CFLAGS= -Os \
507 - -Winline \
508 - ${CLANG_OPT_SMALL}
509 -
510 --CFLAGS.gcc+= -fno-guess-branch-probability \
511 -+CFLAGS.clang+= -Oz
512 -+
513 -+CFLAGS.gcc+= -Os \
514 -+ -fno-guess-branch-probability \
515 - -fno-unit-at-a-time \
516 - --param max-inline-insns-single=100
517 - .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
518
519 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
520 deleted file mode 100644
521 index af1d351..0000000
522 --- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
523 +++ /dev/null
524 @@ -1,28 +0,0 @@
525 -diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
526 -index fc66e01..470453d 100644
527 ---- a/sys/boot/efi/libefi/Makefile
528 -+++ b/sys/boot/efi/libefi/Makefile
529 -@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
530 - # Pick up the bootstrap header for some interface items
531 - CFLAGS+= -I${.CURDIR}/../../common
532 -
533 --
534 --# Suppress warning from clang for FreeBSD %b and %D formats
535 --CFLAGS+= -fformat-extensions
536 - CFLAGS+= -DTERM_EMU
537 -
538 - .include <bsd.lib.mk>
539 -diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
540 -index 24cc4c1..e5d2bae 100644
541 ---- a/sys/boot/i386/libi386/Makefile
542 -+++ b/sys/boot/i386/libi386/Makefile
543 -@@ -55,9 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \
544 - # the location of libstand
545 - CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
546 -
547 --# Suppress warning from clang for FreeBSD %b and %D formats
548 --CFLAGS+= -fformat-extensions
549 --
550 - .if ${MACHINE_CPUARCH} == "amd64"
551 - CLEANFILES+= machine
552 - machine:
553
554 diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
555 deleted file mode 100644
556 index fdafe74..0000000
557 --- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
558 +++ /dev/null
559 @@ -1,33 +0,0 @@
560 -diff --git a/efi/Makefile b/efi/Makefile
561 -index 30024e3..a33efb2 100644
562 ---- a/efi/Makefile
563 -+++ b/efi/Makefile
564 -@@ -2,15 +2,10 @@
565 -
566 - .include <bsd.own.mk>
567 -
568 --# In-tree GCC does not support __attribute__((ms_abi)).
569 --.if ${COMPILER_TYPE} != "gcc"
570 --
571 - .if ${MACHINE_CPUARCH} == "amd64"
572 - SUBDIR+= libefi loader boot1
573 - .endif
574 -
575 --.endif # ${COMPILER_TYPE} != "gcc"
576 --
577 - .if ${MACHINE_CPUARCH} == "ia64"
578 - SUBDIR+= libefi
579 - .endif
580 -diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile
581 -index 4ffdfda..8ec0e00 100644
582 ---- a/efi/boot1/Makefile
583 -+++ b/efi/boot1/Makefile
584 -@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc
585 - # Add libstand for required string and memory functions for all platforms.
586 - #
587 - DPADD+= ${LIBSTAND}
588 --LDADD+= -lstand
589 -+LDADD+= ${LIBSTAND}
590 -
591 - DPADD+= ${LDSCRIPT}
592 -
593
594 diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
595 deleted file mode 100644
596 index a3a33d5..0000000
597 --- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
598 +++ /dev/null
599 @@ -1,13 +0,0 @@
600 -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
601 -index bb16ea3..7dedb49 100644
602 ---- a/sys/boot/i386/zfsboot/Makefile
603 -+++ b/sys/boot/i386/zfsboot/Makefile
604 -@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out
605 - zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
606 - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
607 -
608 -+drv.o: drv.c xreadorg.h
609 -+
610 - zfsboot.o: zfsboot.s
611 -
612 - SRCS= zfsboot.c xreadorg.h
613
614 diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
615 deleted file mode 100644
616 index ffd9f43..0000000
617 --- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
618 +++ /dev/null
619 @@ -1,66 +0,0 @@
620 -diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
621 -index f5faec7..a9cf593 100644
622 ---- a/sys/boot/i386/Makefile.inc
623 -+++ b/sys/boot/i386/Makefile.inc
624 -@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib
625 - .if ${MACHINE_CPUARCH} == "amd64"
626 - CFLAGS+= -m32
627 - ACFLAGS+= -m32
628 --LDFLAGS+= -m elf_i386_fbsd
629 - AFLAGS+= --32
630 - .endif
631 -
632 -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
633 -index 65815a5..61840dd 100644
634 ---- a/sys/boot/i386/boot2/Makefile
635 -+++ b/sys/boot/i386/boot2/Makefile
636 -@@ -109,3 +109,10 @@ machine:
637 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
638 - CFLAGS.boot1.S= ${CLANG_NO_IAS}
639 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
640 -+
641 -+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
642 -+CFLAGS+= -fno-asynchronous-unwind-tables
643 -+
644 -+.if ${MACHINE_CPUARCH} == "amd64"
645 -+LDFLAGS+= -m elf_i386_fbsd
646 -+.endif
647 -diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
648 -index e1a640a..29886cc 100644
649 ---- a/sys/boot/i386/gptboot/Makefile
650 -+++ b/sys/boot/i386/gptboot/Makefile
651 -@@ -78,3 +78,8 @@ machine:
652 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
653 - CFLAGS.gptldr.S= ${CLANG_NO_IAS}
654 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
655 -+
656 -+.if ${MACHINE_CPUARCH} == "amd64"
657 -+LDFLAGS+= -m elf_i386_fbsd
658 -+.endif
659 -+
660 -diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
661 -index a2b8fcc..107f531 100644
662 ---- a/sys/boot/i386/gptzfsboot/Makefile
663 -+++ b/sys/boot/i386/gptzfsboot/Makefile
664 -@@ -76,3 +76,8 @@ machine:
665 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
666 - CFLAGS.gptldr.S= ${CLANG_NO_IAS}
667 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
668 -+
669 -+.if ${MACHINE_CPUARCH} == "amd64"
670 -+LDFLAGS+= -m elf_i386_fbsd
671 -+.endif
672 -+
673 -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
674 -index b2db778..252dc62 100644
675 ---- a/sys/boot/i386/zfsboot/Makefile
676 -+++ b/sys/boot/i386/zfsboot/Makefile
677 -@@ -89,3 +89,8 @@ machine:
678 - # XXX: clang integrated-as doesn't grok .codeNN directives yet
679 - CFLAGS.zfsldr.S= ${CLANG_NO_IAS}
680 - CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
681 -+
682 -+.if ${MACHINE_CPUARCH} == "amd64"
683 -+LDFLAGS+= -m elf_i386_fbsd
684 -+.endif
685 -+
686
687 diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
688 deleted file mode 100644
689 index abc6a57..0000000
690 --- a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
691 +++ /dev/null
692 @@ -1,11 +0,0 @@
693 -https://bugs.gentoo.org/show_bug.cgi?id=511698
694 -
695 -diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
696 -index e0039b9..533dea0 100644
697 ---- a/sys/boot/Makefile.inc
698 -+++ b/sys/boot/Makefile.inc
699 -@@ -1,3 +1,3 @@
700 - # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $
701 -
702 --SSP_CFLAGS=
703 -+SSP_CFLAGS= -fno-stack-protector
704
705 diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml
706 deleted file mode 100644
707 index d9f0c83..0000000
708 --- a/sys-freebsd/boot0/metadata.xml
709 +++ /dev/null
710 @@ -1,12 +0,0 @@
711 -<?xml version="1.0" encoding="UTF-8"?>
712 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
713 -<pkgmetadata>
714 -<maintainer type="project">
715 - <email>bsd@g.o</email>
716 - <name>BSD Project</name>
717 - </maintainer>
718 - <use>
719 - <flag name="tftp">Enable PXE/TFTP boot support.</flag>
720 - <flag name="zfs">Enable booting on ZFS filesystems.</flag>
721 - </use>
722 -</pkgmetadata>
723
724 diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
725 deleted file mode 100644
726 index c634df4..0000000
727 --- a/sys-freebsd/freebsd-bin/Manifest
728 +++ /dev/null
729 @@ -1,3 +0,0 @@
730 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
731 -EBUILD freebsd-bin-10.3_rc3.ebuild 800 SHA256 ccc8ba3dce3c251ccf7fbc468b803d41414968012808a89baa85fdffdf374dbf SHA512 7a0e427a5621bf195544cfeed199bf93c2f5d42bce139d31c5477019c2ee9c8e9cd1bcea41cb5b3cb10f972db89f29f4868c5c7687062d85a3d51051f72fe5fb WHIRLPOOL 8f64ea4813d9db4b379a53a12222eaea8d1ff43a49a961a64e844bb30768029aec2b953b7c8afbbedd35451070b25322ff04dc0019524a2bbb3ffb6ee766aa53
732 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
733
734 diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_rc3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3_rc3.ebuild
735 deleted file mode 100644
736 index d4bf7e3..0000000
737 --- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3_rc3.ebuild
738 +++ /dev/null
739 @@ -1,42 +0,0 @@
740 -# Copyright 1999-2016 Gentoo Foundation
741 -# Distributed under the terms of the GNU General Public License v2
742 -# $Id$
743 -
744 -EAPI=5
745 -
746 -inherit bsdmk freebsd
747 -
748 -DESCRIPTION="FreeBSD /bin tools"
749 -SLOT="0"
750 -
751 -IUSE=""
752 -
753 -if [[ ${PV} != *9999* ]]; then
754 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
755 -fi
756 -
757 -EXTRACTONLY="
758 - bin/
759 - usr.bin/
760 - sbin/
761 - lib/
762 -"
763 -
764 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
765 - >=dev-libs/libedit-20120311.3.0-r1
766 - sys-libs/ncurses:0=
767 - sys-apps/ed
768 - !app-misc/realpath
769 - !<sys-freebsd/freebsd-ubin-8"
770 -DEPEND="${RDEPEND}
771 - =sys-freebsd/freebsd-mk-defs-${RV}*
772 - >=sys-devel/flex-2.5.31-r2"
773 -
774 -S=${WORKDIR}/bin
775 -
776 -# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
777 -REMOVE_SUBDIRS="csh rmail ed freebsd-version"
778 -
779 -pkg_setup() {
780 - mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
781 -}
782
783 diff --git a/sys-freebsd/freebsd-bin/metadata.xml b/sys-freebsd/freebsd-bin/metadata.xml
784 deleted file mode 100644
785 index a00f3ae..0000000
786 --- a/sys-freebsd/freebsd-bin/metadata.xml
787 +++ /dev/null
788 @@ -1,8 +0,0 @@
789 -<?xml version="1.0" encoding="UTF-8"?>
790 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
791 -<pkgmetadata>
792 -<maintainer type="project">
793 - <email>bsd@g.o</email>
794 - <name>BSD Project</name>
795 -</maintainer>
796 -</pkgmetadata>
797
798 diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
799 deleted file mode 100644
800 index 96820b8..0000000
801 --- a/sys-freebsd/freebsd-cddl/Manifest
802 +++ /dev/null
803 @@ -1,16 +0,0 @@
804 -AUX freebsd-cddl-10.1-underlink.patch 942 SHA256 f5a0139191b98584832075f22880e6ea9212a835cbb1e9aa15fa4e9364758a15 SHA512 67777ff41978c4e90c6e73f6cd2736732b838f42cc4e86f3d47bc5928f7ff4fcedfab84d599156255d243f81fc5a00daa0534ec6704ff820478fab39ce8dafbd WHIRLPOOL a7640e2be2a4fa97932a86a1f4dd68709f83d57a8bf5d043fa4f413474560c73960264fa3687b0154c568365c97d1a928511e207135be53f08acf65845dd6b99
805 -AUX freebsd-cddl-10.2-libpaths.patch 9569 SHA256 80350e3493fd667840555d06e453769e02604da8362d6e76280573a30dd9185b SHA512 615caa713eee62030a9f4630578f8f7ae8c4a2df71307237083115e2226734646ba1923f5de46aaf1523ffaa6b4c83b5fc64ceee552b15cb0244583408736ed4 WHIRLPOOL 3fd3f8d42057ab01965b4314f4565009076ea54da83401efdedd838299cf554092717d7795ba7a4dca22420c993d521411021dc4f521a273af4ff894bb938353
806 -AUX freebsd-cddl-10.2-underlink.patch 433 SHA256 2f6cbfc524f01b18496a1fe2c7abe7af611875e8fc23a6d801cd7871d1c1a304 SHA512 6a8448fcac3fc7d602890f2c197d285c3e2c6a018c26fc857ff14b74fb7b571200f14f425507f4cafcc3b714ad063735529dc4e96690d3012fedd060c986c620 WHIRLPOOL d3647e02d170cb69c9e598e47c3e680432887665905e5186c34edd359d92a543c3a4156175a04bb461bfc633fd0341d2d5410dcb7e7bec044b51bdb352ab8cf0
807 -AUX freebsd-cddl-10.3-underlink.patch 437 SHA256 ac486d44bf8ed4dd1b30d6200c59446e552e9e21f30535077533a080a28280ef SHA512 9ef6768be960a0c08cef094ba220e045b434aef6cfdb0be4631a63ea0b233158e927ca32c4f1d47a2f9a1e4a568f3850e61f56dcab35bd26cf1cea49035240fd WHIRLPOOL 8d5de341ceeca0e4a6c22b3bde9ddfdd611b1508344e837d34b926a3f8ac411a9daebaf30198fb323197d0860f102dc5b76172b7213a4cd4d41e623b79111393
808 -AUX freebsd-cddl-8.0-libpaths.patch 4418 SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5 WHIRLPOOL 0ed3869833b9606ce325b30874f01106c2d288c6bff703398f63abe00602c6d3adf1d2faf2dc629a220dcfeb4c3d819f672875ce3b7bb4ab969977b5ce6920fd
809 -AUX freebsd-cddl-8.2-libpaths.patch 822 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567 WHIRLPOOL 3ecdb9ea5050d4309b2561dd37082982450180e6eb8b77373ca3949f62ccd7719e5178a3c3a61346b2820fa827e0bc13075d2266d5500a5f80d8efab16adb414
810 -AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5 WHIRLPOOL 5af01d3ba6e1e4a038de1f3274bf3bd241264db05b021fa374c5a56c805901320a4c30c2234013902eb2f5ca879a4972d3468e0157315dd98e73ce1ee4359e0a
811 -AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f
812 -AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995
813 -AUX freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643
814 -AUX zfs.initd 374 SHA256 2257ad345b4db70da768dd637b3c7b98f5ca23901bca8ac550d7332e97dc7930 SHA512 53976b601b1baa52576268910433bc7725b5de6ea45d928c64726d16fe4a2050f9ba120802d45c9991561bd33a998b6b998ac3da83a1fc4aef5898a5989c0f34 WHIRLPOOL 4048d257497d994dad564953bff6ae90f8d1907b24016c70ceeec27391acce223a7ea72a520265c2fed4d70f4371700f0c1f0127509a2cc24ca24383f83be6f5
815 -AUX zvol.initd 844 SHA256 831023b84fe6deda1451e645e19fa5e8e8efccaf6bcbcf1f28f276084635a89e SHA512 7ed02b0ca1b3bb6416daa21e60263af86f0d4a42688880fa5d3e0bc8ce8775dabb8db968a80604e16acb72ed4f4f767a3c3b2350134dfed9a6eaa671589bb314 WHIRLPOOL 044afd17baa49dfce73bea951e62577d50e886cee8eacfb50d25a47aacfab3ae508afef1054e5571f74d4c8661ab67ccc1b00fc2a152f47389c2e6a440eedb16
816 -AUX zvol.initd-9.0 818 SHA256 8d46f8fa90d9e8126382913072de8a256b7975328d7dc8de26fe87a487938f5e SHA512 749a11c6eccc356398803f7d282198f509ef7f73bbcd83edee736124e58f4a1b59d3fa3a218e167a8d031478eeae1f5b1939074a45e3c781ad499fa58b174371 WHIRLPOOL 71a77d38454119c424b2b911814330b964836e739d4e07e436b4d6e403ec9dda722563ce98989b588f59594e76ed1db6d8e9277ec89a01cd0719d9ad4cd72823
817 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
818 -EBUILD freebsd-cddl-10.3_rc3.ebuild 1470 SHA256 f010709a1fba8f37f7087051db8182b2f7318cc0d381879f6d0ade743587693f SHA512 577a9f2350b0a9623d37b00b84e16988c4cfff896957a2d639aa671a80e24df6e0c351657aebfd67e0edcd976e46ed62beeb86806be3c60d63a926f7e601c3a7 WHIRLPOOL deb931a65798785ad8f21797b96163cdf823b6d6ecc83b3323e98df57a52cb19ff929006ad39d594a1a62862f4180b760a2b5bc0b36023ef9d862416a36c0f56
819 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
820
821 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch
822 deleted file mode 100644
823 index 62d5326..0000000
824 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.1-underlink.patch
825 +++ /dev/null
826 @@ -1,27 +0,0 @@
827 -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
828 -index cc0f363..065281f 100644
829 ---- a/cddl/lib/libzfs/Makefile
830 -+++ b/cddl/lib/libzfs/Makefile
831 -@@ -8,7 +8,8 @@
832 - LIB= zfs
833 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
834 - ${LIBAVL} ${LIBZFS_CORE}
835 --LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
836 -+LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core -lgeom -luutil
837 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
838 -
839 - SRCS= deviceid.c \
840 - fsshare.c \
841 -diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
842 -index 61c4788..4888cc7 100644
843 ---- a/cddl/lib/libzpool/Makefile
844 -+++ b/cddl/lib/libzpool/Makefile
845 -@@ -61,7 +61,7 @@ LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
846 - LDFLAGS+= -L${.CURDIR}/../../lib/libumem
847 -
848 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
849 --LDADD= -lmd -lpthread -lz
850 -+LDADD= -lmd -lpthread -lz -lumem -lavl
851 -
852 - # atomic.S doesn't like profiling.
853 - NO_PROFILE=
854
855 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
856 deleted file mode 100644
857 index 9af7cfb..0000000
858 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch
859 +++ /dev/null
860 @@ -1,220 +0,0 @@
861 -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
862 -index d8bcccb..2cebbcb 100644
863 ---- a/cddl/lib/libzfs/Makefile
864 -+++ b/cddl/lib/libzfs/Makefile
865 -@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
866 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
867 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
868 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
869 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
870 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
871 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
872 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
873 -+
874 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
875 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
876 -
877 -diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
878 -index 262d3e9..9643210 100644
879 ---- a/cddl/lib/libzfs_core/Makefile
880 -+++ b/cddl/lib/libzfs_core/Makefile
881 -@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
882 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
883 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
884 -
885 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
886 -+
887 - .include <bsd.lib.mk>
888 -diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
889 -index 83cefca..55c56d5 100644
890 ---- a/cddl/lib/libzpool/Makefile
891 -+++ b/cddl/lib/libzpool/Makefile
892 -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
893 - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
894 - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
895 -
896 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
897 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
898 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
899 -+
900 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
901 - ${LIBAVL} ${LIBUMEM}
902 - LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
903 -diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
904 -index 1f909aa..2590302 100644
905 ---- a/cddl/sbin/zfs/Makefile
906 -+++ b/cddl/sbin/zfs/Makefile
907 -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
908 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
909 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
910 -
911 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
912 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
913 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
914 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
915 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
916 -+
917 - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
918 - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
919 - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
920 -diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
921 -index 4b5b898..f89d010 100644
922 ---- a/cddl/sbin/zpool/Makefile
923 -+++ b/cddl/sbin/zpool/Makefile
924 -@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
925 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
926 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
927 -
928 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
929 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
930 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
931 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
932 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
933 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
934 -+
935 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
936 - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
937 - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
938 -diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
939 -index 6cb9529..e76fbc4 100644
940 ---- a/cddl/usr.bin/ctfconvert/Makefile
941 -+++ b/cddl/usr.bin/ctfconvert/Makefile
942 -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
943 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
944 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
945 -
946 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
947 -+
948 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
949 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
950 -
951 -diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
952 -index 673c7e3..5fff940 100644
953 ---- a/cddl/usr.bin/ctfmerge/Makefile
954 -+++ b/cddl/usr.bin/ctfmerge/Makefile
955 -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
956 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
957 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
958 -
959 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
960 -+
961 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
962 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
963 -
964 -diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
965 -index b6605cb..7028630 100644
966 ---- a/cddl/usr.bin/zinject/Makefile
967 -+++ b/cddl/usr.bin/zinject/Makefile
968 -@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
969 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
970 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
971 -
972 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
973 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
974 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
975 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
976 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
977 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
978 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
979 -+
980 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
981 - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
982 - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
983 -diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
984 -index 888b9af..523ba44 100644
985 ---- a/cddl/usr.bin/zstreamdump/Makefile
986 -+++ b/cddl/usr.bin/zstreamdump/Makefile
987 -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
988 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
989 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
990 -
991 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
992 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
993 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
994 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
995 -+
996 - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
997 - ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
998 - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
999 -diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
1000 -index f6f7e03..6fed691 100644
1001 ---- a/cddl/usr.bin/ztest/Makefile
1002 -+++ b/cddl/usr.bin/ztest/Makefile
1003 -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
1004 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1005 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1006 -
1007 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1008 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1009 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1010 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1011 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1012 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1013 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1014 -+
1015 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1016 - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
1017 - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
1018 -diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
1019 -index fb5729f..ea9a752 100644
1020 ---- a/cddl/usr.sbin/dtrace/Makefile
1021 -+++ b/cddl/usr.sbin/dtrace/Makefile
1022 -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
1023 - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
1024 - -lrtld_db
1025 -
1026 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace
1027 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1028 -+
1029 - .include <bsd.prog.mk>
1030 -diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
1031 -index ccd8189..827a197 100644
1032 ---- a/cddl/usr.sbin/lockstat/Makefile
1033 -+++ b/cddl/usr.sbin/lockstat/Makefile
1034 -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
1035 -
1036 - CFLAGS+= -DNEED_ERRLOC -g
1037 -
1038 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace
1039 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1040 -+
1041 - #YFLAGS+= -d
1042 -
1043 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
1044 -diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
1045 -index c2a6b1d..f411fc0 100644
1046 ---- a/cddl/usr.sbin/zdb/Makefile
1047 -+++ b/cddl/usr.sbin/zdb/Makefile
1048 -@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1049 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1050 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1051 -
1052 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1053 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1054 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1055 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1056 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1057 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1058 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1059 -+
1060 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1061 - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
1062 - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
1063 -diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
1064 -index 1957aad..9a5570a 100644
1065 ---- a/cddl/usr.sbin/zhack/Makefile
1066 -+++ b/cddl/usr.sbin/zhack/Makefile
1067 -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1068 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1069 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1070 -
1071 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1072 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1073 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1074 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1075 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1076 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1077 -+
1078 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1079 - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
1080 - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
1081
1082 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-underlink.patch
1083 deleted file mode 100644
1084 index 4c9275f..0000000
1085 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-underlink.patch
1086 +++ /dev/null
1087 @@ -1,12 +0,0 @@
1088 -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
1089 -index 2cebbcb..c20dfe8 100644
1090 ---- a/cddl/lib/libzfs/Makefile
1091 -+++ b/cddl/lib/libzfs/Makefile
1092 -@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
1093 -
1094 - LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
1095 - -lbsdxml -lgeom -lnvpair -lzfs_core
1096 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1097 -
1098 - SRCS= deviceid.c \
1099 - fsshare.c \
1100
1101 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
1102 deleted file mode 100644
1103 index c8ce8e1..0000000
1104 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
1105 +++ /dev/null
1106 @@ -1,12 +0,0 @@
1107 -diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
1108 -index 2a66337..04988d7 100644
1109 ---- a/cddl/lib/libzfs/Makefile
1110 -+++ b/cddl/lib/libzfs/Makefile
1111 -@@ -12,6 +12,7 @@ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
1112 -
1113 - LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
1114 - -lbsdxml -lgeom -lnvpair -lz -lzfs_core
1115 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1116 -
1117 - SRCS= deviceid.c \
1118 - fsshare.c \
1119
1120 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
1121 deleted file mode 100644
1122 index ad5c83e..0000000
1123 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
1124 +++ /dev/null
1125 @@ -1,114 +0,0 @@
1126 -diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
1127 ---- cddl.orig/lib/libctf/Makefile 2009-01-24 03:36:33 -0200
1128 -+++ cddl/lib/libctf/Makefile 2009-01-24 03:55:10 -0200
1129 -@@ -4,6 +4,7 @@
1130 -
1131 - LIB= ctf
1132 - SHLIB_MAJOR= 2
1133 -+LDADD+=-lz
1134 -
1135 - SRCS= ctf_create.c \
1136 - ctf_decl.c \
1137 -diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
1138 ---- cddl.orig/lib/libdtrace/Makefile 2009-01-24 00:18:47 -0200
1139 -+++ cddl/lib/libdtrace/Makefile 2009-01-24 03:31:06 -0200
1140 -@@ -74,7 +74,7 @@
1141 - .endif
1142 -
1143 - LFLAGS+=-l
1144 --
1145 -+LDADD+=-lz -lproc
1146 - YFLAGS+=-d
1147 -
1148 - CLEANFILES= dt_errtags.c dt_names.c
1149 -diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
1150 ---- cddl.orig/lib/libzfs/Makefile 2008-06-22 10:26:18 -0300
1151 -+++ cddl/lib/libzfs/Makefile 2008-06-22 10:26:26 -0300
1152 -@@ -7,7 +7,8 @@
1153 -
1154 - LIB= zfs
1155 - DPADD= ${LIBUTIL}
1156 --LDADD= -lutil
1157 -+LDADD= -lutil -lgeom -lm -luutil -lumem
1158 -+LDFLAGS+= -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem
1159 -
1160 - SRCS= deviceid.c \
1161 - mnttab.c \
1162 -diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
1163 ---- cddl.orig/lib/libzpool/Makefile 2008-06-22 10:35:15 -0300
1164 -+++ cddl/lib/libzpool/Makefile 2008-06-22 10:37:06 -0300
1165 -@@ -42,7 +42,8 @@
1166 - CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
1167 -
1168 - DPADD= ${LIBPTHREAD} ${LIBZ}
1169 --LDADD= -lpthread -lz
1170 -+LDADD= -lpthread -lz -lavl -lumem
1171 -+LDFLAGS+= -L${.CURDIR}/../libavl -L${.CURDIR}/../libumem
1172 -
1173 - # atomic.S doesn't like profiling.
1174 - NO_PROFILE=
1175 -diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
1176 ---- cddl.orig/sbin/zfs/Makefile 2008-06-22 10:02:30 -0300
1177 -+++ cddl/sbin/zfs/Makefile 2008-06-22 10:14:23 -0300
1178 -@@ -23,5 +23,7 @@
1179 - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
1180 - LDADD= -lzfs -lgeom -lbsdxml -lsbuf \
1181 - -lm -lnvpair -luutil -lutil
1182 -+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
1183 -+ -L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
1184 -
1185 - .include <bsd.prog.mk>
1186 -diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
1187 ---- cddl.orig/sbin/zpool/Makefile 2008-06-22 10:02:30 -0300
1188 -+++ cddl/sbin/zpool/Makefile 2008-06-22 10:14:47 -0300
1189 -@@ -23,5 +23,7 @@
1190 - ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
1191 - LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \
1192 - -lm -lnvpair -luutil -lutil
1193 -+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib \
1194 -+ -L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
1195 -
1196 - .include <bsd.prog.mk>
1197 -diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
1198 ---- cddl.orig/usr.bin/ztest/Makefile 2008-06-22 10:02:30 -0300
1199 -+++ cddl/usr.bin/ztest/Makefile 2008-06-22 10:12:40 -0300
1200 -@@ -18,5 +18,7 @@
1201 - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1202 - ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
1203 - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
1204 -+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
1205 -+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
1206 -
1207 - .include <bsd.prog.mk>
1208 -diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
1209 ---- cddl.orig/usr.bin/Makefile.inc 2009-01-10 07:21:10 +0000
1210 -+++ cddl/usr.bin/Makefile.inc 2009-01-10 07:18:55 +0000
1211 -@@ -1,5 +1,6 @@
1212 - # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
1213 -
1214 - BINDIR?= /usr/bin
1215 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1216 -
1217 - .include "../Makefile.inc"
1218 ---- cddl.orig/usr.sbin/zdb/Makefile 2010-03-11 13:19:48 +0100
1219 -+++ cddl/usr.sbin/zdb/Makefile 2010-03-11 13:20:08 +0100
1220 -@@ -22,6 +22,8 @@
1221 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1222 - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
1223 - LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
1224 -+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
1225 -+ -L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs
1226 -
1227 - CSTD= c99
1228 -
1229 ---- cddl.orig/usr.bin/zinject/Makefile 2010-03-11 13:30:32 +0100
1230 -+++ cddl/usr.bin/zinject/Makefile 2010-03-11 13:33:27 +0100
1231 -@@ -21,5 +21,8 @@
1232 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
1233 - ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
1234 - LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
1235 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \
1236 -+ -L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \
1237 -+ -L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool
1238 -
1239 - .include <bsd.prog.mk>
1240
1241 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
1242 deleted file mode 100644
1243 index a0e5677..0000000
1244 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
1245 +++ /dev/null
1246 @@ -1,22 +0,0 @@
1247 ---- cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000
1248 -+++ cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000
1249 -@@ -24,6 +24,8 @@
1250 - #CFLAGS+= -DNEED_ERRLOC
1251 - #YFLAGS+= -d
1252 -
1253 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
1254 -+
1255 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
1256 - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
1257 - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
1258 ---- cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000
1259 -+++ cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000
1260 -@@ -23,6 +23,8 @@
1261 -
1262 - CFLAGS+= -DNEED_ERRLOC -g
1263 -
1264 -+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
1265 -+
1266 - #YFLAGS+= -d
1267 -
1268 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
1269
1270 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
1271 deleted file mode 100644
1272 index b3d95bb..0000000
1273 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
1274 +++ /dev/null
1275 @@ -1,28 +0,0 @@
1276 -diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
1277 ---- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000
1278 -+++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000
1279 -@@ -21,8 +21,8 @@
1280 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
1281 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1282 -
1283 --DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
1284 -+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
1285 - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
1286 --LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1287 -+LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1288 -
1289 - .include <bsd.prog.mk>
1290 -diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
1291 ---- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000
1292 -+++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000
1293 -@@ -26,8 +26,8 @@
1294 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
1295 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
1296 -
1297 --DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
1298 -+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
1299 - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
1300 --LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1301 -+LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1302 -
1303 - .include <bsd.prog.mk>
1304
1305 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
1306 deleted file mode 100644
1307 index c81a2c3..0000000
1308 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
1309 +++ /dev/null
1310 @@ -1,167 +0,0 @@
1311 -diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
1312 ---- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000
1313 -+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000
1314 -@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont
1315 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
1316 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
1317 -
1318 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1319 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1320 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1321 -+
1322 - .include <bsd.lib.mk>
1323 -diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
1324 ---- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000
1325 -+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000
1326 -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt
1327 - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
1328 - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
1329 -
1330 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1331 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1332 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1333 -+
1334 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
1335 - LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
1336 -
1337 -diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
1338 ---- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000
1339 -+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000
1340 -@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1341 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
1342 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1343 -
1344 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1345 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1346 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1347 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1348 -+
1349 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
1350 - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
1351 - LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1352 -diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
1353 ---- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000
1354 -+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000
1355 -@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1356 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
1357 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
1358 -
1359 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1360 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1361 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1362 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1363 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1364 -+
1365 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
1366 - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
1367 - LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
1368 -diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
1369 ---- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000
1370 -+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000
1371 -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1372 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
1373 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
1374 -
1375 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1376 -+
1377 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
1378 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
1379 -
1380 -diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
1381 ---- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000
1382 -+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000
1383 -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1384 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
1385 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
1386 -
1387 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1388 -+
1389 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
1390 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
1391 -
1392 -diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
1393 ---- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000
1394 -+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000
1395 -@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1396 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1397 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1398 -
1399 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1400 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1401 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1402 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1403 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1404 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1405 -+
1406 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
1407 - ${LIBZFS} ${LIBZPOOL}
1408 - LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
1409 -diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
1410 ---- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000
1411 -+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000
1412 -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1413 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1414 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1415 -
1416 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1417 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1418 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1419 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1420 -+
1421 - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1422 - ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
1423 - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
1424 -diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
1425 ---- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000
1426 -+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000
1427 -@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1428 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1429 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1430 -
1431 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1432 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1433 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1434 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1435 -+
1436 - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1437 - ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
1438 - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
1439 -diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
1440 ---- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000
1441 -+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000
1442 -@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
1443 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1444 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1445 -
1446 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1447 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1448 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1449 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1450 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1451 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1452 -+
1453 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1454 - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
1455 - LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
1456 ---- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000
1457 -+++ b/cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000
1458 -@@ -24,6 +24,8 @@
1459 - #CFLAGS+= -DNEED_ERRLOC
1460 - #YFLAGS+= -d
1461 -
1462 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
1463 -+
1464 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
1465 - ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
1466 - LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
1467 ---- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000
1468 -+++ b/cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000
1469 -@@ -23,6 +23,8 @@
1470 -
1471 - CFLAGS+= -DNEED_ERRLOC -g
1472 -
1473 -+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
1474 -+
1475 - #YFLAGS+= -d
1476 -
1477 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
1478
1479 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
1480 deleted file mode 100644
1481 index ff87d2c..0000000
1482 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
1483 +++ /dev/null
1484 @@ -1,22 +0,0 @@
1485 ---- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000
1486 -+++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000
1487 -@@ -7,7 +7,7 @@
1488 -
1489 - LIB= zfs
1490 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
1491 --LDADD= -lmd -lpthread -lumem -lutil
1492 -+LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom
1493 -
1494 - SRCS= deviceid.c \
1495 - fsshare.c \
1496 ---- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000
1497 -+++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000
1498 -@@ -57,7 +57,7 @@
1499 - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
1500 -
1501 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
1502 --LDADD= -lmd -lpthread -lz
1503 -+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
1504 -
1505 - # atomic.S doesn't like profiling.
1506 - NO_PROFILE=
1507
1508 diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
1509 deleted file mode 100644
1510 index 36eb570..0000000
1511 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
1512 +++ /dev/null
1513 @@ -1,220 +0,0 @@
1514 -diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile
1515 -index 5b6b47d..c8549b4 100644
1516 ---- a/lib/libzfs/Makefile
1517 -+++ b/lib/libzfs/Makefile
1518 -@@ -55,6 +55,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1519 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
1520 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
1521 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
1522 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1523 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1524 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1525 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1526 -+
1527 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
1528 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
1529 -
1530 -diff --git a/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile
1531 -index a470fbc..ae8c649 100644
1532 ---- a/lib/libzfs_core/Makefile
1533 -+++ b/lib/libzfs_core/Makefile
1534 -@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
1535 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
1536 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
1537 -
1538 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1539 -+
1540 - .include <bsd.lib.mk>
1541 -diff --git a/lib/libzpool/Makefile b/lib/libzpool/Makefile
1542 -index 417c1cc..838cdb5 100644
1543 ---- a/lib/libzpool/Makefile
1544 -+++ b/lib/libzpool/Makefile
1545 -@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
1546 - CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
1547 - CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
1548 -
1549 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1550 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1551 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1552 -+
1553 - DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
1554 - LDADD= -lmd -lpthread -lz
1555 -
1556 -diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile
1557 -index a49d278..b22442e 100644
1558 ---- a/sbin/zfs/Makefile
1559 -+++ b/sbin/zfs/Makefile
1560 -@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
1561 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
1562 - CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1563 -
1564 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1565 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1566 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1567 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1568 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1569 -+
1570 - DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
1571 - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
1572 - LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
1573 -diff --git a/sbin/zpool/Makefile b/sbin/zpool/Makefile
1574 -index 1884d24..5f06d5f 100644
1575 ---- a/sbin/zpool/Makefile
1576 -+++ b/sbin/zpool/Makefile
1577 -@@ -26,6 +26,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
1578 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
1579 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
1580 -
1581 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1582 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1583 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1584 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1585 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1586 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1587 -+
1588 - DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
1589 - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
1590 - LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
1591 -diff --git a/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile
1592 -index 7e4a05a..72327ad 100644
1593 ---- a/usr.bin/ctfconvert/Makefile
1594 -+++ b/usr.bin/ctfconvert/Makefile
1595 -@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
1596 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
1597 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
1598 -
1599 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1600 -+
1601 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
1602 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
1603 -
1604 -diff --git a/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile
1605 -index ba4840e..845d28c 100644
1606 ---- a/usr.bin/ctfmerge/Makefile
1607 -+++ b/usr.bin/ctfmerge/Makefile
1608 -@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
1609 - -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
1610 - -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
1611 -
1612 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1613 -+
1614 - DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
1615 - LDADD= -lctf -ldwarf -lelf -lz -lpthread
1616 -
1617 -diff --git a/usr.bin/zinject/Makefile b/usr.bin/zinject/Makefile
1618 -index 8c5c141..3db2b29 100644
1619 ---- a/usr.bin/zinject/Makefile
1620 -+++ b/usr.bin/zinject/Makefile
1621 -@@ -19,6 +19,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
1622 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1623 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1624 -
1625 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1626 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1627 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1628 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1629 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1630 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1631 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1632 -+
1633 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
1634 - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
1635 - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
1636 -diff --git a/usr.bin/zstreamdump/Makefile b/usr.bin/zstreamdump/Makefile
1637 -index 304ff7c..5f0b00e 100644
1638 ---- a/usr.bin/zstreamdump/Makefile
1639 -+++ b/usr.bin/zstreamdump/Makefile
1640 -@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
1641 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1642 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1643 -
1644 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1645 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1646 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1647 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1648 -+
1649 - DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1650 - ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
1651 - LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
1652 -diff --git a/usr.bin/ztest/Makefile b/usr.bin/ztest/Makefile
1653 -index 965300e..ad40a92 100644
1654 ---- a/usr.bin/ztest/Makefile
1655 -+++ b/usr.bin/ztest/Makefile
1656 -@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
1657 - CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
1658 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1659 -
1660 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1661 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1662 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1663 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1664 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1665 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1666 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1667 -+
1668 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
1669 - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
1670 - LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
1671 -diff --git a/usr.sbin/dtrace/Makefile b/usr.sbin/dtrace/Makefile
1672 -index 3930f01..4bdbd1a 100644
1673 ---- a/usr.sbin/dtrace/Makefile
1674 -+++ b/usr.sbin/dtrace/Makefile
1675 -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
1676 - LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \
1677 - -lrtld_db
1678 -
1679 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace
1680 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1681 -+
1682 - .include <bsd.prog.mk>
1683 -diff --git a/usr.sbin/lockstat/Makefile b/usr.sbin/lockstat/Makefile
1684 -index 70515ef..d65e4c3 100644
1685 ---- a/usr.sbin/lockstat/Makefile
1686 -+++ b/usr.sbin/lockstat/Makefile
1687 -@@ -20,6 +20,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
1688 -
1689 - CFLAGS+= -DNEED_ERRLOC -g
1690 -
1691 -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace
1692 -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
1693 -+
1694 - #YFLAGS+= -d
1695 -
1696 - DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
1697 -diff --git a/usr.sbin/zdb/Makefile b/usr.sbin/zdb/Makefile
1698 -index 8068385..337e324 100644
1699 ---- a/usr.sbin/zdb/Makefile
1700 -+++ b/usr.sbin/zdb/Makefile
1701 -@@ -23,6 +23,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1702 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1703 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1704 -
1705 -+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
1706 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1707 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1708 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1709 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1710 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1711 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1712 -+
1713 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1714 - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
1715 - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
1716 -diff --git a/usr.sbin/zhack/Makefile b/usr.sbin/zhack/Makefile
1717 -index f09d2d8..fc3d7a4 100644
1718 ---- a/usr.sbin/zhack/Makefile
1719 -+++ b/usr.sbin/zhack/Makefile
1720 -@@ -22,6 +22,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
1721 - CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
1722 - CFLAGS+= -I${.CURDIR}/../../lib/libumem
1723 -
1724 -+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
1725 -+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
1726 -+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
1727 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
1728 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
1729 -+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
1730 -+
1731 - DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
1732 - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
1733 - LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
1734
1735 diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
1736 deleted file mode 100644
1737 index f73bdf0..0000000
1738 --- a/sys-freebsd/freebsd-cddl/files/zfs.initd
1739 +++ /dev/null
1740 @@ -1,24 +0,0 @@
1741 -#!/sbin/runscript
1742 -# Copyright 1999-2012 Gentoo Foundation
1743 -# Distributed under the terms of the GNU General Public License v2
1744 -# $Id$
1745 -
1746 -depend() {
1747 - need hostid
1748 - before fsck
1749 -}
1750 -
1751 -start() {
1752 - einfo "Starting zfs ..."
1753 - zfs mount -a
1754 - zfs share -a
1755 - if [ ! -r /etc/zfs/exports ]; then
1756 - touch /etc/zfs/exports
1757 - fi
1758 -}
1759 -
1760 -stop() {
1761 - einfo "Stopping zfs ..."
1762 - zfs unshare -a
1763 - zfs unmount -a
1764 -}
1765
1766 diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
1767 deleted file mode 100755
1768 index 5a593fa..0000000
1769 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd
1770 +++ /dev/null
1771 @@ -1,47 +0,0 @@
1772 -#!/sbin/runscript
1773 -# Copyright 1999-2011 Gentoo Foundation
1774 -# Distributed under the terms of the GNU General Public License v2
1775 -# $Id$
1776 -
1777 -depend() {
1778 - need hostid
1779 - before fsck
1780 -}
1781 -
1782 -start() {
1783 - einfo "Starting zfs volumes..."
1784 - zfs volinit
1785 - eend $?
1786 - # Enable swap on ZVOLs that have org.freebsd:swap=on.
1787 - zfs list -H -o org.freebsd:swap,name -t volume | \
1788 - while read state name; do
1789 - case "${state}" in
1790 - [oO][nN])
1791 - einfo "Enabling swap on zvol ${name}"
1792 - swapon /dev/zvol/${name}
1793 - eend $?
1794 - ;;
1795 - esac
1796 - done
1797 -}
1798 -
1799 -stop() {
1800 - # Disable what we had enabled before.
1801 - zfs list -H -o org.freebsd:swap,name -t volume | \
1802 - while read state name; do
1803 - case "${state}" in
1804 - [oO][nN])
1805 - einfo "Disabling swap on zvol ${name}"
1806 - swapoff /dev/zvol/${name}
1807 - eend $?
1808 - ;;
1809 - esac
1810 - done
1811 - einfo "Stopping zfs volumes..."
1812 - zfs volfini
1813 - eend $?
1814 -}
1815 -
1816 -restart() {
1817 - :
1818 -}
1819
1820 diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
1821 deleted file mode 100755
1822 index e80f324..0000000
1823 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
1824 +++ /dev/null
1825 @@ -1,45 +0,0 @@
1826 -#!/sbin/runscript
1827 -# Copyright 1999-2012 Gentoo Foundation
1828 -# Distributed under the terms of the GNU General Public License v2
1829 -# $Id$
1830 -
1831 -depend() {
1832 - need hostid
1833 - before fsck
1834 -}
1835 -
1836 -start() {
1837 - einfo "Starting zfs volumes..."
1838 - eend $?
1839 - # Enable swap on ZVOLs that have org.freebsd:swap=on.
1840 - zfs list -H -o org.freebsd:swap,name -t volume | \
1841 - while read state name; do
1842 - case "${state}" in
1843 - [oO][nN])
1844 - einfo "Enabling swap on zvol ${name}"
1845 - swapon /dev/zvol/${name}
1846 - eend $?
1847 - ;;
1848 - esac
1849 - done
1850 -}
1851 -
1852 -stop() {
1853 - # Disable what we had enabled before.
1854 - zfs list -H -o org.freebsd:swap,name -t volume | \
1855 - while read state name; do
1856 - case "${state}" in
1857 - [oO][nN])
1858 - einfo "Disabling swap on zvol ${name}"
1859 - swapoff /dev/zvol/${name}
1860 - eend $?
1861 - ;;
1862 - esac
1863 - done
1864 - einfo "Stopping zfs volumes..."
1865 - eend $?
1866 -}
1867 -
1868 -restart() {
1869 - :
1870 -}
1871
1872 diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_rc3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_rc3.ebuild
1873 deleted file mode 100644
1874 index afc5c8d..0000000
1875 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3_rc3.ebuild
1876 +++ /dev/null
1877 @@ -1,75 +0,0 @@
1878 -# Copyright 1999-2016 Gentoo Foundation
1879 -# Distributed under the terms of the GNU General Public License v2
1880 -# $Id$
1881 -
1882 -EAPI=5
1883 -
1884 -inherit bsdmk freebsd toolchain-funcs multilib
1885 -
1886 -DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
1887 -SLOT="0"
1888 -
1889 -IUSE="build"
1890 -LICENSE="CDDL GPL-2"
1891 -
1892 -if [[ ${PV} != *9999* ]]; then
1893 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
1894 -fi
1895 -
1896 -# sys is required.
1897 -EXTRACTONLY="
1898 - cddl/
1899 - contrib/
1900 - usr.bin/
1901 - lib/
1902 - sbin/
1903 - sys/
1904 -"
1905 -
1906 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
1907 - =sys-freebsd/freebsd-libexec-${RV}*
1908 - build? ( sys-apps/baselayout )"
1909 -
1910 -DEPEND="${RDEPEND}
1911 - =sys-freebsd/freebsd-mk-defs-${RV}*
1912 - !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
1913 -
1914 -S="${WORKDIR}/cddl"
1915 -
1916 -PATCHES=(
1917 - "${FILESDIR}/${PN}-10.2-libpaths.patch"
1918 - "${FILESDIR}/${PN}-10.3-underlink.patch"
1919 - )
1920 -
1921 -pkg_setup() {
1922 - # Add the required source files.
1923 - use build && EXTRACTONLY+="include/ "
1924 -}
1925 -
1926 -src_prepare() {
1927 - if [[ ! -e "${WORKDIR}/include" ]]; then
1928 - # Link in include headers.
1929 - ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
1930 - fi
1931 -}
1932 -
1933 -src_compile() {
1934 - # Disable parallel make.
1935 - freebsd_src_compile -j1
1936 -}
1937 -
1938 -src_install() {
1939 - # Install libraries proper place
1940 - local mylibdir=$(get_libdir)
1941 - mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
1942 -
1943 - gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
1944 -
1945 - # Install zfs volinit script.
1946 - newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
1947 -
1948 - # Install zfs script
1949 - newinitd "${FILESDIR}"/zfs.initd zfs
1950 -
1951 - keepdir /etc/zfs
1952 -}
1953
1954 diff --git a/sys-freebsd/freebsd-cddl/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml
1955 deleted file mode 100644
1956 index a00f3ae..0000000
1957 --- a/sys-freebsd/freebsd-cddl/metadata.xml
1958 +++ /dev/null
1959 @@ -1,8 +0,0 @@
1960 -<?xml version="1.0" encoding="UTF-8"?>
1961 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1962 -<pkgmetadata>
1963 -<maintainer type="project">
1964 - <email>bsd@g.o</email>
1965 - <name>BSD Project</name>
1966 -</maintainer>
1967 -</pkgmetadata>
1968
1969 diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
1970 deleted file mode 100644
1971 index d0b4aa3..0000000
1972 --- a/sys-freebsd/freebsd-lib/Manifest
1973 +++ /dev/null
1974 @@ -1,38 +0,0 @@
1975 -AUX freebsd-lib-10.0-atfcxx.patch 1545 SHA256 eef9680da13fb24adc01fab170d83787e8b9926ec2bbb89cd7933b3dd8b35306 SHA512 37d8fc83b97addef48807196738be511fdc74b002dce321c2eaf38db5b618ff4a2f8e8447677c60b96b8add8f1dc586a66a30992289fa95e20e2005589e83953 WHIRLPOOL 78096c4064b98cbb05617355c8c65c306f9d6ceb2a2c8f772cf39f20c81395da9a2d1e128f5b1382bdd65d7e6d7df2d08606933ac5fa8a9aa3d55ec8b76363e2
1976 -AUX freebsd-lib-10.0-liblink.patch 2448 SHA256 cbdcca5cc893b0d0b1ff98d1c1046519cebe9877b4cddd180340cfafbbbd2726 SHA512 c77049fa170d08d6ce035a8b9ae799f6d8e0b899371c1644a7493543fc07511515f68d54c82c618064954e48023c09bfcff452bd93e69ac07b7f8c6fc0e5089d WHIRLPOOL 12a22aeb74491960bf12da6d0db67504f1f804e732d332fd607cf58a78f0fc291af7d6a3d9f65744fedc36daa9326b463b2ebbe545d88deccc29135b6be60dbf
1977 -AUX freebsd-lib-10.0-libproc-libcxx.patch 393 SHA256 da065c458716e8a56a3c3aab87c9e5135287d6c8fa46eb26092c197e167b7acd SHA512 086d71467dcaccefdb2d9d31deab1905407aadca625853ff222610ea713e80dd8dd61caae3765107045b376f4162f73d12407d1d27aad29603b45b108c09cd8f WHIRLPOOL 3bed09ac5887736dcb15583b4d6cde50419d156bc12f1e1a55668ed85bfb0f502c79c760e8cde3db7172b72775786bb8968df811980ad046c677ff0aff176b33
1978 -AUX freebsd-lib-10.0-libusb.patch 764 SHA256 5e7bede29a900eda7ee3935203574bd6547b75864087ded60473f19dfcfa40eb SHA512 5b56af4f0ad5706001ed89075ff37b88412a1de7dd18742fdbfdd674581f20f39068fb6002c43e7ee22ae3051c11428f1c2e6cdab319da2ede065cffd330ceb9 WHIRLPOOL 2fdbe9ca0fc40b6626e40413d2364cb5de00611d674cdd6128d6e70e91fcfe0dffb60eb6c3e868907ee613f32258e519ea50e0722b180ab8021d766ebeef8370
1979 -AUX freebsd-lib-10.2-bsdxml2expat.patch 982 SHA256 0dab6d4525cee88eb1d6ce6c1176100ff9271222d6c6cde20f894781c02eb075 SHA512 b65fd732825e2813d499bd519bc5ef69b4c603ad57b047d2716405cc47a221c6e137a1f2e890b79a23bc26036834f7696dc9ac5953400f26975a0139fedad7c5 WHIRLPOOL dd2bd2384e12ee5e978dfb284ecdee73ce07f32d16dd67302a8cfc0ca324d078ab8b6153e170753a2fbe22993e07a4240e848d7b00aad78b58a4fa5cd27d0c26
1980 -AUX freebsd-lib-10.2-liblink.patch 653 SHA256 a252201ec74f0cf0940b28b626e72f909cfab04addcb86b8f9abe984265c074e SHA512 c75c1fd81bd826685db5258ce0cd2407e385990dd576973fad361206271eda678d1fbe95a406909904bfee22890c79eb0f4cbfab09ddbee579552d003df2e6b1 WHIRLPOOL 3a579e65e07d7b8b558004eae9923c249d9dbd13983e3e263cb5384734d4e8c739440baa95a67953a56d2c6b7ff0a2cb8d2d7d8f7a0fbb4366001d0ea990cc4d
1981 -AUX freebsd-lib-10.3-libusb.patch 339 SHA256 64c737051839e430108c96914485bc200e83ea951832033ace683470da823791 SHA512 15ad67c805c34e5a67f21de0db9ec3826aa96fadb880f2cca8110d4b26ed3722eea8aa9ee2c8e1976288b5e9be5e6046e4bd60d515305fff283ad50cc01d3d0f WHIRLPOOL 59ad6cb93295a95f8bb94fb7d2b13e1a8bd83267a96bc816142f9254bbdf494fd17670a0e8634eaeebe93f7535467c1b388f044eb459e222eecb84a7e21745bc
1982 -AUX freebsd-lib-6.0-flex-2.5.31.patch 421 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec WHIRLPOOL 177f7ee5764f79fcdab768b13016e809f677cfd57a06ebb5e1bbafc6520f309b328908716ee02a8155f35566faefa95b67b064dafa8de9a7d2a19bde92b386b0
1983 -AUX freebsd-lib-6.0-gccfloat.patch 542 SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495 WHIRLPOOL dee1bcf99935ae9ead0d5f498049a46ee89416f06eb7361901c69f40d0151ae1d3647a7dbb1c58b1aca7f541169b20d622019bc20b12953ba0c06fba56fd375e
1984 -AUX freebsd-lib-6.0-pmc.patch 338 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327 WHIRLPOOL 1744ed829c1775c01b5d1b827b5677b6b5d731cff376da4d8e7ab8facbb0c465131a34157d77186bfcf1a1097f515e3909d1e753aa2b8e72efaf7feae319361f
1985 -AUX freebsd-lib-6.1-csu.patch 655 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4 WHIRLPOOL fada1ac622c48e1e5af34245bdb17507b2b317938265f722c8cbdbbce3d14bbe76f39a231c0e7237bd229a8c0687952643c6f56e65ffc56b18508969fad837f7
1986 -AUX freebsd-lib-6.2-bluetooth.patch 243 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc WHIRLPOOL df2ab6e6d9223c7e2369fb8baf19638cb897343b6ba571c7b9294be7d335068b7978690b2cd50174b4ee0215f2409322a9cc2a374140fc14dff460e181c05578
1987 -AUX freebsd-lib-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
1988 -AUX freebsd-lib-8.0-gcc45.patch 1264 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57 WHIRLPOOL 0cb37d909a02492a1ca700a5b990e4b6ce42a7f7d55e14a5a3fe685d28f360a10e95d97bd489f1dae0b152e168e9d901bfc13bf08bc91d8dfa1d263d4dba9abf
1989 -AUX freebsd-lib-8.0-log2.patch 667 SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3 WHIRLPOOL dbe9a686efa26dab9ca129ed39ddab49556490fee22b43f6aa07bd9cbebfa24bd8ccb6e30f0d213bab857571a022bcd1b110d47bd85c6f70462441772bfeb243
1990 -AUX freebsd-lib-8.0-rpcsec_gss.patch 298 SHA256 775ec2ee12c49f134938fa8264c04c6b2bf95f8001371f20b85058c25ff1c472 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702 WHIRLPOOL 884b76cd6d5d01f801b2fb13f53cfa6ed26dd0b9b2a5062ac9dbe63a6813bfe737e4c3f98b3d94c32dfb6ce3cc19cd5c8760c81250f4b2d5980a4f084d7dc54b
1991 -AUX freebsd-lib-8.2-liblink.patch 510 SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee WHIRLPOOL c0b95cb074ff6fd7699a03dfe31572a5edbde2b59c8aac3431fb85a0a0d71ad28566500951e0fb96ed9a8d3081abca7ec507c26e12e988f0ff2ece51bb0df2d1
1992 -AUX freebsd-lib-8.2-nlm_syscall.patch 385 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd WHIRLPOOL 4d335910c00f21d2d8d5f80cd99c5316e5c485f935eefb782398e2e308e20a2cd4da0e1acf74c07a2c6d8ff446b3757cc416c0bee7e1be9d9cae0843a45e0748
1993 -AUX freebsd-lib-9.0-bluetooth.patch 318 SHA256 5b8810471bd57e1100cc7ee6eee3ed92799e1a5c0244f5ae42f3715189fb06c3 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488 WHIRLPOOL eccb54dd10a01358aa7e8267e64f103b89c2981ab2475f27282d5ea0bfe8adb8a106c869ca661553c3d2eda0c1d3d9dec669da6cfe61c23d5749535bdcc8c28b
1994 -AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 SHA256 a6383bd3b59bb6a8989ba7746f89115b91e5082768d914bab169842144569c45 SHA512 bb7090a0acbf8ab431334245b1e767da60dcf8f2d23de97a4690e879ae5d528065f5462e2ad3647313662a906f139cfff04f15bce80efede2d2174f74792a07b WHIRLPOOL 6df4a824cd657e79cce984f9181f3e6b20e998f9b9bc1a233bbc5dd7f2e40c055e9f9d401453b49bffb3cc8ef6bb541400f486a966339e56584569c08b358ee4
1995 -AUX freebsd-lib-9.0-liblink.patch 627 SHA256 41f0b7f92f2a8f0a3e422447b830d7dec70a068573086484d5efd6826b7c4c3c SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616 WHIRLPOOL b59e3bb0aaede34492d1940a77b11c7e5192643122f18ee6ad363053f9dec2600218ca416dd153e1d0b3bb6621d6f9e2ec50621e6e7f4b610abbd69993dc428a
1996 -AUX freebsd-lib-9.0-netware.patch 400 SHA256 e83d43f5bf9461c3d332365cca12db7b041b765c79eef392970665740411c382 SHA512 07ebde5797480f37502e60db2a8c9ce9459bd55b176e79c0f20a859cf737f619559cb27706fb0e83fb501493677a3ffeaa9a98d45db3c0c539b71d2f18140246 WHIRLPOOL 2d78565fe0bc0dcdd61d028ba24b20d2db94f32b40536e7e8e1d5e7f485e0e2f3125807dbb6607d26e4366a6aa8ee89a8f0af7c9498f1fba9431f652c181a8f1
1997 -AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b SHA512 a3828985f7da9e72ad44d88640952d56079693024bc11b4e3cca86b6f455a9e4756ba76f9e6d4c15960898f39e1dac7bc833e3241082f532c7fbd6d7d6f9418b WHIRLPOOL e0180dd0086c054e9f6895ecfe34bfb21d0e1db483dfc63ad411c651954c4703996d9b537a9566133a01770f2cf0f331727865013413181728c3b21740735473
1998 -AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
1999 -AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36
2000 -AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
2001 -AUX freebsd-lib-add-nossp-cflags.patch 1193 SHA256 53a844511feca44a9db4ac19de336320398335d18617b39cbc4e66db3f88e861 SHA512 fcb290527381df5b91355ca7f36bb4c770378b014890e7a4d129b7cc28e7c18cb1f87ef9e1b308e0de61b54d767677865969c77a9877d8874f2bec223331f9f8 WHIRLPOOL 20e4a0cd017f9aee59f0e4fa809ae74c855fcb7c7a794e1e71b1e5900390d08a9bdfaf5a36a45b057d6211c056a5fb69adfc688fa2adb0586f115be0aea40219
2002 -AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
2003 -AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
2004 -AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
2005 -AUX freebsd-lib-new_as.patch 1494 SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982 SHA512 f53aa3833179c701a8c0fc6c48c3ab9d1a2694a1c30287ae08e9ea94ddf8c547f7bfe632908b9c3a3ffc4541ed2bf41277a309ffbb7d3eea58d389198d884adb WHIRLPOOL 738b312f04f8a51ab7182c4fde21bfa18d90c9a85486cd071724a61c2ecdb58cb3cdf4c52c50219baab91f15ccebf7de7700267952da65ec52e7c71eab3f954b
2006 -AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
2007 -AUX libmap.conf 201 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742 SHA512 abc358dff495fe96b9ed549bacb5278577ca4da46b89b87e9211a2f6acdd455111df02ba11b797287f839af6cc22f8810e8ac1dc52154acc8b22364e667b3c49 WHIRLPOOL 0827a0ea9b8a2faed019d13356a793b2b572e54d6f8ebf32a9f12214759153433e21f7d8fdedf43e038ac1925432c1f4843441db47d29895eda51781f1fedb5e
2008 -AUX libusb-1.0.pc.in 207 SHA256 edf35e887cbfed2df288825434c467e0a946eeb21e0d631f55940bb177c2ba15 SHA512 93289cecfc298a31fd4fd0848bf25a63048a7549bd81792d7bd158731246221c24ec9f469a918430da56873a0936fb2b372cedaaa32a38ccd5323de0f9a89b93 WHIRLPOOL 7c81b0df4548a9391b4e1420186f1e970aa9e2e73a89e817adbff9de52b8797cbd8a4d8b3ca01f782f86e4b1e48fad72a08b5bff49d5ee6ffaa5135c015ca5ae
2009 -AUX libusb.pc.in 208 SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56 SHA512 e9c6d5f04057cf8c13f69a3d8e07bdd517fdb01d572a69a1beb397766311b3c53894b108caaaea740bfc27b227a9620621dac5846bff1a367fbf9954f38bb40c WHIRLPOOL e80e76a8a564655d924a7148a841c7c7cf0be0ea3bdbd76e95e5004124543826e5d925dfe791f4b040e042a10923865bb517499d9f5be39611fedbcceebe32d8
2010 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
2011 -EBUILD freebsd-lib-10.3_rc3.ebuild 19393 SHA256 e64ca01cb38f201de96b17a644208e5ba2a62c7540351c392614eca5523278e0 SHA512 b38f581b6a5d622205c03eda9aa62ad1659ba286a4fde71b8f65ce063a553e26898ef4230a48a318678091ddf88c62c40721a25e58cde611505144cdcb2c17ec WHIRLPOOL 47085900c6eac319a07477dc237aba7dbd0c8470ddaeb4814376cf03ba5d98df5c03378e2aeb951de8ca99ba9a142fba655100cfc389633316d30ea7a5f85845
2012 -MISC metadata.xml 500 SHA256 82c704031ba7ec4dec7348c15d1188fad5e9df804c12f90c04afcb0a46eb5dd6 SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470 WHIRLPOOL 0837f442d3673e9bac470774a9868ad4992056a4edae8e07759248ec58830cb1a596cf39b347d04a3e33b16d88329084571df30f33bdc9c9e73073f32ca015ae
2013
2014 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
2015 deleted file mode 100644
2016 index 42b64b5..0000000
2017 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
2018 +++ /dev/null
2019 @@ -1,49 +0,0 @@
2020 -diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
2021 -index 937187a..d5277f3 100644
2022 ---- a/lib/atf/Makefile.inc
2023 -+++ b/lib/atf/Makefile.inc
2024 -@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"'
2025 - CFLAGS+= -DATF_SHELL='"/bin/sh"'
2026 - CFLAGS+= -DATF_WORKDIR='"/tmp"'
2027 -
2028 -+CXXFLAGS+= -DHAVE_CONFIG_H
2029 -+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"'
2030 -+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"'
2031 -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
2032 -+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"'
2033 -+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
2034 -+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"'
2035 -+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
2036 -+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"'
2037 -+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"'
2038 -+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"'
2039 -+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"'
2040 -+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"'
2041 -+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"'
2042 -+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"'
2043 -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"'
2044 -+CXXFLAGS+= -DATF_WORKDIR='"/tmp"'
2045 -+
2046 - WARNS?= 3
2047 -
2048 - # vim: syntax=make
2049 -diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
2050 -index 37d6073..90a2687 100644
2051 ---- a/lib/atf/libatf-c++/Makefile
2052 -+++ b/lib/atf/libatf-c++/Makefile
2053 -@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c
2054 - .PATH: ${ATF}/atf-c++
2055 - .PATH: ${ATF}/atf-c++/detail
2056 -
2057 --CFLAGS+= -I${ATF}
2058 --CFLAGS+= -I${.CURDIR}/../libatf-c
2059 --CFLAGS+= -I.
2060 -+CXXFLAGS+= -I${ATF}
2061 -+CXXFLAGS+= -I${.CURDIR}/../libatf-c
2062 -+CXXFLAGS+= -I.
2063 -
2064 --CFLAGS+= -DHAVE_CONFIG_H
2065 -+CXXFLAGS+= -DHAVE_CONFIG_H
2066 -
2067 - SRCS= application.cpp \
2068 - build.cpp \
2069
2070 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
2071 deleted file mode 100644
2072 index 6ef3f07..0000000
2073 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
2074 +++ /dev/null
2075 @@ -1,98 +0,0 @@
2076 -diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
2077 -index 9a21dde..0815f0a 100644
2078 ---- a/lib/libcam/Makefile
2079 -+++ b/lib/libcam/Makefile
2080 -@@ -8,6 +8,7 @@ INCS= camlib.h
2081 -
2082 - DPADD= ${LIBSBUF}
2083 - LDADD= -lsbuf
2084 -+LDFLAGS+= -L${.OBJDIR}/../libsbuf
2085 -
2086 - MAN= cam.3 cam_cdbparse.3
2087 -
2088 -diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
2089 -index dbd7895..607b1f6 100644
2090 ---- a/lib/libdwarf/Makefile
2091 -+++ b/lib/libdwarf/Makefile
2092 -@@ -21,6 +21,7 @@ SRCS= \
2093 - INCS= dwarf.h libdwarf.h
2094 -
2095 - CFLAGS+= -I${.CURDIR}
2096 -+CFLAGS+= -I${.CURDIR}/../libelf
2097 -
2098 - SHLIB_MAJOR= 3
2099 -
2100 -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
2101 -index 4449c06..f024cf0 100644
2102 ---- a/lib/libproc/Makefile
2103 -+++ b/lib/libproc/Makefile
2104 -@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \
2105 - INCS= libproc.h
2106 -
2107 - CFLAGS+= -I${.CURDIR}
2108 -+CFLAGS+= -I${.CURDIR}/../libelf
2109 -
2110 - .if ${MK_LIBCPLUSPLUS} != "no"
2111 - LDADD+= -lcxxrt
2112 -@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2
2113 -
2114 - WITHOUT_MAN=
2115 -
2116 -+LDADD+= -lelf
2117 -+LDFLAGS+= -L${.OBJDIR}/../libelf
2118 -+
2119 - .include <bsd.lib.mk>
2120 -diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
2121 -index af5a775..c01aa05 100644
2122 ---- a/lib/libprocstat/Makefile
2123 -+++ b/lib/libprocstat/Makefile
2124 -@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def
2125 - SYMBOL_MAPS= ${.CURDIR}/Symbol.map
2126 -
2127 - INCS= libprocstat.h
2128 -+CFLAGS+= -I${.CURDIR}/../libelf
2129 -+LDFLAGS+= -L${.OBJDIR}/../libelf
2130 - CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
2131 - SHLIB_MAJOR= 1
2132 -
2133 -diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
2134 -index 2815a07..e992662 100644
2135 ---- a/lib/librtld_db/Makefile
2136 -+++ b/lib/librtld_db/Makefile
2137 -@@ -10,5 +10,8 @@ SRCS= rtld_db.c
2138 - INCS= rtld_db.h
2139 -
2140 - CFLAGS+= -I${.CURDIR}
2141 -+CFLAGS+= -I${.CURDIR}/../libelf
2142 -+LDADD+= -lutil -lproc
2143 -+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
2144 -
2145 - .include <bsd.lib.mk>
2146 -diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
2147 -index 1cf52a0..3d25fae 100644
2148 ---- a/lib/libtelnet/Makefile
2149 -+++ b/lib/libtelnet/Makefile
2150 -@@ -13,6 +13,8 @@ INTERNALLIB=
2151 - SRCS= genget.c getent.c misc.c
2152 - CFLAGS+= -I${TELNETDIR}
2153 -
2154 -+CFLAGS+= -I${.CURDIR}/../libmp
2155 -+
2156 - WARNS?= 2
2157 -
2158 - .if !defined(RELEASE_CRUNCH)
2159 -diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
2160 -index 30a1dfb..9f8a99c 100644
2161 ---- a/lib/libexecinfo/Makefile
2162 -+++ b/lib/libexecinfo/Makefile
2163 -@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1
2164 - INCS= execinfo.h
2165 - SRCS= backtrace.c symtab.c unwind.c
2166 -
2167 -+CFLAGS+= -I${.CURDIR}/../libelf
2168 - DPADD= ${LIBELF}
2169 - LDADD= -lelf
2170 -+LDFLAGS+= -L${.OBJDIR}/../libelf
2171 -
2172 - MAN= backtrace.3
2173 -
2174
2175 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
2176 deleted file mode 100644
2177 index 55987aa..0000000
2178 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
2179 +++ /dev/null
2180 @@ -1,16 +0,0 @@
2181 -diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
2182 -index f9e01ab..15b27d8 100644
2183 ---- a/lib/libproc/Makefile
2184 -+++ b/lib/libproc/Makefile
2185 -@@ -15,7 +15,10 @@ INCS= libproc.h
2186 -
2187 - CFLAGS+= -I${.CURDIR}
2188 -
2189 --.if ${MK_LIBCPLUSPLUS} != "no"
2190 -+.if ${CXX:T:M*-stdlib=libc++*}
2191 -+LDADD+= -lcxxrt
2192 -+DPADD+= ${LIBCXXRT}
2193 -+.elif ${CXXFLAGS:T:M*-stdlib=libc++*}
2194 - LDADD+= -lcxxrt
2195 - DPADD+= ${LIBCXXRT}
2196 - .else
2197
2198 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
2199 deleted file mode 100644
2200 index 2968252..0000000
2201 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
2202 +++ /dev/null
2203 @@ -1,19 +0,0 @@
2204 -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
2205 -index 21016a9..26010e8 100644
2206 ---- a/lib/libusb/Makefile
2207 -+++ b/lib/libusb/Makefile
2208 -@@ -40,11 +40,11 @@ CFLAGS+= -DCOMPAT_32BIT
2209 -
2210 - beforeinstall:
2211 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
2212 -- ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
2213 -+ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig
2214 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
2215 -- ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
2216 -+ ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
2217 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
2218 -- ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
2219 -+ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
2220 -
2221 - #
2222 - # Cross platform support
2223
2224 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
2225 deleted file mode 100644
2226 index 303f422..0000000
2227 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch
2228 +++ /dev/null
2229 @@ -1,39 +0,0 @@
2230 -diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
2231 -index bbfb57b..a7c17e3 100644
2232 ---- a/lib/libgeom/Makefile
2233 -+++ b/lib/libgeom/Makefile
2234 -@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR}
2235 -
2236 - WARNS?= 3
2237 -
2238 --DPADD= ${LIBBSDXML} ${LIBSBUF}
2239 -+DPADD= ${LIBSBUF}
2240 - LDADD= -lbsdxml -lsbuf
2241 -
2242 - MAN= libgeom.3
2243 -diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
2244 -index 9dedb8e..d96420c 100644
2245 ---- a/lib/libgeom/geom_xml2tree.c
2246 -+++ b/lib/libgeom/geom_xml2tree.c
2247 -@@ -43,7 +43,7 @@
2248 - #include <sys/sbuf.h>
2249 - #include <sys/sysctl.h>
2250 - #include <err.h>
2251 --#include <bsdxml.h>
2252 -+#include <expat.h>
2253 - #include <libgeom.h>
2254 -
2255 - struct mystate {
2256 -diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c
2257 -index d1fc0b1..89ac55e 100644
2258 ---- a/lib/libmt/mtlib.c
2259 -+++ b/lib/libmt/mtlib.c
2260 -@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken
2261 - #include <unistd.h>
2262 - #include <stdint.h>
2263 - #include <errno.h>
2264 --#include <bsdxml.h>
2265 -+#include <expat.h>
2266 - #include <mtlib.h>
2267 -
2268 - /*
2269
2270 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
2271 deleted file mode 100644
2272 index b08d95f..0000000
2273 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch
2274 +++ /dev/null
2275 @@ -1,26 +0,0 @@
2276 -diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile
2277 -index cb1da71..43de5a5 100644
2278 ---- a/lib/libmt/Makefile
2279 -+++ b/lib/libmt/Makefile
2280 -@@ -5,6 +5,7 @@ SHLIBDIR?= /lib
2281 - SRCS= mtlib.c
2282 - INCS= mtlib.h
2283 -
2284 -+CFLAGS+= -I${.CURDIR}
2285 - DPADD= ${LIBSBUF}
2286 - LDADD= -lsbuf
2287 -
2288 -diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile
2289 -index e9384b7..085ef62 100644
2290 ---- a/lib/libdpv/Makefile
2291 -+++ b/lib/libdpv/Makefile
2292 -@@ -11,7 +11,8 @@ LDADD= -ldialog -lfigpar -lncursesw -lutil
2293 -
2294 - SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c
2295 -
2296 --CFLAGS+= -I${.CURDIR}
2297 -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libfigpar
2298 -+LDFLAGS+= -L${.OBJDIR}/../libfigpar
2299 -
2300 - WARNS?= 6
2301 -
2302
2303 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
2304 deleted file mode 100644
2305 index 813a42b..0000000
2306 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch
2307 +++ /dev/null
2308 @@ -1,13 +0,0 @@
2309 -diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
2310 -index 88ec3fe..076b8d4 100644
2311 ---- a/lib/libusb/Makefile
2312 -+++ b/lib/libusb/Makefile
2313 -@@ -38,7 +38,7 @@ SRCS+= libusb10_io.c
2314 - CFLAGS+= -DCOMPAT_32BIT
2315 - .else
2316 - FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
2317 --FILESDIR= ${LIBDATADIR}/pkgconfig
2318 -+FILESDIR= ${LIBDIR}/pkgconfig
2319 - .endif
2320 -
2321 - #
2322
2323 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
2324 deleted file mode 100644
2325 index 00de8a6..0000000
2326 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-flex-2.5.31.patch
2327 +++ /dev/null
2328 @@ -1,13 +0,0 @@
2329 -Index: fbsd-6/lib/libipsec/policy_token.l
2330 -===================================================================
2331 ---- fbsd-6.orig/lib/libipsec/policy_token.l
2332 -+++ fbsd-6/lib/libipsec/policy_token.l
2333 -@@ -138,8 +138,6 @@ void
2334 - __policy__strbuffer__init__(msg)
2335 - char *msg;
2336 - {
2337 -- if (yy_current_buffer)
2338 -- yy_delete_buffer(yy_current_buffer);
2339 - strbuffer = (YY_BUFFER_STATE)yy_scan_string(msg);
2340 - yy_switch_to_buffer(strbuffer);
2341 -
2342
2343 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
2344 deleted file mode 100644
2345 index a3e7d5e..0000000
2346 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
2347 +++ /dev/null
2348 @@ -1,16 +0,0 @@
2349 -This patch is needed to avoid inclusion of GCC's float.h that defines
2350 -LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
2351 -
2352 -Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
2353 -===================================================================
2354 ---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
2355 -+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
2356 -@@ -28,7 +28,7 @@
2357 - __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
2358 -
2359 - #include <fenv.h>
2360 --#include <float.h>
2361 -+#include <machine/float.h>
2362 - #include <math.h>
2363 -
2364 - /*
2365
2366 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
2367 deleted file mode 100644
2368 index 2f6de46..0000000
2369 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-pmc.patch
2370 +++ /dev/null
2371 @@ -1,13 +0,0 @@
2372 -Index: freebsd-6.0_beta4/lib/libpmc/Makefile
2373 -===================================================================
2374 ---- freebsd-6.0_beta4.orig/lib/libpmc/Makefile
2375 -+++ freebsd-6.0_beta4/lib/libpmc/Makefile
2376 -@@ -9,6 +9,8 @@ WARNS?= 6
2377 -
2378 - MAN= pmc.3 pmclog.3
2379 -
2380 -+CFLAGS+= -I${.CURDIR}
2381 -+
2382 - MLINKS+= \
2383 - pmc.3 pmc_allocate.3 \
2384 - pmc.3 pmc_attach.3 \
2385
2386 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
2387 deleted file mode 100644
2388 index 075f278..0000000
2389 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.1-csu.patch
2390 +++ /dev/null
2391 @@ -1,20 +0,0 @@
2392 ---- lib/csu/amd64/Makefile.orig 2006-07-04 07:49:58 -0300
2393 -+++ lib/csu/amd64/Makefile 2006-07-04 07:50:15 -0300
2394 -@@ -16,6 +16,7 @@
2395 - ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c
2396 -
2397 - realinstall:
2398 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
2399 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
2400 - ${OBJS} ${DESTDIR}${LIBDIR}
2401 -
2402 ---- lib/csu/sparc64/Makefile.orig 2006-10-06 15:13:55 +0100
2403 -+++ lib/csu/sparc64/Makefile 2006-10-06 15:15:06 +0100
2404 -@@ -15,6 +15,7 @@
2405 - ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC}
2406 -
2407 - realinstall:
2408 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
2409 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
2410 - ${OBJS} ${DESTDIR}${LIBDIR}
2411 -
2412
2413 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
2414 deleted file mode 100644
2415 index a9b8435..0000000
2416 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
2417 +++ /dev/null
2418 @@ -1,11 +0,0 @@
2419 ---- lib/libsdp/Makefile 2007-06-15 12:04:37 +0200
2420 -+++ lib.sdp/libsdp/Makefile 2007-06-15 12:26:14 +0200
2421 -@@ -5,7 +5,7 @@
2422 - MAN= sdp.3
2423 -
2424 - WARNS?= 2
2425 --CFLAGS+= -I${.CURDIR}
2426 -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth
2427 -
2428 - SHLIB_MAJOR= 2
2429 -
2430
2431 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
2432 deleted file mode 100644
2433 index 8de5df2..0000000
2434 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-types.h-fix.patch
2435 +++ /dev/null
2436 @@ -1,15 +0,0 @@
2437 -Fixes a compile error if XOPEN_SOURCE 600 is defined.
2438 -
2439 -See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html
2440 -
2441 ---- sys/sys/types.h.orig
2442 -+++ sys/sys/types.h
2443 -@@ -46,7 +46,7 @@
2444 -
2445 - #include <sys/_pthreadtypes.h>
2446 -
2447 --#if __BSD_VISIBLE
2448 -+#ifndef _POSIX_SOURCE
2449 - typedef unsigned char u_char;
2450 - typedef unsigned short u_short;
2451 - typedef unsigned int u_int;
2452
2453 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
2454 deleted file mode 100644
2455 index 2ddb9ea..0000000
2456 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-gcc45.patch
2457 +++ /dev/null
2458 @@ -1,28 +0,0 @@
2459 -diff -Nur work.orig/include/rpcsvc/nis.x work/include/rpcsvc/nis.x
2460 ---- work.orig/include/rpcsvc/nis.x 2009-10-25 10:10:29.000000000 +0900
2461 -+++ work/include/rpcsvc/nis.x 2011-04-13 21:25:13.000000000 +0900
2462 -@@ -399,10 +399,7 @@
2463 - %#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
2464 - %#define WORLD_DEFAULT (NIS_READ_ACC)
2465 - %#define GROUP_DEFAULT (NIS_READ_ACC << 8)
2466 --%#define OWNER_DEFAULT ((NIS_READ_ACC +\
2467 -- NIS_MODIFY_ACC +\
2468 -- NIS_CREATE_ACC +\
2469 -- NIS_DESTROY_ACC) << 16)
2470 -+%#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
2471 - %#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
2472 - %
2473 - %/* Result manipulation defines ... */
2474 -@@ -431,10 +428,8 @@
2475 - % * these definitions they take an nis_object *, and an int and return
2476 - % * a u_char * for Value, and an int for length.
2477 - % */
2478 --%#define ENTRY_VAL(obj, col) \
2479 -- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
2480 --%#define ENTRY_LEN(obj, col) \
2481 -- (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
2482 -+%#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
2483 -+%#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
2484 - %
2485 - %#ifdef __cplusplus
2486 - %}
2487
2488 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
2489 deleted file mode 100644
2490 index a9fd189..0000000
2491 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
2492 +++ /dev/null
2493 @@ -1,21 +0,0 @@
2494 -log2 and log2f are required by C99 and are not implemented.
2495 -Workaround the deficiency.
2496 -
2497 ---- lib/msun/src/math.h.old 2010-03-14 17:02:25.000000000 +0100
2498 -+++ lib/msun/src/math.h 2010-03-14 17:07:03.000000000 +0100
2499 -@@ -203,6 +203,7 @@
2500 - double frexp(double, int *); /* fundamentally !__pure2 */
2501 - double ldexp(double, int);
2502 - double log(double);
2503 -+#define log2(x) log(x)/log(2.0)
2504 - double log10(double);
2505 - double modf(double, double *); /* fundamentally !__pure2 */
2506 -
2507 -@@ -319,6 +320,7 @@
2508 - float log10f(float);
2509 - float log1pf(float);
2510 - float logf(float);
2511 -+#define log2f(x) logf(x)/logf(2.0)
2512 - float modff(float, float *); /* fundamentally !__pure2 */
2513 -
2514 - float powf(float, float);
2515
2516 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
2517 deleted file mode 100644
2518 index a7de06f..0000000
2519 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
2520 +++ /dev/null
2521 @@ -1,12 +0,0 @@
2522 -Without this linking fails during a stage3 build.
2523 -
2524 ---- lib/librpcsec_gss/Makefile.orig
2525 -+++ lib/librpcsec_gss/Makefile
2526 -@@ -8,6 +8,7 @@
2527 -
2528 - DPADD+= ${LIBGSSAPI}
2529 - LDADD+= -lgssapi
2530 -+LDFLAGS+= -L${.OBJDIR}/../libgssapi
2531 -
2532 - VERSION_DEF= ${.CURDIR}/../libc/Versions.def
2533 - SYMBOL_MAPS= ${.CURDIR}/Symbol.map
2534
2535 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
2536 deleted file mode 100644
2537 index c8be7f4..0000000
2538 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
2539 +++ /dev/null
2540 @@ -1,19 +0,0 @@
2541 ---- lib/libproc/Makefile.old 2011-07-06 00:58:04.000000000 +0000
2542 -+++ lib/libproc/Makefile 2011-07-06 00:58:58.000000000 +0000
2543 -@@ -18,5 +18,6 @@
2544 - WARNS?= 6
2545 -
2546 - WITHOUT_MAN= yes
2547 -+LDADD=-lelf
2548 -
2549 - .include <bsd.lib.mk>
2550 ---- lib/librtld_db/Makefile.old 2011-07-06 00:58:12.000000000 +0000
2551 -+++ lib/librtld_db/Makefile 2011-07-06 00:59:27.000000000 +0000
2552 -@@ -10,5 +10,7 @@
2553 - INCS= rtld_db.h
2554 -
2555 - CFLAGS+= -I${.CURDIR}
2556 -+LDADD=-lutil -lproc
2557 -+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
2558 -
2559 - .include <bsd.lib.mk>
2560
2561 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
2562 deleted file mode 100644
2563 index 556ade5..0000000
2564 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
2565 +++ /dev/null
2566 @@ -1,10 +0,0 @@
2567 ---- include/unistd.h 2010/12/20 20:39:49 216602
2568 -+++ include/unistd.h 2010/12/20 21:12:18 216603
2569 -@@ -529,6 +529,7 @@
2570 - #define _MKTEMP_DECLARED
2571 - #endif
2572 - int nfssvc(int, void *);
2573 -+int nlm_syscall(int, int, int, char **);
2574 - int profil(char *, size_t, vm_offset_t, int);
2575 - int rcmd(char **, int, const char *, const char *, const char *, int *);
2576 - int rcmd_af(char **, int, const char *,
2577
2578 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
2579 deleted file mode 100644
2580 index cf1172a..0000000
2581 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-bluetooth.patch
2582 +++ /dev/null
2583 @@ -1,12 +0,0 @@
2584 -diff -Nur lib.orig/libsdp/Makefile lib/libsdp/Makefile
2585 ---- lib.orig/libsdp/Makefile 2012-12-25 20:28:50.000000000 +0900
2586 -+++ lib/libsdp/Makefile 2012-12-25 20:31:19.000000000 +0900
2587 -@@ -5,7 +5,7 @@
2588 - MAN= sdp.3
2589 -
2590 - WARNS?= 2
2591 --CFLAGS+= -I${.CURDIR}
2592 -+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libbluetooth
2593 -
2594 - SHLIB_MAJOR= 4
2595 -
2596
2597 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch
2598 deleted file mode 100644
2599 index ad9b960..0000000
2600 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-cve-2010-2632.patch
2601 +++ /dev/null
2602 @@ -1,215 +0,0 @@
2603 -Index: lib/libc/gen/glob.c
2604 -===================================================================
2605 ---- lib/libc/gen/glob.c (revision 246357)
2606 -+++ lib/libc/gen/glob.c (working copy)
2607 -@@ -94,6 +94,25 @@ __FBSDID("$FreeBSD$");
2608 -
2609 - #include "collate.h"
2610 -
2611 -+/*
2612 -+ * glob(3) expansion limits. Stop the expansion if any of these limits
2613 -+ * is reached. This caps the runtime in the face of DoS attacks. See
2614 -+ * also CVE-2010-2632
2615 -+ */
2616 -+#define GLOB_LIMIT_BRACE 128 /* number of brace calls */
2617 -+#define GLOB_LIMIT_PATH 65536 /* number of path elements */
2618 -+#define GLOB_LIMIT_READDIR 16384 /* number of readdirs */
2619 -+#define GLOB_LIMIT_STAT 1024 /* number of stat system calls */
2620 -+#define GLOB_LIMIT_STRING ARG_MAX /* maximum total size for paths */
2621 -+
2622 -+struct glob_limit {
2623 -+ size_t l_brace_cnt;
2624 -+ size_t l_path_lim;
2625 -+ size_t l_readdir_cnt;
2626 -+ size_t l_stat_cnt;
2627 -+ size_t l_string_cnt;
2628 -+};
2629 -+
2630 - #define DOLLAR '$'
2631 - #define DOT '.'
2632 - #define EOS '\0'
2633 -@@ -153,15 +172,18 @@ static const Char *g_strchr(const Char *, wchar_t)
2634 - static Char *g_strcat(Char *, const Char *);
2635 - #endif
2636 - static int g_stat(Char *, struct stat *, glob_t *);
2637 --static int glob0(const Char *, glob_t *, size_t *);
2638 --static int glob1(Char *, glob_t *, size_t *);
2639 --static int glob2(Char *, Char *, Char *, Char *, glob_t *, size_t *);
2640 --static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *);
2641 --static int globextend(const Char *, glob_t *, size_t *);
2642 --static const Char *
2643 -+static int glob0(const Char *, glob_t *, struct glob_limit *);
2644 -+static int glob1(Char *, glob_t *, struct glob_limit *);
2645 -+static int glob2(Char *, Char *, Char *, Char *, glob_t *,
2646 -+ struct glob_limit *);
2647 -+static int glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
2648 -+ struct glob_limit *);
2649 -+static int globextend(const Char *, glob_t *, struct glob_limit *);
2650 -+static const Char *
2651 - globtilde(const Char *, Char *, size_t, glob_t *);
2652 --static int globexp1(const Char *, glob_t *, size_t *);
2653 --static int globexp2(const Char *, const Char *, glob_t *, int *, size_t *);
2654 -+static int globexp1(const Char *, glob_t *, struct glob_limit *);
2655 -+static int globexp2(const Char *, const Char *, glob_t *, int *,
2656 -+ struct glob_limit *);
2657 - static int match(Char *, Char *, Char *);
2658 - #ifdef DEBUG
2659 - static void qprintf(const char *, Char *);
2660 -@@ -171,8 +193,8 @@ int
2661 - glob(const char * __restrict pattern, int flags,
2662 - int (*errfunc)(const char *, int), glob_t * __restrict pglob)
2663 - {
2664 -+ struct glob_limit limit = { 0, 0, 0, 0, 0 };
2665 - const char *patnext;
2666 -- size_t limit;
2667 - Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot;
2668 - mbstate_t mbs;
2669 - wchar_t wc;
2670 -@@ -186,11 +208,10 @@ glob(const char * __restrict pattern, int flags,
2671 - pglob->gl_offs = 0;
2672 - }
2673 - if (flags & GLOB_LIMIT) {
2674 -- limit = pglob->gl_matchc;
2675 -- if (limit == 0)
2676 -- limit = ARG_MAX;
2677 -- } else
2678 -- limit = 0;
2679 -+ limit.l_path_lim = pglob->gl_matchc;
2680 -+ if (limit.l_path_lim == 0)
2681 -+ limit.l_path_lim = GLOB_LIMIT_PATH;
2682 -+ }
2683 - pglob->gl_flags = flags & ~GLOB_MAGCHAR;
2684 - pglob->gl_errfunc = errfunc;
2685 - pglob->gl_matchc = 0;
2686 -@@ -243,11 +264,17 @@ glob(const char * __restrict pattern, int flags,
2687 - * characters
2688 - */
2689 - static int
2690 --globexp1(const Char *pattern, glob_t *pglob, size_t *limit)
2691 -+globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
2692 - {
2693 - const Char* ptr = pattern;
2694 - int rv;
2695 -
2696 -+ if ((pglob->gl_flags & GLOB_LIMIT) &&
2697 -+ limit->l_brace_cnt++ >= GLOB_LIMIT_BRACE) {
2698 -+ errno = 0;
2699 -+ return (GLOB_NOSPACE);
2700 -+ }
2701 -+
2702 - /* Protect a single {}, for find(1), like csh */
2703 - if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
2704 - return glob0(pattern, pglob, limit);
2705 -@@ -266,7 +293,8 @@ static int
2706 - * If it fails then it tries to glob the rest of the pattern and returns.
2707 - */
2708 - static int
2709 --globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, size_t *limit)
2710 -+globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv,
2711 -+ struct glob_limit *limit)
2712 - {
2713 - int i;
2714 - Char *lm, *ls;
2715 -@@ -436,7 +464,7 @@ globtilde(const Char *pattern, Char *patbuf, size_
2716 - * if things went well, nonzero if errors occurred.
2717 - */
2718 - static int
2719 --glob0(const Char *pattern, glob_t *pglob, size_t *limit)
2720 -+glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
2721 - {
2722 - const Char *qpatnext;
2723 - int err;
2724 -@@ -529,7 +557,7 @@ compare(const void *p, const void *q)
2725 - }
2726 -
2727 - static int
2728 --glob1(Char *pattern, glob_t *pglob, size_t *limit)
2729 -+glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit)
2730 - {
2731 - Char pathbuf[MAXPATHLEN];
2732 -
2733 -@@ -547,7 +575,7 @@ static int
2734 - */
2735 - static int
2736 - glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern,
2737 -- glob_t *pglob, size_t *limit)
2738 -+ glob_t *pglob, struct glob_limit *limit)
2739 - {
2740 - struct stat sb;
2741 - Char *p, *q;
2742 -@@ -563,6 +591,15 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_
2743 - if (g_lstat(pathbuf, &sb, pglob))
2744 - return(0);
2745 -
2746 -+ if ((pglob->gl_flags & GLOB_LIMIT) &&
2747 -+ limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) {
2748 -+ errno = 0;
2749 -+ if (pathend + 1 > pathend_last)
2750 -+ return (GLOB_ABORTED);
2751 -+ *pathend++ = SEP;
2752 -+ *pathend = EOS;
2753 -+ return (GLOB_NOSPACE);
2754 -+ }
2755 - if (((pglob->gl_flags & GLOB_MARK) &&
2756 - pathend[-1] != SEP) && (S_ISDIR(sb.st_mode)
2757 - || (S_ISLNK(sb.st_mode) &&
2758 -@@ -606,7 +643,7 @@ glob2(Char *pathbuf, Char *pathend, Char *pathend_
2759 - static int
2760 - glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
2761 - Char *pattern, Char *restpattern,
2762 -- glob_t *pglob, size_t *limit)
2763 -+ glob_t *pglob, struct glob_limit *limit)
2764 - {
2765 - struct dirent *dp;
2766 - DIR *dirp;
2767 -@@ -652,6 +689,19 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_
2768 - size_t clen;
2769 - mbstate_t mbs;
2770 -
2771 -+ if ((pglob->gl_flags & GLOB_LIMIT) &&
2772 -+ limit->l_readdir_cnt++ >= GLOB_LIMIT_READDIR) {
2773 -+ errno = 0;
2774 -+ if (pathend + 1 > pathend_last)
2775 -+ err = GLOB_ABORTED;
2776 -+ else {
2777 -+ *pathend++ = SEP;
2778 -+ *pathend = EOS;
2779 -+ err = GLOB_NOSPACE;
2780 -+ }
2781 -+ break;
2782 -+ }
2783 -+
2784 - /* Initial DOT must be matched literally. */
2785 - if (dp->d_name[0] == DOT && *pattern != DOT)
2786 - continue;
2787 -@@ -702,14 +752,15 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_
2788 - * gl_pathv points to (gl_offs + gl_pathc + 1) items.
2789 - */
2790 - static int
2791 --globextend(const Char *path, glob_t *pglob, size_t *limit)
2792 -+globextend(const Char *path, glob_t *pglob, struct glob_limit *limit)
2793 - {
2794 - char **pathv;
2795 - size_t i, newsize, len;
2796 - char *copy;
2797 - const Char *p;
2798 -
2799 -- if (*limit && pglob->gl_pathc > *limit) {
2800 -+ if ((pglob->gl_flags & GLOB_LIMIT) &&
2801 -+ pglob->gl_matchc > limit->l_path_lim) {
2802 - errno = 0;
2803 - return (GLOB_NOSPACE);
2804 - }
2805 -@@ -737,6 +788,12 @@ static int
2806 - for (p = path; *p++;)
2807 - continue;
2808 - len = MB_CUR_MAX * (size_t)(p - path); /* XXX overallocation */
2809 -+ limit->l_string_cnt += len;
2810 -+ if ((pglob->gl_flags & GLOB_LIMIT) &&
2811 -+ limit->l_string_cnt >= GLOB_LIMIT_STRING) {
2812 -+ errno = 0;
2813 -+ return (GLOB_NOSPACE);
2814 -+ }
2815 - if ((copy = malloc(len)) != NULL) {
2816 - if (g_Ctoc(path, copy, len)) {
2817 - free(copy);
2818
2819 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
2820 deleted file mode 100644
2821 index f8e4707..0000000
2822 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-liblink.patch
2823 +++ /dev/null
2824 @@ -1,21 +0,0 @@
2825 -diff -uNr lib.ol/libproc/Makefile lib/libproc/Makefile
2826 ---- lib.ol/libproc/Makefile 2011-11-02 14:02:17.000000000 +0000
2827 -+++ lib/libproc/Makefile 2011-11-02 14:03:09.000000000 +0000
2828 -@@ -16,5 +16,6 @@
2829 - SHLIB_MAJOR= 2
2830 -
2831 - WITHOUT_MAN=
2832 -+LDADD+=-lelf
2833 -
2834 - .include <bsd.lib.mk>
2835 -diff -uNr lib.ol/librtld_db/Makefile lib/librtld_db/Makefile
2836 ---- lib.ol/librtld_db/Makefile 2011-11-02 14:02:13.000000000 +0000
2837 -+++ lib/librtld_db/Makefile 2011-11-02 14:04:00.000000000 +0000
2838 -@@ -10,5 +10,7 @@
2839 - INCS= rtld_db.h
2840 -
2841 - CFLAGS+= -I${.CURDIR}
2842 -+LDADD+=-lutil -lproc
2843 -+LDFLAGS+=-L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
2844 -
2845 - .include <bsd.lib.mk>
2846
2847 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
2848 deleted file mode 100644
2849 index c1c2a0e..0000000
2850 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-netware.patch
2851 +++ /dev/null
2852 @@ -1,11 +0,0 @@
2853 -diff -Nur lib.orig/libncp/Makefile lib/libncp/Makefile
2854 ---- lib.orig/libncp/Makefile 2012-12-25 20:35:16.000000000 +0900
2855 -+++ lib/libncp/Makefile 2012-12-25 20:36:23.000000000 +0900
2856 -@@ -6,6 +6,7 @@
2857 -
2858 - DPADD= ${LIBIPX}
2859 - LDADD= -lipx
2860 -+LDFLAGS+=-L${.OBJDIR}/../libipx
2861 -
2862 - SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \
2863 - ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \
2864
2865 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
2866 deleted file mode 100644
2867 index bf77a0a..0000000
2868 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-opieincludes.patch
2869 +++ /dev/null
2870 @@ -1,122 +0,0 @@
2871 -Fixes warnings like:
2872 -/var/tmp/portage/sys-freebsd/freebsd-lib-9.0-r2/work/lib/libopie/../../contrib/opie/libopie/randomchallenge.c:43:5:
2873 -warning: incompatible implicit declaration of built-in function ‘strcpy’
2874 -
2875 -diff -uNr contrib.old/opie/libopie/accessfile.c contrib/opie/libopie/accessfile.c
2876 ---- contrib.old/opie/libopie/accessfile.c 2012-05-25 08:54:33.000000000 -0400
2877 -+++ contrib/opie/libopie/accessfile.c 2012-05-25 09:12:34.000000000 -0400
2878 -@@ -46,6 +46,7 @@
2879 - #ifdef DEBUG
2880 - #include <syslog.h>
2881 - #endif /* DEBUG */
2882 -+#include <ctype.h>
2883 -
2884 - #include "opie.h"
2885 -
2886 -diff -uNr contrib.old/opie/libopie/generator.c contrib/opie/libopie/generator.c
2887 ---- contrib.old/opie/libopie/generator.c 2012-05-25 08:54:33.000000000 -0400
2888 -+++ contrib/opie/libopie/generator.c 2012-05-25 08:58:10.000000000 -0400
2889 -@@ -50,6 +50,7 @@
2890 - #include <syslog.h>
2891 - #endif /* DEBUG */
2892 - #include "opie.h"
2893 -+#include <stdio.h>
2894 -
2895 - static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
2896 -
2897 -diff -uNr contrib.old/opie/libopie/lookup.c contrib/opie/libopie/lookup.c
2898 ---- contrib.old/opie/libopie/lookup.c 2012-05-25 08:54:33.000000000 -0400
2899 -+++ contrib/opie/libopie/lookup.c 2012-05-25 09:15:08.000000000 -0400
2900 -@@ -14,6 +14,7 @@
2901 - #include "opie_cfg.h"
2902 - #include <stdio.h>
2903 - #include "opie.h"
2904 -+#include <string.h>
2905 -
2906 - int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
2907 - {
2908 -diff -uNr contrib.old/opie/libopie/newseed.c contrib/opie/libopie/newseed.c
2909 ---- contrib.old/opie/libopie/newseed.c 2012-05-25 08:54:33.000000000 -0400
2910 -+++ contrib/opie/libopie/newseed.c 2012-05-25 09:14:37.000000000 -0400
2911 -@@ -36,6 +36,9 @@
2912 - #include <syslog.h>
2913 - #endif /* DEBUG */
2914 - #include "opie.h"
2915 -+#include <stdio.h>
2916 -+#include <stdlib.h>
2917 -+#include <time.h>
2918 -
2919 - int opienewseed FUNCTION((seed), char *seed)
2920 - {
2921 -diff -uNr contrib.old/opie/libopie/parsechallenge.c contrib/opie/libopie/parsechallenge.c
2922 ---- contrib.old/opie/libopie/parsechallenge.c 2012-05-25 08:54:33.000000000 -0400
2923 -+++ contrib/opie/libopie/parsechallenge.c 2012-05-25 09:15:54.000000000 -0400
2924 -@@ -20,6 +20,8 @@
2925 - #include <string.h>
2926 - #endif /* HAVE_STRING_H */
2927 - #include "opie.h"
2928 -+#include <stdlib.h>
2929 -+#include <ctype.h>
2930 -
2931 - struct algorithm {
2932 - char *name;
2933 -diff -uNr contrib.old/opie/libopie/passwd.c contrib/opie/libopie/passwd.c
2934 ---- contrib.old/opie/libopie/passwd.c 2012-05-25 08:54:33.000000000 -0400
2935 -+++ contrib/opie/libopie/passwd.c 2012-05-25 09:13:45.000000000 -0400
2936 -@@ -22,6 +22,7 @@
2937 -
2938 - #include "opie_cfg.h"
2939 - #include "opie.h"
2940 -+#include <string.h>
2941 -
2942 - int opiepasswd FUNCTION((old, flags, principal, n, seed, ks), struct opie *old AND int flags AND char *principal AND int n AND char *seed AND char *ks)
2943 - {
2944 -diff -uNr contrib.old/opie/libopie/randomchallenge.c contrib/opie/libopie/randomchallenge.c
2945 ---- contrib.old/opie/libopie/randomchallenge.c 2012-05-25 08:54:33.000000000 -0400
2946 -+++ contrib/opie/libopie/randomchallenge.c 2012-05-25 09:00:27.000000000 -0400
2947 -@@ -28,6 +28,9 @@
2948 -
2949 - #include "opie_cfg.h"
2950 - #include "opie.h"
2951 -+#include <stdio.h>
2952 -+#include <string.h>
2953 -+#include <stdlib.h>
2954 -
2955 - static char *algids[] = { 0, 0, 0, "sha1", "md4", "md5" };
2956 -
2957 -diff -uNr contrib.old/opie/libopie/verify.c contrib/opie/libopie/verify.c
2958 ---- contrib.old/opie/libopie/verify.c 2012-05-25 08:54:33.000000000 -0400
2959 -+++ contrib/opie/libopie/verify.c 2012-05-25 09:12:09.000000000 -0400
2960 -@@ -25,6 +25,7 @@
2961 - #include <string.h>
2962 - #endif /* HAVE_STRING_H */
2963 - #include "opie.h"
2964 -+#include <ctype.h>
2965 -
2966 - #define RESPONSE_STANDARD 0
2967 - #define RESPONSE_WORD 1
2968 -diff -uNr contrib.old/opie/libopie/version.c contrib/opie/libopie/version.c
2969 ---- contrib.old/opie/libopie/version.c 2012-05-25 08:54:33.000000000 -0400
2970 -+++ contrib/opie/libopie/version.c 2012-05-25 09:13:15.000000000 -0400
2971 -@@ -19,6 +19,8 @@
2972 - */
2973 - #include "opie_cfg.h"
2974 - #include "opie.h"
2975 -+#include <stdio.h>
2976 -+#include <stdlib.h>
2977 -
2978 - VOIDRET opieversion FUNCTION_NOARGS
2979 - {
2980 -diff -uNr contrib.old/opie/opie.h contrib/opie/opie.h
2981 ---- contrib.old/opie/opie.h 2012-05-25 08:54:33.000000000 -0400
2982 -+++ contrib/opie/opie.h 2012-05-25 09:21:28.000000000 -0400
2983 -@@ -158,6 +158,9 @@
2984 - int __opiereadrec __P((struct opie *));
2985 - int __opiewriterec __P((struct opie *));
2986 - int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
2987 -+VOIDRET opiehashlen FUNCTION((algorithm, in, out, n), int algorithm AND VOIDPTR in AND struct opie_otpkey *out AND int n);
2988 -+int opieinsecure FUNCTION_NOARGS;
2989 -+int opienewseed FUNCTION((seed), char *seed);
2990 - __END_DECLS
2991 -
2992 - #define opiestrncpy(dst, src, n) \
2993
2994 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
2995 deleted file mode 100644
2996 index fdb7e16..0000000
2997 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-.eh_frame_hdr-fix.patch
2998 +++ /dev/null
2999 @@ -1,17 +0,0 @@
3000 -Fix "no .eh_frame_hdr table will be created" error.
3001 -
3002 -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47829
3003 -http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4a0e0cd7377c45dc21d5c71bcab931b5e5727e74
3004 -
3005 -diff -Nur lib.orig/csu/i386-elf/Makefile lib/csu/i386-elf/Makefile
3006 ---- lib.orig/csu/i386-elf/Makefile 2013-03-06 01:07:57.000000000 +0900
3007 -+++ lib/csu/i386-elf/Makefile 2013-03-06 01:10:09.000000000 +0900
3008 -@@ -10,6 +10,8 @@
3009 - FILESDIR= ${LIBDIR}
3010 - CFLAGS+= -I${.CURDIR}/../common \
3011 - -I${.CURDIR}/../../libc/include
3012 -+CFLAGS+= -fno-omit-frame-pointer
3013 -+CFLAGS+= -fno-asynchronous-unwind-tables
3014 - CLEANFILES= ${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
3015 - CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s
3016 -
3017
3018 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch
3019 deleted file mode 100644
3020 index 97ac141..0000000
3021 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-aligned_alloc.patch
3022 +++ /dev/null
3023 @@ -1,51 +0,0 @@
3024 -Backport aligned_alloc for C++11 support.
3025 -
3026 -http://lists.freebsd.org/pipermail/svn-src-stable-9/2012-November/003313.html
3027 -
3028 -diff -uNr lib.old/libc/stdlib/Symbol.map lib/libc/stdlib/Symbol.map
3029 ---- lib.old/libc/stdlib/Symbol.map 2013-05-24 17:03:55.000000000 -0400
3030 -+++ lib/libc/stdlib/Symbol.map 2013-05-24 17:06:03.000000000 -0400
3031 -@@ -97,6 +97,7 @@
3032 - atoi_l;
3033 - atol_l;
3034 - atoll_l;
3035 -+ aligned_alloc;
3036 - at_quick_exit;
3037 - quick_exit;
3038 - strtod_l;
3039 -diff -uNr lib.old/libc/stdlib/malloc.c lib/libc/stdlib/malloc.c
3040 ---- lib.old/libc/stdlib/malloc.c 2013-05-24 17:03:55.000000000 -0400
3041 -+++ lib/libc/stdlib/malloc.c 2013-05-24 17:05:40.000000000 -0400
3042 -@@ -6046,6 +6046,21 @@
3043 - }
3044 -
3045 - void *
3046 -+aligned_alloc(size_t alignment, size_t size)
3047 -+{
3048 -+ void *memptr;
3049 -+ int ret;
3050 -+
3051 -+ ret = posix_memalign(&memptr, alignment, size);
3052 -+ if (ret != 0) {
3053 -+ errno = ret;
3054 -+ return (NULL);
3055 -+ }
3056 -+ return (memptr);
3057 -+}
3058 -+
3059 -+
3060 -+void *
3061 - calloc(size_t num, size_t size)
3062 - {
3063 - void *ret;
3064 -diff -uNr includeold/stdlib.h include/stdlib.h
3065 ---- includeold/stdlib.h 2013-05-24 17:03:46.000000000 -0400
3066 -+++ include/stdlib.h 2013-05-24 17:04:46.000000000 -0400
3067 -@@ -155,6 +155,7 @@
3068 - * If we're in a mode greater than C99, expose C1x functions.
3069 - */
3070 - #if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
3071 -+void * aligned_alloc(size_t, size_t);
3072 - _Noreturn void
3073 - quick_exit(int);
3074 - int at_quick_exit(void (*)(void));
3075
3076 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
3077 deleted file mode 100644
3078 index 62357e0..0000000
3079 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.1-rmgssapi.patch
3080 +++ /dev/null
3081 @@ -1,16 +0,0 @@
3082 ---- include/Makefile.orig 2013-06-16 10:47:52.000000000 +0200
3083 -+++ include/Makefile 2013-06-16 10:47:37.000000000 +0200
3084 -@@ -6,11 +6,11 @@
3085 - .include <bsd.own.mk>
3086 -
3087 - CLEANFILES= osreldate.h version vers.c
3088 -+SUBDIR= arpa protocols rpcsvc rpc xlocale
3089 --SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
3090 - INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
3091 - db.h \
3092 - dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
3093 -+ fts.h ftw.h getopt.h glob.h grp.h \
3094 -- fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
3095 - ieeefp.h ifaddrs.h \
3096 - inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
3097 - locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
3098
3099 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
3100 deleted file mode 100644
3101 index 00b39f7..0000000
3102 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-add-nossp-cflags.patch
3103 +++ /dev/null
3104 @@ -1,30 +0,0 @@
3105 -Please do not disable this patch.
3106 -All commands will be non-executable.
3107 -Abort trap: 6 (core dumped) is displayed...
3108 -
3109 -Details see Gentoo Bug #511698.
3110 -https://bugs.gentoo.org/show_bug.cgi?id=511698
3111 -
3112 -diff --git a/lib/libc/Makefile b/lib/libc/Makefile
3113 -index 1cc23b7..7dd458e 100644
3114 ---- a/lib/libc/Makefile
3115 -+++ b/lib/libc/Makefile
3116 -@@ -149,6 +149,6 @@ CWARNFLAGS:= ${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
3117 - # in the future to circumvent this.
3118 - SSP_CFLAGS:= ${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
3119 - # Disable stack protection for SSP symbols.
3120 --SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
3121 -+SSP_CFLAGS:= ${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/:C/^$/-fno-stack-protector/}
3122 - # Generate stack unwinding tables for cancellation points
3123 - CANCELPOINTS_CFLAGS:= ${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
3124 -diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
3125 -index f92d87d..7a3a2f3 100644
3126 ---- a/lib/csu/Makefile.inc
3127 -+++ b/lib/csu/Makefile.inc
3128 -@@ -1,5 +1,5 @@
3129 - # $FreeBSD: release/9.1.0/lib/csu/Makefile.inc 204757 2010-03-05 13:29:05Z uqs $
3130 -
3131 --SSP_CFLAGS=
3132 -+SSP_CFLAGS= -fno-stack-protector
3133 -
3134 - .include "../Makefile.inc"
3135
3136 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
3137 deleted file mode 100644
3138 index ec90def..0000000
3139 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
3140 +++ /dev/null
3141 @@ -1,13 +0,0 @@
3142 -diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
3143 ---- lib/libgeom/Makefile 2004-03-07 16:07:57 +0000
3144 -+++ lib.xml/libgeom/Makefile 2005-05-06 10:38:41 +0000
3145 -@@ -8,7 +8,8 @@
3146 - SRCS+= geom_ctl.c
3147 - INCS= libgeom.h
3148 -
3149 --CFLAGS += -I${.CURDIR}
3150 -+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
3151 -+LDFLAGS += -L${.CURDIR}/../libexpat
3152 -
3153 - WARNS?= 3
3154 -
3155
3156 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
3157 deleted file mode 100644
3158 index 1b4e791..0000000
3159 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml2expat.patch
3160 +++ /dev/null
3161 @@ -1,26 +0,0 @@
3162 -diff -ur lib/libgeom.old/Makefile lib/libgeom/Makefile
3163 ---- lib/libgeom.old/Makefile 2011-07-10 14:23:51.000000000 +0000
3164 -+++ lib/libgeom/Makefile 2011-07-10 15:12:39.000000000 +0000
3165 -@@ -13,8 +13,8 @@
3166 -
3167 - WARNS?= 3
3168 -
3169 --DPADD= ${LIBBSDXML} ${LIBSBUF}
3170 --LDADD= -lbsdxml -lsbuf
3171 -+DPADD= ${LIBSBUF}
3172 -+LDADD= -lexpat -lsbuf
3173 -
3174 - MAN= libgeom.3
3175 -
3176 -diff -ur lib/libgeom.old/geom_xml2tree.c lib/libgeom/geom_xml2tree.c
3177 ---- lib/libgeom.old/geom_xml2tree.c 2010-12-21 17:09:25.000000000 +0000
3178 -+++ lib/libgeom/geom_xml2tree.c 2011-07-10 15:12:52.000000000 +0000
3179 -@@ -43,7 +43,7 @@
3180 - #include <sys/sbuf.h>
3181 - #include <sys/sysctl.h>
3182 - #include <err.h>
3183 --#include <bsdxml.h>
3184 -+#include <expat.h>
3185 - #include <libgeom.h>
3186 -
3187 - struct mystate {
3188
3189 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
3190 deleted file mode 100644
3191 index c2cf142..0000000
3192 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-includes.patch
3193 +++ /dev/null
3194 @@ -1,13 +0,0 @@
3195 -Fix headers dependencies so that they can be included alone.
3196 -
3197 ---- include/ifaddrs.h.old 2009-05-15 13:50:10 +0000
3198 -+++ include/ifaddrs.h 2009-05-15 13:50:23 +0000
3199 -@@ -28,6 +28,8 @@
3200 - #ifndef _IFADDRS_H_
3201 - #define _IFADDRS_H_
3202 -
3203 -+#include <sys/types.h>
3204 -+
3205 - struct ifaddrs {
3206 - struct ifaddrs *ifa_next;
3207 - char *ifa_name;
3208
3209 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
3210 deleted file mode 100644
3211 index c9288a4..0000000
3212 --- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
3213 +++ /dev/null
3214 @@ -1,68 +0,0 @@
3215 ---- lib/msun/i387/fenv.c.orig 2007-01-05 04:15:26 -0300
3216 -+++ lib/msun/i387/fenv.c 2008-06-14 00:49:30 -0300
3217 -@@ -152,7 +152,8 @@
3218 - int
3219 - feupdateenv(const fenv_t *envp)
3220 - {
3221 -- int mxcsr, status;
3222 -+ int mxcsr;
3223 -+ short status;
3224 -
3225 - __fnstsw(&status);
3226 - if (__HAS_SSE())
3227 ---- lib/msun/i387/fenv.h.orig 2007-01-06 18:46:23 -0300
3228 -+++ lib/msun/i387/fenv.h 2008-06-14 01:06:40 -0300
3229 -@@ -134,7 +134,8 @@
3230 - static __inline int
3231 - fegetexceptflag(fexcept_t *__flagp, int __excepts)
3232 - {
3233 -- int __mxcsr, __status;
3234 -+ int __mxcsr;
3235 -+ short __status;
3236 -
3237 - __fnstsw(&__status);
3238 - if (__HAS_SSE())
3239 -@@ -151,7 +152,8 @@
3240 - static __inline int
3241 - fetestexcept(int __excepts)
3242 - {
3243 -- int __mxcsr, __status;
3244 -+ int __mxcsr;
3245 -+ short __status;
3246 -
3247 - __fnstsw(&__status);
3248 - if (__HAS_SSE())
3249 ---- lib/msun/amd64/fenv.c.orig 2007-01-05 04:15:26 -0300
3250 -+++ lib/msun/amd64/fenv.c 2008-06-14 01:02:41 -0300
3251 -@@ -101,7 +101,8 @@
3252 - int
3253 - feupdateenv(const fenv_t *envp)
3254 - {
3255 -- int mxcsr, status;
3256 -+ int mxcsr;
3257 -+ short status;
3258 -
3259 - __fnstsw(&status);
3260 - __stmxcsr(&mxcsr);
3261 ---- lib/msun/amd64/fenv.h.orig 2007-01-06 18:46:23 -0300
3262 -+++ lib/msun/amd64/fenv.h 2008-06-14 01:08:23 -0300
3263 -@@ -110,7 +110,8 @@
3264 - static __inline int
3265 - fegetexceptflag(fexcept_t *__flagp, int __excepts)
3266 - {
3267 -- int __mxcsr, __status;
3268 -+ int __mxcsr;
3269 -+ short __status;
3270 -
3271 - __stmxcsr(&__mxcsr);
3272 - __fnstsw(&__status);
3273 -@@ -124,7 +125,8 @@
3274 - static __inline int
3275 - fetestexcept(int __excepts)
3276 - {
3277 -- int __mxcsr, __status;
3278 -+ int __mxcsr;
3279 -+ short __status;
3280 -
3281 - __stmxcsr(&__mxcsr);
3282 - __fnstsw(&__status);
3283
3284 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
3285 deleted file mode 100644
3286 index 751a77c..0000000
3287 --- a/sys-freebsd/freebsd-lib/files/freebsd-sources-9.0-sysctluint.patch
3288 +++ /dev/null
3289 @@ -1,13 +0,0 @@
3290 -u_int is defined in sys/types.h
3291 -makes header usable alone.
3292 -
3293 ---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400
3294 -+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400
3295 -@@ -788,6 +788,7 @@
3296 - struct sysctl_req *);
3297 - #else /* !_KERNEL */
3298 - #include <sys/cdefs.h>
3299 -+#include <sys/types.h> /* for u_int */
3300 -
3301 - __BEGIN_DECLS
3302 - int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
3303
3304 diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
3305 deleted file mode 100644
3306 index 7a879f9..0000000
3307 --- a/sys-freebsd/freebsd-lib/files/libmap.conf
3308 +++ /dev/null
3309 @@ -1,8 +0,0 @@
3310 -# /etc/libmap.conf
3311 -
3312 -# Ensure that libthr does all threading
3313 -libpthread.so.2 libthr.so.2
3314 -libpthread.so libthr.so
3315 -libc_r.so.6 libthr.so.2
3316 -libc_r.so libthr.so
3317 -
3318
3319 diff --git a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in b/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
3320 deleted file mode 100644
3321 index 058ecb4..0000000
3322 --- a/sys-freebsd/freebsd-lib/files/libusb-1.0.pc.in
3323 +++ /dev/null
3324 @@ -1,11 +0,0 @@
3325 -prefix=/usr
3326 -exec_prefix=${prefix}
3327 -libdir=@LIBDIR@
3328 -includedir=${prefix}/include
3329 -
3330 -Name: libusb
3331 -Description: USB access library (FreeBSD version)
3332 -Version: 1.0.1
3333 -Libs: -L${libdir} -lusb
3334 -Cflags: -I${includedir}
3335 -
3336
3337 diff --git a/sys-freebsd/freebsd-lib/files/libusb.pc.in b/sys-freebsd/freebsd-lib/files/libusb.pc.in
3338 deleted file mode 100644
3339 index f63c6e3..0000000
3340 --- a/sys-freebsd/freebsd-lib/files/libusb.pc.in
3341 +++ /dev/null
3342 @@ -1,11 +0,0 @@
3343 -prefix=/usr
3344 -exec_prefix=${prefix}
3345 -libdir=@LIBDIR@
3346 -includedir=${prefix}/include
3347 -
3348 -Name: libusb
3349 -Description: USB access library (FreeBSD version)
3350 -Version: 0.1.12
3351 -Libs: -L${libdir} -lusb
3352 -Cflags: -I${includedir}
3353 -
3354
3355 diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild
3356 deleted file mode 100644
3357 index d657ddb..0000000
3358 --- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3_rc3.ebuild
3359 +++ /dev/null
3360 @@ -1,645 +0,0 @@
3361 -# Copyright 1999-2016 Gentoo Foundation
3362 -# Distributed under the terms of the GNU General Public License v2
3363 -# $Id$
3364 -
3365 -EAPI=5
3366 -
3367 -inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
3368 -
3369 -DESCRIPTION="FreeBSD's base system libraries"
3370 -SLOT="0"
3371 -LICENSE="BSD zfs? ( CDDL )"
3372 -
3373 -# Crypto is needed to have an internal OpenSSL header
3374 -# sys is needed for libalias, probably we can just extract that instead of
3375 -# extracting the whole tarball
3376 -if [[ ${PV} != *9999* ]]; then
3377 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
3378 - SRC_URI="${SRC_URI}
3379 - $(freebsd_upstream_patches)"
3380 -fi
3381 -
3382 -EXTRACTONLY="
3383 - lib/
3384 - contrib/
3385 - crypto/
3386 - libexec/
3387 - etc/
3388 - include/
3389 - usr.sbin/
3390 - gnu/
3391 - secure/
3392 -"
3393 -
3394 -if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
3395 - RDEPEND="ssl? ( dev-libs/openssl:0= )
3396 - hesiod? ( net-dns/hesiod )
3397 - kerberos? ( app-crypt/heimdal )
3398 - usb? ( !dev-libs/libusb )
3399 - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
3400 - >=dev-libs/expat-2.0.1
3401 - >=dev-util/dialog-1.2.20150225
3402 - =sys-freebsd/freebsd-libexec-${RV}*
3403 - !sys-libs/libutempter
3404 - !dev-libs/libelf
3405 - !dev-libs/libexecinfo
3406 - !dev-libs/libiconv
3407 - !sys-freebsd/freebsd-headers"
3408 - DEPEND="${RDEPEND}
3409 - >=sys-devel/flex-2.5.31-r2
3410 - =sys-freebsd/freebsd-sources-${RV}*"
3411 - RDEPEND="${RDEPEND}
3412 - =sys-freebsd/freebsd-share-${RV}*
3413 - >=virtual/libiconv-0-r2"
3414 -else
3415 - EXTRACTONLY+="sys/ "
3416 -fi
3417 -
3418 -DEPEND="${DEPEND}
3419 - userland_GNU? ( sys-apps/mtree )
3420 - =sys-freebsd/freebsd-mk-defs-${RV}*"
3421 -
3422 -S="${WORKDIR}/lib"
3423 -
3424 -export CTARGET=${CTARGET:-${CHOST}}
3425 -if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
3426 - export CTARGET=${CATEGORY/cross-}
3427 -fi
3428 -
3429 -IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
3430 - build crosscompile_opts_headers-only zfs
3431 - userland_GNU userland_BSD"
3432 -
3433 -QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
3434 -
3435 -pkg_setup() {
3436 - # Add the required source files.
3437 - use build && EXTRACTONLY+="sys/ "
3438 - use zfs && EXTRACTONLY+="cddl/ "
3439 -
3440 - [ -c /dev/zero ] || \
3441 - die "You forgot to mount /dev; the compiled libc would break."
3442 -
3443 - if ! use ssl && use kerberos; then
3444 - eerror "If you want kerberos support you need to enable ssl support, too."
3445 - fi
3446 -
3447 - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
3448 - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
3449 - use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
3450 - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
3451 - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
3452 - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
3453 - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
3454 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
3455 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
3456 -
3457 - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
3458 -
3459 - if [ "${CTARGET}" != "${CHOST}" ]; then
3460 - mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
3461 - mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
3462 - fi
3463 -}
3464 -
3465 -PATCHES=(
3466 - "${FILESDIR}/${PN}-6.0-pmc.patch"
3467 - "${FILESDIR}/${PN}-6.1-csu.patch"
3468 - "${FILESDIR}/${PN}-10.0-liblink.patch"
3469 - "${FILESDIR}/${PN}-10.2-liblink.patch"
3470 - "${FILESDIR}/${PN}-10.0-atfcxx.patch"
3471 - "${FILESDIR}/${PN}-10.3-libusb.patch"
3472 - "${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
3473 - "${FILESDIR}/${PN}-10.2-bsdxml2expat.patch"
3474 - "${FILESDIR}/${PN}-9.0-bluetooth.patch"
3475 - "${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
3476 - "${FILESDIR}/${PN}-add-nossp-cflags.patch"
3477 - )
3478 -# Here we disable and remove source which we don't need or want
3479 -# In order:
3480 -# - ncurses stuff
3481 -# - libexpat creates a bsdxml library which is the same as expat
3482 -# - archiving libraries (have their own ebuild)
3483 -# - sendmail libraries (they are installed by sendmail)
3484 -# - SNMP library and dependency (have their own ebuilds)
3485 -# - libstand: static library, 32bits on amd64 used for boot0, we build it from
3486 -# boot0 instead.
3487 -#
3488 -# The rest are libraries we already have somewhere else because
3489 -# they are contribution.
3490 -REMOVE_SUBDIRS="ncurses \
3491 - libexpat \
3492 - libz libbz2 libarchive liblzma \
3493 - libsm libsmdb libsmutil \
3494 - libbegemot libbsnmp \
3495 - libpam libpcap libwrap libmagic \
3496 - libcom_err
3497 - libedit
3498 - libstand
3499 - libgssapi"
3500 -
3501 -# Are we building a cross-compiler?
3502 -is_crosscompile() {
3503 - [ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
3504 -}
3505 -
3506 -src_prepare() {
3507 - # gcc-5.0 or later, Workaround for critical issue. bug 573358.
3508 - use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
3509 -
3510 - sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
3511 -
3512 - # Upstream Display Managers default to using VT7
3513 - # We should make FreeBSD allow this by default
3514 - local x=
3515 - for x in "${WORKDIR}"/etc/etc.*/ttys ; do
3516 - sed -i.bak \
3517 - -e '/ttyv5[[:space:]]/ a\
3518 -# Display Managers default to VT7.\
3519 -# If you use the xdm init script, keep ttyv6 commented out\
3520 -# unless you force a different VT for the DM being used.' \
3521 - -e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
3522 - || die "Failed to sed ${x}"
3523 - rm "${x}".bak
3524 - done
3525 -
3526 - # This one is here because it also
3527 - # patches "${WORKDIR}/include"
3528 - cd "${WORKDIR}"
3529 - epatch "${FILESDIR}/${PN}-includes.patch"
3530 - epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
3531 - epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
3532 -
3533 - # Don't install the hesiod man page or header
3534 - rm "${WORKDIR}"/include/hesiod.h || die
3535 - sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
3536 - sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
3537 - "${WORKDIR}"/lib/libc/net/Makefile.inc || die
3538 -
3539 - # Fix the Makefiles of these few libraries that will overwrite our LDADD.
3540 - cd "${S}"
3541 - for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
3542 - libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
3543 - die "Problem fixing \"${dir}/Makefile"
3544 - done
3545 - # Call LD with LDFLAGS, rename them to RAW_LDFLAGS
3546 - sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
3547 - -i "${S}/csu/i386-elf/Makefile" \
3548 - -i "${S}/csu/ia64/Makefile" || die
3549 -
3550 - if install --version 2> /dev/null | grep -q GNU; then
3551 - sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
3552 - fi
3553 -
3554 - # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
3555 - # BSD's sed on BSD.
3556 - cd "${S}"
3557 - if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
3558 - find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
3559 - sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
3560 - fi
3561 -
3562 - if use build; then
3563 - cd "${WORKDIR}"
3564 - # This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
3565 - # shouldn't be a symlink to /usr/src/sys (which should be already patched)
3566 - epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
3567 - epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
3568 - return 0
3569 - fi
3570 -
3571 - if ! is_crosscompile ; then
3572 - if [[ ! -e "${WORKDIR}/sys" ]]; then
3573 - ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
3574 - fi
3575 - else
3576 - sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
3577 - "${S}/libc/rpc/Makefile.inc" \
3578 - "${S}/libc/yp/Makefile.inc"
3579 - fi
3580 -}
3581 -
3582 -bootstrap_lib() {
3583 - for i ; do
3584 - cd "${WORKDIR}/${i}" || die "missing ${i}"
3585 - freebsd_src_compile
3586 - append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
3587 - done
3588 -}
3589 -
3590 -get_csudir() {
3591 - if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
3592 - echo "lib/csu/$1-elf"
3593 - else
3594 - echo "lib/csu/$1"
3595 - fi
3596 -}
3597 -
3598 -bootstrap_csu() {
3599 - local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
3600 - export RAW_LDFLAGS=$(raw-ldflags)
3601 - bootstrap_lib "${csudir}"
3602 -
3603 - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
3604 - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
3605 -
3606 - bootstrap_lib "gnu/lib/csu"
3607 -
3608 - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
3609 - for i in *.So ; do
3610 - ln -s $i ${i%.So}S.o
3611 - done
3612 - CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
3613 - append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
3614 -}
3615 -
3616 -# Compile libssp_nonshared.a and add it's path to LDFLAGS.
3617 -bootstrap_libssp_nonshared() {
3618 - bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
3619 - export LDADD="-lssp_nonshared"
3620 -}
3621 -
3622 -bootstrap_libgcc() {
3623 - bootstrap_lib "lib/libcompiler_rt"
3624 - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
3625 - ln -s libcompiler_rt.a libgcc.a || die
3626 -
3627 - bootstrap_lib "lib/libc" "gnu/lib/libgcc"
3628 -}
3629 -
3630 -bootstrap_libthr() {
3631 - bootstrap_lib "lib/libthr"
3632 - cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
3633 - ln -s libthr.so libpthread.so
3634 -}
3635 -
3636 -# What to build for a cross-compiler.
3637 -# We also need the csu but this has to be handled separately.
3638 -CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
3639 -
3640 -# What to build for non-default ABIs.
3641 -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"
3642 -
3643 -# Subdirs for a native build:
3644 -NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
3645 -
3646 -# Is my $ABI native ?
3647 -is_native_abi() {
3648 - is_crosscompile && return 1
3649 - multilib_is_native_abi
3650 -}
3651 -
3652 -# Do we need to bootstrap the csu and libssp_nonshared?
3653 -need_bootstrap() {
3654 - 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}"
3655 -}
3656 -
3657 -# Get the subdirs we are building.
3658 -get_subdirs() {
3659 - local ret=""
3660 - if is_native_abi ; then
3661 - # If we are building for the native ABI, build everything
3662 - ret="${NATIVE_SUBDIRS}"
3663 - elif is_crosscompile ; then
3664 - # With a cross-compiler we only build the very core parts.
3665 - ret="${CROSS_SUBDIRS}"
3666 - if [ "${EBUILD_PHASE}" = "install" ]; then
3667 - # Add the csu dir first when installing. We treat it separately for
3668 - # compiling.
3669 - ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
3670 - fi
3671 - else
3672 - # For the non-native ABIs we only build the csu parts and very core
3673 - # libraries for now.
3674 - ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
3675 - fi
3676 - echo "${ret}"
3677 -}
3678 -
3679 -# Bootstrap the core libraries and setup the flags so that the other parts can
3680 -# build against it.
3681 -do_bootstrap() {
3682 - einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
3683 - if ! is_crosscompile ; then
3684 - # Pre-install headers, but not when building a cross-compiler since we
3685 - # assume they have been installed in the previous pass.
3686 - einfo "Pre-installing includes in include_proper_${ABI}"
3687 - mkdir "${WORKDIR}/include_proper_${ABI}" || die
3688 - CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
3689 - CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
3690 - CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
3691 - mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc"
3692 - fi
3693 - bootstrap_csu
3694 - bootstrap_libssp_nonshared
3695 - is_crosscompile && bootstrap_lib "lib/libc"
3696 - is_crosscompile || is_native_abi || bootstrap_libgcc
3697 - is_native_abi || bootstrap_libthr
3698 -}
3699 -
3700 -# Compile it. Assume we have the toolchain setup correctly.
3701 -do_compile() {
3702 - # Bootstrap if needed, otherwise assume the system headers are in
3703 - # /usr/include.
3704 - if need_bootstrap ; then
3705 - do_bootstrap
3706 - else
3707 - CFLAGS="${CFLAGS} -isystem /usr/include"
3708 - CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
3709 - fi
3710 -
3711 - export RAW_LDFLAGS=$(raw-ldflags)
3712 -
3713 - # Everything is now setup, build it!
3714 - for i in $(get_subdirs) ; do
3715 - einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
3716 - cd "${WORKDIR}/${i}/" || die "missing ${i}."
3717 - freebsd_src_compile || die "make ${i} failed"
3718 - done
3719 -}
3720 -
3721 -src_compile() {
3722 - # Does not work with GNU sed
3723 - # Force BSD's sed on BSD.
3724 - if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
3725 - export ESED=/usr/bin/sed
3726 - unalias sed
3727 - fi
3728 -
3729 - use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
3730 -
3731 - cd "${WORKDIR}/include"
3732 - $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
3733 -
3734 - use crosscompile_opts_headers-only && return 0
3735 -
3736 - # Bug #270098
3737 - append-flags $(test-flags -fno-strict-aliasing)
3738 -
3739 - # Bug #324445
3740 - append-flags $(test-flags -fno-strict-overflow)
3741 -
3742 - # strip flags and do not do it later, we only add safe, and in fact
3743 - # needed flags after all
3744 - strip-flags
3745 - export NOFLAGSTRIP=yes
3746 - if is_crosscompile ; then
3747 - export YACC='yacc -by'
3748 - CHOST=${CTARGET} tc-export CC LD CXX RANLIB
3749 - mymakeopts="${mymakeopts} NLS="
3750 - CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
3751 - CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
3752 - append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
3753 - fi
3754 -
3755 - if is_crosscompile ; then
3756 - do_compile
3757 - else
3758 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
3759 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
3760 - fi
3761 -}
3762 -
3763 -gen_libc_ldscript() {
3764 - # Parameters:
3765 - # $1 = target libdir
3766 - # $2 = source libc dir
3767 - # $3 = source libssp_nonshared dir
3768 -
3769 - # Clear the symlink.
3770 - rm -f "${DESTDIR}/$2/libc.so" || die
3771 -
3772 - # Move the library if needed
3773 - if [ "$1" != "$2" ] ; then
3774 - mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die
3775 - fi
3776 -
3777 - # Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
3778 - # this is done to avoid having to touch gcc spec file as it is currently
3779 - # done on FreeBSD upstream, mostly because their binutils aren't able to
3780 - # cope with linker scripts yet.
3781 - # Taken from toolchain-funcs.eclass:
3782 - local output_format
3783 - output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
3784 - [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
3785 -
3786 - # iconv symbol provided by libc_nonshared.a.
3787 - # http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
3788 - cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT
3789 -/* GNU ld script
3790 - SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
3791 - GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
3792 - this symbol was provided by a shared libc. So we link in
3793 - libssp_nonshared.a from here.
3794 - */
3795 -${output_format}
3796 -GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
3797 -END_LDSCRIPT
3798 -}
3799 -
3800 -header_list=""
3801 -
3802 -move_header() {
3803 - local dirname=$(dirname ${1})
3804 - local filename=$(basename ${1})
3805 -
3806 - if [ ! -d "${dirname}/${ABI}" ] ; then
3807 - mkdir "${dirname}/${ABI}" || die
3808 - fi
3809 -
3810 - mv "${1}" "${dirname}/${ABI}/" || die
3811 -
3812 - export header_list="${header_list} ${1}"
3813 -}
3814 -
3815 -make_header_template() {
3816 - cat <<-END_HEADER
3817 -/*
3818 - * Wrapped header for multilib support.
3819 - * See the real headers included below.
3820 - */
3821 -
3822 -#if defined(__x86_64__)
3823 - @ABI_amd64_fbsd@
3824 -#elif defined(__i386__)
3825 - @ABI_x86_fbsd@
3826 -#else
3827 - @ABI_${DEFAULT_ABI}@
3828 -#endif
3829 -END_HEADER
3830 -}
3831 -
3832 -wrap_header() {
3833 - local dirname=$(dirname ${1})
3834 - local filename=$(basename ${1})
3835 -
3836 - if [ -n "${dirname#.}" ] ; then
3837 - dirname="${dirname}/${2}"
3838 - else
3839 - dirname="${2}"
3840 - fi
3841 -
3842 - if [ -f "${dirname}/${filename}" ] ; then
3843 - sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
3844 - else
3845 - cat ${1}
3846 - fi
3847 -}
3848 -
3849 -wrap_header_end() {
3850 - sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
3851 -}
3852 -
3853 -do_install() {
3854 - if is_crosscompile ; then
3855 - INCLUDEDIR="/usr/${CTARGET}/usr/include"
3856 - else
3857 - INCLUDEDIR="/usr/include"
3858 - fi
3859 -
3860 - dodir ${INCLUDEDIR}
3861 - CTARGET="${CHOST}" \
3862 - install_includes ${INCLUDEDIR}
3863 -
3864 - is_crosscompile && use crosscompile_opts_headers-only && return 0
3865 -
3866 - # Install a libusb.pc for better compat with Linux's libusb
3867 - if use usb ; then
3868 - dodir /usr/$(get_libdir)/pkgconfig
3869 - sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc
3870 - fi
3871 -
3872 - for i in $(get_subdirs) ; do
3873 - if [[ ${i} != *libiconv_modules* ]] ; then
3874 - einfo "Installing in ${i}..."
3875 - cd "${WORKDIR}/${i}/" || die "missing ${i}."
3876 - freebsd_src_install || die "Install ${i} failed"
3877 - fi
3878 - done
3879 -
3880 - if ! is_crosscompile; then
3881 - local mymakeopts_save="${mymakeopts}"
3882 - mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
3883 -
3884 - einfo "Installing in lib/libiconv_modules..."
3885 - cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules."
3886 - freebsd_src_install || die "Install lib/libiconv_modules failed"
3887 -
3888 - mymakeopts="${mymakeopts_save}"
3889 - fi
3890 -
3891 - if ! is_crosscompile ; then
3892 - if ! multilib_is_native_abi ; then
3893 - DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
3894 - else
3895 - dodir "$(get_libdir)"
3896 - DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
3897 - fi
3898 - else
3899 - CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib"
3900 - # We're done for the cross libc here.
3901 - return 0
3902 - fi
3903 -
3904 - # Generate ldscripts for core libraries that will go in /
3905 - multilib_is_native_abi && \
3906 - gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
3907 - kvm m md procstat sbuf thr ufs util elf
3908 -
3909 - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
3910 - cd "${D}/usr/include"
3911 - for i in machine/*.h fenv.h ; do
3912 - move_header ${i}
3913 - done
3914 - if multilib_is_native_abi ; then
3915 - # Supposedly the last one!
3916 - local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
3917 - for j in ${uniq_headers} ; do
3918 - make_header_template > ${j}
3919 - for i in $(get_all_abis) ; do
3920 - wrap_header ${j} ${i} > ${j}.new
3921 - cp ${j}.new ${j}
3922 - rm -f ${j}.new
3923 - done
3924 - wrap_header_end ${j} > ${j}.new
3925 - cp ${j}.new ${j}
3926 - rm -f ${j}.new
3927 - done
3928 - fi
3929 - fi
3930 -}
3931 -
3932 -src_install() {
3933 - if is_crosscompile ; then
3934 - einfo "Installing for ${CTARGET} in ${CHOST}.."
3935 - # From this point we need to force: get stripped with the correct tools,
3936 - # get tc-arch-kernel to return the right value, etc.
3937 - export CHOST=${CTARGET}
3938 -
3939 - mymakeopts="${mymakeopts} NO_MAN= \
3940 - INCLUDEDIR=/usr/${CTARGET}/usr/include \
3941 - SHLIBDIR=/usr/${CTARGET}/usr/lib \
3942 - LIBDIR=/usr/${CTARGET}/usr/lib"
3943 -
3944 - dosym "usr/include" "/usr/${CTARGET}/sys-include"
3945 - do_install
3946 -
3947 - return 0
3948 - else
3949 - export STRIP_MASK="*/usr/lib*/*crt*.o"
3950 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
3951 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
3952 - fi
3953 -
3954 - cd "${WORKDIR}/etc/"
3955 - insinto /etc
3956 - doins nls.alias mac.conf netconfig
3957 -
3958 - # Install ttys file
3959 - local MACHINE="$(tc-arch-kernel)"
3960 - doins "etc.${MACHINE}"/*
3961 -}
3962 -
3963 -install_includes()
3964 -{
3965 - local INCLUDEDIR="$1"
3966 -
3967 - # The idea is to be called from either install or unpack.
3968 - # During unpack it's required to install them as portage's user.
3969 - if [[ "${EBUILD_PHASE}" == "install" ]]; then
3970 - local DESTDIR="${D}"
3971 - BINOWN="root"
3972 - BINGRP="wheel"
3973 - else
3974 - local DESTDIR="${WORKDIR}"
3975 - [[ -z "${USER}" ]] && USER="portage"
3976 - BINOWN="${USER}"
3977 - [[ -z "${GROUPS}" ]] && GROUPS="portage"
3978 - BINGRP="${GROUPS}"
3979 - fi
3980 -
3981 - # Must exist before we use it.
3982 - [[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
3983 - cd "${WORKDIR}/include"
3984 -
3985 - local MACHINE="$(tc-arch-kernel)"
3986 -
3987 - einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
3988 - $(freebsd_get_bmake) installincludes \
3989 - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
3990 - DESTDIR="${DESTDIR}" \
3991 - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
3992 - BINGRP="${BINGRP}" \
3993 - WITHOUT_GSSAPI= || die "install_includes() failed"
3994 - einfo "includes installed ok."
3995 - EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
3996 - for i in $EXTRA_INCLUDES; do
3997 - einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
3998 - cd "${WORKDIR}/$i" || die
3999 - $(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
4000 - MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
4001 - INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
4002 - BINGRP="${BINGRP}" || die "problem installing $i includes."
4003 - einfo "$i includes installed ok."
4004 - done
4005 -}
4006
4007 diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml
4008 deleted file mode 100644
4009 index 24ca540..0000000
4010 --- a/sys-freebsd/freebsd-lib/metadata.xml
4011 +++ /dev/null
4012 @@ -1,16 +0,0 @@
4013 -<?xml version="1.0" encoding="UTF-8"?>
4014 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
4015 -<pkgmetadata>
4016 - <maintainer type="project">
4017 - <email>bsd@g.o</email>
4018 - <name>BSD Project</name>
4019 - </maintainer>
4020 - <use>
4021 - <flag name="hesiod">Enable support for net-dns/hesiod</flag>
4022 - <flag name="netware">
4023 - Build libraries and tools to work with NetWare protocols (IPX
4024 - and NCP).
4025 - </flag>
4026 - <flag name="zfs">Enable ZFS support.</flag>
4027 - </use>
4028 -</pkgmetadata>
4029
4030 diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
4031 deleted file mode 100644
4032 index 41f1382..0000000
4033 --- a/sys-freebsd/freebsd-libexec/Manifest
4034 +++ /dev/null
4035 @@ -1,16 +0,0 @@
4036 -AUX bootpd.confd 183 SHA256 c70c6a7a99470354a5f61bfe5c0f71325f4896e41da150e782223a30f07a275c SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f WHIRLPOOL c6721ac9b3ba70268fdba8c81ad9225e26049a5eb5ef8ea9bccc5fbbe7a110defe15df1d27b1c4b54f92e19d7d8b2099f87e7972faa0e5ddf17b66d30e26e0ad
4037 -AUX bootpd.initd 553 SHA256 1fdc8470fda0acca9213c11e1e380110d36e992754709f754bec6ab04b77e7fa SHA512 a7522086d3c968485891fb658fee490f53582328dd07ee65f4b620b227f33f3bfb6637ad5758846eac7df11425f2e8ed681b70bc7f52bea2db0b4a29fca4b87d WHIRLPOOL a7725cfd975808759c91468f61b161701adaafbaab0e2675e9ebb33ed43b4840dfbe71cf4a203f3d9105cbaa02306258c6d12984c51a4e3e4866704b8b2d58a1
4038 -AUX freebsd-libexec-10.0-atf-check.patch 628 SHA256 3733068f0253cd7b3c311390927e77d3d315d9ed42f07d1e82c549d8a4a2457e SHA512 fb21ad139f0ebabf94856dde84c9694e70da21f2e02286a1f35101ae80b19739f536525f3cf1ef17f8b09d7ada093785b3f86b0dd72cd59b12460605b5f48868 WHIRLPOOL 3c01985ffda2a75188290fe5ac805564561af6dde51c67b2d0003f11e597f8432238d1bb7a9c62fef02a45250c8bcd4b196245eb2b98d40bc774388efeda8420
4039 -AUX freebsd-libexec-10.2-atf-check.patch 809 SHA256 75cddd83ece1a3be8c10c0e2fd335180738d5b6a6b01b89e51d5c53243e54f46 SHA512 46b265db484d707e9e65906e8d5b3dbb06223c1c229c78b6cb92864f4a4a017b61cfd2de35e5533bae2eb8867adea5e1732c279bc5d90e60d07646b9a4b06681 WHIRLPOOL 77f069b1c649dd6f37ed4b0343c43609c7bc9efb09ebd0e22449a5db7d8eabbb9a870127974639108ceb3bf272bca64a3358809ea2a6a89296ac2097125cefc2
4040 -AUX freebsd-libexec-7.2-pic.patch 348 SHA256 424ed7b69067d3a3a77ad387026548b77d41412f52ae17c737e96e57b6cb3b0f SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5 WHIRLPOOL 6407b4f3781b56aeb62252f87f7522e38930e24952610938a05cad24c0b56c62dac8b8b517c5805699432f3d3b4b59e31784def6aa38ca6b8a6c8aabace40712
4041 -AUX freebsd-libexec-8.2-rtld.patch 1332 SHA256 0f0dc285b4797ab3be266db02f905ca72ffb39589c927311f74678acd9517e4d SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6 WHIRLPOOL 41489254c1f800208bc0ff2548d109cd34a84c025f5428f85c7aada69c5cbbe3f165410cc58dff773b7e792c9c9145580423f55f120f0e29159b251fc7e99d0c
4042 -AUX freebsd-libexec-9.2-no_ld32.patch 634 SHA256 ee5568c2ffbff4cf73c87401e5eb93165e813a2ff252d953a95fc4294dd2ace8 SHA512 df5421ad4d07d9f3d5f8dfd110eca588848ff55a63c70adf76f90746c1156ac50004a79bb626783ada8f96060fdd37e153e64da6ed43148c02a8eae4493c18d8 WHIRLPOOL d11ddc097a8ff171d143c655c1f2c9dd4ee3ff5e7bd6693bbd7c5d065e72c4d9e2c5a3521b9701ea0a3c7f5234fb174675373e68fb65cbb41c95133db6eb53f5
4043 -AUX ftpd.pamd 192 SHA256 4b789fb18bc0d1f9b0a9b0f1bf5dac6d86166a7106e966e5f65ffd4faf5ce024 SHA512 d7e7f08ef05ccc63e63ddc65d79f96106dfa0ec2421ee9fbbb83966aaccb73d9868cb14467c1bdfaa9d12299a8ad27cbc725a33fec58e47b5b8212e52a7c18eb WHIRLPOOL 1d418e336dec5b6c34541c11068fd19ffe7546d338851f47359c50c18bc382c84230c0d751fa8185d48ca1c67250ba320fec895fc92f96c1d6909647db67a54a
4044 -AUX rquotad.xinetd 162 SHA256 3f73f86e5a6ab3b6d25698f6179cdbe169b2fd01c682b45a9c8711f36bb317e5 SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f WHIRLPOOL 237667cbff4807d703a3c4c4eb8c2c5863d024a6263e3addf8d96ffa1461a8d1cda6318deee1de72146d27305b670b501da9ad4035880551dee5138b6798f6c6
4045 -AUX rstatd.xinetd 218 SHA256 7bf526babdd46f03a6ea9ed12b5df16e5c2abc8aeb567214c8edb8ac327d4381 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011 WHIRLPOOL 76f8b1f3f85e97f27950549f62dc411e0620b25eba68c161c96a5252617c7c4beb0fecf94af9bc9cf931dff8fc4c750e780c41143a50b39d7538a30b7c0bd322
4046 -AUX rusersd.xinetd 220 SHA256 271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e99181408067a49cd3 SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd WHIRLPOOL 7517089e5ab5b3925b46908c22a929cb04c8390387ad075f17c2fa0213ab38cae833d9280cfe289915afe4c2ee0b3e0299cee42daa871c23507f5f96cc22f227
4047 -AUX sprayd.xinetd 216 SHA256 5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101 WHIRLPOOL 3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
4048 -AUX walld.xinetd 215 SHA256 b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830 WHIRLPOOL 013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
4049 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
4050 -EBUILD freebsd-libexec-10.3_rc3.ebuild 3287 SHA256 cb0195c14c67be387e539c112021db2cf7dc8d274932a718a08e20be78205fbe SHA512 6b862c6633f7664821e3fe18e1ac996b296a1bb27b8b8558ce96834431fbe3e1f59808df5f80ac873205a7b9cb07afbe87e506c3e6b293551caddaf229367b6c WHIRLPOOL 4438e12877b355d35011cbb45c8cb076e05b2c8069e64f901a1345144cb77640ff8bab729cc818605243b1dc5dadff5c1c918a26f5bcdb25f3f3864f6821f43d
4051 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
4052
4053 diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.confd b/sys-freebsd/freebsd-libexec/files/bootpd.confd
4054 deleted file mode 100644
4055 index 6d238e4..0000000
4056 --- a/sys-freebsd/freebsd-libexec/files/bootpd.confd
4057 +++ /dev/null
4058 @@ -1,7 +0,0 @@
4059 -# Configuration file for /etc/init.d/bootpd
4060 -
4061 -# Name of the configuration file for bootpd
4062 -# bootptab_file="/etc/bootptab"
4063 -
4064 -# Options to pass to bootpd. See bootpd(8).
4065 -# bootpd_opts=""
4066
4067 diff --git a/sys-freebsd/freebsd-libexec/files/bootpd.initd b/sys-freebsd/freebsd-libexec/files/bootpd.initd
4068 deleted file mode 100644
4069 index e82563f..0000000
4070 --- a/sys-freebsd/freebsd-libexec/files/bootpd.initd
4071 +++ /dev/null
4072 @@ -1,27 +0,0 @@
4073 -#!/sbin/runscript
4074 -# Copyright 2008 Gentoo Foundation
4075 -# Distributed under the terms of the GNU General Public License v2
4076 -
4077 -depend() {
4078 - need net
4079 -}
4080 -
4081 -start() {
4082 - local bootptab=${bootptab_file:-/etc/bootptab}
4083 -
4084 - if ! [ -f "${bootptab}" ]; then
4085 - eerror "Unable to find the bootptab file: ${bootptab}"
4086 - eend 1
4087 - return 1
4088 - fi
4089 -
4090 - ebegin "Starting BOOTP server"
4091 - start-stop-daemon --start --exec /usr/libexec/bootpd -- ${bootpd_opts} ${bootptab}
4092 - eend $?
4093 -}
4094 -
4095 -stop() {
4096 - ebegin "Stopping BOOTP server"
4097 - start-stop-daemon --stop --exec /usr/libexec/bootpd
4098 - eend $?
4099 -}
4100
4101 diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
4102 deleted file mode 100644
4103 index c7bb686..0000000
4104 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.0-atf-check.patch
4105 +++ /dev/null
4106 @@ -1,25 +0,0 @@
4107 -diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
4108 -index a28f546..9f55937 100644
4109 ---- a/libexec/atf/Makefile.inc
4110 -+++ b/libexec/atf/Makefile.inc
4111 -@@ -27,6 +27,6 @@
4112 -
4113 - ATF = ${.CURDIR}/../../../contrib/atf
4114 -
4115 --CFLAGS+= -DHAVE_CONFIG_H
4116 -+CXXFLAGS+= -DHAVE_CONFIG_H
4117 -
4118 - WARNS?= 3
4119 -diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
4120 -index fafb1e4..3710403 100644
4121 ---- a/libexec/atf/atf-check/Makefile
4122 -+++ b/libexec/atf/atf-check/Makefile
4123 -@@ -34,7 +34,7 @@ PROG_CXX= atf-check
4124 - SRCS= atf-check.cpp
4125 - MAN= atf-check.1
4126 -
4127 --CFLAGS+= -I${ATF}
4128 -+CXXFLAGS+= -I${ATF}
4129 -
4130 - DPADD+= ${LIBATF_CXX} ${LIBATF_C}
4131 -
4132
4133 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
4134 deleted file mode 100644
4135 index e9c0925..0000000
4136 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch
4137 +++ /dev/null
4138 @@ -1,28 +0,0 @@
4139 -diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
4140 -index b50e14e..e59a413 100644
4141 ---- a/libexec/atf/Makefile.inc
4142 -+++ b/libexec/atf/Makefile.inc
4143 -@@ -25,7 +25,7 @@
4144 - #
4145 - # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $
4146 -
4147 --CFLAGS+= -DHAVE_CONFIG_H
4148 -+CXXFLAGS+= -DHAVE_CONFIG_H
4149 -
4150 - WARNS?= 3
4151 -
4152 -diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
4153 -index 77c11db..7449ddb 100644
4154 ---- a/libexec/atf/atf-check/Makefile
4155 -+++ b/libexec/atf/atf-check/Makefile
4156 -@@ -34,8 +34,8 @@ PROG_CXX= atf-check
4157 - SRCS= atf-check.cpp
4158 - MAN= atf-check.1
4159 -
4160 --CFLAGS+= -I${ATF}
4161 --CFLAGS+= -DATF_SHELL='"/bin/sh"'
4162 -+CXXFLAGS+= -I${ATF}
4163 -+CXXFLAGS+= -DATF_SHELL='"/bin/sh"'
4164 -
4165 - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++
4166 - LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c
4167
4168 diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
4169 deleted file mode 100644
4170 index 22d5658..0000000
4171 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
4172 +++ /dev/null
4173 @@ -1,13 +0,0 @@
4174 -Fails to build on sparc without using -fPIC
4175 -
4176 ---- libexec/rtld-elf/Makefile.old 2010-01-09 17:17:21 +0100
4177 -+++ libexec/rtld-elf/Makefile 2010-01-09 17:17:33 +0100
4178 -@@ -19,7 +19,7 @@
4179 - MLINKS= rtld.1 ld-elf.so.1.1 \
4180 - rtld.1 ld.so.1
4181 -
4182 --CFLAGS+= -fpic -DPIC
4183 -+CFLAGS+= -fPIC -DPIC
4184 - LDFLAGS+= -shared -Wl,-Bsymbolic
4185 - DPADD= ${LIBC_PIC}
4186 - LDADD= -lc_pic
4187
4188 diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
4189 deleted file mode 100644
4190 index c60b2fe..0000000
4191 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
4192 +++ /dev/null
4193 @@ -1,40 +0,0 @@
4194 ---- head/libexec/rtld-elf/rtld.c 2011/09/15 11:50:09 225582
4195 -+++ head/libexec/rtld-elf/rtld.c 2011/10/08 12:39:47 226155
4196 -@@ -495,8 +495,12 @@
4197 - exit (0);
4198 - }
4199 -
4200 -- /* setup TLS for main thread */
4201 -- dbg("initializing initial thread local storage");
4202 -+ /*
4203 -+ * Processing tls relocations requires having the tls offsets
4204 -+ * initialized. Prepare offsets before starting initial
4205 -+ * relocation processing.
4206 -+ */
4207 -+ dbg("initializing initial thread local storage offsets");
4208 - STAILQ_FOREACH(entry, &list_main, link) {
4209 - /*
4210 - * Allocate all the initial objects out of the static TLS
4211 -@@ -504,7 +508,6 @@
4212 - */
4213 - allocate_tls_offset(entry->obj);
4214 - }
4215 -- allocate_initial_tls(obj_list);
4216 -
4217 - if (relocate_objects(obj_main,
4218 - ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1)
4219 -@@ -519,6 +522,14 @@
4220 - exit (0);
4221 - }
4222 -
4223 -+ /*
4224 -+ * Setup TLS for main thread. This must be done after the
4225 -+ * relocations are processed, since tls initialization section
4226 -+ * might be the subject for relocations.
4227 -+ */
4228 -+ dbg("initializing initial thread local storage");
4229 -+ allocate_initial_tls(obj_list);
4230 -+
4231 - dbg("initializing key program variables");
4232 - set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
4233 - set_program_var("environ", env);
4234
4235 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
4236 deleted file mode 100644
4237 index d330009..0000000
4238 --- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
4239 +++ /dev/null
4240 @@ -1,15 +0,0 @@
4241 -Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
4242 -We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue
4243 -about LD_32_* and thus fail to run from the build directory.
4244 -
4245 -diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h
4246 ---- libexec.old/rtld-elf/rtld.h 2013-08-24 12:30:26.000000000 -0400
4247 -+++ libexec/rtld-elf/rtld.h 2013-08-26 17:10:19.000000000 -0400
4248 -@@ -47,7 +47,6 @@
4249 - #define _PATH_ELF_HINTS "/var/run/ld-elf32.so.hints"
4250 - /* For running 32 bit binaries */
4251 - #define STANDARD_LIBRARY_PATH "/lib32:/usr/lib32"
4252 --#define LD_ "LD_32_"
4253 - #endif
4254 -
4255 - #ifndef STANDARD_LIBRARY_PATH
4256
4257 diff --git a/sys-freebsd/freebsd-libexec/files/ftpd.pamd b/sys-freebsd/freebsd-libexec/files/ftpd.pamd
4258 deleted file mode 100644
4259 index 8e90823..0000000
4260 --- a/sys-freebsd/freebsd-libexec/files/ftpd.pamd
4261 +++ /dev/null
4262 @@ -1,8 +0,0 @@
4263 -# PAM configuration for the "ftpd" service
4264 -#
4265 -
4266 -auth include system-auth
4267 -account include system-auth
4268 -password include system-auth
4269 -session include system-auth
4270 -
4271
4272 diff --git a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd b/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
4273 deleted file mode 100644
4274 index 876cd16..0000000
4275 --- a/sys-freebsd/freebsd-libexec/files/rquotad.xinetd
4276 +++ /dev/null
4277 @@ -1,11 +0,0 @@
4278 -service rquotad
4279 -{
4280 - type = rpc
4281 - socket_type = dgram
4282 - protocol = udp
4283 - wait = yes
4284 - user = root
4285 - server = /usr/libexec/rpc.rquotad
4286 - rpc_version = 1
4287 - disabled = yes
4288 -}
4289
4290 diff --git a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd b/sys-freebsd/freebsd-libexec/files/rstatd.xinetd
4291 deleted file mode 100644
4292 index ba1b819..0000000
4293 --- a/sys-freebsd/freebsd-libexec/files/rstatd.xinetd
4294 +++ /dev/null
4295 @@ -1,11 +0,0 @@
4296 -service rstatd
4297 -{
4298 - type = rpc
4299 - socket_type = dgram
4300 - protocol = udp
4301 - wait = yes
4302 - user = root
4303 - server = /usr/libexec/rpc.rstatd
4304 - rpc_version = 1-3
4305 - disabled = yes
4306 -}
4307
4308 diff --git a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd b/sys-freebsd/freebsd-libexec/files/rusersd.xinetd
4309 deleted file mode 100644
4310 index 5cbe091..0000000
4311 --- a/sys-freebsd/freebsd-libexec/files/rusersd.xinetd
4312 +++ /dev/null
4313 @@ -1,11 +0,0 @@
4314 -service rusersd
4315 -{
4316 - type = rpc
4317 - socket_type = dgram
4318 - protocol = udp
4319 - wait = yes
4320 - user = root
4321 - server = /usr/libexec/rpc.rusersd
4322 - rpc_version = 1-2
4323 - disabled = yes
4324 -}
4325
4326 diff --git a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd b/sys-freebsd/freebsd-libexec/files/sprayd.xinetd
4327 deleted file mode 100644
4328 index 7be5577..0000000
4329 --- a/sys-freebsd/freebsd-libexec/files/sprayd.xinetd
4330 +++ /dev/null
4331 @@ -1,11 +0,0 @@
4332 -service sprayd
4333 -{
4334 - type = rpc
4335 - socket_type = dgram
4336 - protocol = udp
4337 - wait = yes
4338 - user = root
4339 - server = /usr/libexec/rpc.sprayd
4340 - rpc_version = 1
4341 - disabled = yes
4342 -}
4343
4344 diff --git a/sys-freebsd/freebsd-libexec/files/walld.xinetd b/sys-freebsd/freebsd-libexec/files/walld.xinetd
4345 deleted file mode 100644
4346 index 800b84f..0000000
4347 --- a/sys-freebsd/freebsd-libexec/files/walld.xinetd
4348 +++ /dev/null
4349 @@ -1,11 +0,0 @@
4350 -service walld
4351 -{
4352 - type = rpc
4353 - socket_type = dgram
4354 - protocol = udp
4355 - wait = yes
4356 - user = root
4357 - server = /usr/libexec/rpc.rwalld
4358 - rpc_version = 1
4359 - disabled = yes
4360 -}
4361
4362 diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild
4363 deleted file mode 100644
4364 index 84eb839..0000000
4365 --- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3_rc3.ebuild
4366 +++ /dev/null
4367 @@ -1,109 +0,0 @@
4368 -# Copyright 1999-2016 Gentoo Foundation
4369 -# Distributed under the terms of the GNU General Public License v2
4370 -# $Id$
4371 -
4372 -EAPI=5
4373 -
4374 -inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
4375 -
4376 -DESCRIPTION="FreeBSD libexec things"
4377 -SLOT="0"
4378 -
4379 -if [[ ${PV} != *9999* ]]; then
4380 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
4381 -fi
4382 -
4383 -EXTRACTONLY="
4384 - libexec/
4385 - usr.bin/
4386 - bin/
4387 - contrib/hyperv/
4388 - lib/
4389 - etc/
4390 - usr.sbin/
4391 -"
4392 -
4393 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
4394 - >=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
4395 - pam? ( virtual/pam )"
4396 -DEPEND="${RDEPEND}
4397 - =sys-freebsd/freebsd-mk-defs-${RV}*
4398 - =sys-freebsd/freebsd-sources-${RV}*"
4399 -RDEPEND="${RDEPEND}
4400 - xinetd? ( sys-apps/xinetd )"
4401 -
4402 -S="${WORKDIR}/libexec"
4403 -
4404 -# Remove sendmail, tcp_wrapper and other useless stuff
4405 -REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
4406 -
4407 -IUSE="pam ssl kerberos ipv6 nis xinetd"
4408 -
4409 -PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch"
4410 - "${FILESDIR}/${PN}-10.2-atf-check.patch" )
4411 -
4412 -pkg_setup() {
4413 - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
4414 - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
4415 - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
4416 - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
4417 - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
4418 -
4419 - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
4420 -}
4421 -
4422 -src_prepare() {
4423 - # gcc-5.0 or later, Workaround for critical issue. bug 573358.
4424 - [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
4425 -
4426 - if [[ ! -e "${WORKDIR}/include" ]]; then
4427 - ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
4428 - fi
4429 - # allow upgrade directly from 9.x to 10.2.
4430 - if has_version "<sys-freebsd/freebsd-lib-${RV}"; then
4431 - # taken from sys/sys/elf_common.h
4432 - echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
4433 - echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
4434 - echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
4435 - echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
4436 - echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
4437 - # taken from sys/sys/fcntl.h
4438 - echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
4439 - # taken from sys/sys/cdefs.h
4440 - echo '#define __compiler_membar() __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
4441 - # taken from sys/sys/mman.h
4442 - echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
4443 - fi
4444 -}
4445 -
4446 -setup_multilib_vars() {
4447 - if ! multilib_is_native_abi ; then
4448 - cd "${WORKDIR}/libexec/rtld-elf" || die
4449 - export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
4450 - else
4451 - cd "${S}" || die
4452 - fi
4453 - "$@"
4454 -}
4455 -
4456 -src_compile() {
4457 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
4458 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
4459 -}
4460 -
4461 -src_install() {
4462 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
4463 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
4464 -
4465 - insinto /etc
4466 - doins "${WORKDIR}/etc/gettytab"
4467 - newinitd "${FILESDIR}/bootpd.initd" bootpd
4468 - newconfd "${FILESDIR}/bootpd.confd" bootpd
4469 -
4470 - if use xinetd; then
4471 - for rpcd in rstatd rusersd walld rquotad sprayd; do
4472 - insinto /etc/xinetd.d
4473 - newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
4474 - done
4475 - fi
4476 -}
4477
4478 diff --git a/sys-freebsd/freebsd-libexec/metadata.xml b/sys-freebsd/freebsd-libexec/metadata.xml
4479 deleted file mode 100644
4480 index a00f3ae..0000000
4481 --- a/sys-freebsd/freebsd-libexec/metadata.xml
4482 +++ /dev/null
4483 @@ -1,8 +0,0 @@
4484 -<?xml version="1.0" encoding="UTF-8"?>
4485 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
4486 -<pkgmetadata>
4487 -<maintainer type="project">
4488 - <email>bsd@g.o</email>
4489 - <name>BSD Project</name>
4490 -</maintainer>
4491 -</pkgmetadata>
4492
4493 diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
4494 deleted file mode 100644
4495 index d9d001b..0000000
4496 --- a/sys-freebsd/freebsd-mk-defs/Manifest
4497 +++ /dev/null
4498 @@ -1,13 +0,0 @@
4499 -AUX freebsd-mk-defs-10.0-gentoo.patch 12183 SHA256 7e859440386e4b7047507a279fa6e5b0737918f65a04f8c75cc8470a20511d39 SHA512 3d257b59873281afbaeaead56abe944cb82cd42fe3b403795009efe452ae9e85f50da845f261e576b39c5110f422dc8929b30451905f7a797541a83983c8a39b WHIRLPOOL 67adf7e146743b0c372197df595ccdfa0725879213dab05656ce033a5189e3d71a7f64462baf4ff4761de572ca61473cadeacf63c76e67aa80543d0916b94a93
4500 -AUX freebsd-mk-defs-10.1-gnu.patch 2320 SHA256 7b73dd0076eff45f71345dda0b4dd8e2a1a05f40101f559f52ab938813ef4ce1 SHA512 a8b82220f30c7b9ae369876339ff3e7431d3bbcb2c2a0fd8cb4e4c1c17188563c3d4d29938ef3b2b5480acf42f7d71a08ca8ade4f55968da17e82ceafc703981 WHIRLPOOL f0d56fc3065258b25e64a966470f4941e1f4cf6f0558cd3083102961d84acdbeb17c3469a5ab6a3c591e62a72e9c1c06d336ca854c607b40780f8e80f9157e4e
4501 -AUX freebsd-mk-defs-10.2-gentoo.patch 11855 SHA256 cb528d3843c3927eac7dd85eb66b2a864980eb8a5626f8c81af8293f7e52b974 SHA512 e76c5a600ba7376a9fd2533fb6e4825074ce9f782b007440c4fc0a584d85e8858f4763824c6ea9a949544b742d9c01db22f033091d27b43819c6bab3c31a95f2 WHIRLPOOL 7b64044b73c39b927542fd53ca6c013959d2520e09f7f8f53ae77eaeca5435888f74345167f43efbdda39d895fc70e4bb606e1f6ed9859b0c129e2e4f5d5f755
4502 -AUX freebsd-mk-defs-10.2-gnu.patch 1853 SHA256 acc69cba0617496e6dcef543198bf5023fb1799b81a458451f58ea2fe63e46a1 SHA512 3913287e294a09bf17a06b8878de40995c27e63c64e79711112c8fc60bb1630e757e8df2ba4ee41720270776ed5df06d7f1cfb9c09e20b566653023466e01a1e WHIRLPOOL 1db20b2a7e39da3b86a4fb09c42980c6c028b1b46baac55c334abccea87f8c6c59f1c3aaa753bcbc2c08e9bad17d342410ca882a75e37edcf9bdfd26ac7ec1ba
4503 -AUX freebsd-mk-defs-10.3-gentoo.patch 11845 SHA256 2298f4bead99ffed440d92c7b0d5ff81542bce0cbf07a3fe99f920201297d010 SHA512 05d0366b58e02ff11e6fa34cd3f731a06e5d4464eee92f05128e2b68bf6b2539e792489a44ff9e224bb994fcdc6807c19be7aaa459163bb900c8ee130b6a4c11 WHIRLPOOL 3bfdda2ebfa3ba81ad7464845c9ca9c81c438a0becf848e960d2a30171d506ae868aa5b5151cfce6f5390a5d487e423112c56eb8a4be24885e1df28a256c2da7
4504 -AUX freebsd-mk-defs-8.0-gentoo.patch 11076 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 SHA512 3b3e828ac0f5cafdd3f3ef84ae2e0ea5eb36d9c3d465800d1234d8b405b727628b82ca691513bb47c609dbb7767cfb8f16be05f7eefa361a96cb8f282569e480 WHIRLPOOL ae4a0110d88e584ee650fdb04847a29c285e40f4a5a931fbbc21fefeccd4a3a7b948a15f0a9b09b9672e662de55dd4e293d3745c12eacb0dac3ec7d7f433b973
4505 -AUX freebsd-mk-defs-8.0-gnu.patch 4074 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 SHA512 8196f6f01059dd7890af9e0e0be654ad264938f4e8c9a209543b995baf6be43d841417ba8b8340c3c092c8d5f14ad76d578ddcd9267c372999b857ca9a566f03 WHIRLPOOL 28a4600e93855aba192d326beb479743890814c68999290d65a94e7cfa636db897c2c2a2c4ac177a87f8af12ff0a51c1b8ba5a8bb22802e0ef695e7418469d70
4506 -AUX freebsd-mk-defs-9.1-gentoo.patch 11769 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe WHIRLPOOL 65946289e0e62ca575e3ce1acd22955e41143eefe0412f5dc6f6d358d95d08c2325d4870475d664a9565cc5492a0debe73d4f24a8ca34dce03ea20b46306f924
4507 -AUX freebsd-mk-defs-9.1-gnu.patch 2273 SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd WHIRLPOOL 91b7e4a43f5f83fdd3c9bbaa9a2a82ab28373cca6050e7f558baa67fcc39983be84d43e64b17949c4ed3066c0b2e27d409b4cf18c930e4de793a4f41a54a10e6
4508 -AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 SHA256 fa9f47aa7bee35feee0462b6c91995f648143384c547326bcec3b58f69d3db5b SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913 WHIRLPOOL 98c8fd10f85e9b2e780ef639de932caaa68ae4da50d7417601ae3366d119445364d15307016561b11fa91e4849a0ba45599a85b988702688e15ebd44457883c1
4509 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
4510 -EBUILD freebsd-mk-defs-10.3_rc3.ebuild 795 SHA256 0b899c21899afe4e27c6783e766c1a07f032ef4ba1b6fe0b2d9d0d180b704821 SHA512 1bc652eadc222e87e131d3d11f0f9ddb2413b07403e4a08111a7306bec98273977b0c4f4989c82ca07c208bd67dbae3a1567b7110ad7aad157f8def197fd8a02 WHIRLPOOL e696b94b54a4ca14f065ba516c66d9e1466d1860c67919285430c2c7ccb4ba62c03e6bf947ace6b234406da64881f9eb1808eb129ff879aad062da07beaf1f00
4511 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
4512
4513 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
4514 deleted file mode 100644
4515 index 2b99754..0000000
4516 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.0-gentoo.patch
4517 +++ /dev/null
4518 @@ -1,352 +0,0 @@
4519 -tested revision 255489
4520 -
4521 -diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk
4522 -index 2d648de..e456a4b 100644
4523 ---- a/share/mk/bsd.compiler.mk
4524 -+++ b/share/mk/bsd.compiler.mk
4525 -@@ -1,7 +1,7 @@
4526 - # $FreeBSD$
4527 -
4528 - .if !defined(COMPILER_TYPE)
4529 --. if ${CC:T:Mgcc*}
4530 -+. if ${CC:T:M*gcc*}
4531 - COMPILER_TYPE:= gcc
4532 - . elif ${CC:T:Mclang}
4533 - COMPILER_TYPE:= clang
4534 -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
4535 -index 49b2d9b..c2a8c5c 100644
4536 ---- a/share/mk/bsd.doc.mk
4537 -+++ b/share/mk/bsd.doc.mk
4538 -@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
4539 - realinstall:
4540 - .for _dev in ${PRINTERDEVICE:Mhtml}
4541 - cd ${SRCDIR}; \
4542 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
4543 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
4544 - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
4545 - .endfor
4546 - .for _dev in ${PRINTERDEVICE:Nhtml}
4547 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
4548 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
4549 - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
4550 - .endfor
4551 -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
4552 -index 240f958..67f0cf9 100644
4553 ---- a/share/mk/bsd.files.mk
4554 -+++ b/share/mk/bsd.files.mk
4555 -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T}
4556 - .endif
4557 - installfiles: _${group}INS_${file:T}
4558 - _${group}INS_${file:T}: ${file}
4559 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
4560 - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
4561 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
4562 - ${.ALLSRC} \
4563 -@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
4564 - installfiles: _${group}INS
4565 - _${group}INS: ${_${group}FILES}
4566 - .if defined(${group}NAME)
4567 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
4568 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
4569 - -m ${${group}MODE} ${.ALLSRC} \
4570 - ${DESTDIR}${${group}DIR}/${${group}NAME}
4571 - .else
4572 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
4573 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
4574 - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
4575 - .endif
4576 -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
4577 -index 74c378b..7d2c7a0 100644
4578 ---- a/share/mk/bsd.incs.mk
4579 -+++ b/share/mk/bsd.incs.mk
4580 -@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T}
4581 - .endif
4582 - installincludes: _${group}INS_${header:T}
4583 - _${group}INS_${header:T}: ${header}
4584 -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
4585 -+ -g ${${group}GRP_${.ALLSRC:T}} \
4586 -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
4587 - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
4588 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
4589 - ${.ALLSRC} \
4590 -@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
4591 - installincludes: _${group}INS
4592 - _${group}INS: ${_${group}INCS}
4593 - .if defined(${group}NAME)
4594 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
4595 -+ ${DESTDIR}${${group}DIR}
4596 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
4597 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
4598 - .else
4599 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
4600 -+ ${DESTDIR}${${group}DIR}
4601 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
4602 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
4603 - .endif
4604 -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
4605 -index c54b435..d283240 100644
4606 ---- a/share/mk/bsd.info.mk
4607 -+++ b/share/mk/bsd.info.mk
4608 -@@ -83,6 +83,7 @@ INFO2HTML?= info2html
4609 - TEX?= tex
4610 - DVIPS?= dvips
4611 - DVIPS2ASCII?= dvips2ascii
4612 -+INSTALL?= install
4613 -
4614 - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
4615 -
4616 -@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
4617 - INSTALLINFODIRS+= ${x:S/$/-install/}
4618 - ${x:S/$/-install/}:
4619 - .if !empty(.MAKEFLAGS:M-j)
4620 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
4621 - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
4622 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
4623 -- --defsection=${INFOSECTION} \
4624 -- --defentry=${INFOENTRY_${x}} \
4625 -+ --section=${INFOSECTION} \
4626 -+ --entry=${INFOENTRY_${x}} \
4627 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
4628 - .else
4629 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
4630 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
4631 -- --defsection=${INFOSECTION} \
4632 -- --defentry=${INFOENTRY_${x}} \
4633 -+ --section=${INFOSECTION} \
4634 -+ --entry=${INFOENTRY_${x}} \
4635 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
4636 - .endif
4637 - .endfor
4638 -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
4639 -index bb3db64..dbb9bf4 100644
4640 ---- a/share/mk/bsd.lib.mk
4641 -+++ b/share/mk/bsd.lib.mk
4642 -@@ -39,8 +39,6 @@ CFLAGS+= ${DEBUG_FLAGS}
4643 - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
4644 - CTFFLAGS+= -g
4645 - .endif
4646 --.else
4647 --STRIP?= -s
4648 - .endif
4649 -
4650 - .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
4651 -@@ -302,14 +300,17 @@ realinstall: _libinstall
4652 - .ORDER: beforeinstall _libinstall
4653 - _libinstall:
4654 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
4655 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
4656 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
4657 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
4658 - .endif
4659 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
4660 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
4661 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
4662 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
4663 - .endif
4664 - .if defined(SHLIB_NAME)
4665 -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
4666 - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
4667 - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
4668 - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
4669 -@@ -363,10 +364,12 @@ _libinstall:
4670 - .endif # SHLIB_LINK
4671 - .endif # SHIB_NAME
4672 - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
4673 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
4674 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
4675 - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
4676 - .endif
4677 - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
4678 -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
4679 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
4680 - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
4681 - .endif
4682 -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
4683 -index 00d38ff..86792f4 100644
4684 ---- a/share/mk/bsd.libnames.mk
4685 -+++ b/share/mk/bsd.libnames.mk
4686 -@@ -53,7 +53,7 @@ LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
4687 - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
4688 - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
4689 - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
4690 --LIBFL?= "don't use LIBFL, use LIBL"
4691 -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
4692 - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
4693 - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
4694 - LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a
4695 -@@ -88,7 +88,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
4696 - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
4697 - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
4698 - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
4699 --LIBL?= ${DESTDIR}${LIBDIR}/libl.a
4700 -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
4701 - .if ${MK_LDNS} != "no"
4702 - LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
4703 - .endif
4704 -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
4705 -index 1e4d57e..fcb81fe 100644
4706 ---- a/share/mk/bsd.links.mk
4707 -+++ b/share/mk/bsd.links.mk
4708 -@@ -15,6 +15,8 @@ _installlinks:
4709 - t=${DESTDIR}$$1; \
4710 - shift; \
4711 - ${ECHO} $$t -\> $$l; \
4712 -+ d=`dirname $$t`; \
4713 -+ test -d $$d || mkdir $$d; \
4714 - ${INSTALL_LINK} $$l $$t; \
4715 - done; true
4716 - .endif
4717 -@@ -26,6 +28,8 @@ _installlinks:
4718 - t=${DESTDIR}$$1; \
4719 - shift; \
4720 - ${ECHO} $$t -\> $$l; \
4721 -+ d=`dirname $$t`; \
4722 -+ test -d $$d || mkdir $$d; \
4723 - ${INSTALL_SYMLINK} $$l $$t; \
4724 - done; true
4725 - .endif
4726 -diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
4727 -index 6445ba3..fabffa2 100644
4728 ---- a/share/mk/bsd.man.mk
4729 -+++ b/share/mk/bsd.man.mk
4730 -@@ -165,9 +165,11 @@ _maninstall: ${MAN}
4731 - .if defined(NO_MANCOMPRESS)
4732 - .if defined(MANFILTER)
4733 - .for __page in ${MAN}
4734 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
4735 - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
4736 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
4737 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
4738 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
4739 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
4740 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
4741 - .endif
4742 -@@ -181,11 +183,14 @@ _maninstall: ${MAN}
4743 - esac; \
4744 - page=$$1; shift; sect=$$1; shift; \
4745 - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
4746 -+ ${ECHO} ${INSTALL} -d $${d}; \
4747 -+ ${INSTALL} -d $${d}; \
4748 - ${ECHO} ${MINSTALL} $${page} $${d}; \
4749 - ${MINSTALL} $${page} $${d}; \
4750 - done
4751 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
4752 - .for __page in ${MAN}
4753 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
4754 - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
4755 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
4756 - .endfor
4757 -@@ -193,9 +198,11 @@ _maninstall: ${MAN}
4758 - .endif
4759 - .else
4760 - .for __page in ${MAN}
4761 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
4762 - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
4763 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
4764 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
4765 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
4766 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
4767 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
4768 - .endif
4769 -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
4770 -index 48093eb..69f56bc 100644
4771 ---- a/share/mk/bsd.nls.mk
4772 -+++ b/share/mk/bsd.nls.mk
4773 -@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
4774 - # installation rules
4775 - #
4776 - .for file in ${NLS}
4777 --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
4778 -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
4779 -+NLSNAME_${file:T}= ${NLSNAME}.cat
4780 - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
4781 - NLSLINKS+= ${file:R}
4782 - .endif
4783 -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
4784 -index 8f7f0b9..189ccec 100644
4785 ---- a/share/mk/bsd.own.mk
4786 -+++ b/share/mk/bsd.own.mk
4787 -@@ -202,9 +202,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
4788 - INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
4789 -
4790 - # Common variables
4791 --.if !defined(DEBUG_FLAGS)
4792 --STRIP?= -s
4793 --.endif
4794 -
4795 - COMPRESS_CMD?= gzip -cn
4796 - COMPRESS_EXT?= .gz
4797 -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
4798 -index 22ddfb5..f6a4939 100644
4799 ---- a/share/mk/bsd.prog.mk
4800 -+++ b/share/mk/bsd.prog.mk
4801 -@@ -44,10 +44,6 @@ CTFFLAGS+= -g
4802 - .endif
4803 - .endif
4804 -
4805 --.if !defined(DEBUG_FLAGS)
4806 --STRIP?= -s
4807 --.endif
4808 --
4809 - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
4810 - LDFLAGS+= -static
4811 - .endif
4812 -@@ -201,6 +197,7 @@ realinstall: _proginstall
4813 - .ORDER: beforeinstall _proginstall
4814 - _proginstall:
4815 - .if defined(PROG)
4816 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
4817 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
4818 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
4819 - .if ${MK_DEBUG_FILES} != "no"
4820 -@@ -234,6 +231,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
4821 - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
4822 - _scriptsinstall: _SCRIPTSINS_${script:T}
4823 - _SCRIPTSINS_${script:T}: ${script}
4824 -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
4825 - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
4826 - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
4827 - ${.ALLSRC} \
4828 -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
4829 -index 72dfa61..4f21af4 100644
4830 ---- a/share/mk/bsd.sys.mk
4831 -+++ b/share/mk/bsd.sys.mk
4832 -@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
4833 - .if defined(WARNS)
4834 - .if ${WARNS} >= 1
4835 - CWARNFLAGS+= -Wsystem-headers
4836 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
4837 -- || !defined(NO_WERROR.clang))
4838 --CWARNFLAGS+= -Werror
4839 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
4840 - .endif # WARNS >= 1
4841 - .if ${WARNS} >= 2
4842 - CWARNFLAGS+= -Wall -Wno-format-y2k
4843 -@@ -99,10 +95,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
4844 - CWARNFLAGS+= -Wno-format-nonliteral
4845 - .endif # WARNS <= 3
4846 - .endif # CLANG
4847 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
4848 -- || !defined(NO_WERROR.clang))
4849 --CWARNFLAGS+= -Werror
4850 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
4851 - .endif # WFORMAT > 0
4852 - .endif # WFORMAT
4853 - .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
4854 -diff --git a/share/mk/sys.mk b/share/mk/sys.mk
4855 -index eb9f2ca..09ad4cf 100644
4856 ---- a/share/mk/sys.mk
4857 -+++ b/share/mk/sys.mk
4858 -@@ -321,12 +321,6 @@ YFLAGS ?= -d
4859 - rm -f ${.PREFIX}.tmp.c
4860 - ${CTFCONVERT_CMD}
4861 -
4862 --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
4863 --__MAKE_CONF?=/etc/make.conf
4864 --.if exists(${__MAKE_CONF})
4865 --.include "${__MAKE_CONF}"
4866 --.endif
4867 --
4868 - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
4869 - SHELL= ${__MAKE_SHELL}
4870 - .SHELL: path=${__MAKE_SHELL}
4871
4872 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
4873 deleted file mode 100644
4874 index e566e62..0000000
4875 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.1-gnu.patch
4876 +++ /dev/null
4877 @@ -1,79 +0,0 @@
4878 -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
4879 -index a5eacf9..01d1045 100644
4880 ---- a/share/mk/bsd.lib.mk
4881 -+++ b/share/mk/bsd.lib.mk
4882 -@@ -166,11 +166,7 @@ _LIBS= lib${LIB}.a
4883 - lib${LIB}.a: ${OBJS} ${STATICOBJS}
4884 - @${ECHO} building static ${LIB} library
4885 - @rm -f ${.TARGET}
4886 --.if !defined(NM)
4887 -- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
4888 --.else
4889 -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
4890 --.endif
4891 -+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
4892 - ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
4893 - .endif
4894 -
4895 -@@ -183,11 +179,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
4896 - lib${LIB}_p.a: ${POBJS}
4897 - @${ECHO} building profiled ${LIB} library
4898 - @rm -f ${.TARGET}
4899 --.if !defined(NM)
4900 -- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
4901 --.else
4902 -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
4903 --.endif
4904 -+ @${AR} ${ARFLAGS} ${.TARGET} ${POBJS} ${ARADD}
4905 - ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
4906 - .endif
4907 -
4908 -@@ -214,15 +206,9 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
4909 - .if defined(SHLIB_LINK)
4910 - @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
4911 - .endif
4912 --.if !defined(NM)
4913 - @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
4914 - -o ${.TARGET} -Wl,-soname,${SONAME} \
4915 -- `lorder ${SOBJS} | tsort -q` ${LDADD}
4916 --.else
4917 -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
4918 -- -o ${.TARGET} -Wl,-soname,${SONAME} \
4919 -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
4920 --.endif
4921 -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
4922 - .if ${MK_CTF} != "no"
4923 - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
4924 - .endif
4925 -@@ -280,13 +266,6 @@ _EXTRADEPEND:
4926 -
4927 - .if !target(install)
4928 -
4929 --.if defined(PRECIOUSLIB)
4930 --.if !defined(NO_FSCHG)
4931 --SHLINSTALLFLAGS+= -fschg
4932 --.endif
4933 --SHLINSTALLFLAGS+= -S
4934 --.endif
4935 --
4936 - _INSTALLFLAGS:= ${INSTALLFLAGS}
4937 - .for ie in ${INSTALLFLAGS_EDIT}
4938 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
4939 -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
4940 -index a53ea14..af3f37c 100644
4941 ---- a/share/mk/bsd.prog.mk
4942 -+++ b/share/mk/bsd.prog.mk
4943 -@@ -179,13 +179,6 @@ _EXTRADEPEND:
4944 -
4945 - .if !target(install)
4946 -
4947 --.if defined(PRECIOUSPROG)
4948 --.if !defined(NO_FSCHG)
4949 --INSTALLFLAGS+= -fschg
4950 --.endif
4951 --INSTALLFLAGS+= -S
4952 --.endif
4953 --
4954 - _INSTALLFLAGS:= ${INSTALLFLAGS}
4955 - .for ie in ${INSTALLFLAGS_EDIT}
4956 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
4957
4958 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gentoo.patch
4959 deleted file mode 100644
4960 index 628a516..0000000
4961 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gentoo.patch
4962 +++ /dev/null
4963 @@ -1,337 +0,0 @@
4964 -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
4965 -index 80b2969..d854472 100644
4966 ---- a/share/mk/bsd.doc.mk
4967 -+++ b/share/mk/bsd.doc.mk
4968 -@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
4969 - realinstall:
4970 - .for _dev in ${PRINTERDEVICE:Mhtml}
4971 - cd ${SRCDIR}; \
4972 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
4973 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
4974 - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
4975 - .endfor
4976 - .for _dev in ${PRINTERDEVICE:Nhtml}
4977 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
4978 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
4979 - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
4980 - .endfor
4981 -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
4982 -index 183cb1c..5b57594 100644
4983 ---- a/share/mk/bsd.files.mk
4984 -+++ b/share/mk/bsd.files.mk
4985 -@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T}
4986 - .endif
4987 - installfiles-${group}: _${group}INS_${file:T}
4988 - _${group}INS_${file:T}: ${file}
4989 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
4990 - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
4991 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
4992 - ${.ALLSRC} \
4993 -@@ -52,10 +53,12 @@ _${group}FILES+= ${file}
4994 - installfiles-${group}: _${group}INS
4995 - _${group}INS: ${_${group}FILES}
4996 - .if defined(${group}NAME)
4997 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
4998 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
4999 - -m ${${group}MODE} ${.ALLSRC} \
5000 - ${DESTDIR}${${group}DIR}/${${group}NAME}
5001 - .else
5002 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
5003 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
5004 - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
5005 - .endif
5006 -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
5007 -index b938221..6b98e72 100644
5008 ---- a/share/mk/bsd.incs.mk
5009 -+++ b/share/mk/bsd.incs.mk
5010 -@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T}
5011 - .endif
5012 - installincludes: _${group}INS_${header:T}
5013 - _${group}INS_${header:T}: ${header}
5014 -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
5015 -+ -g ${${group}GRP_${.ALLSRC:T}} \
5016 -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
5017 - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
5018 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5019 - ${.ALLSRC} \
5020 -@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
5021 - installincludes: _${group}INS
5022 - _${group}INS: ${_${group}INCS}
5023 - .if defined(${group}NAME)
5024 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
5025 -+ ${DESTDIR}${${group}DIR}
5026 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5027 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
5028 - .else
5029 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
5030 -+ ${DESTDIR}${${group}DIR}
5031 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5032 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
5033 - .endif
5034 -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
5035 -index 6275ce3..8d32289 100644
5036 ---- a/share/mk/bsd.info.mk
5037 -+++ b/share/mk/bsd.info.mk
5038 -@@ -83,6 +83,7 @@ INFO2HTML?= info2html
5039 - TEX?= tex
5040 - DVIPS?= dvips
5041 - DVIPS2ASCII?= dvips2ascii
5042 -+INSTALL?= install
5043 -
5044 - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
5045 -
5046 -@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
5047 - INSTALLINFODIRS+= ${x:S/$/-install/}
5048 - ${x:S/$/-install/}:
5049 - .if !empty(.MAKEFLAGS:M-j)
5050 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
5051 - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
5052 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5053 -- --defsection=${INFOSECTION} \
5054 -- --defentry=${INFOENTRY_${x}} \
5055 -+ --section=${INFOSECTION} \
5056 -+ --entry=${INFOENTRY_${x}} \
5057 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
5058 - .else
5059 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
5060 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5061 -- --defsection=${INFOSECTION} \
5062 -- --defentry=${INFOENTRY_${x}} \
5063 -+ --section=${INFOSECTION} \
5064 -+ --entry=${INFOENTRY_${x}} \
5065 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
5066 - .endif
5067 - .endfor
5068 -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
5069 -index 33a7e8b..80549d8 100644
5070 ---- a/share/mk/bsd.lib.mk
5071 -+++ b/share/mk/bsd.lib.mk
5072 -@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS}
5073 - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
5074 - CTFFLAGS+= -g
5075 - .endif
5076 --.else
5077 --STRIP?= -s
5078 - .endif
5079 -
5080 - .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
5081 -@@ -296,14 +294,17 @@ realinstall: _libinstall
5082 - .ORDER: beforeinstall _libinstall
5083 - _libinstall:
5084 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
5085 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5086 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5087 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
5088 - .endif
5089 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
5090 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5091 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5092 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
5093 - .endif
5094 - .if defined(SHLIB_NAME)
5095 -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
5096 - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5097 - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
5098 - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
5099 -@@ -357,10 +358,12 @@ _libinstall:
5100 - .endif # SHLIB_LINK
5101 - .endif # SHIB_NAME
5102 - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
5103 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5104 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5105 - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
5106 - .endif
5107 - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
5108 -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
5109 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5110 - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
5111 - .endif
5112 -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
5113 -index aaa75ab..3009f34 100644
5114 ---- a/share/mk/bsd.libnames.mk
5115 -+++ b/share/mk/bsd.libnames.mk
5116 -@@ -50,7 +50,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
5117 - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
5118 - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
5119 - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a
5120 --LIBFL?= "don't use LIBFL, use LIBL"
5121 -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
5122 - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
5123 - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
5124 - LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a
5125 -@@ -80,7 +80,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
5126 - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
5127 - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
5128 - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
5129 --LIBL?= ${DESTDIR}${LIBDIR}/libl.a
5130 -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
5131 - .if ${MK_LDNS} != "no"
5132 - LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
5133 - .endif
5134 -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
5135 -index 574f0f5..b63b117 100644
5136 ---- a/share/mk/bsd.links.mk
5137 -+++ b/share/mk/bsd.links.mk
5138 -@@ -15,6 +15,8 @@ _installlinks:
5139 - t=${DESTDIR}$$1; \
5140 - shift; \
5141 - ${ECHO} $$t -\> $$l; \
5142 -+ d=`dirname $$t`; \
5143 -+ test -d $$d || mkdir $$d; \
5144 - ${INSTALL_LINK} $$l $$t; \
5145 - done; true
5146 - .endif
5147 -@@ -26,6 +28,8 @@ _installlinks:
5148 - t=${DESTDIR}$$1; \
5149 - shift; \
5150 - ${ECHO} $$t -\> $$l; \
5151 -+ d=`dirname $$t`; \
5152 -+ test -d $$d || mkdir $$d; \
5153 - ${INSTALL_SYMLINK} $$l $$t; \
5154 - done; true
5155 - .endif
5156 -diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
5157 -index 0212d3a..6435936 100644
5158 ---- a/share/mk/bsd.man.mk
5159 -+++ b/share/mk/bsd.man.mk
5160 -@@ -165,9 +165,11 @@ _maninstall: ${MAN}
5161 - .if defined(NO_MANCOMPRESS)
5162 - .if defined(MANFILTER)
5163 - .for __page in ${MAN}
5164 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
5165 - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
5166 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
5167 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5168 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
5169 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
5170 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
5171 - .endif
5172 -@@ -181,11 +183,14 @@ _maninstall: ${MAN}
5173 - esac; \
5174 - page=$$1; shift; sect=$$1; shift; \
5175 - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
5176 -+ ${ECHO} ${INSTALL} -d $${d}; \
5177 -+ ${INSTALL} -d $${d}; \
5178 - ${ECHO} ${MINSTALL} $${page} $${d}; \
5179 - ${MINSTALL} $${page} $${d}; \
5180 - done
5181 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5182 - .for __page in ${MAN}
5183 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
5184 - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
5185 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
5186 - .endfor
5187 -@@ -193,9 +198,11 @@ _maninstall: ${MAN}
5188 - .endif
5189 - .else
5190 - .for __page in ${MAN}
5191 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
5192 - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
5193 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
5194 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5195 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
5196 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
5197 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
5198 - .endif
5199 -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
5200 -index 28255ea..2bc6546 100644
5201 ---- a/share/mk/bsd.nls.mk
5202 -+++ b/share/mk/bsd.nls.mk
5203 -@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
5204 - # installation rules
5205 - #
5206 - .for file in ${NLS}
5207 --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
5208 -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
5209 -+NLSNAME_${file:T}= ${NLSNAME}.cat
5210 - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
5211 - NLSLINKS+= ${file:R}
5212 - .endif
5213 -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
5214 -index b7ae975..9a51425 100644
5215 ---- a/share/mk/bsd.own.mk
5216 -+++ b/share/mk/bsd.own.mk
5217 -@@ -206,9 +206,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
5218 - INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
5219 -
5220 - # Common variables
5221 --.if !defined(DEBUG_FLAGS)
5222 --STRIP?= -s
5223 --.endif
5224 -
5225 - COMPRESS_CMD?= gzip -cn
5226 - COMPRESS_EXT?= .gz
5227 -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
5228 -index f34c264..19ad99f 100644
5229 ---- a/share/mk/bsd.prog.mk
5230 -+++ b/share/mk/bsd.prog.mk
5231 -@@ -42,10 +42,6 @@ CTFFLAGS+= -g
5232 - .endif
5233 - .endif
5234 -
5235 --.if !defined(DEBUG_FLAGS)
5236 --STRIP?= -s
5237 --.endif
5238 --
5239 - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
5240 - LDFLAGS+= -static
5241 - .endif
5242 -@@ -200,6 +196,7 @@ realinstall: _proginstall
5243 - .ORDER: beforeinstall _proginstall
5244 - _proginstall:
5245 - .if defined(PROG)
5246 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
5247 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5248 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
5249 - .if ${MK_DEBUG_FILES} != "no"
5250 -@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
5251 - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
5252 - _scriptsinstall: _SCRIPTSINS_${script:T}
5253 - _SCRIPTSINS_${script:T}: ${script}
5254 -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
5255 - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
5256 - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
5257 - ${.ALLSRC} \
5258 -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
5259 -index e33d805..8232ba9 100644
5260 ---- a/share/mk/bsd.sys.mk
5261 -+++ b/share/mk/bsd.sys.mk
5262 -@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
5263 - .if defined(WARNS)
5264 - .if ${WARNS} >= 1
5265 - CWARNFLAGS+= -Wsystem-headers
5266 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
5267 -- || !defined(NO_WERROR.clang))
5268 --CWARNFLAGS+= -Werror
5269 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
5270 - .endif # WARNS >= 1
5271 - .if ${WARNS} >= 2
5272 - CWARNFLAGS+= -Wall -Wno-format-y2k
5273 -@@ -102,10 +98,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
5274 - CWARNFLAGS+= -Wno-format-nonliteral
5275 - .endif # WARNS <= 3
5276 - .endif # CLANG
5277 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
5278 -- || !defined(NO_WERROR.clang))
5279 --CWARNFLAGS+= -Werror
5280 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
5281 - .endif # WFORMAT > 0
5282 - .endif # WFORMAT
5283 - .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
5284 -diff --git a/share/mk/sys.mk b/share/mk/sys.mk
5285 -index 4c46c90..2c3aaff 100644
5286 ---- a/share/mk/sys.mk
5287 -+++ b/share/mk/sys.mk
5288 -@@ -325,12 +325,6 @@ YFLAGS ?= -d
5289 - rm -f ${.PREFIX}.tmp.c
5290 - ${CTFCONVERT_CMD}
5291 -
5292 --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
5293 --__MAKE_CONF?=/etc/make.conf
5294 --.if exists(${__MAKE_CONF})
5295 --.include "${__MAKE_CONF}"
5296 --.endif
5297 --
5298 - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
5299 - SHELL= ${__MAKE_SHELL}
5300 - .SHELL: path=${__MAKE_SHELL}
5301
5302 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
5303 deleted file mode 100644
5304 index b88fde2..0000000
5305 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch
5306 +++ /dev/null
5307 @@ -1,63 +0,0 @@
5308 -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
5309 -index 80549d8..fd2aac5 100644
5310 ---- a/share/mk/bsd.lib.mk
5311 -+++ b/share/mk/bsd.lib.mk
5312 -@@ -173,7 +173,7 @@ _LIBS= lib${LIB}.a
5313 - lib${LIB}.a: ${OBJS} ${STATICOBJS}
5314 - @${ECHO} building static ${LIB} library
5315 - @rm -f ${.TARGET}
5316 -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
5317 -+ @${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
5318 - ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
5319 - .endif
5320 -
5321 -@@ -186,7 +186,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
5322 - lib${LIB}_p.a: ${POBJS}
5323 - @${ECHO} building profiled ${LIB} library
5324 - @rm -f ${.TARGET}
5325 -- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
5326 -+ @${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD}
5327 - ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
5328 - .endif
5329 -
5330 -@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
5331 - .endif
5332 - ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
5333 - -o ${.TARGET} -Wl,-soname,${SONAME} \
5334 -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
5335 -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
5336 - .if ${MK_CTF} != "no"
5337 - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
5338 - .endif
5339 -@@ -273,13 +273,6 @@ _EXTRADEPEND:
5340 -
5341 - .if !target(install)
5342 -
5343 --.if defined(PRECIOUSLIB)
5344 --.if !defined(NO_FSCHG)
5345 --SHLINSTALLFLAGS+= -fschg
5346 --.endif
5347 --SHLINSTALLFLAGS+= -S
5348 --.endif
5349 --
5350 - _INSTALLFLAGS:= ${INSTALLFLAGS}
5351 - .for ie in ${INSTALLFLAGS_EDIT}
5352 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
5353 -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
5354 -index 19ad99f..46c4b09 100644
5355 ---- a/share/mk/bsd.prog.mk
5356 -+++ b/share/mk/bsd.prog.mk
5357 -@@ -179,13 +179,6 @@ _EXTRADEPEND:
5358 -
5359 - .if !target(install)
5360 -
5361 --.if defined(PRECIOUSPROG)
5362 --.if !defined(NO_FSCHG)
5363 --INSTALLFLAGS+= -fschg
5364 --.endif
5365 --INSTALLFLAGS+= -S
5366 --.endif
5367 --
5368 - _INSTALLFLAGS:= ${INSTALLFLAGS}
5369 - .for ie in ${INSTALLFLAGS_EDIT}
5370 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
5371
5372 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
5373 deleted file mode 100644
5374 index cdc244d..0000000
5375 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch
5376 +++ /dev/null
5377 @@ -1,337 +0,0 @@
5378 -diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
5379 -index a8aa595..476b33b 100644
5380 ---- a/share/mk/bsd.doc.mk
5381 -+++ b/share/mk/bsd.doc.mk
5382 -@@ -135,10 +135,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
5383 - realinstall:
5384 - .if ${PRINTERDEVICE:Mhtml}
5385 - cd ${SRCDIR}; \
5386 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
5387 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5388 - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
5389 - .endif
5390 - .for _dev in ${PRINTERDEVICE:Nhtml}
5391 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
5392 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5393 - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
5394 - .endfor
5395 -diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
5396 -index 183cb1c..5b57594 100644
5397 ---- a/share/mk/bsd.files.mk
5398 -+++ b/share/mk/bsd.files.mk
5399 -@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?= ${file:T}
5400 - .endif
5401 - installfiles-${group}: _${group}INS_${file:T}
5402 - _${group}INS_${file:T}: ${file}
5403 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
5404 - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
5405 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5406 - ${.ALLSRC} \
5407 -@@ -52,10 +53,12 @@ _${group}FILES+= ${file}
5408 - installfiles-${group}: _${group}INS
5409 - _${group}INS: ${_${group}FILES}
5410 - .if defined(${group}NAME)
5411 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
5412 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
5413 - -m ${${group}MODE} ${.ALLSRC} \
5414 - ${DESTDIR}${${group}DIR}/${${group}NAME}
5415 - .else
5416 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
5417 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
5418 - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
5419 - .endif
5420 -diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
5421 -index b938221..6b98e72 100644
5422 ---- a/share/mk/bsd.incs.mk
5423 -+++ b/share/mk/bsd.incs.mk
5424 -@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?= ${header:T}
5425 - .endif
5426 - installincludes: _${group}INS_${header:T}
5427 - _${group}INS_${header:T}: ${header}
5428 -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
5429 -+ -g ${${group}GRP_${.ALLSRC:T}} \
5430 -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
5431 - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
5432 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5433 - ${.ALLSRC} \
5434 -@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
5435 - installincludes: _${group}INS
5436 - _${group}INS: ${_${group}INCS}
5437 - .if defined(${group}NAME)
5438 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
5439 -+ ${DESTDIR}${${group}DIR}
5440 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5441 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
5442 - .else
5443 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
5444 -+ ${DESTDIR}${${group}DIR}
5445 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5446 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
5447 - .endif
5448 -diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
5449 -index 6275ce3..8d32289 100644
5450 ---- a/share/mk/bsd.info.mk
5451 -+++ b/share/mk/bsd.info.mk
5452 -@@ -83,6 +83,7 @@ INFO2HTML?= info2html
5453 - TEX?= tex
5454 - DVIPS?= dvips
5455 - DVIPS2ASCII?= dvips2ascii
5456 -+INSTALL?= install
5457 -
5458 - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
5459 -
5460 -@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
5461 - INSTALLINFODIRS+= ${x:S/$/-install/}
5462 - ${x:S/$/-install/}:
5463 - .if !empty(.MAKEFLAGS:M-j)
5464 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
5465 - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
5466 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5467 -- --defsection=${INFOSECTION} \
5468 -- --defentry=${INFOENTRY_${x}} \
5469 -+ --section=${INFOSECTION} \
5470 -+ --entry=${INFOENTRY_${x}} \
5471 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
5472 - .else
5473 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
5474 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5475 -- --defsection=${INFOSECTION} \
5476 -- --defentry=${INFOENTRY_${x}} \
5477 -+ --section=${INFOSECTION} \
5478 -+ --entry=${INFOENTRY_${x}} \
5479 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
5480 - .endif
5481 - .endfor
5482 -diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
5483 -index c753afe..14f74aa 100644
5484 ---- a/share/mk/bsd.lib.mk
5485 -+++ b/share/mk/bsd.lib.mk
5486 -@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS}
5487 - .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
5488 - CTFFLAGS+= -g
5489 - .endif
5490 --.else
5491 --STRIP?= -s
5492 - .endif
5493 -
5494 - .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
5495 -@@ -296,14 +294,17 @@ realinstall: _libinstall
5496 - .ORDER: beforeinstall _libinstall
5497 - _libinstall:
5498 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
5499 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5500 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5501 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
5502 - .endif
5503 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
5504 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5505 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5506 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
5507 - .endif
5508 - .if defined(SHLIB_NAME)
5509 -+ ${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
5510 - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5511 - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
5512 - ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
5513 -@@ -357,10 +358,12 @@ _libinstall:
5514 - .endif # SHLIB_LINK
5515 - .endif # SHIB_NAME
5516 - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
5517 -+ ${INSTALL} -d ${DESTDIR}${_LIBDIR}
5518 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5519 - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
5520 - .endif
5521 - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
5522 -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
5523 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5524 - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
5525 - .endif
5526 -diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
5527 -index c097c77..c2994d8 100644
5528 ---- a/share/mk/bsd.libnames.mk
5529 -+++ b/share/mk/bsd.libnames.mk
5530 -@@ -51,7 +51,7 @@ LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
5531 - LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
5532 - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
5533 - LIBFIGPAR?= ${DESTDIR}${LIBDIR}/libfigpar.a
5534 --LIBFL?= "don't use LIBFL, use LIBL"
5535 -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
5536 - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
5537 - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
5538 - LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a
5539 -@@ -81,7 +81,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a
5540 - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
5541 - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
5542 - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
5543 --LIBL?= ${DESTDIR}${LIBDIR}/libl.a
5544 -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
5545 - .if ${MK_LDNS} != "no"
5546 - LIBLDNS?= ${DESTDIR}${LIBPRIVATEDIR}/libldns.a
5547 - .endif
5548 -diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
5549 -index 574f0f5..b63b117 100644
5550 ---- a/share/mk/bsd.links.mk
5551 -+++ b/share/mk/bsd.links.mk
5552 -@@ -15,6 +15,8 @@ _installlinks:
5553 - t=${DESTDIR}$$1; \
5554 - shift; \
5555 - ${ECHO} $$t -\> $$l; \
5556 -+ d=`dirname $$t`; \
5557 -+ test -d $$d || mkdir $$d; \
5558 - ${INSTALL_LINK} $$l $$t; \
5559 - done; true
5560 - .endif
5561 -@@ -26,6 +28,8 @@ _installlinks:
5562 - t=${DESTDIR}$$1; \
5563 - shift; \
5564 - ${ECHO} $$t -\> $$l; \
5565 -+ d=`dirname $$t`; \
5566 -+ test -d $$d || mkdir $$d; \
5567 - ${INSTALL_SYMLINK} $$l $$t; \
5568 - done; true
5569 - .endif
5570 -diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
5571 -index 0212d3a..6435936 100644
5572 ---- a/share/mk/bsd.man.mk
5573 -+++ b/share/mk/bsd.man.mk
5574 -@@ -165,9 +165,11 @@ _maninstall: ${MAN}
5575 - .if defined(NO_MANCOMPRESS)
5576 - .if defined(MANFILTER)
5577 - .for __page in ${MAN}
5578 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
5579 - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
5580 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
5581 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5582 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
5583 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
5584 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
5585 - .endif
5586 -@@ -181,11 +183,14 @@ _maninstall: ${MAN}
5587 - esac; \
5588 - page=$$1; shift; sect=$$1; shift; \
5589 - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
5590 -+ ${ECHO} ${INSTALL} -d $${d}; \
5591 -+ ${INSTALL} -d $${d}; \
5592 - ${ECHO} ${MINSTALL} $${page} $${d}; \
5593 - ${MINSTALL} $${page} $${d}; \
5594 - done
5595 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5596 - .for __page in ${MAN}
5597 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
5598 - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
5599 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
5600 - .endfor
5601 -@@ -193,9 +198,11 @@ _maninstall: ${MAN}
5602 - .endif
5603 - .else
5604 - .for __page in ${MAN}
5605 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
5606 - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
5607 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
5608 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5609 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
5610 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
5611 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
5612 - .endif
5613 -diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
5614 -index 28255ea..2bc6546 100644
5615 ---- a/share/mk/bsd.nls.mk
5616 -+++ b/share/mk/bsd.nls.mk
5617 -@@ -62,7 +62,8 @@ NLSDIR?= ${SHAREDIR}/nls
5618 - # installation rules
5619 - #
5620 - .for file in ${NLS}
5621 --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
5622 -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
5623 -+NLSNAME_${file:T}= ${NLSNAME}.cat
5624 - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
5625 - NLSLINKS+= ${file:R}
5626 - .endif
5627 -diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
5628 -index 73de02d..c6c30ca 100644
5629 ---- a/share/mk/bsd.own.mk
5630 -+++ b/share/mk/bsd.own.mk
5631 -@@ -206,9 +206,6 @@ INSTALL_LINK?= ${INSTALL} ${HRDLINK}
5632 - INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
5633 -
5634 - # Common variables
5635 --.if !defined(DEBUG_FLAGS)
5636 --STRIP?= -s
5637 --.endif
5638 -
5639 - COMPRESS_CMD?= gzip -cn
5640 - COMPRESS_EXT?= .gz
5641 -diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
5642 -index d6d0fa5..93a9046 100644
5643 ---- a/share/mk/bsd.prog.mk
5644 -+++ b/share/mk/bsd.prog.mk
5645 -@@ -42,10 +42,6 @@ CTFFLAGS+= -g
5646 - .endif
5647 - .endif
5648 -
5649 --.if !defined(DEBUG_FLAGS)
5650 --STRIP?= -s
5651 --.endif
5652 --
5653 - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
5654 - LDFLAGS+= -static
5655 - .endif
5656 -@@ -200,6 +196,7 @@ realinstall: _proginstall
5657 - .ORDER: beforeinstall _proginstall
5658 - _proginstall:
5659 - .if defined(PROG)
5660 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
5661 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5662 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
5663 - .if ${MK_DEBUG_FILES} != "no"
5664 -@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
5665 - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
5666 - _scriptsinstall: _SCRIPTSINS_${script:T}
5667 - _SCRIPTSINS_${script:T}: ${script}
5668 -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
5669 - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
5670 - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
5671 - ${.ALLSRC} \
5672 -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
5673 -index fee6ccc..c2fe39a 100644
5674 ---- a/share/mk/bsd.sys.mk
5675 -+++ b/share/mk/bsd.sys.mk
5676 -@@ -30,10 +30,6 @@ CFLAGS+= -std=${CSTD}
5677 - .if defined(WARNS)
5678 - .if ${WARNS} >= 1
5679 - CWARNFLAGS+= -Wsystem-headers
5680 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
5681 -- || !defined(NO_WERROR.clang))
5682 --CWARNFLAGS+= -Werror
5683 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
5684 - .endif # WARNS >= 1
5685 - .if ${WARNS} >= 2
5686 - CWARNFLAGS+= -Wall -Wno-format-y2k
5687 -@@ -102,10 +98,6 @@ CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args
5688 - CWARNFLAGS+= -Wno-format-nonliteral
5689 - .endif # WARNS <= 3
5690 - .endif # CLANG
5691 --.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
5692 -- || !defined(NO_WERROR.clang))
5693 --CWARNFLAGS+= -Werror
5694 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
5695 - .endif # WFORMAT > 0
5696 - .endif # WFORMAT
5697 - .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
5698 -diff --git a/share/mk/sys.mk b/share/mk/sys.mk
5699 -index c270260..68491ce 100644
5700 ---- a/share/mk/sys.mk
5701 -+++ b/share/mk/sys.mk
5702 -@@ -327,12 +327,6 @@ YFLAGS ?= -d
5703 - rm -f ${.PREFIX}.tmp.c
5704 - ${CTFCONVERT_CMD}
5705 -
5706 --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
5707 --__MAKE_CONF?=/etc/make.conf
5708 --.if exists(${__MAKE_CONF})
5709 --.include "${__MAKE_CONF}"
5710 --.endif
5711 --
5712 - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
5713 - SHELL= ${__MAKE_SHELL}
5714 - .SHELL: path=${__MAKE_SHELL}
5715
5716 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch
5717 deleted file mode 100644
5718 index f17f6c4..0000000
5719 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch
5720 +++ /dev/null
5721 @@ -1,332 +0,0 @@
5722 -Index: share/mk/bsd.doc.mk
5723 -===================================================================
5724 ---- share/mk/bsd.doc.mk.orig
5725 -+++ share/mk/bsd.doc.mk
5726 -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${
5727 - realinstall:
5728 - .for _dev in ${PRINTERDEVICE:Mhtml}
5729 - cd ${SRCDIR}; \
5730 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
5731 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5732 - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
5733 - .endfor
5734 - .for _dev in ${PRINTERDEVICE:Nhtml}
5735 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
5736 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5737 - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
5738 - .endfor
5739 -Index: share/mk/bsd.files.mk
5740 -===================================================================
5741 ---- share/mk/bsd.files.mk.orig
5742 -+++ share/mk/bsd.files.mk
5743 -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T}
5744 - .endif
5745 - installfiles: _${group}INS_${file:T}
5746 - _${group}INS_${file:T}: ${file}
5747 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
5748 - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
5749 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5750 - ${.ALLSRC} \
5751 -@@ -51,10 +52,12 @@ _${group}FILES+= ${file}
5752 - installfiles: _${group}INS
5753 - _${group}INS: ${_${group}FILES}
5754 - .if defined(${group}NAME)
5755 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
5756 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
5757 - -m ${${group}MODE} ${.ALLSRC} \
5758 - ${DESTDIR}${${group}DIR}/${${group}NAME}
5759 - .else
5760 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
5761 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
5762 - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
5763 - .endif
5764 -Index: share/mk/bsd.incs.mk
5765 -===================================================================
5766 ---- share/mk/bsd.incs.mk.orig
5767 -+++ share/mk/bsd.incs.mk
5768 -@@ -41,6 +41,10 @@ ${group}NAME_${header:T}?= ${header:T}
5769 - .endif
5770 - installincludes: _${group}INS_${header:T}
5771 - _${group}INS_${header:T}: ${header}
5772 -+
5773 -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
5774 -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5775 -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
5776 - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
5777 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
5778 - ${.ALLSRC} \
5779 -@@ -53,9 +57,11 @@ _${group}INCS+= ${header}
5780 - installincludes: _${group}INS
5781 - _${group}INS: ${_${group}INCS}
5782 - .if defined(${group}NAME)
5783 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
5784 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5785 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
5786 - .else
5787 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
5788 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
5789 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
5790 - .endif
5791 -Index: share/mk/bsd.info.mk
5792 -===================================================================
5793 ---- share/mk/bsd.info.mk.orig
5794 -+++ share/mk/bsd.info.mk
5795 -@@ -83,6 +83,7 @@ INFO2HTML?= info2html
5796 - TEX?= tex
5797 - DVIPS?= dvips
5798 - DVIPS2ASCII?= dvips2ascii
5799 -+INSTALL?= install
5800 -
5801 - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
5802 -
5803 -@@ -144,12 +145,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
5804 - INSTALLINFODIRS+= ${x:S/$/-install/}
5805 - ${x:S/$/-install/}:
5806 - .if !empty(.MAKEFLAGS:M-j)
5807 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
5808 - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
5809 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5810 - --defsection=${INFOSECTION} \
5811 - --defentry=${INFOENTRY_${x}} \
5812 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
5813 - .else
5814 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
5815 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
5816 - --defsection=${INFOSECTION} \
5817 - --defentry=${INFOENTRY_${x}} \
5818 -Index: share/mk/bsd.lib.mk
5819 -===================================================================
5820 ---- share/mk/bsd.lib.mk.orig
5821 -+++ share/mk/bsd.lib.mk
5822 -@@ -41,10 +41,6 @@ CTFFLAGS+= -g
5823 - .endif
5824 - .endif
5825 -
5826 --.if !defined(DEBUG_FLAGS)
5827 --STRIP?= -s
5828 --.endif
5829 --
5830 - .include <bsd.libnames.mk>
5831 -
5832 - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
5833 -@@ -276,14 +272,17 @@ realinstall: _libinstall
5834 - .ORDER: beforeinstall _libinstall
5835 - _libinstall:
5836 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
5837 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
5838 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5839 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
5840 - .endif
5841 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
5842 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
5843 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5844 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
5845 - .endif
5846 - .if defined(SHLIB_NAME)
5847 -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR}
5848 - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
5849 - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
5850 - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
5851 -Index: share/mk/bsd.libnames.mk
5852 -===================================================================
5853 ---- share/mk/bsd.libnames.mk.orig
5854 -+++ share/mk/bsd.libnames.mk
5855 -@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.
5856 - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
5857 - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
5858 - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
5859 --LIBFL?= "don't use LIBFL, use LIBL"
5860 -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a
5861 - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
5862 - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
5863 - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
5864 -@@ -77,7 +77,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca
5865 - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
5866 - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
5867 - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
5868 --LIBL?= ${DESTDIR}${LIBDIR}/libl.a
5869 -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a
5870 - LIBLN?= "don't use LIBLN, use LIBL"
5871 - .if ${MK_BIND} != "no"
5872 - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
5873 -Index: share/mk/bsd.man.mk
5874 -===================================================================
5875 ---- share/mk/bsd.man.mk.orig
5876 -+++ share/mk/bsd.man.mk
5877 -@@ -165,9 +165,11 @@ _maninstall: ${MAN}
5878 - .if defined(NO_MANCOMPRESS)
5879 - .if defined(MANFILTER)
5880 - .for __page in ${MAN}
5881 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
5882 - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
5883 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
5884 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5885 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
5886 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
5887 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
5888 - .endif
5889 -@@ -181,11 +183,14 @@ _maninstall: ${MAN}
5890 - esac; \
5891 - page=$$1; shift; sect=$$1; shift; \
5892 - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
5893 -+ ${ECHO} ${INSTALL} -d $${d}; \
5894 -+ ${INSTALL} -d $${d}; \
5895 - ${ECHO} ${MINSTALL} $${page} $${d}; \
5896 - ${MINSTALL} $${page} $${d}; \
5897 - done
5898 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5899 - .for __page in ${MAN}
5900 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
5901 - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
5902 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
5903 - .endfor
5904 -@@ -193,9 +198,11 @@ _maninstall: ${MAN}
5905 - .endif
5906 - .else
5907 - .for __page in ${MAN}
5908 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
5909 - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
5910 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
5911 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
5912 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
5913 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
5914 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
5915 - .endif
5916 -Index: share/mk/bsd.prog.mk
5917 -===================================================================
5918 ---- share/mk/bsd.prog.mk.orig
5919 -+++ share/mk/bsd.prog.mk
5920 -@@ -27,10 +27,6 @@ CTFFLAGS+= -g
5921 - CFLAGS+=${CRUNCH_CFLAGS}
5922 - .endif
5923 -
5924 --.if !defined(DEBUG_FLAGS)
5925 --STRIP?= -s
5926 --.endif
5927 --
5928 - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
5929 - LDFLAGS+= -static
5930 - .endif
5931 -@@ -152,9 +148,11 @@ realinstall: _proginstall
5932 - _proginstall:
5933 - .if defined(PROG)
5934 - .if defined(PROGNAME)
5935 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
5936 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5937 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
5938 - .else
5939 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
5940 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
5941 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
5942 - .endif
5943 -@@ -182,6 +180,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
5944 - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
5945 - _scriptsinstall: _SCRIPTSINS_${script:T}
5946 - _SCRIPTSINS_${script:T}: ${script}
5947 -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
5948 - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
5949 - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
5950 - ${.ALLSRC} \
5951 -Index: share/mk/bsd.sys.mk
5952 -===================================================================
5953 ---- share/mk/bsd.sys.mk.orig
5954 -+++ share/mk/bsd.sys.mk
5955 -@@ -28,9 +28,6 @@ CFLAGS += -std=${CSTD}
5956 - . if defined(WARNS)
5957 - . if ${WARNS} >= 1
5958 - CWARNFLAGS += -Wsystem-headers
5959 --. if !defined(NO_WERROR)
5960 --CWARNFLAGS += -Werror
5961 --. endif
5962 - . endif
5963 - . if ${WARNS} >= 2
5964 - CWARNFLAGS += -Wall -Wno-format-y2k
5965 -@@ -64,9 +61,6 @@ WFORMAT = 1
5966 - . if ${WFORMAT} > 0
5967 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args
5968 - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args
5969 --. if !defined(NO_WERROR)
5970 --CWARNFLAGS += -Werror
5971 --. endif
5972 - . endif
5973 - . endif
5974 - .endif
5975 -Index: share/mk/bsd.links.mk
5976 -===================================================================
5977 ---- share/mk/bsd.links.mk.orig
5978 -+++ share/mk/bsd.links.mk
5979 -@@ -15,6 +15,8 @@ _installlinks:
5980 - t=${DESTDIR}$$1; \
5981 - shift; \
5982 - ${ECHO} $$t -\> $$l; \
5983 -+ d=`dirname $$t`; \
5984 -+ test -d $$d || mkdir $$d; \
5985 - ln -f $$l $$t; \
5986 - done; true
5987 - .endif
5988 -@@ -26,6 +28,8 @@ _installlinks:
5989 - t=${DESTDIR}$$1; \
5990 - shift; \
5991 - ${ECHO} $$t -\> $$l; \
5992 -+ d=`dirname $$t`; \
5993 -+ test -d $$d || mkdir $$d; \
5994 - ln -fs $$l $$t; \
5995 - done; true
5996 - .endif
5997 -Index: share/mk/bsd.own.mk
5998 -===================================================================
5999 ---- share/mk/bsd.own.mk.orig
6000 -+++ share/mk/bsd.own.mk
6001 -@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE}
6002 -
6003 - INCLUDEDIR?= /usr/include
6004 -
6005 --# Common variables
6006 --.if !defined(DEBUG_FLAGS)
6007 --STRIP?= -s
6008 --.endif
6009 --
6010 - COMPRESS_CMD?= gzip -cn
6011 - COMPRESS_EXT?= .gz
6012 -
6013 -Index: share/mk/sys.mk
6014 -===================================================================
6015 ---- share/mk/sys.mk.orig
6016 -+++ share/mk/sys.mk
6017 -@@ -34,11 +34,11 @@ AFLAGS ?=
6018 - CC ?= c89
6019 - CFLAGS ?= -O
6020 - .else
6021 --CC ?= cc
6022 -+CC ?= gcc
6023 - .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips"
6024 --CFLAGS ?= -O -pipe
6025 -+CFLAGS ?= -pipe
6026 - .else
6027 --CFLAGS ?= -O2 -pipe
6028 -+CFLAGS ?= -pipe
6029 - .endif
6030 - .if defined(NO_STRICT_ALIASING)
6031 - CFLAGS += -fno-strict-aliasing
6032 -@@ -64,7 +64,7 @@ CFLAGS += -g
6033 - .endif
6034 - .endif
6035 -
6036 --CXX ?= c++
6037 -+CXX ?= g++
6038 - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
6039 -
6040 - CPP ?= cpp
6041 -@@ -333,12 +333,6 @@ YFLAGS ?= -d
6042 - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
6043 - .endif
6044 -
6045 --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
6046 --__MAKE_CONF?=/etc/make.conf
6047 --.if exists(${__MAKE_CONF})
6048 --.include "${__MAKE_CONF}"
6049 --.endif
6050 --
6051 - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
6052 - SHELL= ${__MAKE_SHELL}
6053 - .SHELL: path=${__MAKE_SHELL}
6054
6055 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch
6056 deleted file mode 100644
6057 index 41c4de4..0000000
6058 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch
6059 +++ /dev/null
6060 @@ -1,121 +0,0 @@
6061 -Index: mk/bsd.incs.mk
6062 -===================================================================
6063 ---- mk/bsd.incs.mk.orig
6064 -+++ mk/bsd.incs.mk
6065 -@@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header}
6066 - ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
6067 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
6068 - ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
6069 -- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
6070 -+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
6071 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
6072 - ${.ALLSRC} \
6073 - ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
6074 -@@ -58,11 +58,11 @@ installincludes: _${group}INS
6075 - _${group}INS: ${_${group}INCS}
6076 - .if defined(${group}NAME)
6077 - ${INSTALL} -d ${DESTDIR}${${group}DIR}
6078 -- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6079 -+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6080 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
6081 - .else
6082 - ${INSTALL} -d ${DESTDIR}${${group}DIR}
6083 -- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6084 -+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6085 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
6086 - .endif
6087 - .endif
6088 -Index: mk/bsd.lib.mk
6089 -===================================================================
6090 ---- mk/bsd.lib.mk.orig
6091 -+++ mk/bsd.lib.mk
6092 -@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a
6093 - lib${LIB}.a: ${OBJS} ${STATICOBJS}
6094 - @${ECHO} building static ${LIB} library
6095 - @rm -f ${.TARGET}
6096 --.if !defined(NM)
6097 -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
6098 --.else
6099 -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
6100 --.endif
6101 -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
6102 - ${RANLIB} ${.TARGET}
6103 - .endif
6104 -
6105 -@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
6106 - lib${LIB}_p.a: ${POBJS}
6107 - @${ECHO} building profiled ${LIB} library
6108 - @rm -f ${.TARGET}
6109 --.if !defined(NM)
6110 -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
6111 --.else
6112 -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
6113 --.endif
6114 -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
6115 - ${RANLIB} ${.TARGET}
6116 - .endif
6117 -
6118 -@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS}
6119 - .if defined(SHLIB_LINK)
6120 - @ln -fs ${.TARGET} ${SHLIB_LINK}
6121 - .endif
6122 --.if !defined(NM)
6123 -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
6124 -- -o ${.TARGET} -Wl,-soname,${SONAME} \
6125 -- `lorder ${SOBJS} | tsort -q` ${LDADD}
6126 --.else
6127 - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \
6128 - -o ${.TARGET} -Wl,-soname,${SONAME} \
6129 -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
6130 --.endif
6131 -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
6132 - .if defined(CTFMERGE)
6133 - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
6134 - .endif
6135 -@@ -251,13 +237,6 @@ _EXTRADEPEND:
6136 -
6137 - .if !target(install)
6138 -
6139 --.if defined(PRECIOUSLIB)
6140 --.if !defined(NO_FSCHG)
6141 --SHLINSTALLFLAGS+= -fschg
6142 --.endif
6143 --SHLINSTALLFLAGS+= -S
6144 --.endif
6145 --
6146 - _INSTALLFLAGS:= ${INSTALLFLAGS}
6147 - .for ie in ${INSTALLFLAGS_EDIT}
6148 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
6149 -@@ -273,12 +252,12 @@ realinstall: _libinstall
6150 - _libinstall:
6151 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
6152 - ${INSTALL} -d ${DESTDIR}${LIBDIR}
6153 -- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6154 -+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6155 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
6156 - .endif
6157 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
6158 - ${INSTALL} -d ${DESTDIR}${LIBDIR}
6159 -- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6160 -+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6161 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
6162 - .endif
6163 - .if defined(SHLIB_NAME)
6164 -Index: mk/bsd.prog.mk
6165 -===================================================================
6166 ---- mk/bsd.prog.mk.orig
6167 -+++ mk/bsd.prog.mk
6168 -@@ -130,13 +130,6 @@ _EXTRADEPEND:
6169 -
6170 - .if !target(install)
6171 -
6172 --.if defined(PRECIOUSPROG)
6173 --.if !defined(NO_FSCHG)
6174 --INSTALLFLAGS+= -fschg
6175 --.endif
6176 --INSTALLFLAGS+= -S
6177 --.endif
6178 --
6179 - _INSTALLFLAGS:= ${INSTALLFLAGS}
6180 - .for ie in ${INSTALLFLAGS_EDIT}
6181 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
6182
6183 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
6184 deleted file mode 100644
6185 index 598d0b9..0000000
6186 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
6187 +++ /dev/null
6188 @@ -1,326 +0,0 @@
6189 -diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
6190 ---- share.orig/mk/bsd.doc.mk 2012-07-12 13:25:44.000000000 +0900
6191 -+++ share/mk/bsd.doc.mk 2012-07-16 00:01:55.000000000 +0900
6192 -@@ -135,10 +135,12 @@
6193 - realinstall:
6194 - .for _dev in ${PRINTERDEVICE:Mhtml}
6195 - cd ${SRCDIR}; \
6196 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
6197 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
6198 - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
6199 - .endfor
6200 - .for _dev in ${PRINTERDEVICE:Nhtml}
6201 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
6202 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
6203 - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
6204 - .endfor
6205 -diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
6206 ---- share.orig/mk/bsd.files.mk 2012-07-12 13:25:44.000000000 +0900
6207 -+++ share/mk/bsd.files.mk 2012-07-16 00:01:55.000000000 +0900
6208 -@@ -39,6 +39,7 @@
6209 - .endif
6210 - installfiles: _${group}INS_${file:T}
6211 - _${group}INS_${file:T}: ${file}
6212 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
6213 - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
6214 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
6215 - ${.ALLSRC} \
6216 -@@ -51,10 +52,12 @@
6217 - installfiles: _${group}INS
6218 - _${group}INS: ${_${group}FILES}
6219 - .if defined(${group}NAME)
6220 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
6221 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
6222 - -m ${${group}MODE} ${.ALLSRC} \
6223 - ${DESTDIR}${${group}DIR}/${${group}NAME}
6224 - .else
6225 -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}
6226 - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
6227 - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
6228 - .endif
6229 -diff -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
6230 ---- share.orig/mk/bsd.incs.mk 2012-07-12 13:25:44.000000000 +0900
6231 -+++ share/mk/bsd.incs.mk 2012-07-16 00:01:55.000000000 +0900
6232 -@@ -41,6 +41,9 @@
6233 - .endif
6234 - installincludes: _${group}INS_${header:T}
6235 - _${group}INS_${header:T}: ${header}
6236 -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
6237 -+ -g ${${group}GRP_${.ALLSRC:T}} \
6238 -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
6239 - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
6240 - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
6241 - ${.ALLSRC} \
6242 -@@ -53,9 +56,13 @@
6243 - installincludes: _${group}INS
6244 - _${group}INS: ${_${group}INCS}
6245 - .if defined(${group}NAME)
6246 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
6247 -+ ${DESTDIR}${${group}DIR}
6248 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6249 - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
6250 - .else
6251 -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
6252 -+ ${DESTDIR}${${group}DIR}
6253 - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
6254 - ${.ALLSRC} ${DESTDIR}${${group}DIR}
6255 - .endif
6256 -diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
6257 ---- share.orig/mk/bsd.info.mk 2012-07-12 13:25:44.000000000 +0900
6258 -+++ share/mk/bsd.info.mk 2012-07-16 00:01:55.000000000 +0900
6259 -@@ -83,6 +83,7 @@
6260 - TEX?= tex
6261 - DVIPS?= dvips
6262 - DVIPS2ASCII?= dvips2ascii
6263 -+INSTALL?= install
6264 -
6265 - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
6266 -
6267 -@@ -144,15 +145,17 @@
6268 - INSTALLINFODIRS+= ${x:S/$/-install/}
6269 - ${x:S/$/-install/}:
6270 - .if !empty(.MAKEFLAGS:M-j)
6271 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
6272 - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
6273 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
6274 -- --defsection=${INFOSECTION} \
6275 -- --defentry=${INFOENTRY_${x}} \
6276 -+ --section=${INFOSECTION} \
6277 -+ --entry=${INFOENTRY_${x}} \
6278 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
6279 - .else
6280 -+ ${INSTALL} -d ${DESTDIR}${INFODIR}
6281 - ${INSTALLINFO} ${INSTALLINFOFLAGS} \
6282 -- --defsection=${INFOSECTION} \
6283 -- --defentry=${INFOENTRY_${x}} \
6284 -+ --section=${INFOSECTION} \
6285 -+ --entry=${INFOENTRY_${x}} \
6286 - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
6287 - .endif
6288 - .endfor
6289 -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
6290 ---- share.orig/mk/bsd.lib.mk 2012-07-12 13:25:44.000000000 +0900
6291 -+++ share/mk/bsd.lib.mk 2012-07-16 00:01:55.000000000 +0900
6292 -@@ -46,10 +46,6 @@
6293 - .endif
6294 - .endif
6295 -
6296 --.if !defined(DEBUG_FLAGS)
6297 --STRIP?= -s
6298 --.endif
6299 --
6300 - .include <bsd.libnames.mk>
6301 -
6302 - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
6303 -@@ -284,14 +280,17 @@
6304 - .ORDER: beforeinstall _libinstall
6305 - _libinstall:
6306 - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
6307 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
6308 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6309 - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
6310 - .endif
6311 - .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
6312 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
6313 - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6314 - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
6315 - .endif
6316 - .if defined(SHLIB_NAME)
6317 -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR}
6318 - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6319 - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
6320 - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
6321 -@@ -329,10 +328,12 @@
6322 - .endif # SHLIB_LINK
6323 - .endif # SHIB_NAME
6324 - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
6325 -+ ${INSTALL} -d ${DESTDIR}${LIBDIR}
6326 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6327 - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
6328 - .endif
6329 - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
6330 -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
6331 - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
6332 - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
6333 - .endif
6334 -diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
6335 ---- share.orig/mk/bsd.libnames.mk 2012-07-12 13:25:44.000000000 +0900
6336 -+++ share/mk/bsd.libnames.mk 2012-07-16 00:01:55.000000000 +0900
6337 -@@ -48,7 +48,7 @@
6338 - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
6339 - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
6340 - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
6341 --LIBFL?= "don't use LIBFL, use LIBL"
6342 -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a
6343 - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
6344 - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a
6345 - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a
6346 -@@ -79,7 +79,7 @@
6347 - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a
6348 - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a
6349 - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a
6350 --LIBL?= ${DESTDIR}${LIBDIR}/libl.a
6351 -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a
6352 - LIBLN?= "don't use LIBLN, use LIBL"
6353 - .if ${MK_BIND} != "no"
6354 - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a
6355 -diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
6356 ---- share.orig/mk/bsd.links.mk 2012-07-12 13:25:44.000000000 +0900
6357 -+++ share/mk/bsd.links.mk 2012-07-16 00:01:55.000000000 +0900
6358 -@@ -15,6 +15,8 @@
6359 - t=${DESTDIR}$$1; \
6360 - shift; \
6361 - ${ECHO} $$t -\> $$l; \
6362 -+ d=`dirname $$t`; \
6363 -+ test -d $$d || mkdir $$d; \
6364 - ln -f $$l $$t; \
6365 - done; true
6366 - .endif
6367 -@@ -26,6 +28,8 @@
6368 - t=${DESTDIR}$$1; \
6369 - shift; \
6370 - ${ECHO} $$t -\> $$l; \
6371 -+ d=`dirname $$t`; \
6372 -+ test -d $$d || mkdir $$d; \
6373 - ln -fs $$l $$t; \
6374 - done; true
6375 - .endif
6376 -diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
6377 ---- share.orig/mk/bsd.man.mk 2012-07-12 13:25:44.000000000 +0900
6378 -+++ share/mk/bsd.man.mk 2012-07-16 00:01:55.000000000 +0900
6379 -@@ -165,9 +165,11 @@
6380 - .if defined(NO_MANCOMPRESS)
6381 - .if defined(MANFILTER)
6382 - .for __page in ${MAN}
6383 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
6384 - ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
6385 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
6386 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
6387 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
6388 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
6389 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
6390 - .endif
6391 -@@ -181,11 +183,14 @@
6392 - esac; \
6393 - page=$$1; shift; sect=$$1; shift; \
6394 - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
6395 -+ ${ECHO} ${INSTALL} -d $${d}; \
6396 -+ ${INSTALL} -d $${d}; \
6397 - ${ECHO} ${MINSTALL} $${page} $${d}; \
6398 - ${MINSTALL} $${page} $${d}; \
6399 - done
6400 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
6401 - .for __page in ${MAN}
6402 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
6403 - ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
6404 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
6405 - .endfor
6406 -@@ -193,9 +198,11 @@
6407 - .endif
6408 - .else
6409 - .for __page in ${MAN}
6410 -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
6411 - ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
6412 - ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
6413 - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
6414 -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
6415 - ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
6416 - ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
6417 - .endif
6418 -diff -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
6419 ---- share.orig/mk/bsd.nls.mk 2012-07-12 13:25:44.000000000 +0900
6420 -+++ share/mk/bsd.nls.mk 2012-07-16 00:01:55.000000000 +0900
6421 -@@ -62,7 +62,8 @@
6422 - # installation rules
6423 - #
6424 - .for file in ${NLS}
6425 --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
6426 -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
6427 -+NLSNAME_${file:T}= ${NLSNAME}.cat
6428 - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
6429 - NLSLINKS+= ${file:R}
6430 - .endif
6431 -diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
6432 ---- share.orig/mk/bsd.own.mk 2012-07-12 13:25:44.000000000 +0900
6433 -+++ share/mk/bsd.own.mk 2012-07-16 00:01:55.000000000 +0900
6434 -@@ -182,9 +182,6 @@
6435 - INCLUDEDIR?= /usr/include
6436 -
6437 - # Common variables
6438 --.if !defined(DEBUG_FLAGS)
6439 --STRIP?= -s
6440 --.endif
6441 -
6442 - COMPRESS_CMD?= gzip -cn
6443 - COMPRESS_EXT?= .gz
6444 -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
6445 ---- share.orig/mk/bsd.prog.mk 2012-07-12 13:25:44.000000000 +0900
6446 -+++ share/mk/bsd.prog.mk 2012-07-16 00:01:55.000000000 +0900
6447 -@@ -33,10 +33,6 @@
6448 - CFLAGS+=${CRUNCH_CFLAGS}
6449 - .endif
6450 -
6451 --.if !defined(DEBUG_FLAGS)
6452 --STRIP?= -s
6453 --.endif
6454 --
6455 - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
6456 - LDFLAGS+= -static
6457 - .endif
6458 -@@ -155,6 +151,7 @@
6459 - .ORDER: beforeinstall _proginstall
6460 - _proginstall:
6461 - .if defined(PROG)
6462 -+ ${INSTALL} -d ${DESTDIR}${BINDIR}
6463 - .if defined(PROGNAME)
6464 - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
6465 - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
6466 -@@ -186,6 +183,7 @@
6467 - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
6468 - _scriptsinstall: _SCRIPTSINS_${script:T}
6469 - _SCRIPTSINS_${script:T}: ${script}
6470 -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
6471 - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
6472 - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
6473 - ${.ALLSRC} \
6474 -diff -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
6475 ---- share.orig/mk/bsd.sys.mk 2012-07-12 13:25:44.000000000 +0900
6476 -+++ share/mk/bsd.sys.mk 2012-07-16 00:04:14.000000000 +0900
6477 -@@ -28,10 +28,6 @@
6478 - .if defined(WARNS)
6479 - .if ${WARNS} >= 1
6480 - CWARNFLAGS+= -Wsystem-headers
6481 --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
6482 -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
6483 --CWARNFLAGS+= -Werror
6484 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
6485 - .endif # WARNS >= 1
6486 - .if ${WARNS} >= 2
6487 - CWARNFLAGS+= -Wall -Wno-format-y2k
6488 -@@ -95,10 +91,6 @@
6489 - CWARNFLAGS+= -Wno-format-nonliteral
6490 - .endif # WARNS <= 3
6491 - .endif # CLANG
6492 --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
6493 -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
6494 --CWARNFLAGS+= -Werror
6495 --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
6496 - .endif # WFORMAT > 0
6497 - .endif # WFORMAT
6498 - .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
6499 -diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
6500 ---- share.orig/mk/sys.mk 2012-07-12 13:25:44.000000000 +0900
6501 -+++ share/mk/sys.mk 2012-07-16 00:01:55.000000000 +0900
6502 -@@ -349,12 +349,6 @@
6503 - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
6504 - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
6505 -
6506 --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
6507 --__MAKE_CONF?=/etc/make.conf
6508 --.if exists(${__MAKE_CONF})
6509 --.include "${__MAKE_CONF}"
6510 --.endif
6511 --
6512 - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
6513 - SHELL= ${__MAKE_SHELL}
6514 - .SHELL: path=${__MAKE_SHELL}
6515
6516 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
6517 deleted file mode 100644
6518 index f986ed9..0000000
6519 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
6520 +++ /dev/null
6521 @@ -1,77 +0,0 @@
6522 -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
6523 ---- share.orig/mk/bsd.lib.mk 2012-07-16 02:40:07.000000000 +0900
6524 -+++ share/mk/bsd.lib.mk 2012-07-16 02:41:40.000000000 +0900
6525 -@@ -155,11 +155,7 @@
6526 - lib${LIB}.a: ${OBJS} ${STATICOBJS}
6527 - @${ECHO} building static ${LIB} library
6528 - @rm -f ${.TARGET}
6529 --.if !defined(NM)
6530 -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
6531 --.else
6532 -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
6533 --.endif
6534 -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
6535 - ${RANLIB} ${.TARGET}
6536 - .endif
6537 -
6538 -@@ -172,11 +168,7 @@
6539 - lib${LIB}_p.a: ${POBJS}
6540 - @${ECHO} building profiled ${LIB} library
6541 - @rm -f ${.TARGET}
6542 --.if !defined(NM)
6543 -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
6544 --.else
6545 -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
6546 --.endif
6547 -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
6548 - ${RANLIB} ${.TARGET}
6549 - .endif
6550 -
6551 -@@ -203,15 +195,9 @@
6552 - .if defined(SHLIB_LINK)
6553 - @ln -fs ${.TARGET} ${SHLIB_LINK}
6554 - .endif
6555 --.if !defined(NM)
6556 - @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
6557 - -o ${.TARGET} -Wl,-soname,${SONAME} \
6558 -- `lorder ${SOBJS} | tsort -q` ${LDADD}
6559 --.else
6560 -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
6561 -- -o ${.TARGET} -Wl,-soname,${SONAME} \
6562 -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
6563 --.endif
6564 -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
6565 - @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
6566 - (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
6567 - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
6568 -@@ -259,13 +245,6 @@
6569 -
6570 - .if !target(install)
6571 -
6572 --.if defined(PRECIOUSLIB)
6573 --.if !defined(NO_FSCHG)
6574 --SHLINSTALLFLAGS+= -fschg
6575 --.endif
6576 --SHLINSTALLFLAGS+= -S
6577 --.endif
6578 --
6579 - _INSTALLFLAGS:= ${INSTALLFLAGS}
6580 - .for ie in ${INSTALLFLAGS_EDIT}
6581 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
6582 -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
6583 ---- share.orig/mk/bsd.prog.mk 2012-07-16 02:40:07.000000000 +0900
6584 -+++ share/mk/bsd.prog.mk 2012-07-16 02:40:24.000000000 +0900
6585 -@@ -134,13 +134,6 @@
6586 -
6587 - .if !target(install)
6588 -
6589 --.if defined(PRECIOUSPROG)
6590 --.if !defined(NO_FSCHG)
6591 --INSTALLFLAGS+= -fschg
6592 --.endif
6593 --INSTALLFLAGS+= -S
6594 --.endif
6595 --
6596 - _INSTALLFLAGS:= ${INSTALLFLAGS}
6597 - .for ie in ${INSTALLFLAGS_EDIT}
6598 - _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
6599
6600 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
6601 deleted file mode 100644
6602 index 8eb80c3..0000000
6603 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
6604 +++ /dev/null
6605 @@ -1,28 +0,0 @@
6606 -https://bugs.gentoo.org/show_bug.cgi?id=511698
6607 -
6608 -diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
6609 -index e438633..de4a05b 100644
6610 ---- a/share/mk/bsd.sys.mk
6611 -+++ b/share/mk/bsd.sys.mk
6612 -@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
6613 - CFLAGS+= -Qunused-arguments
6614 - .endif # CLANG
6615 -
6616 --.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
6617 -- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
6618 -+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
6619 -+ && ${MACHINE_CPUARCH} != "mips"
6620 -+.if ${MK_SSP} != "no"
6621 - # Don't use -Wstack-protector as it breaks world with -Werror.
6622 - SSP_CFLAGS?= -fstack-protector
6623 -+.else
6624 -+# gcc-4.9, -fstack-protector-strong is enabled by default.
6625 -+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
6626 -+SSP_CFLAGS= -fno-stack-protector
6627 -+.endif #SSP
6628 - CFLAGS+= ${SSP_CFLAGS}
6629 --.endif # SSP && !IA64 && !ARM && !MIPS
6630 -+.endif # !IA64 && !ARM && !MIPS
6631 -
6632 - # Allow user-specified additional warning flags
6633 - CFLAGS+= ${CWARNFLAGS}
6634
6635 diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_rc3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_rc3.ebuild
6636 deleted file mode 100644
6637 index 571e0f8..0000000
6638 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3_rc3.ebuild
6639 +++ /dev/null
6640 @@ -1,42 +0,0 @@
6641 -# Copyright 1999-2016 Gentoo Foundation
6642 -# Distributed under the terms of the GNU General Public License v2
6643 -# $Id$
6644 -
6645 -EAPI=5
6646 -
6647 -inherit bsdmk freebsd
6648 -
6649 -DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
6650 -SLOT="0"
6651 -
6652 -IUSE="userland_GNU"
6653 -
6654 -if [[ ${PV} != *9999* ]]; then
6655 - KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
6656 -fi
6657 -
6658 -EXTRACTONLY="share/"
6659 -
6660 -RDEPEND=""
6661 -DEPEND=""
6662 -
6663 -RESTRICT="strip"
6664 -
6665 -S="${WORKDIR}/share/mk"
6666 -
6667 -src_prepare() {
6668 - epatch "${FILESDIR}/${PN}-10.3-gentoo.patch"
6669 - epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
6670 - use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch"
6671 -}
6672 -
6673 -src_compile() { :; }
6674 -
6675 -src_install() {
6676 - if [[ ${CHOST} != *-freebsd* ]]; then
6677 - insinto /usr/share/mk/freebsd
6678 - else
6679 - insinto /usr/share/mk
6680 - fi
6681 - doins *.mk *.awk
6682 -}
6683
6684 diff --git a/sys-freebsd/freebsd-mk-defs/metadata.xml b/sys-freebsd/freebsd-mk-defs/metadata.xml
6685 deleted file mode 100644
6686 index a00f3ae..0000000
6687 --- a/sys-freebsd/freebsd-mk-defs/metadata.xml
6688 +++ /dev/null
6689 @@ -1,8 +0,0 @@
6690 -<?xml version="1.0" encoding="UTF-8"?>
6691 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
6692 -<pkgmetadata>
6693 -<maintainer type="project">
6694 - <email>bsd@g.o</email>
6695 - <name>BSD Project</name>
6696 -</maintainer>
6697 -</pkgmetadata>
6698
6699 diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
6700 deleted file mode 100644
6701 index c6bdec5..0000000
6702 --- a/sys-freebsd/freebsd-pam-modules/Manifest
6703 +++ /dev/null
6704 @@ -1,6 +0,0 @@
6705 -AUX README.pamd 2846 SHA256 cc15a45d85590c1c1267a6083048e410b0175d863f1685b51e26745672cd1b44 SHA512 155b5ba68ffcdff57b9bc5822eb3affd01cba9dcc5ae8095c91aa5048d61f7b550cb8f4c7a0b508055f4300a1a6295770f6075cd6c0df84ce6782088c84c7f6a WHIRLPOOL 080a3c562a81986289992a8a43a8f41a6e4161ff5ff72d96ca6b76ba3182e94a949944fca1342acdf75ac4bd0e03940cbfba22390d5da7c4d150a880ace2f201
6706 -AUX freebsd-pam-modules-6.0-gentoo.patch 701 SHA256 8346d95aa5b4f283fedf4387ebb85a61f5f10fac38dc45bdea8c2c345fdc633d SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995 WHIRLPOOL 2b02611fce484145fe62468826bbdb8f1dedfb1c4a7a14b01234c99f13daefe9597d08a23e0836f5804f92c26cc1b950180f7fcbd1698af360b23e06c143621c
6707 -AUX freebsd-pam-modules-9.0-gentoo.patch 622 SHA256 b397d5d646712c4a63606d94c45d25551344872d77d7b6b5f646403a2b09f7fb SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0 WHIRLPOOL 168b0ba47e9a326ff1db9cfe46724c83a45d744df0fa737599894ef1574b0e199c46e7626b16f5cc83cd4886fd79320c5f92e4c2b37801ef3604ffd4ec1b2de7
6708 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
6709 -EBUILD freebsd-pam-modules-10.3_rc3.ebuild 1106 SHA256 2d715cce8bad14969a393e21b4bf5bce6d73a360ab0e245df59ec4435976ff17 SHA512 f4e8d20cf11f79a98bb55dea74807afff87498cb0934f6eb688d30c20ccdc3a243d2fa935bbbf359cb6179b1c8dcfe2cce6cf05fd9e933e917cf7a50ba781789 WHIRLPOOL 391b071ad5ad7366c580ff7cf3f30b4de5b0f69387eda6624db35af0ec241c72cf09535b32c83613f74ee85811f6d548f23eb75930e1a4205599485f44c568a7
6710 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
6711
6712 diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd
6713 deleted file mode 100644
6714 index 10da6cc..0000000
6715 --- a/sys-freebsd/freebsd-pam-modules/files/README.pamd
6716 +++ /dev/null
6717 @@ -1,63 +0,0 @@
6718 -/etc/pam.d
6719 -
6720 -This directory contains configuration files for the Pluggable
6721 -Authentication Modules (PAM) library.
6722 -
6723 -Each file details the module chain for a single service, and must be
6724 -named after that service. If no configuration file is found for a
6725 -particular service, the /etc/pam.d/other is used instead. If that
6726 -file does not exist, /etc/pam.conf is searched for entries matching
6727 -the specified service or, failing that, the "other" service.
6728 -
6729 -See the pam(8) manual page for an explanation of the workings of the
6730 -PAM library and descriptions of the various files and modules. Below
6731 -is a summary of the format for the pam.conf and /etc/pam.d/* files.
6732 -
6733 -Configuration lines take the following form:
6734 -
6735 -module-type control-flag module-path arguments
6736 -
6737 -Comments are introduced with a hash mark ('#'). Blank lines and lines
6738 -consisting entirely of comments are ignored.
6739 -
6740 -The meanings of the different fields are as follows:
6741 -
6742 - module-type:
6743 - auth: prompt for a password to authenticate that the user is
6744 - who they say they are, and set any credentials.
6745 - account: non-authentication based authorization, based on time,
6746 - resources, etc.
6747 - session: housekeeping before and/or after login.
6748 - password: update authentication tokens.
6749 -
6750 - control-flag: How libpam handles success or failure of the module.
6751 - required: success is required; on failure all remaining
6752 - modules are run, but the request will be denied.
6753 - requisite: success is required, and on failure no remaining
6754 - modules are run.
6755 - sufficient: success is sufficient, and if no previous required
6756 - module failed, no remaining modules are run.
6757 - binding: success is sufficient; on failure all remaining
6758 - modules are run, but the request will be denied.
6759 - optional: ignored unless the other modules return PAM_IGNORE.
6760 -
6761 - arguments: Module-specific options, plus some generic ones:
6762 - debug: syslog debug info.
6763 - no_warn: return no warning messages to the application.
6764 - Remove this to feed back to the user the
6765 - reason(s) they are being rejected.
6766 - use_first_pass: try authentication using password from the
6767 - preceding auth module.
6768 - try_first_pass: first try authentication using password from
6769 - the preceding auth module, and if that fails
6770 - prompt for a new password.
6771 - use_mapped_pass: convert cleartext password to a crypto key.
6772 - expose_account: allow printing more info about the user when
6773 - prompting.
6774 -
6775 -Note that having a "sufficient" module as the last entry for a
6776 -particular service and module type may result in surprising behaviour.
6777 -To get the intended semantics, add a "required" entry listing the
6778 -pam_deny module at the end of the chain.
6779 -
6780 -$Id$
6781
6782 diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
6783 deleted file mode 100644
6784 index ce1a7fb..0000000
6785 --- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
6786 +++ /dev/null
6787 @@ -1,24 +0,0 @@
6788 -Index: fbsd-6.0/lib/libpam/modules/Makefile.inc
6789 -===================================================================
6790 ---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc
6791 -+++ fbsd-6.0/lib/libpam/modules/Makefile.inc
6792 -@@ -5,18 +5,10 @@ PAMDIR= ${.CURDIR}/../../../../contrib/
6793 - NO_INSTALLLIB=
6794 - NO_PROFILE=
6795 -
6796 --CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
6797 -+CFLAGS+= -I${.CURDIR}/../../libpam
6798 - WARNS?= 4
6799 -
6800 --# This is nasty.
6801 --# For the static case, libpam.a depends on the modules.
6802 --# For the dynamic case, the modules depend on libpam.so.N
6803 --.if defined(_NO_LIBPAM_SO_YET)
6804 --NO_PIC=
6805 --.else
6806 - SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
6807 --DPADD+= ${LIBPAM}
6808 - LDADD+= -lpam
6809 --.endif
6810 -
6811 - .include "../Makefile.inc"
6812
6813 diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch
6814 deleted file mode 100644
6815 index aa08d40..0000000
6816 --- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-9.0-gentoo.patch
6817 +++ /dev/null
6818 @@ -1,22 +0,0 @@
6819 ---- lib/libpam/modules/Makefile.inc.old 2011-11-02 20:46:56.000000000 +0000
6820 -+++ lib/libpam/modules/Makefile.inc 2011-11-02 20:47:16.000000000 +0000
6821 -@@ -5,18 +5,10 @@
6822 - NO_INSTALLLIB=
6823 - NO_PROFILE=
6824 -
6825 --CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
6826 -+CFLAGS+= -I${.CURDIR}/../../libpam
6827 -
6828 --# This is nasty.
6829 --# For the static case, libpam.a depends on the modules.
6830 --# For the dynamic case, the modules depend on libpam.so.N
6831 --.if defined(_NO_LIBPAM_SO_YET)
6832 --NO_PIC=
6833 --.else
6834 - SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
6835 --DPADD+= ${LIBPAM}
6836 - LDADD+= -lpam
6837 --.endif
6838 -
6839 - .c.o:
6840 - ${CC} ${CFLAGS} -DOPENPAM_STATIC_MODULES -c ${.IMPSRC}
6841
6842 diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_rc3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_rc3.ebuild
6843 deleted file mode 100644
6844 index 62a7b3e..0000000
6845 --- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3_rc3.ebuild
6846 +++ /dev/null
6847 @@ -1,48 +0,0 @@
6848 -# Copyright 1999-2016 Gentoo Foundation
6849 -# Distributed under the terms of the GNU General Public License v2
6850 -# $Id$
6851 -
6852 -EAPI=5
6853 -
6854 -inherit bsdmk freebsd multilib pam
6855 -
6856 -DESCRIPTION="FreeBSD's PAM authentication modules"
6857 -SLOT="0"
6858 -
6859 -IUSE="kerberos nis"
6860 -
6861 -if [[ ${PV} != *9999* ]]; then
6862 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
6863 -fi
6864 -
6865 -EXTRACTONLY="lib/"
6866 -
6867 -RDEPEND=">=sys-auth/openpam-20050201-r1
6868 - kerberos? ( dev-libs/openssl:0=
6869 - virtual/krb5 )"
6870 -DEPEND="${RDEPEND}
6871 - =sys-freebsd/freebsd-mk-defs-${RV}*
6872 - =sys-freebsd/freebsd-sources-${RV}*"
6873 -
6874 -S=${WORKDIR}/lib/libpam/modules
6875 -
6876 -PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
6877 -
6878 -pkg_setup() {
6879 - # Avoid installing pam_ssh as that has its own ebuild.
6880 - mymakeopts="${mymakeopts} WITHOUT_OPENSSH= "
6881 - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= "
6882 - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
6883 -}
6884 -
6885 -src_prepare() {
6886 - for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
6887 - sed -i -e "s:${module}::" "${S}"/modules.inc || die
6888 - done
6889 -}
6890 -
6891 -src_install() {
6892 - mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
6893 -
6894 - dodoc "${FILESDIR}/README.pamd"
6895 -}
6896
6897 diff --git a/sys-freebsd/freebsd-pam-modules/metadata.xml b/sys-freebsd/freebsd-pam-modules/metadata.xml
6898 deleted file mode 100644
6899 index a00f3ae..0000000
6900 --- a/sys-freebsd/freebsd-pam-modules/metadata.xml
6901 +++ /dev/null
6902 @@ -1,8 +0,0 @@
6903 -<?xml version="1.0" encoding="UTF-8"?>
6904 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
6905 -<pkgmetadata>
6906 -<maintainer type="project">
6907 - <email>bsd@g.o</email>
6908 - <name>BSD Project</name>
6909 -</maintainer>
6910 -</pkgmetadata>
6911
6912 diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
6913 deleted file mode 100644
6914 index 257bd92..0000000
6915 --- a/sys-freebsd/freebsd-pf/Manifest
6916 +++ /dev/null
6917 @@ -1,14 +0,0 @@
6918 -AUX freebsd-pf-10.0-libevent.patch 403 SHA256 b3de99dbc75a116ae46fec1aeaab0bfcc7448a87b963e9defbb94238bb79bee0 SHA512 1ec0d97afd9392c852071d6df704b05a0ca3146a20a3daa4ac541291a2a30c7c8752330381e1f3ae3d874640dd2f04d4b94c5b4adf985a3fbf8890da6a7f9b0b WHIRLPOOL 9cfa4b4b751737b224c43eb75a6eb27ba2e02f2c99829ce8327956d5b0aa381afce7cb86455bc97792ffbe66d8919959865f0c4a5ba44302391c8ea91c7bc065
6919 -AUX freebsd-pf-10.0-pflogd.patch 349 SHA256 630346adc5d39d32112ebb299391b728a0e22b517376fa5f1d872593186f3800 SHA512 d4a605bb1a31837bfb0fa5d20fbac5ed449e4d579c5ab6025da2988ff101c31df7c67e23f9863f2f0b98a76788123e06402d8790d1c9baafd5b732dff0678644 WHIRLPOOL 388b3e724a6971e17867fc4749ea8769d56327a07fbba318f6e4d052ac049f78cc673911cca28dc37dbc3ca93f47eee061c07c0854101cefe6919b373746ebe1
6920 -AUX freebsd-pf-7.0-libevent.patch 331 SHA256 ea5db9308712447cee285d2ac479d95399f1c0948afbbaf6598ad362e262c716 SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61 WHIRLPOOL 2f84a4ae54fa3dd53610db31af88c064b6df82460516f2024176d4acd5dd6c702c5adee98473a6a05ed701b07b0404c90dae490acd11483a48206ce542b21a96
6921 -AUX freebsd-pf-7.0-pcap_pollution.patch 437 SHA256 65eb1dd0c9084981faa80dfc74140deb431223ae14cf47b1ee0b83fc0fa2bfef SHA512 e08df63ac57747cbd42e32b6e61e08e92b0f7af333508e32717194e9c0d0a1b0f23bf4ed9f0b745f804c164b2c950bf92d2abc22ece58113b7ccaee5e86ea3d9 WHIRLPOOL 735d498ba1765df65acb2db018c0f058da06dd5bef27eca3137ed1409e959bd637c6040f32fe40d022d6fba98272c496765e84319e1f1f5857618ac66744c872
6922 -AUX freebsd-pf-9.0-bpf.patch 309 SHA256 9adf0af94c2cf2f61c1e9f2ab071c8628b3845778f7f61abfe52feb347a615a7 SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039 WHIRLPOOL 141a2ad5dbc1e199dc669aef995fcd9b4c71a6a0da55c11645adbef073755a8d661ae4e653d377c42ab000913599ba7f90aa611059496996a2f57282eaf07f8a
6923 -AUX freebsd-pf-9.0-getline.patch 1159 SHA256 c56fa01870e2ea7ea187b14ef0d13801782c3f479f3e7fe31ac8fba2917969aa SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb WHIRLPOOL 4ab2c2598b79a4066d013bc056f6e3977501cdce959568b7f14360b8b34f3622654a784291c9ba979390fb71f6b76672c26c0242ee9c1df09aadbe96e3e4156e
6924 -AUX freebsd-pf-9.0-libevent.patch 384 SHA256 e1331cdc64d5d135f3cf33bea70031cba7813abc39778f860f06a161c395f799 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8 WHIRLPOOL ac352886754590178c550aa755a2380e493cccb66815f2875e03427d5d644394de5f711b6d01625a49fafabb4df1e63bff89ea19f47f99b1f6252ff7ca248ab2
6925 -AUX freebsd-pf-9.0-pcap_pollution.patch 450 SHA256 d6ec6b1952e22f621b33d85956837bae26fd06a79cd3daf5e073b889d4650276 SHA512 262d23f74449f75d628dcda09a7c7e0d501b61899c0a2a1ca71179989803f5c5f70fd4f8908f06ce998aca994d54b43efe03578892ff121c0a27e7fa36e4f1dd WHIRLPOOL 9dd4be7cf9741a8cbb0395346a79656233532b10762551d04c85a36637bd95e5d1aed0024ba1ee4259d41d1b5d26777524353787d3c13ad12e4dfb21f12955cf
6926 -AUX freebsd-pf-9.0-pflogd.patch 332 SHA256 fc832fdfa406603a2cb185b8f0f746b13f7673742578913ba635849e1fd778f6 SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073 WHIRLPOOL b90b5e454e96cc6f243e99358b78d45b6a13a46810a3683d837f03721052e7b4fc3f8733ac2c96cabed204435a9be93a0652da5311f6552ece294031b0b663df
6927 -AUX pf.confd 274 SHA256 dba0e34d34ef583b3a06499eae5f5dd9a73cacdb238915060735e24bd6c2c8eb SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5 WHIRLPOOL fa87094a2339af4fc117840741e6460331c8de1d7ff656394701d58d0f362243788b1d6e650ee2cea34e9e4ad9c19f97996de8d01927808875384af2925a8adc
6928 -AUX pf.initd 809 SHA256 d22b84e3400582bfcc1363871f21911617ae61502e2fc2ed7e86cf50505b530f SHA512 9c5135e1f86caccabf7f0440a5747a17e488f60891a822024b1908945781e0957f6ec61cae46f7d0a09aa90815e4e7dc58e064b5137b3f8207e3e5a90fd30118 WHIRLPOOL 4716aeb605e14f78010f3a68dd98dd9c217f29e012d14ed6e3a951ba973fccc9ca7314f6588ab5d4dbd8ee635a7eda47eefd484215dd5282d456ea7b031ca9f2
6929 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
6930 -EBUILD freebsd-pf-10.3_rc3.ebuild 1593 SHA256 8702bb90a54501cfe4b5118f880d221a2e71417ae39cbea1701c97413580cfd9 SHA512 babb6b940ee1786b06675f8ce6a723dc7a68893a733bb583209ba84636e4ec29b7fe38fbc7af9d2eab75a2a6659624ecdbc98ce70bde1adb50e2f00ba625455e WHIRLPOOL a76b4f84e29fa9b68ab216fb1394637776bf39c10dba30be1b304cc587d3245e42449d3db0c3521f94e7d0c864d7544a3fa01b19f69f86722f3b540e37cd40ce
6931 -MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
6932
6933 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
6934 deleted file mode 100644
6935 index 57474ea..0000000
6936 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch
6937 +++ /dev/null
6938 @@ -1,16 +0,0 @@
6939 -diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
6940 -index de49888..2ab32fb 100644
6941 ---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
6942 -+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
6943 -@@ -7,10 +7,7 @@ MAN= ftp-proxy.8
6944 -
6945 - SRCS= ftp-proxy.c filter.c
6946 -
6947 --CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
6948 --
6949 --LDADD+= ${LIBEVENT}
6950 --DPADD+= ${LIBEVENT}
6951 -+LDADD+= -levent
6952 -
6953 - WARNS?= 3
6954 -
6955
6956 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
6957 deleted file mode 100644
6958 index 1316d3b..0000000
6959 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch
6960 +++ /dev/null
6961 @@ -1,15 +0,0 @@
6962 -diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
6963 -index fcff8eb..0da383d 100644
6964 ---- a/sbin/pflogd/Makefile
6965 -+++ b/sbin/pflogd/Makefile
6966 -@@ -6,10 +6,7 @@ PROG= pflogd
6967 - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
6968 - MAN= pflogd.8
6969 -
6970 --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
6971 --
6972 - LDADD= -lpcap
6973 --DPADD= ${LIBPCAP}
6974 -
6975 - WARNS?= 2
6976 -
6977
6978 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
6979 deleted file mode 100644
6980 index 1425db2..0000000
6981 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
6982 +++ /dev/null
6983 @@ -1,12 +0,0 @@
6984 ---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.orig 2008-06-14 00:01:52 -0300
6985 -+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2008-06-14 00:03:19 -0300
6986 -@@ -10,8 +10,7 @@
6987 - CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
6988 - CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
6989 -
6990 --DPADD= ${LIBEVENT}
6991 --LDADD= ${LIBEVENT}
6992 -+LDADD= -levent
6993 -
6994 - WARNS?= 2
6995 -
6996
6997 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
6998 deleted file mode 100644
6999 index 4a7c2e9..0000000
7000 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
7001 +++ /dev/null
7002 @@ -1,18 +0,0 @@
7003 ---- contrib/pf/pflogd/privsep.c.orig 2007-07-03 09:30:02 -0300
7004 -+++ contrib/pf/pflogd/privsep.c 2008-06-13 23:55:39 -0300
7005 -@@ -31,13 +31,14 @@
7006 - #include <errno.h>
7007 - #include <fcntl.h>
7008 - #include <limits.h>
7009 -+#include <stdio.h>
7010 -+#define HAVE_SNPRINTF
7011 - #ifndef __FreeBSD__
7012 - #include <pcap.h>
7013 - #include <pcap-int.h>
7014 - #endif
7015 - #include <pwd.h>
7016 - #include <signal.h>
7017 --#include <stdio.h>
7018 - #include <stdlib.h>
7019 - #include <string.h>
7020 - #ifdef __FreeBSD__
7021
7022 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
7023 deleted file mode 100644
7024 index fb3c701..0000000
7025 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-bpf.patch
7026 +++ /dev/null
7027 @@ -1,10 +0,0 @@
7028 ---- contrib/pf/pflogd/pflogd.c.old 2011-11-02 21:12:57.000000000 +0000
7029 -+++ contrib/pf/pflogd/pflogd.c 2011-11-02 21:13:11.000000000 +0000
7030 -@@ -39,6 +39,7 @@
7031 - #include <sys/stat.h>
7032 - #include <sys/socket.h>
7033 - #include <net/if.h>
7034 -+#include <net/bpf.h>
7035 - #include <stdio.h>
7036 - #include <stdlib.h>
7037 - #include <string.h>
7038
7039 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
7040 deleted file mode 100644
7041 index 6679d32..0000000
7042 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-getline.patch
7043 +++ /dev/null
7044 @@ -1,38 +0,0 @@
7045 ---- contrib/pf/ftp-proxy/ftp-proxy.c.old 2011-11-02 21:18:19.000000000 +0000
7046 -+++ contrib/pf/ftp-proxy/ftp-proxy.c 2011-11-02 21:18:36.000000000 +0000
7047 -@@ -103,7 +103,7 @@
7048 - int drop_privs(void);
7049 - void end_session(struct session *);
7050 - void exit_daemon(void);
7051 --int getline(char *, size_t *);
7052 -+int ftpgetline(char *, size_t *);
7053 - void handle_connection(const int, short, void *);
7054 - void handle_signal(int, short, void *);
7055 - struct session * init_session(void);
7056 -@@ -249,7 +249,7 @@
7057 - buf_avail);
7058 - s->cbuf_valid += clientread;
7059 -
7060 -- while ((n = getline(s->cbuf, &s->cbuf_valid)) > 0) {
7061 -+ while ((n = ftpgetline(s->cbuf, &s->cbuf_valid)) > 0) {
7062 - logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
7063 - if (!client_parse(s)) {
7064 - end_session(s);
7065 -@@ -343,7 +343,7 @@
7066 - }
7067 -
7068 - int
7069 --getline(char *buf, size_t *valid)
7070 -+ftpgetline(char *buf, size_t *valid)
7071 - {
7072 - size_t i;
7073 -
7074 -@@ -1087,7 +1087,7 @@
7075 - buf_avail);
7076 - s->sbuf_valid += srvread;
7077 -
7078 -- while ((n = getline(s->sbuf, &s->sbuf_valid)) > 0) {
7079 -+ while ((n = ftpgetline(s->sbuf, &s->sbuf_valid)) > 0) {
7080 - logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf);
7081 - if (!server_parse(s)) {
7082 - end_session(s);
7083
7084 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
7085 deleted file mode 100644
7086 index e488423..0000000
7087 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-libevent.patch
7088 +++ /dev/null
7089 @@ -1,15 +0,0 @@
7090 ---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.old 2011-11-02 20:57:03.000000000 +0000
7091 -+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile 2011-11-02 20:57:21.000000000 +0000
7092 -@@ -7,11 +7,9 @@
7093 -
7094 - SRCS= ftp-proxy.c filter.c
7095 -
7096 --CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
7097 - CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
7098 -
7099 --LDADD+= ${LIBEVENT}
7100 --DPADD+= ${LIBEVENT}
7101 -+LDADD+= -levent
7102 -
7103 - WARNS?= 3
7104 -
7105
7106 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
7107 deleted file mode 100644
7108 index 184ab6f..0000000
7109 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pcap_pollution.patch
7110 +++ /dev/null
7111 @@ -1,17 +0,0 @@
7112 ---- contrib/pf/pflogd/privsep.c.old 2011-11-02 21:04:01.000000000 +0000
7113 -+++ contrib/pf/pflogd/privsep.c 2011-11-02 21:04:27.000000000 +0000
7114 -@@ -32,11 +32,13 @@
7115 - #include <errno.h>
7116 - #include <fcntl.h>
7117 - #include <limits.h>
7118 -+#include <stdio.h>
7119 -+#define HAVE_SNPRINTF
7120 -+#define HAVE_STRLCPY
7121 - #include <pcap.h>
7122 - #include <pcap-int.h>
7123 - #include <pwd.h>
7124 - #include <signal.h>
7125 --#include <stdio.h>
7126 - #include <stdlib.h>
7127 - #include <string.h>
7128 - #include <syslog.h>
7129
7130 diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
7131 deleted file mode 100644
7132 index d5a65ea..0000000
7133 --- a/sys-freebsd/freebsd-pf/files/freebsd-pf-9.0-pflogd.patch
7134 +++ /dev/null
7135 @@ -1,13 +0,0 @@
7136 ---- sbin/pflogd/Makefile.old 2011-11-02 21:08:46.000000000 +0000
7137 -+++ sbin/pflogd/Makefile 2011-11-02 21:08:53.000000000 +0000
7138 -@@ -6,10 +6,7 @@
7139 - SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
7140 - MAN= pflogd.8
7141 -
7142 --CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
7143 --
7144 - LDADD= -lpcap
7145 --DPADD= ${LIBPCAP} ${LIBUTIL}
7146 -
7147 - WARNS?= 2
7148 -
7149
7150 diff --git a/sys-freebsd/freebsd-pf/files/pf.confd b/sys-freebsd/freebsd-pf/files/pf.confd
7151 deleted file mode 100644
7152 index 87c21b2..0000000
7153 --- a/sys-freebsd/freebsd-pf/files/pf.confd
7154 +++ /dev/null
7155 @@ -1,9 +0,0 @@
7156 -# Copyright 2006 Gentoo Foundation
7157 -# Distributed under the terms of the GNU General Public License v2
7158 -
7159 -# Defines where the rules file is found, by default /etc/pf.conf
7160 -# pf_conf=/etc/pf.conf
7161 -
7162 -# Extra options to pass to pfctl when loading the rules
7163 -# See pfctl(8)
7164 -# pf_args=
7165
7166 diff --git a/sys-freebsd/freebsd-pf/files/pf.initd b/sys-freebsd/freebsd-pf/files/pf.initd
7167 deleted file mode 100755
7168 index e8f3d92..0000000
7169 --- a/sys-freebsd/freebsd-pf/files/pf.initd
7170 +++ /dev/null
7171 @@ -1,50 +0,0 @@
7172 -#!/sbin/runscript
7173 -# Copyright 2006 Gentoo Foundation
7174 -# Distributed under the terms of the GNU General Public License v2
7175 -# $Id$
7176 -
7177 -depend() {
7178 - need net
7179 -}
7180 -
7181 -checkconfig() {
7182 - if ! [ -c /dev/pf ]; then
7183 - ewarn "Pseudo-device /dev/pf not found."
7184 -
7185 - ebegin "Loading pf module"
7186 - if ! kldload pf; then
7187 - eerror "Unable to load pf module."
7188 - eend 1
7189 - return 1
7190 - fi
7191 - eend $?
7192 -
7193 - if ! [ -c /dev/pf ]; then
7194 - eerror "Pseudo-device /dev/pf still not found."
7195 - return 1
7196 - fi
7197 - fi
7198 -
7199 - return 0
7200 -}
7201 -
7202 -start() {
7203 - checkconfig || return 1
7204 -
7205 - einfo "Starting firewall"
7206 -
7207 - if [ -r "${PF_RULES_FILE}" ]; then
7208 - einfo "Loading firewall rules"
7209 - /sbin/pfctl -qe -f ${PF_RULES_FILE:-/etc/pf.conf} ${PF_OPTS}
7210 - else
7211 - /sbin/pfctl -qe ${PF_OPTS}
7212 - fi
7213 -
7214 - eend $?
7215 -}
7216 -
7217 -stop() {
7218 - einfo "Stopping firewall"
7219 - /sbin/pfctl -qd || retval=1
7220 - eend $?
7221 -}
7222
7223 diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_rc3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3_rc3.ebuild
7224 deleted file mode 100644
7225 index 14efdcb..0000000
7226 --- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3_rc3.ebuild
7227 +++ /dev/null
7228 @@ -1,73 +0,0 @@
7229 -# Copyright 1999-2016 Gentoo Foundation
7230 -# Distributed under the terms of the GNU General Public License v2
7231 -# $Id$
7232 -
7233 -EAPI=5
7234 -
7235 -inherit bsdmk freebsd user
7236 -
7237 -DESCRIPTION="FreeBSD's base system libraries"
7238 -SLOT="0"
7239 -
7240 -IUSE=""
7241 -
7242 -# Crypto is needed to have an internal OpenSSL header
7243 -if [[ ${PV} != *9999* ]]; then
7244 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
7245 -fi
7246 -
7247 -EXTRACTONLY="
7248 - usr.sbin/
7249 - sbin/
7250 - contrib/pf/
7251 - etc/
7252 -"
7253 -
7254 -RDEPEND="net-libs/libpcap"
7255 -DEPEND="${RDEPEND}
7256 - dev-libs/libevent
7257 - =sys-freebsd/freebsd-mk-defs-${RV}*
7258 - =sys-freebsd/freebsd-sources-${RV}*"
7259 -
7260 -S="${WORKDIR}"
7261 -
7262 -SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
7263 -
7264 -pkg_setup() {
7265 - enewgroup authpf 63
7266 - mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
7267 -}
7268 -
7269 -src_prepare() {
7270 - # pcap-int.h redefines snprintf as pcap_snprintf
7271 - epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
7272 - # Use system's libevent
7273 - epatch "${FILESDIR}/${PN}-10.0-libevent.patch"
7274 - epatch "${FILESDIR}/${PN}-10.0-pflogd.patch"
7275 - epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
7276 - epatch "${FILESDIR}/${PN}-9.0-getline.patch"
7277 - # Link in kernel sources
7278 - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
7279 -}
7280 -
7281 -src_compile() {
7282 - for dir in ${SUBDIRS}; do
7283 - einfo "Starting make in ${dir}"
7284 - cd "${S}/${dir}" || die
7285 - mkmake || die "Make ${dir} failed"
7286 - done
7287 -}
7288 -
7289 -src_install() {
7290 - for dir in ${SUBDIRS}; do
7291 - einfo "Starting install in ${dir}"
7292 - cd "${S}/${dir}" || die
7293 - mkinstall || die "Install ${dir} failed"
7294 - done
7295 -
7296 - cd "${WORKDIR}"/etc
7297 - insinto /etc
7298 - doins pf.os
7299 - # pf.initd provided by openrc, but no pf.confd
7300 - newconfd "${FILESDIR}/pf.confd" pf
7301 -}
7302
7303 diff --git a/sys-freebsd/freebsd-pf/metadata.xml b/sys-freebsd/freebsd-pf/metadata.xml
7304 deleted file mode 100644
7305 index a00f3ae..0000000
7306 --- a/sys-freebsd/freebsd-pf/metadata.xml
7307 +++ /dev/null
7308 @@ -1,8 +0,0 @@
7309 -<?xml version="1.0" encoding="UTF-8"?>
7310 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
7311 -<pkgmetadata>
7312 -<maintainer type="project">
7313 - <email>bsd@g.o</email>
7314 - <name>BSD Project</name>
7315 -</maintainer>
7316 -</pkgmetadata>
7317
7318 diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
7319 deleted file mode 100644
7320 index 8acc50f..0000000
7321 --- a/sys-freebsd/freebsd-rescue/Manifest
7322 +++ /dev/null
7323 @@ -1,11 +0,0 @@
7324 -AUX freebsd-rescue-10.0-zlib.patch 861 SHA256 e6ed90b353f180dc805d8ebf8774ef221f99dcd2ee2df485d48e795020ae8f4c SHA512 b055878934144bb2403bcf7d93b6239d161654d822ff5839676430eec282b1a7d210e9d4d4b744995b6e6d400ac15a98af9268f0ef62e455c6e776fa79d7b037 WHIRLPOOL 13e41e3aa5d9e0ca581927a8550acddd31ca0619b8e59f34a4f1c0a4a43b1d5fe2927fe8860db9c3bbd8cce8f7267c6f88ceca139569a0ac3ab575561929b4b8
7325 -AUX freebsd-rescue-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef
7326 -AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 SHA256 3690730ee66082fcc4f04ab79c49c6759772c0aefc68abdebbe4497b1155a7bc SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5 WHIRLPOOL 95b65d6501a8d77fe4ecbc13aea1010e85fa5591fb5fc12d4a3ccaee51b908245ac79961bccd3d0e4b8430eacd7eb0fe271907c8a94812fad8df0ab888e3bd7d
7327 -AUX freebsd-rescue-8.2-libzcleverlink.patch 789 SHA256 80d86cb1b632d0c09fdcfd7b998fb1189e957619a41fc65682e2c439392c38fd SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f WHIRLPOOL 55b39e959f0d0821189070ca03167becdd6d446a97dff7c171c40b12629cb2365aed6633635e6d8f6e3f3fa6bea68c46f31b79e537c3d56752e4aee76d76ce84
7328 -AUX freebsd-rescue-9.1-bsdtar.patch 404 SHA256 0e71e3e370b33318bbb167e82d6507589fb95cc2c2d1fc6e8b74d0faf3d17ef1 SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4 WHIRLPOOL 412da27f4535e1300d150edc74f72cf5e4e2b8bb6d4c7e9f31a498396ac12514e97e4b3a83040484b4713a7edb6b2d6ed5e8b2fe714d13f297c35d657f90fc08
7329 -AUX freebsd-rescue-9.1-libcleverlink.patch 801 SHA256 53794263aabaf55cd570adbbfdb68e86a9e9b17557e8ca223d424a5c2f4f6831 SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3 WHIRLPOOL 88125b9143113b1f7049bf63a20a0c6d82fbe2c722198405830092b0a183f4bf7744420e6a82b601c8fb25911556c8f3a9088949798c7f66caf7843a5f9b2347
7330 -AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
7331 -AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863
7332 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
7333 -EBUILD freebsd-rescue-10.3_rc3.ebuild 1839 SHA256 a0341a66a720d19340bb74b5268e27cc6019d3929b8420c8ebc3795195d26f91 SHA512 94a610dc02ea75a704f4ecec7e83cb1f6cf87daae887b76b5c27cd783d12c9e0b73353d9ef861978ffa98362548025cad41df794abb21f8840ddf0b27d06c6cb WHIRLPOOL 2ea106e2ff98cbcb6632066c8b5cbd523345db9aea49c850c4db143a01796312d1171b165f032b2367a89f829242652928f70e1a810d624d5d7928b302afb948
7334 -MISC metadata.xml 402 SHA256 75ec89a9158454c340bf52b7b8c9206f5cb65fe01afd5dfd36aaf13fd68eca7b SHA512 247e4e4c80cd64a81f698fc7fbeab529a02f8b2c6b0040628936ab7d83a09c7242df0b10d7cb4e4e8d7d78806c303cd82903adc4a38b649e911337a832c35834 WHIRLPOOL 4cd689a5c3a69a0ae7614bbed3c7a51eade7c77e03eba094fbeb75390ec9faee52c2bb085655ad3069148ec03838c03c713921a62eb6c1380e2a90781d294d72
7335
7336 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
7337 deleted file mode 100644
7338 index 42165c4..0000000
7339 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-10.0-zlib.patch
7340 +++ /dev/null
7341 @@ -1,22 +0,0 @@
7342 -diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
7343 -index 13c0d43..1f258f3 100644
7344 ---- a/sbin/savecore/savecore.c
7345 -+++ b/sbin/savecore/savecore.c
7346 -@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */
7347 - static int nfound, nsaved, nerr; /* statistics */
7348 - static int maxdumps;
7349 -
7350 --extern FILE *zopen(const char *, const char *);
7351 -+extern FILE *gzopen(const char *, const char *);
7352 -
7353 - static sig_atomic_t got_siginfo;
7354 - static void infohandler(int);
7355 -@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
7356 - if (compress) {
7357 - snprintf(corename, sizeof(corename), "%s.%d.gz",
7358 - istextdump ? "textdump.tar" : "vmcore", bounds);
7359 -- fp = zopen(corename, "w");
7360 -+ fp = gzopen(corename, "w");
7361 - } else {
7362 - snprintf(corename, sizeof(corename), "%s.%d",
7363 - istextdump ? "textdump.tar" : "vmcore", bounds);
7364
7365 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
7366 deleted file mode 100644
7367 index 22fb2ec..0000000
7368 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-7.1-zlib.patch
7369 +++ /dev/null
7370 @@ -1,21 +0,0 @@
7371 -diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
7372 ---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000
7373 -+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000
7374 -@@ -95,7 +95,7 @@
7375 - static int checkfor, compress, clear, force, keep, verbose; /* flags */
7376 - static int nfound, nsaved, nerr; /* statistics */
7377 -
7378 --extern FILE *zopen(const char *, const char *);
7379 -+extern FILE *gzopen(const char *, const char *);
7380 -
7381 - static void
7382 - printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
7383 -@@ -553,7 +553,7 @@
7384 - if (compress) {
7385 - sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" :
7386 - "vmcore", bounds);
7387 -- fp = zopen(filename, "w");
7388 -+ fp = gzopen(filename, "w");
7389 - } else {
7390 - sprintf(filename, "%s.%d", istextdump ? "textdump.tar" :
7391 - "vmcore", bounds);
7392
7393 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
7394 deleted file mode 100644
7395 index 7d12621..0000000
7396 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.0-pkgconfig_static_libarchive.patch
7397 +++ /dev/null
7398 @@ -1,11 +0,0 @@
7399 ---- rescue/rescue/Makefile.old 2010-03-12 12:14:17 +0100
7400 -+++ rescue/rescue/Makefile 2010-03-12 12:14:47 +0100
7401 -@@ -209,7 +209,7 @@
7402 - CRUNCH_LIBS+= -lbz2
7403 -
7404 - CRUNCH_PROGS_usr.bin+= tar
7405 --CRUNCH_LIBS+= -larchive -lmd
7406 -+CRUNCH_LIBS+= `pkg-config --static --libs libarchive` -lmd
7407 - .if ${MK_OPENSSL} != "no"
7408 - CRUNCH_LIBS+= -lcrypto
7409 - .endif
7410
7411 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
7412 deleted file mode 100644
7413 index 3d44457..0000000
7414 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
7415 +++ /dev/null
7416 @@ -1,20 +0,0 @@
7417 ---- rescue/rescue/Makefile.old 2011-07-06 01:35:13.000000000 +0000
7418 -+++ rescue/rescue/Makefile 2011-07-06 01:35:54.000000000 +0000
7419 -@@ -143,7 +143,7 @@
7420 - .if ${MK_ZFS} != "no"
7421 - CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
7422 - .endif
7423 --CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
7424 -+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs
7425 -
7426 - .if ${MACHINE_ARCH} == "i386"
7427 - CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
7428 -@@ -234,7 +234,7 @@
7429 - CRUNCH_PROGS_usr.sbin+= chown
7430 - CRUNCH_ALIAS_chown= chgrp
7431 - ##################################################################
7432 --CRUNCH_LIBS+= -lm
7433 -+CRUNCH_LIBS+= -lz -lm
7434 -
7435 - ##################################################################
7436 - # The following is pretty nearly a generic crunchgen-handling makefile
7437
7438 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
7439 deleted file mode 100644
7440 index d4d23d7..0000000
7441 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-bsdtar.patch
7442 +++ /dev/null
7443 @@ -1,12 +0,0 @@
7444 -diff -Nur work.orig/contrib/libarchive/tar/bsdtar.c work/contrib/libarchive/tar/bsdtar.c
7445 ---- work.orig/contrib/libarchive/tar/bsdtar.c 2012-07-12 13:44:29.000000000 +0900
7446 -+++ work/contrib/libarchive/tar/bsdtar.c 2012-07-29 00:57:25.000000000 +0900
7447 -@@ -691,7 +691,7 @@
7448 - {
7449 - printf("bsdtar %s - %s\n",
7450 - BSDTAR_VERSION_STRING,
7451 -- archive_version());
7452 -+ archive_version_string());
7453 - exit(0);
7454 - }
7455 -
7456
7457 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
7458 deleted file mode 100644
7459 index a194397..0000000
7460 --- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-9.1-libcleverlink.patch
7461 +++ /dev/null
7462 @@ -1,21 +0,0 @@
7463 -diff -Nur work.orig/rescue/rescue/Makefile work/rescue/rescue/Makefile
7464 ---- work.orig/rescue/rescue/Makefile 2012-07-29 00:50:20.000000000 +0900
7465 -+++ work/rescue/rescue/Makefile 2012-07-29 00:56:01.000000000 +0900
7466 -@@ -125,7 +125,7 @@
7467 - .if ${MK_ZFS} != "no"
7468 - CRUNCH_LIBS+= -lavl -lnvpair -lpthread -lzfs -luutil -lumem
7469 - .endif
7470 --CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
7471 -+CRUNCH_LIBS+= -lgeom -lexpat -ljail -lkiconv -lreadline -lsbuf -lufs
7472 -
7473 - .if ${MACHINE_CPUARCH} == "i386"
7474 - CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
7475 -@@ -216,7 +216,7 @@
7476 - CRUNCH_PROGS_usr.sbin+= chown
7477 - CRUNCH_ALIAS_chown= chgrp
7478 - ##################################################################
7479 --CRUNCH_LIBS+= -lm
7480 -+CRUNCH_LIBS+= -lmd -lz -lm
7481 -
7482 - .include <bsd.crunchgen.mk>
7483 - .include <bsd.prog.mk>
7484
7485 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
7486 deleted file mode 100644
7487 index bdda99b..0000000
7488 --- a/sys-freebsd/freebsd-rescue/files/freebsd-sbin-bsdxml2expat.patch
7489 +++ /dev/null
7490 @@ -1,13 +0,0 @@
7491 -diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c
7492 ---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000
7493 -+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000
7494 -@@ -39,7 +39,7 @@
7495 - #include <err.h>
7496 - #include <unistd.h>
7497 -
7498 --#include <bsdxml.h>
7499 -+#include <expat.h>
7500 -
7501 - #include "regdomain.h"
7502 -
7503 -Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos
7504
7505 diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch
7506 deleted file mode 100644
7507 index 6064717..0000000
7508 --- a/sys-freebsd/freebsd-rescue/files/freebsd-ubin-10.2-bsdxml.patch
7509 +++ /dev/null
7510 @@ -1,13 +0,0 @@
7511 -diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
7512 -index af6562b..3121c81 100644
7513 ---- a/usr.bin/mt/mt.c
7514 -+++ b/usr.bin/mt/mt.c
7515 -@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $"
7516 - #include <unistd.h>
7517 - #include <stdint.h>
7518 - #include <errno.h>
7519 --#include <bsdxml.h>
7520 -+#include <expat.h>
7521 - #include <mtlib.h>
7522 -
7523 - #include <cam/cam.h>
7524
7525 diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_rc3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_rc3.ebuild
7526 deleted file mode 100644
7527 index a0eb03f..0000000
7528 --- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3_rc3.ebuild
7529 +++ /dev/null
7530 @@ -1,82 +0,0 @@
7531 -# Copyright 1999-2016 Gentoo Foundation
7532 -# Distributed under the terms of the GNU General Public License v2
7533 -# $Id$
7534 -
7535 -EAPI=5
7536 -
7537 -inherit bsdmk freebsd toolchain-funcs
7538 -
7539 -DESCRIPTION="FreeBSD's rescue binaries"
7540 -SLOT="0"
7541 -LICENSE="BSD zfs? ( CDDL )"
7542 -
7543 -IUSE="atm netware nis zfs"
7544 -
7545 -if [[ ${PV} != *9999* ]]; then
7546 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
7547 -fi
7548 -
7549 -EXTRACTONLY="
7550 - usr.bin/
7551 - contrib/
7552 - lib/
7553 - bin/
7554 - sbin/
7555 - usr.sbin/
7556 - gnu/
7557 - sys/
7558 - libexec/
7559 - rescue/
7560 -"
7561 -
7562 -RDEPEND=""
7563 -DEPEND="sys-devel/flex
7564 - app-arch/xz-utils[static-libs]
7565 - sys-libs/ncurses[static-libs]
7566 - dev-libs/expat[static-libs]
7567 - app-arch/bzip2[static-libs]
7568 - dev-libs/libedit[static-libs]
7569 - dev-libs/libxml2:2[static-libs]
7570 - dev-libs/openssl:0=[static-libs]
7571 - sys-libs/zlib[static-libs]
7572 - sys-libs/readline[static-libs]
7573 - =sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
7574 - =sys-freebsd/freebsd-sources-${RV}*
7575 - =sys-freebsd/freebsd-mk-defs-${RV}*
7576 - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
7577 -
7578 -S="${WORKDIR}/rescue"
7579 -
7580 -pkg_setup() {
7581 - # Add the required source files.
7582 - use zfs && EXTRACTONLY+="cddl/ "
7583 -
7584 - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
7585 - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
7586 - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
7587 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
7588 - mymakeopts="${mymakeopts} NO_PIC= "
7589 -}
7590 -
7591 -src_prepare() {
7592 - # As they are patches from ${WORKDIR} apply them by hand
7593 - cd "${WORKDIR}" || die
7594 - epatch "${FILESDIR}/${PN}"-10.0-zlib.patch
7595 - epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
7596 - epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch"
7597 -}
7598 -
7599 -src_compile() {
7600 - tc-export CC
7601 - # crunchgen is now checks env MAKE.
7602 - # Use to force BSD's make
7603 - export MAKE=/usr/bin/make
7604 -
7605 - cd "${WORKDIR}/lib/libarchive" || die
7606 - echo "#include <expat.h>" > bsdxml.h
7607 - freebsd_src_compile
7608 - export CC="${CC} -L${WORKDIR}/lib/libarchive"
7609 -
7610 - cd "${S}" || die
7611 - freebsd_src_compile
7612 -}
7613
7614 diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml
7615 deleted file mode 100644
7616 index 8703f7b..0000000
7617 --- a/sys-freebsd/freebsd-rescue/metadata.xml
7618 +++ /dev/null
7619 @@ -1,12 +0,0 @@
7620 -<?xml version="1.0" encoding="UTF-8"?>
7621 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
7622 -<pkgmetadata>
7623 -<maintainer type="project">
7624 - <email>bsd@g.o</email>
7625 - <name>BSD Project</name>
7626 - </maintainer>
7627 - <use>
7628 - <flag name="zfs">Enable ZFS support.</flag>
7629 - <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag>
7630 - </use>
7631 -</pkgmetadata>
7632
7633 diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
7634 deleted file mode 100644
7635 index 3224ed1..0000000
7636 --- a/sys-freebsd/freebsd-sbin/Manifest
7637 +++ /dev/null
7638 @@ -1,17 +0,0 @@
7639 -AUX adjkerntz-crontab 184 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc SHA512 28ecfd94257eca2d91323e4bac1920969e589a13f877f1d67c4be0dd5d0bf4585eba8f749ae04f2e0761d5860b76e0c04993350bbdeb52736584ea9df97c6093 WHIRLPOOL 883509014af5a6f3803993eb4fc9f53608b08eaffdfcb409be3945d8234ab66b6a99c620b781a8d650aaeaff1f05db2e5249fb280f9a2bb079421062be3e5332
7640 -AUX devd.conf 4770 SHA256 48c6d3664813222aed6b3c0ff5badbf3e8a37477445fe705850f77a9b95e3219 SHA512 af33a24edda94487adca283427cd0c5c027033ea7c03b11ea4b75c5d402794845005551200d90b74a29867490c2f7e35c74a864a18c7fba09d792ec591fe2c75 WHIRLPOOL b249cb96a67b8c10564212cb3cef34a1779b3adc4068edc1c68b8a7bdbc8cf4f527d2a655b9c8da1e68ec50b4bb8e7a9efe36b5a10db329fac4544a06e28fed5
7641 -AUX devd.initd 1136 SHA256 fadb98847713ec89fe9726b3eb954d1762067e9edffcdc89c2dfc8a054f54d7f SHA512 7a627b0713cb6519b773bafad1bb0ce9b492e9143ff28605c27fb2b28c6c7580ba5bfd7f94c79eb600991e580fe0f30d52fd7781c63b6b445c6f62f1633275b2 WHIRLPOOL 74406bba04022f62b61f957fb3fcb708179939a18a479b55a6fa7def7a3271caf24d08fe0ef552ec60e8a3393434494fd55c660347288c35815f5d5e627a44d4
7642 -AUX devd_queue 853 SHA256 af57ffa202eec7d8c050e32e5ca3f54cbf491fac2e439172f9e008ac3e5e8417 SHA512 9d14d3d41608de50877761fd015cafe29d9103e3f77d0f42726405d4e66da5508000056e3b7603e224e4fab86b992f40af2fa3a764b4aae71e2fe4a898d97d88 WHIRLPOOL 23e5d1268f85d71e761717c19a8d1bb5516d32847f47080ea10ea4536dd7154666f76a5709e9e9639989dc2121ace708bea22538e2a571244578668e0b1b5791
7643 -AUX freebsd-sbin-10.0-zlib.patch 861 SHA256 9e2b89c1def6424b4a628d286ced8554f5f59bdf890e647f5b07e431e4bc9351 SHA512 8a6e14d15e44e9de22863c65cd359cc408207a4329ecdfe053317fd120d01025f5d42b958447ed0bb2e584cc050391306438934ac8cae0edc4a6a785da8138b7 WHIRLPOOL ebad6febc4ebdd4355fe6a60f99af13d2b15e52f538a6c677705401982e1e55556234df7099c570fa7e6fa5ee9c9264e5a394382c626919d43c214d21023d6ba
7644 -AUX freebsd-sbin-6.1-pr102701.patch 548 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 SHA512 2b882565670ffe559410b17e2fa6a94624eee89d25a791ef3e27d657dedcf95b2be282217a2350203af7727b839d5d6ff50368f72c4bef3d7e60fef8a6325cbe WHIRLPOOL 14db7a26e6189314cc9a0e8ff5ccd01bedba178d9ddff856df262b18ce35fbd85999f5f4a612c2388af8718c6a1c0b544db4287bca08356fa5fb191f1cccf978
7645 -AUX freebsd-sbin-6.2-ldconfig.patch 389 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b SHA512 ed8f6073991ba0c8823aea1570e720273d7dc68ec6daf38d7e1d41f2285d307d7905cf674a1148d4783c69f2dafd7fc8a51e729aa4727eb46d857218ab2d71ed WHIRLPOOL 3ecccd7b56c9bee820ca92b8a6a446a1bf69e61e889324407f2e76336eb0328b1162c7dc5d5f24505ec1f36d235bfe33fbecc5c5d60bf0f04741eeca9eb5b1cb
7646 -AUX freebsd-sbin-7.1-zlib.patch 800 SHA256 18c028bf1b51cf7c57d5517d8fe6f3221c8a4d00d1ae436e40af0d1cd095bc4f SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c WHIRLPOOL cc5572b6ed34cb0462da77edf714e92ba10b672a315b216f342d200f0081ffdc417936b69cdf9e7e5ba8e1451f509fe222d366c84d98a005999c2987ae08d3ef
7647 -AUX freebsd-sbin-bsdxml2expat.patch 424 SHA256 f40f55bec52d0e3e0205c363ad624a1139a74d5de36f99ca2ff9e53583bc2287 SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522 WHIRLPOOL 9409fa6d31a1a9b7dad59a6bdd820319c8a895b27c130af7d29e0db969be6760c4ab7df952420fb4fca9445fe0433b3aca5377f509852261d0f6b4e5a2fbd72b
7648 -AUX freebsd-sbin-setXid.patch 541 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e WHIRLPOOL a2d578ff3b54ad25875f65d6724d0762c0fc3a400aa8e14c93ab94dc789910fbc6ab70528cbd0074fd0d7a4957a2d2d51bf10f615cbfd751aa4e95edc88d4e7d
7649 -AUX idmapd.initd 440 SHA256 e89050097731f658825b4a7215023e1c5070f0e31cfdf79eaf299ede9c9f9e39 SHA512 d76f1ed5b6cb0624359f0e1018b1decee80fec6e201393500656a2001034b042dde4299c2768ea8bfd1aa65813c86a5f9c06b5dd2e41ab74f954b8310d55259a WHIRLPOOL eeb04173b61c7e60883bd51e07be5f69aa67d6f4e506c3b3e07604e86cb43d81b5722e23e21ec189d83f2549a8827256216f45025ea5fd427b4874f2723c7a16
7650 -AUX ipfw.confd 364 SHA256 97911a2f003e2108c1f5da04b84a3b73fbccbde48fe58af0f056d8a9effbb3d3 SHA512 6bb923386c40e7bfcc2d9a122ee3e942fe30cb49715d1cfb122923416d2dcf63fd6f61cb93510a245eb8bbd767e33f029726bb277cb0e16e98d2e856ef33ff2f WHIRLPOOL e1de6e7f8807f7079b856197d9e7a650491a0a0f7b9fab703befed7bc24ccedb3be1ff758194c70cfa4e86f0930b6f30bc03342edd8de55795621ceb5be471f0
7651 -AUX ipfw.initd 2911 SHA256 45789a2e51c8eb164247d08c58d47ab52798bfbd19b4ddb6cc87acb5684e4eb5 SHA512 56776597170cf3549d7560fbb13ebb81cf608eb6f16d5ea440d38d4f3edbd06d56bc3fe104f9114e099d622cff1cd8e1a65529ebb4a7ecbf75ee6759e7bdc190 WHIRLPOOL f82edd7d971946637451519a78bcd0da73344944e2002fddca2b1fe22012d9a74dabec644937833e3f9250ea6d81fbd002569dc64b11db04c83e57c18ec508fe
7652 -AUX sysctl.initd 557 SHA256 49b93a918e66a7464284d5d5cfb7bc969b88f8cfb43921cc0b5859d8f63ea693 SHA512 7de60d317542b912fecaeb29323bded3be579df7b231bc7326ef9978b9985e180b812a847c5707900f4683b46389d19d393c2474fbbc5a1573beacda85a590e9 WHIRLPOOL 29e983847ce0b925ed2bd168241e89f1052c5353b2863750ae0c3f1c6133635b800a54787b5838e3d3f30dab2d9f2b62bc382ec2e30ccaa6fcd6e3d37df392d6
7653 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
7654 -EBUILD freebsd-sbin-10.3_rc3.ebuild 2578 SHA256 59109fc9f0da30b141dd3dbd46fd7a8d01140aa4481f5ecf2921fafb7d65e1a3 SHA512 2143b63b26690dc7461b232cdd75e89f94de047c46dc77d557c2843353ea8ae894ea8a38dfceb38a7606e8eb00e4dc259890b7646c93c69f00911e40f23f9407 WHIRLPOOL 4a021f8a800d225905afbcf4629baf2c7d55495c78422b3b36d2068694d87b08f4cfd381c5790660968124ef3078972c942ca7f19d1fbde53ba04bb17e5451dd
7655 -MISC metadata.xml 563 SHA256 fbc171fa5f85349a31cbd904e559b5f012f86f7aa61a60c57a9eaf12a5e39dd4 SHA512 e83379562dfc0fd06156ac34e3c06677655a79ec7f51df2a3adc90fcf246dc0a779085252801d5415826bf3cb050917005b12792987d2f199484291a3635d765 WHIRLPOOL 543a80aa8e2403d4dd119572ddf3f9c7992f9a84825d6130480f46b247f310718faf3c64cad81c45e5b3e56f56439fcac4caf2a19c22b8e1a3034335c0e296a6
7656
7657 diff --git a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab b/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
7658 deleted file mode 100644
7659 index 5fc46f5..0000000
7660 --- a/sys-freebsd/freebsd-sbin/files/adjkerntz-crontab
7661 +++ /dev/null
7662 @@ -1,4 +0,0 @@
7663 -# Adjust the time zone if the CMOS clock keeps local time, as opposed to
7664 -# UTC time. See adjkerntz(8) for details.
7665 -1,31 0-5 * * * root /sbin/adjkerntz -a
7666 -
7667
7668 diff --git a/sys-freebsd/freebsd-sbin/files/devd.conf b/sys-freebsd/freebsd-sbin/files/devd.conf
7669 deleted file mode 100644
7670 index fd1e035..0000000
7671 --- a/sys-freebsd/freebsd-sbin/files/devd.conf
7672 +++ /dev/null
7673 @@ -1,153 +0,0 @@
7674 -# Refer to devd.conf(5) and devd(8) man pages for the details on how to
7675 -# run and configure devd.
7676 -#
7677 -
7678 -# NB: All regular expressions have an implicit ^$ around them.
7679 -# NB: device-name is shorthand for 'match device-name'
7680 -
7681 -options {
7682 - # Each directory directive adds a directory the list of directories
7683 - # that we scan for files. Files are read-in in the order that they
7684 - # are returned from readdir(3). The rule-sets are combined to
7685 - # create a DFA that's used to match events to actions.
7686 - directory "/etc/devd";
7687 - directory "/usr/local/etc/devd";
7688 - pid-file "/var/run/devd.pid";
7689 -
7690 - # Setup some shorthand for regex that we use later in the file.
7691 - #XXX Yes, these are gross -- imp
7692 - set scsi-controller-regex
7693 - "(aac|adv|adw|aha|ahb|ahc|ahd|aic|amd|amr|asr|bt|ciss|ct|dpt|\
7694 - esp|ida|iir|ips|isp|mlx|mly|mpt|ncr|ncv|nsp|stg|sym|trm|wds)\
7695 - [0-9]+";
7696 -};
7697 -
7698 -# Note that the attach/detach with the highest value wins, so that one can
7699 -# override these general rules.
7700 -
7701 -#
7702 -# For ethernet like devices start configuring the interface. Due to
7703 -# a historical accident, this script is called pccard_ether.
7704 -#
7705 -attach 0 {
7706 - media-type "ethernet";
7707 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name start";
7708 -};
7709 -
7710 -detach 0 {
7711 - media-type "ethernet";
7712 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop";
7713 -};
7714 -
7715 -#
7716 -# Try to start dhclient on Ethernet like interfaces when the link comes
7717 -# up. Only devices that are configured to support DHCP will actually
7718 -# run it. No link down rule exists because dhclient automaticly exits
7719 -# when the link goes down.
7720 -#
7721 -notify 0 {
7722 - match "system" "IFNET";
7723 - match "type" "LINK_UP";
7724 - media-type "ethernet";
7725 - action "/etc/devd_queue add /etc/init.d/net.$subsystem start";
7726 -};
7727 -notify 0 {
7728 - match "system" "IFNET";
7729 - match "type" "LINK_DOWN";
7730 - media-type "ethernet";
7731 - action "/etc/devd_queue add /etc/init.d/net.$subsystem stop";
7732 -};
7733 -
7734 -#
7735 -# Like Ethernet devices, but separate because
7736 -# they have a different media type. We may want
7737 -# to exploit this later.
7738 -#
7739 -#detach 0 {
7740 -# media-type "802.11";
7741 -# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name stop";
7742 -#};
7743 -#attach 0 {
7744 -# media-type "802.11";
7745 -# action "env IN_HOTPLUG=1 /etc/init.d/net.$device-name start";
7746 -#};
7747 -
7748 -# Not sure how to handle this in Gentoo yet
7749 -# When a USB Bluetooth dongle appears activate it
7750 -#attach 100 {
7751 -# device-name "ubt[0-9]+";
7752 -# action "/etc/rc.d/bluetooth start $device-name";
7753 -#};
7754 -#detach 100 {
7755 -# device-name "ubt[0-9]+";
7756 -# action "/etc/rc.d/bluetooth stop $device-name";
7757 -#};
7758 -
7759 -# When a USB keyboard arrives, attach it as the console keyboard.
7760 -attach 100 {
7761 - device-name "ukbd0";
7762 - action "kbdcontrol -k /dev/ukbd0 < /dev/console";
7763 -};
7764 -detach 100 {
7765 - device-name "ukbd0";
7766 - action "kbdcontrol -k /dev/kbd0 < /dev/console";
7767 -};
7768 -
7769 -# The entry below starts and stops moused when a mouse is plugged in.
7770 -attach 100 {
7771 - device-name "psm[0-9]+";
7772 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start";
7773 -};
7774 -detach 100 {
7775 - device-name "psm[0-9]+";
7776 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop";
7777 -};
7778 -attach 100 {
7779 - device-name "ums[0-9]+";
7780 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name start";
7781 -};
7782 -detach 100 {
7783 - device-name "ums[0-9]+";
7784 - action "/etc/devd_queue add env IN_HOTPLUG=1 /etc/init.d/moused.$device-name stop";
7785 -};
7786 -
7787 -# Notify all users before beginning emergency shutdown when we get
7788 -# a _CRT or _HOT thermal event and we're going to power down the system
7789 -# very soon.
7790 -notify 10 {
7791 - match "system" "ACPI";
7792 - match "subsystem" "Thermal";
7793 - match "notify" "0xcc";
7794 - action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'";
7795 -};
7796 -
7797 -/* EXAMPLES TO END OF FILE
7798 -
7799 -
7800 -# Examples of notify hooks. A notify is a generic way for a kernel
7801 -# subsystem to send event notification to userland.
7802 -#
7803 -# Here are some examples of ACPI notify handlers. ACPI subsystems that
7804 -# generate notifies include the AC adapter, power/sleep buttons,
7805 -# control method batteries, lid switch, and thermal zones.
7806 -#
7807 -# Information returned is not always the same as the ACPI notify
7808 -# events. See the ACPI specification for more information about
7809 -# notifies. Here is the information returned for each subsystem:
7810 -#
7811 -# ACAD: AC line state (0 is offline, 1 is online)
7812 -# Button: Button pressed (0 for power, 1 for sleep)
7813 -# CMBAT: ACPI battery events
7814 -# Lid: Lid state (0 is closed, 1 is open)
7815 -# Thermal: ACPI thermal zone events
7816 -#
7817 -# This example calls a script when the AC state changes, passing the
7818 -# notify value as the first argument. If the state is 0x00, it might
7819 -# call some sysctls to implement economy mode. If 0x01, it might set
7820 -# the mode to performance.
7821 -notify 10 {
7822 - match "system" "ACPI";
7823 - match "subsystem" "ACAD";
7824 - action "/etc/acpi_ac $notify";
7825 -};
7826 -*/
7827
7828 diff --git a/sys-freebsd/freebsd-sbin/files/devd.initd b/sys-freebsd/freebsd-sbin/files/devd.initd
7829 deleted file mode 100644
7830 index 2b70320..0000000
7831 --- a/sys-freebsd/freebsd-sbin/files/devd.initd
7832 +++ /dev/null
7833 @@ -1,47 +0,0 @@
7834 -#!/sbin/runscript
7835 -# Copyright 1999-2006 Gentoo Foundation
7836 -# Distributed under the terms of the GNU General Public License v2
7837 -
7838 -depend() {
7839 - need localmount
7840 - after bootmisc hostname
7841 - before net
7842 -}
7843 -
7844 -start() {
7845 - # Services may depend on us, so mark us as inactive
7846 - mark_service_inactive "${SVCNAME}"
7847 -
7848 - # Create a queue so that if things went UP DOWN UP DOWN UP DOWN UP
7849 - # We just do an UP
7850 - # This is used by /etc/devd_queue
7851 - mkdir -p /var/run/devd
7852 -
7853 - ebegin "Starting the Device State Change Daemon"
7854 - sysctl hw.bus.devctl_disable=0 >/dev/null
7855 - start-stop-daemon --start --exec /sbin/devd \
7856 - --pidfile /var/run/devd.pid
7857 - eend $? "Failed to start devd" \
7858 - || return $?
7859 -
7860 - ebegin "Waiting for Device State Change Daemon to settle"
7861 - LC_ALL=C sleep "${DEVD_WAIT:-2}"
7862 - eend $?
7863 -
7864 - # Now flush the queue
7865 - einfo "Flushing Device State Change Daemon queue"
7866 - /etc/devd_queue flush
7867 -
7868 - mark_service_started "${SVCNAME}"
7869 - return 0
7870 -}
7871 -
7872 -stop() {
7873 - ebegin "Stopping the Device State Change Daemon"
7874 - sysctl hw.bus.devctl_disable=1 >/dev/null
7875 - start-stop-daemon --stop --exec /sbin/devd \
7876 - --pidfile /var/run/devd.pid
7877 - eend $? "Failed to stop devd"
7878 -}
7879 -
7880 -# vim: ts=4 :
7881
7882 diff --git a/sys-freebsd/freebsd-sbin/files/devd_queue b/sys-freebsd/freebsd-sbin/files/devd_queue
7883 deleted file mode 100644
7884 index d42cb83..0000000
7885 --- a/sys-freebsd/freebsd-sbin/files/devd_queue
7886 +++ /dev/null
7887 @@ -1,50 +0,0 @@
7888 -#!/bin/sh
7889 -
7890 -# Notify the rc system that we're in the background
7891 -export IN_BACKGROUND=true
7892 -
7893 -arg1="$1"
7894 -if [ -z "$arg1" ] ; then
7895 - echo "Command required" > /dev/stderr
7896 - exit 1
7897 -fi
7898 -shift
7899 -
7900 -case "$arg1" in
7901 - add)
7902 - if [ -z "$1" ] ; then
7903 - echo "Command missing!" > /dev/stderr
7904 - exit 1
7905 - fi
7906 -
7907 - # If we don't have a queue then just run
7908 - if [ ! -d /var/run/devd ] ; then
7909 - "$@"
7910 - exit $?
7911 - fi
7912 -
7913 - cmd="$1"
7914 - args="$*"
7915 - if [ "$cmd" = "env" ] ; then
7916 - shift
7917 - while echo "$1" | grep -q "="; do
7918 - shift
7919 - [ "$1" = "--" ] && shift && break
7920 - done
7921 - cmd="$1"
7922 - fi
7923 - echo "$args" > /var/run/devd/$(basename "$cmd")
7924 - ;;
7925 - flush)
7926 - while ! rmdir /var/run/devd 2>/dev/null ; do
7927 - for cmd in $(cd /var/run/devd; ls) ; do
7928 - args=$(cat /var/run/devd/$cmd)
7929 - rm -f /var/run/devd/$cmd
7930 - $args
7931 - done
7932 - done
7933 - ;;
7934 - *)
7935 - echo "Unknown command $arg1"
7936 - ;;
7937 -esac
7938
7939 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
7940 deleted file mode 100644
7941 index c0a2bf9..0000000
7942 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-10.0-zlib.patch
7943 +++ /dev/null
7944 @@ -1,22 +0,0 @@
7945 -diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
7946 -index bdbf7e3..a4c67ec 100644
7947 ---- a/sbin/savecore/savecore.c
7948 -+++ b/sbin/savecore/savecore.c
7949 -@@ -92,7 +92,7 @@ static int checkfor, compress, clear, force, keep, verbose; /* flags */
7950 - static int nfound, nsaved, nerr; /* statistics */
7951 - static int maxdumps;
7952 -
7953 --extern FILE *zopen(const char *, const char *);
7954 -+extern FILE *gzopen(const char *, const char *);
7955 -
7956 - static sig_atomic_t got_siginfo;
7957 - static void infohandler(int);
7958 -@@ -626,7 +626,7 @@ DoFile(const char *savedir, const char *device)
7959 - if (compress) {
7960 - snprintf(corename, sizeof(corename), "%s.%d.gz",
7961 - istextdump ? "textdump.tar" : "vmcore", bounds);
7962 -- fp = zopen(corename, "w");
7963 -+ fp = gzopen(corename, "w");
7964 - } else {
7965 - snprintf(corename, sizeof(corename), "%s.%d",
7966 - istextdump ? "textdump.tar" : "vmcore", bounds);
7967
7968 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
7969 deleted file mode 100644
7970 index 7b9578c..0000000
7971 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-pr102701.patch
7972 +++ /dev/null
7973 @@ -1,17 +0,0 @@
7974 -Solves the issue reported in Problem Report bin/102701.
7975 -
7976 -Can't delete an inet6 alias address from an interface.
7977 -
7978 -Index: fbsd-6.1/sbin/ifconfig/af_inet6.c
7979 -===================================================================
7980 ---- fbsd-6.1.orig/sbin/ifconfig/af_inet6.c
7981 -+++ fbsd-6.1/sbin/ifconfig/af_inet6.c
7982 -@@ -515,7 +515,7 @@ static struct afswtch af_inet6 = {
7983 - .af_settunnel = in6_set_tunnel,
7984 - .af_difaddr = SIOCDIFADDR_IN6,
7985 - .af_aifaddr = SIOCAIFADDR_IN6,
7986 -- .af_ridreq = &in6_addreq,
7987 -+ .af_ridreq = &in6_ridreq,
7988 - .af_addreq = &in6_addreq,
7989 - };
7990 -
7991
7992 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
7993 deleted file mode 100644
7994 index 81ad024..0000000
7995 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
7996 +++ /dev/null
7997 @@ -1,13 +0,0 @@
7998 -diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c
7999 ---- sbin.orig/ldconfig/elfhints.c 2001-05-03 00:56:18 +0100
8000 -+++ sbin/ldconfig/elfhints.c 2007-08-06 10:16:24 +0100
8001 -@@ -245,6 +245,9 @@
8002 - else
8003 - add_dir(hintsfile, argv[i], 0);
8004 - }
8005 -+ /* Always add our system dirs */
8006 -+ add_dir (hintsfile, "/lib", 1);
8007 -+ add_dir (hintsfile, "/usr/lib", 1);
8008 - write_elf_hints(hintsfile);
8009 - }
8010 -
8011
8012 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch
8013 deleted file mode 100644
8014 index 22fb2ec..0000000
8015 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-7.1-zlib.patch
8016 +++ /dev/null
8017 @@ -1,21 +0,0 @@
8018 -diff -ur sbin/savecore/savecore.c sbin-zlib/savecore/savecore.c
8019 ---- sbin/savecore/savecore.c 2005-02-26 01:21:50 +0000
8020 -+++ sbin-zlib/savecore/savecore.c 2005-05-06 12:00:06 +0000
8021 -@@ -95,7 +95,7 @@
8022 - static int checkfor, compress, clear, force, keep, verbose; /* flags */
8023 - static int nfound, nsaved, nerr; /* statistics */
8024 -
8025 --extern FILE *zopen(const char *, const char *);
8026 -+extern FILE *gzopen(const char *, const char *);
8027 -
8028 - static void
8029 - printheader(FILE *f, const struct kerneldumpheader *h, const char *device,
8030 -@@ -553,7 +553,7 @@
8031 - if (compress) {
8032 - sprintf(filename, "%s.%d.gz", istextdump ? "textdump.tar" :
8033 - "vmcore", bounds);
8034 -- fp = zopen(filename, "w");
8035 -+ fp = gzopen(filename, "w");
8036 - } else {
8037 - sprintf(filename, "%s.%d", istextdump ? "textdump.tar" :
8038 - "vmcore", bounds);
8039
8040 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch
8041 deleted file mode 100644
8042 index bdda99b..0000000
8043 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-bsdxml2expat.patch
8044 +++ /dev/null
8045 @@ -1,13 +0,0 @@
8046 -diff -uNr sbin/ifconfig.old/regdomain.c sbin/ifconfig/regdomain.c
8047 ---- sbin/ifconfig.old/regdomain.c 2010-12-21 17:09:25.000000000 +0000
8048 -+++ sbin/ifconfig/regdomain.c 2011-07-10 15:56:27.000000000 +0000
8049 -@@ -39,7 +39,7 @@
8050 - #include <err.h>
8051 - #include <unistd.h>
8052 -
8053 --#include <bsdxml.h>
8054 -+#include <expat.h>
8055 -
8056 - #include "regdomain.h"
8057 -
8058 -Los ficheros binarios sbin/ifconfig.old/regdomain.o y sbin/ifconfig/regdomain.o son distintos
8059
8060 diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
8061 deleted file mode 100644
8062 index c8cbebc..0000000
8063 --- a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-setXid.patch
8064 +++ /dev/null
8065 @@ -1,20 +0,0 @@
8066 -diff -ur sbin.orig/ping/Makefile sbin.setXid/ping/Makefile
8067 ---- sbin.orig/ping/Makefile Thu Apr 7 20:27:57 2005
8068 -+++ sbin.setXid/ping/Makefile Thu Apr 7 20:42:02 2005
8069 -@@ -18,4 +18,6 @@
8070 - LDADD+= -lipsec
8071 - .endif
8072 -
8073 -+LDFLAGS+= -Wl,-z,now
8074 -+
8075 - .include <bsd.prog.mk>
8076 -diff -ur sbin.orig/shutdown/Makefile sbin.setXid/shutdown/Makefile
8077 ---- sbin.orig/shutdown/Makefile Thu Apr 7 20:27:57 2005
8078 -+++ sbin.setXid/shutdown/Makefile Thu Apr 7 20:42:17 2005
8079 -@@ -7,4 +7,6 @@
8080 - BINGRP= operator
8081 - BINMODE=4550
8082 -
8083 -+LDFLAGS+= -Wl,-z,now
8084 -+
8085 - .include <bsd.prog.mk>
8086
8087 diff --git a/sys-freebsd/freebsd-sbin/files/idmapd.initd b/sys-freebsd/freebsd-sbin/files/idmapd.initd
8088 deleted file mode 100755
8089 index 407b0e8..0000000
8090 --- a/sys-freebsd/freebsd-sbin/files/idmapd.initd
8091 +++ /dev/null
8092 @@ -1,20 +0,0 @@
8093 -#!/sbin/runscript
8094 -# Copyright 1999-2008 Gentoo Foundation
8095 -# Distributed under the terms of the GNU General Public License v2
8096 -
8097 -depend() {
8098 - need rpcbind
8099 -}
8100 -
8101 -start() {
8102 - ebegin "Starting NFS idmapd"
8103 - start-stop-daemon --start --quiet --exec \
8104 - /sbin/idmapd -- $idmapdopts
8105 - eend $? "Error starting NFS idmapd"
8106 -}
8107 -
8108 -stop() {
8109 - ebegin "Stopping NFS idmapd"
8110 - start-stop-daemon --stop --quiet --exec /sbin/idmapd
8111 - eend $? "Error stopping NFS idmapd"
8112 -}
8113
8114 diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.confd b/sys-freebsd/freebsd-sbin/files/ipfw.confd
8115 deleted file mode 100644
8116 index 687f92d..0000000
8117 --- a/sys-freebsd/freebsd-sbin/files/ipfw.confd
8118 +++ /dev/null
8119 @@ -1,10 +0,0 @@
8120 -# ipfw provides a stateful firewall.
8121 -# This means we allow everything out, and if we have a connection we allow it
8122 -# back in. This is very flexable and quite secure.
8123 -
8124 -# For ease of use, we allow auth and ssh ports through as well.
8125 -# To override the list of allowed ports
8126 -#PORTS_IN="auth ssh"
8127 -
8128 -# You may want to enable logging of denied connections
8129 -#LOG_DENY="yes"
8130
8131 diff --git a/sys-freebsd/freebsd-sbin/files/ipfw.initd b/sys-freebsd/freebsd-sbin/files/ipfw.initd
8132 deleted file mode 100644
8133 index 013400b..0000000
8134 --- a/sys-freebsd/freebsd-sbin/files/ipfw.initd
8135 +++ /dev/null
8136 @@ -1,110 +0,0 @@
8137 -#!/sbin/runscript
8138 -# Copyright 2007 Gentoo Foundation
8139 -# Distributed under the terms of the GNU General Public License v2
8140 -
8141 -# This is a nice client firewall script which should suit most desktop users.
8142 -# We allow auth and ssh in by default.
8143 -
8144 -PORTS_IN=${PORTS_IN-auth ssh}
8145 -
8146 -opts="panic showstatus"
8147 -
8148 -depend() {
8149 - before net
8150 - provide firewall
8151 -}
8152 -
8153 -ipfw() {
8154 - /sbin/ipfw -f -q "$@"
8155 -}
8156 -
8157 -init() {
8158 - # Load the kernel module
8159 - if ! sysctl net.inet.ip.fw.enable=1 >/dev/null 2>/dev/null ; then
8160 - if ! kldload ipfw ; then
8161 - eend 1 "Unable to load firewall module"
8162 - return 1
8163 - fi
8164 - fi
8165 -
8166 - ipfw flush
8167 -
8168 - ipfw add allow all from any to any via lo0
8169 - ipfw add allow all from any to 127.0.0.0/8
8170 - ipfw add deny ip from 127.0.0.0/8 to any
8171 -
8172 - ipfw add allow ipv6-icmp from :: to ff02::/16
8173 - ipfw add allow ipv6-icmp from fe80::/10 to fe80::/10
8174 - ipfw add allow ipv6-icmp from fe80::/10 to ff02::/16
8175 -}
8176 -
8177 -start() {
8178 - local x= log=
8179 - ebegin "Starting firewall rules"
8180 - if ! init ; then
8181 - eend 1 "Failed to flush firewall ruleset"
8182 - return 1
8183 - fi
8184 -
8185 - [ "${LOG_DENY}" = "yes" ] && log="log"
8186 -
8187 - # Use a statefull firewall
8188 - ipfw add check-state
8189 -
8190 - # Open our configured ports
8191 - if [ -n "${PORTS_IN}" ] ; then
8192 - local pin=
8193 - for x in ${PORTS_IN} ; do
8194 - pin="${pin}${pin:+,}${x}"
8195 - done
8196 - ipfw add allow tcp from any to me ${pin} established keep-state
8197 - ipfw add allow tcp from any to me6 ${pin} established keep-state
8198 - ipfw add allow tcp from any to me ${pin} setup keep-state
8199 - ipfw add allow tcp from any to me6 ${pin} setup keep-state
8200 - ipfw add allow udp from any to me ${pin} established
8201 - ipfw add allow udp from any to me ${pin} keep-state
8202 - ipfw add allow udp from any to me6 ${pin} established
8203 - ipfw add allow udp from any to me6 ${pin} keep-state
8204 - fi
8205 -
8206 - # Nice flexable rules that disallow incoming except for stuff we
8207 - # have asked for, and allow all outgoing.
8208 - ipfw add allow tcp from me to any established keep-state
8209 - ipfw add allow tcp from me to any setup keep-state
8210 - ipfw add allow tcp from me6 to any established keep-state
8211 - ipfw add allow tcp from me6 to any setup keep-state
8212 - ipfw add deny ${log} tcp from any to any
8213 - ipfw add allow udp from me to any established
8214 - ipfw add allow udp from me to any keep-state
8215 - ipfw add allow udp from me6 to any established
8216 - ipfw add allow udp from me6 to any keep-state
8217 - ipfw add deny ${log} udp from any to any
8218 -
8219 - # Be a good firewall and allow some ICMP traffic.
8220 - # Remove 8 if you really want to disallow ping.
8221 - ipfw add allow icmp from any to any icmptypes 0,3,8,11,12
8222 - ipfw add allow ip6 from any to any proto ipv6-icmp
8223 -
8224 - eend 0
8225 -}
8226 -
8227 -stop() {
8228 - ebegin "Stopping firewall rules"
8229 - # We don't unload the kernel module as that action
8230 - # can cause memory leaks as of FreeBSD 6.x
8231 - sysctl net.inet.ip.fw.enable=0 >/dev/null
8232 - eend $?
8233 -}
8234 -
8235 -panic() {
8236 - ebegin "Stopping firewall rules - hard"
8237 - if ! init ; then
8238 - eend 1 "Failed to flush firewall ruleset"
8239 - return 1
8240 - fi
8241 - eend 0
8242 -}
8243 -
8244 -showstatus() {
8245 - ipfw show
8246 -}
8247
8248 diff --git a/sys-freebsd/freebsd-sbin/files/sysctl.initd b/sys-freebsd/freebsd-sbin/files/sysctl.initd
8249 deleted file mode 100644
8250 index f8a2469..0000000
8251 --- a/sys-freebsd/freebsd-sbin/files/sysctl.initd
8252 +++ /dev/null
8253 @@ -1,28 +0,0 @@
8254 -#!/sbin/runscript
8255 -# Copyright 1999-2005 Gentoo Foundation
8256 -# Distributed under the terms of the GNU General Public License v2
8257 -# $Id$
8258 -
8259 -depend() {
8260 - after checkroot root
8261 -}
8262 -
8263 -start() {
8264 - ebegin "Configuring kernel parameters"
8265 -
8266 - if [ ! -f /etc/sysctl.conf ]; then
8267 - eend 1 "/etc/sysctl.conf" "not found"
8268 - return 1
8269 - fi
8270 -
8271 - local retval=0 var= comments=
8272 - while read var comments ; do
8273 - case "${var}" in
8274 - ""|"#"*) continue;;
8275 - esac
8276 - sysctl "${var}" >/dev/null || retval=1
8277 - done < /etc/sysctl.conf
8278 - eend ${retval} "Some errors were encountered"
8279 -}
8280 -
8281 -# vim: set ts=4 :
8282
8283 diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_rc3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_rc3.ebuild
8284 deleted file mode 100644
8285 index 738e7a1..0000000
8286 --- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3_rc3.ebuild
8287 +++ /dev/null
8288 @@ -1,101 +0,0 @@
8289 -# Copyright 1999-2016 Gentoo Foundation
8290 -# Distributed under the terms of the GNU General Public License v2
8291 -# $Id$
8292 -
8293 -EAPI=5
8294 -
8295 -inherit bsdmk freebsd multilib
8296 -
8297 -DESCRIPTION="FreeBSD sbin utils"
8298 -SLOT="0"
8299 -
8300 -if [[ ${PV} != *9999* ]]; then
8301 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
8302 -fi
8303 -
8304 -EXTRACTONLY="
8305 - sbin/
8306 - contrib/
8307 - lib/
8308 - libexec/
8309 - usr.sbin/
8310 - etc/
8311 -"
8312 -
8313 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
8314 - =sys-freebsd/freebsd-libexec-${RV}*
8315 - >=dev-libs/expat-2.0.1
8316 - ssl? ( dev-libs/openssl:0= )
8317 - >=dev-libs/libedit-20120311.3.0-r1
8318 - sys-libs/readline:0=
8319 - || (
8320 - sys-process/cronie
8321 - sys-process/vixie-cron
8322 - )
8323 - atm? ( net-analyzer/bsnmp )"
8324 -DEPEND="${RDEPEND}
8325 - !build? ( =sys-freebsd/freebsd-sources-${RV}* )
8326 - =sys-freebsd/freebsd-mk-defs-${RV}*"
8327 -
8328 -S="${WORKDIR}/sbin"
8329 -
8330 -IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
8331 -
8332 -pkg_setup() {
8333 - # Add the required source files.
8334 - use build && EXTRACTONLY+="sys/ "
8335 -
8336 - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
8337 - use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
8338 - use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "
8339 - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
8340 - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
8341 - use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
8342 - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
8343 -}
8344 -
8345 -REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
8346 -
8347 -PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
8348 - "${FILESDIR}/${PN}-10.0-zlib.patch"
8349 - "${FILESDIR}/${PN}-6.2-ldconfig.patch"
8350 - "${FILESDIR}/${PN}-6.1-pr102701.patch"
8351 - "${FILESDIR}/${PN}-bsdxml2expat.patch" )
8352 -
8353 -src_prepare() {
8354 - if [[ ! -e "${WORKDIR}/sys" ]]; then
8355 - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
8356 - fi
8357 -}
8358 -
8359 -src_install() {
8360 - mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
8361 - freebsd_src_install
8362 - keepdir /var/log
8363 - # Needed by ldconfig:
8364 - keepdir /var/run
8365 -
8366 - # Maybe ship our own sysctl.conf so things like radvd work out of the box.
8367 - # New wireless config method requires regdomain.xml in /etc
8368 - cd "${WORKDIR}/etc/" || die
8369 - insinto /etc
8370 - doins minfree sysctl.conf regdomain.xml || die
8371 -
8372 - # Install a crontab for adjkerntz
8373 - insinto /etc/cron.d
8374 - newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
8375 -
8376 - # Install the periodic stuff (needs probably to be ported in a more
8377 - # gentooish way)
8378 - cd "${WORKDIR}/etc/periodic" || die
8379 -
8380 - doperiodic security \
8381 - security/*.ipfwlimit \
8382 - security/*.ipfwdenied || die
8383 -
8384 - use ipfilter && { doperiodic security \
8385 - security/*.ipfdenied || die ; }
8386 -
8387 - use pf && { doperiodic security \
8388 - security/*.pfdenied || die ; }
8389 -}
8390
8391 diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
8392 deleted file mode 100644
8393 index dccfe68..0000000
8394 --- a/sys-freebsd/freebsd-sbin/metadata.xml
8395 +++ /dev/null
8396 @@ -1,20 +0,0 @@
8397 -<?xml version="1.0" encoding="UTF-8"?>
8398 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
8399 -<pkgmetadata>
8400 - <maintainer type="project">
8401 - <email>bsd@g.o</email>
8402 - <name>BSD Project</name>
8403 - </maintainer>
8404 - <use>
8405 - <flag name="ipfilter">
8406 - Build tools to administer the ipfilter firewall.
8407 - </flag>
8408 - <flag name="pf">
8409 - Build tools to administer the PF firewall.
8410 - </flag>
8411 - <flag name="netware">
8412 - Build libraries and tools to work with NetWare protocols (IPX
8413 - and NCP).
8414 - </flag>
8415 - </use>
8416 -</pkgmetadata>
8417
8418 diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
8419 deleted file mode 100644
8420 index 88f9858..0000000
8421 --- a/sys-freebsd/freebsd-share/Manifest
8422 +++ /dev/null
8423 @@ -1,10 +0,0 @@
8424 -AUX freebsd-share-10.0-gentoo-eapi3.patch 475 SHA256 504841c762c1fa82ac14c22e16b84543e88927608f3fb972d995caa89449e487 SHA512 b7fe870aafe1cf9029c1d1d9de16413b5be8354b1c2ba0d0eab6f0fe3076ab03da08ff764c923c087e246b90355a48d55acef9b9b5a29238ddf8c92bdb3ca0f8 WHIRLPOOL 58dd84d64cea1c149b0126d7e9567caf7dbe6f238b1434eb4ffde08496e45e268691ba8604ea80da863d06d3f6ac6aeff4e9f7a01d558a28a31f347ed6c0c4c9
8425 -AUX freebsd-share-10.2-gnu-miscfiles.patch 913 SHA256 e2a7e8221753dabf78380b9820991ee067670b9593e3dc9d8ecc8bf487b1ebc8 SHA512 fa792f15e325117e4448b344ab3dbf64d3880719698d88d8dda60c8cc4afea8c11cb845f44fa3b78ddc98fc6b021ef9edac639f649e8d166d79bf2c0e4f654f5 WHIRLPOOL 3c9e15340a71a85f44df3cbc41a6bc46eba7f790410d1aa70266a342038c39dff2b3ec887c210afdde559fecc7c51fb5c0e1484db86d3fff1d5851c21d3f6f8d
8426 -AUX freebsd-share-10.3-gentoo-skel.patch 600 SHA256 6860f0376babafbc0367bfde0d348fac1e4f95f42cdfd2931c3d7a027cd62536 SHA512 338eb369c50b11835f00474be5363bf6af43d8391a28a6e78e1517afc686b168fd0bfc32d45a78e79515c3d89a35b097548117cb2838b751d3d41330939c7dc2 WHIRLPOOL 1a833bc8e2376b25275d5be27dcc403cb8f7b498be08ab1532da1b27e77af32779a38b9a8d54b03d80f36b0ec398425269b58a04d9eea74fd2af5d91fec4d8b9
8427 -AUX freebsd-share-5.3-doc-locations.patch 608 SHA256 d949e9081a181ab9443a18e56949905a77eff2cbd16d09d37b8abb5771cee3b6 SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6 WHIRLPOOL bac15f5c439ffa81b83dfac5dce981e346e2815b6a035e9b9791db16df77d7f2e9fb6706f7b5315c65d18f209176866b23a34b311c56847f543f1257fa5e9634
8428 -AUX freebsd-share-5.4-gentoo-skel.patch 621 SHA256 5480127971c2a5df5faf44355d5ed6a8586923577d37e6cff10805626726c767 SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af WHIRLPOOL 8fabb340e4fcb1a174e3870a2ebe737f89b892586fed61a239e96bb34fb508daaef1e8e80811634e2075dbf6a161a236bca10a589340fbc609382f685b0697a9
8429 -AUX freebsd-share-8.0-gnu-miscfiles.patch 858 SHA256 20b3761bd18d4ff8e7257ab006f9c23b99473809c138c44145e25832e0c79855 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853 WHIRLPOOL f8d6675121ac43d2672f77d7ea4215073ff213c311fc1c09fe367f2d86f7dc1791a95f31b6def6f5bb757a5cd682de4c373c91465aa05acd38acfb537e781a6a
8430 -AUX freebsd-share-9.2-gnu-miscfiles.patch 1022 SHA256 0484a9ea6d05eb8d26c33efac61928c399230d8bf71a374fa2ae5c22a1acf3d2 SHA512 b220c884a6e3bb9037a1817b3bb1bcf181b1493836dafbef98bf0973e9781d2e2e982d9e17eef78b24056038e985969ed08c471c9ba374557097086bfcff8f3e WHIRLPOOL ffa0400172e0834f31897738d426dd53df40e67612e51045cd899cd84cef018db6a14c8600233fe2e23699a708e73f1b6df7654089356bdaa62274f5fc11931b
8431 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
8432 -EBUILD freebsd-share-10.3_rc3.ebuild 3113 SHA256 7c5ed6f3bc5936fb42b03ed1e94d62b9e0604453e6b37026593a071cacb46fec SHA512 d9c0621373fd35c93f870f0e4d8674cfbf8a8e9154b6bbb826c365858b856b862b468a6ba8fc4889615a69ada7bd1d0a00484c3a9b69f13cdca3a273c30f4fc6 WHIRLPOOL 69c25dc9c5d513fcb6eca148cbedcc6b493eea582074a2f622ce6731e4c57b94c721013bb958a2036144ceb61de42b807f860ffe4bbf8f2404d679dde3c40bea
8433 -MISC metadata.xml 359 SHA256 e204eb4e849ada468d2815276528d5bd274b727484eb9edf73f601e7b3b9d302 SHA512 998035745a4f78369a7c88d69e52a5377f09e7804ee93f37758fb26a97731b1dbde42d69cae4656b47e57c5dd6c0f2fa1c1ede360aaee38e3170acb7f73643ac WHIRLPOOL 429a60edcf9afc20c72f296f08e72f36d9e1c86bb7054a32983ca21f057c8720b457352daf15afab2c2e92b2835629ccf3b47b67d8b0833805821924eedd167f
8434
8435 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch
8436 deleted file mode 100644
8437 index 1d0a53e..0000000
8438 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch
8439 +++ /dev/null
8440 @@ -1,17 +0,0 @@
8441 -diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part
8442 -index 9ca8577..329e9fb 100644
8443 ---- a/share/i18n/esdb/Makefile.part
8444 -+++ b/share/i18n/esdb/Makefile.part
8445 -@@ -13,10 +13,10 @@ PART!= sed '/^\#/d;/^ *$$/d' ${PARTFILE}
8446 - .endif
8447 - .if !defined(NO_EPREFIX)
8448 - CODESETS?= ${PART:C/^/${CODE}${SEP}/}
8449 --EPREFIX?= ${CODE}${SEP}
8450 -+EPREFIX= ${CODE}${SEP}
8451 - .else
8452 - CODESETS?= ${PART}
8453 --EPREFIX?=
8454 -+EPREFIX=
8455 - .endif
8456 - ESUBDIR?= ${CODE}
8457 - ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/}
8458
8459 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch
8460 deleted file mode 100644
8461 index 1dc8488..0000000
8462 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch
8463 +++ /dev/null
8464 @@ -1,30 +0,0 @@
8465 -diff --git a/share/dict/Makefile b/share/dict/Makefile
8466 -index 3e2a0df..5395077 100644
8467 ---- a/share/dict/Makefile
8468 -+++ b/share/dict/Makefile
8469 -@@ -4,8 +4,7 @@
8470 - NO_OBJ=
8471 -
8472 - # XXX MISSING: connectives words
8473 --FILES= README propernames web2 web2a freebsd
8474 -+FILES= README freebsd
8475 - FILESDIR= ${BINDIR}/dict
8476 --SYMLINKS= web2 ${FILESDIR}/words
8477 -
8478 - .include <bsd.prog.mk>
8479 -diff --git a/share/misc/Makefile b/share/misc/Makefile
8480 -index ffd42d8..7eb90bb 100644
8481 ---- a/share/misc/Makefile
8482 -+++ b/share/misc/Makefile
8483 -@@ -5,9 +5,9 @@
8484 -
8485 - .PATH: ${.CURDIR}/../../sys/dev/usb
8486 -
8487 --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
8488 -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \
8489 - committers-src.dot eqnchar flowers init.ee \
8490 -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
8491 -+ iso3166 iso639 man.template mdoc.template pci_vendors \
8492 - scsi_modes \
8493 - organization.dot
8494 -
8495
8496 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch
8497 deleted file mode 100644
8498 index 79e29e9..0000000
8499 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch
8500 +++ /dev/null
8501 @@ -1,20 +0,0 @@
8502 -diff --git a/share/skel/Makefile b/share/skel/Makefile
8503 -index 024985c..6f6e563 100644
8504 ---- a/share/skel/Makefile
8505 -+++ b/share/skel/Makefile
8506 -@@ -2,11 +2,11 @@
8507 - # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $
8508 -
8509 - FILESGROUPS= FILES1 FILES2
8510 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
8511 -+FILES1= dot.login_conf dot.mailrc \
8512 - dot.shrc
8513 --FILES2= dot.mail_aliases dot.rhosts
8514 --FILES1DIR= ${SHAREDIR}/skel
8515 --FILES2DIR= ${SHAREDIR}/skel
8516 -+FILES2= dot.mail_aliases
8517 -+FILES1DIR= /etc/skel
8518 -+FILES2DIR= /etc/skel
8519 - FILES1MODE= 0644
8520 - FILES2MODE= 0600
8521 - NO_OBJ=
8522
8523 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch
8524 deleted file mode 100644
8525 index c0798d3..0000000
8526 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.3-doc-locations.patch
8527 +++ /dev/null
8528 @@ -1,20 +0,0 @@
8529 ---- examples/smbfs/Makefile.orig Tue Mar 22 15:20:20 2005
8530 -+++ examples/smbfs/Makefile Tue Mar 22 15:20:46 2005
8531 -@@ -2,6 +2,7 @@
8532 -
8533 - NOOBJ=
8534 - BINDIR= /usr/share/examples/smbfs
8535 -+FILESDIR= ${DOCDIR}/smbfs
8536 - FILES= dot.nsmbrc
8537 -
8538 - .PATH: ${.CURDIR}/../../../contrib/smbfs/examples
8539 ---- examples/smbfs/print/Makefile.orig Tue Mar 22 15:22:17 2005
8540 -+++ examples/smbfs/print/Makefile Tue Mar 22 15:22:35 2005
8541 -@@ -2,6 +2,7 @@
8542 -
8543 - NOOBJ=
8544 - BINDIR= /usr/share/examples/smbfs/print
8545 -+FILESDIR= ${DOCDIR}/smbfs/print
8546 - FILES= lj6l ljspool printcap.sample tolj
8547 -
8548 - .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print
8549
8550 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch b/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch
8551 deleted file mode 100644
8552 index f668d04..0000000
8553 --- a/sys-freebsd/freebsd-share/files/freebsd-share-5.4-gentoo-skel.patch
8554 +++ /dev/null
8555 @@ -1,20 +0,0 @@
8556 -Index: fbsd/share/skel/Makefile
8557 -===================================================================
8558 ---- fbsd.orig/share/skel/Makefile
8559 -+++ fbsd/share/skel/Makefile
8560 -@@ -2,11 +2,11 @@
8561 - # $FreeBSD: src/share/skel/Makefile,v 1.9.2.1 2005/02/13 07:23:30 obrien Exp $
8562 -
8563 - FILESGROUPS= FILES1 FILES2
8564 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
8565 -+FILES1= dot.login_conf dot.mailrc \
8566 - dot.shrc
8567 --FILES2= dot.mail_aliases dot.rhosts
8568 --FILES1DIR= /usr/share/skel
8569 --FILES2DIR= /usr/share/skel
8570 -+FILES2= dot.mail_aliases
8571 -+FILES1DIR= /etc/skel
8572 -+FILES2DIR= /etc/skel
8573 - FILES1MODE= 0644
8574 - FILES2MODE= 0600
8575 - NOOBJ=
8576
8577 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch
8578 deleted file mode 100644
8579 index 19167a6..0000000
8580 --- a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch
8581 +++ /dev/null
8582 @@ -1,26 +0,0 @@
8583 ---- share/misc/Makefile.old 2010-03-12 01:32:39 +0100
8584 -+++ share/misc/Makefile 2010-03-12 01:33:25 +0100
8585 -@@ -3,9 +3,9 @@
8586 -
8587 - .PATH: ${.CURDIR}/../../sys/dev/usb
8588 -
8589 --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
8590 -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \
8591 - committers-src.dot eqnchar flowers init.ee \
8592 -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
8593 -+ iso3166 iso639 man.template mdoc.template pci_vendors \
8594 - scsi_modes usb_hid_usages usbdevs
8595 -
8596 - NO_OBJ=
8597 ---- share/dict/Makefile.old 2010-03-12 01:33:53 +0100
8598 -+++ share/dict/Makefile 2010-03-12 01:34:18 +0100
8599 -@@ -4,8 +4,7 @@
8600 - NO_OBJ=
8601 -
8602 - # XXX MISSING: connectives words
8603 --FILES= README propernames web2 web2a freebsd
8604 -+FILES= README freebsd
8605 - FILESDIR= ${BINDIR}/dict
8606 --SYMLINKS= web2 ${FILESDIR}/words
8607 -
8608 - .include <bsd.prog.mk>
8609
8610 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
8611 deleted file mode 100644
8612 index af84dc3..0000000
8613 --- a/sys-freebsd/freebsd-share/files/freebsd-share-9.2-gnu-miscfiles.patch
8614 +++ /dev/null
8615 @@ -1,28 +0,0 @@
8616 -diff -Nur share.orig/dict/Makefile share/dict/Makefile
8617 ---- share.orig/dict/Makefile 2012-12-31 18:00:00.000000000 +0900
8618 -+++ share/dict/Makefile 2012-12-31 18:03:15.000000000 +0900
8619 -@@ -4,8 +4,7 @@
8620 - NO_OBJ=
8621 -
8622 - # XXX MISSING: connectives words
8623 --FILES= README propernames web2 web2a freebsd
8624 -+FILES= README freebsd
8625 - FILESDIR= ${BINDIR}/dict
8626 --SYMLINKS= web2 ${FILESDIR}/words
8627 -
8628 - .include <bsd.prog.mk>
8629 -diff -Nur share.orig/misc/Makefile share/misc/Makefile
8630 ---- share.orig/misc/Makefile 2012-12-31 18:00:00.000000000 +0900
8631 -+++ share/misc/Makefile 2012-12-31 18:04:22.000000000 +0900
8632 -@@ -3,9 +3,9 @@
8633 -
8634 - .PATH: ${.CURDIR}/../../sys/dev/usb
8635 -
8636 --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
8637 -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \
8638 - committers-src.dot eqnchar flowers init.ee \
8639 -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
8640 -+ iso3166 iso639 man.template mdoc.template pci_vendors \
8641 - scsi_modes usb_hid_usages usbdevs \
8642 - organization.dot
8643 -
8644
8645 diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3_rc3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3_rc3.ebuild
8646 deleted file mode 100644
8647 index 8ab449e..0000000
8648 --- a/sys-freebsd/freebsd-share/freebsd-share-10.3_rc3.ebuild
8649 +++ /dev/null
8650 @@ -1,113 +0,0 @@
8651 -# Copyright 1999-2016 Gentoo Foundation
8652 -# Distributed under the terms of the GNU General Public License v2
8653 -# $Id$
8654 -
8655 -EAPI=5
8656 -
8657 -inherit bsdmk freebsd
8658 -
8659 -DESCRIPTION="FreeBSD shared tools/files"
8660 -SLOT="0"
8661 -LICENSE="BSD zfs? ( CDDL )"
8662 -
8663 -IUSE="doc usb zfs"
8664 -
8665 -if [[ ${PV} != *9999* ]]; then
8666 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
8667 -fi
8668 -
8669 -EXTRACTONLY="
8670 - share/
8671 - contrib/
8672 - gnu/
8673 - usr.bin/
8674 - usr.sbin/
8675 - sbin/
8676 - bin/
8677 - lib/
8678 - etc/
8679 -"
8680 -
8681 -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
8682 - =sys-freebsd/freebsd-sources-${RV}*"
8683 -RDEPEND="sys-apps/miscfiles"
8684 -
8685 -RESTRICT="strip"
8686 -
8687 -S="${WORKDIR}/share"
8688 -
8689 -pkg_setup() {
8690 - # Add the required source files.
8691 - use zfs && EXTRACTONLY+="cddl/ "
8692 -
8693 - use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
8694 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
8695 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
8696 - [[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= "
8697 -
8698 - mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= WITHOUT_CLANG= "
8699 -}
8700 -
8701 -REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
8702 -
8703 -PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
8704 - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
8705 - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" )
8706 -
8707 -src_prepare() {
8708 - # Remove make.conf manpage as it describes bsdmk's make.conf.
8709 - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
8710 - # Remove rc.conf manpage as it describes bsd's rc.conf.
8711 - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
8712 - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
8713 - # Remove mailer.conf manpage
8714 - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
8715 - # Remove pbm and moduli(ssh) manpages
8716 - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
8717 - # Remove builtins manpage
8718 - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
8719 - # Remove rc manpages
8720 - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
8721 - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
8722 - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
8723 -
8724 - # Don't install the arch-specific directories in subdirectories
8725 - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
8726 -
8727 - # Remove them so that they can't be included by error
8728 - rm -rf "${S}"/mk/*.mk
8729 -
8730 - # Make proper symlinks by defining the full target.
8731 - local sdir
8732 - for sdir in colldef mklocale monetdef msgdef numericdef timedef
8733 - do
8734 - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
8735 - "${S}/${sdir}/Makefile" || \
8736 - die "Error fixing ${sdir}/Makefile"
8737 - done
8738 - if [[ ! -e "${WORKDIR}/sys" ]]; then
8739 - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
8740 - fi
8741 -}
8742 -
8743 -src_compile() {
8744 - export ESED="/usr/bin/sed"
8745 -
8746 - # libiconv support.
8747 - # i18n/csmapper/APPLE requires mkcsmapper_static
8748 - # i18n/esdb/APPLE requires mkesdb_static
8749 - for pkg in mkcsmapper_static mkesdb_static
8750 - do
8751 - cd "${WORKDIR}"/usr.bin/${pkg} || die
8752 - freebsd_src_compile
8753 - done
8754 -
8755 - # This is a groff problem and not a -shared problem.
8756 - cd "${S}" || die
8757 - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
8758 - freebsd_src_compile -j1 || die "emake failed"
8759 -}
8760 -
8761 -src_install() {
8762 - mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
8763 -}
8764
8765 diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
8766 deleted file mode 100644
8767 index 9a9053f..0000000
8768 --- a/sys-freebsd/freebsd-share/metadata.xml
8769 +++ /dev/null
8770 @@ -1,12 +0,0 @@
8771 -<?xml version="1.0" encoding="UTF-8"?>
8772 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
8773 -<pkgmetadata>
8774 - <maintainer type="project">
8775 - <email>bsd@g.o</email>
8776 - <name>BSD Project</name>
8777 - </maintainer>
8778 - <use>
8779 - <flag name="isdn">Enable ISDN support</flag>
8780 - <flag name="zfs">Enable ZFS support.</flag>
8781 - </use>
8782 -</pkgmetadata>
8783
8784 diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
8785 deleted file mode 100644
8786 index 37c6b9b..0000000
8787 --- a/sys-freebsd/freebsd-sources/Manifest
8788 +++ /dev/null
8789 @@ -1,36 +0,0 @@
8790 -AUX config-GENTOO 73 SHA256 04a7695383baa247120cfd39f399b62c9d9b66682b79bc9bc1117f0aeb95b858 SHA512 436e1e1cb4077488cd1e054a96598c1c6dc2fda5c060d2d6c1bf2986b534016c86ea2afee0dcf883b4bde6946625596ea474a273013b18fdfa5538ebcfe6ea54 WHIRLPOOL 467ed565c0c6b508185f3c7d9a2031ce1861573614ba6fd5db7d6825fdaaabf23b9be1daef035d7fea9fa66f9d92ba17267085e894db66d8c9f49ed4ca9f16b9
8791 -AUX freebsd-sources-10.0-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c963e220694e3c0b3aae29faf05f8479da SHA512 98b8d1bf033b9bd7147f10e5bb4a39ac4883ec02ef0cc3825541ff11cb9bfe5e7722e7b8dcefe4c356f9fb0f86ec5cad6fbf9b80dbfd04149142fea5f8712d4d WHIRLPOOL 6372ec9abb566d06db174dd20785ab1768487ac2d57799fabad2d45cb77418f0e39aa0bad745c873e1c50de86a70fa80890f7f2f377f6a53f4fd5b7a6fa49edf
8792 -AUX freebsd-sources-10.1-gcc48.patch 452 SHA256 26ad0753e59bd7e45f957cc98c8a11c8c1bcaf89ed55898b4efc6d95e3943671 SHA512 55e5249ec8337d880d96fd9429a0ffe5663c6182996b6b2ab8d19fe9d5168a0042b81222b2bb89de6d90f98d042b593fb40a7f4178ac739f681f84c2d62b5c96 WHIRLPOOL b6ed5ad4d7e444c79afcc0a14ce9fc85fddd5d1ae6b1d7dc8aa3e4949bb598e0da7a0d95025ba7e3981fc0af741c52e3c84fc81cba00bc79f59ab510afa85441
8793 -AUX freebsd-sources-6.0-flex-2.5.31.patch 826 SHA256 8aaf240a344106fc5434fd098eb6555a554d16513b71c95f93a93388021c3d99 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64 WHIRLPOOL 620ae55a54333c55e44247aad76be467bdfa491dac646f65dc0e0b6b1a95fe8edf5087e9ed68abeac1ef6db1a91c0e673342bf44f8753b6b8a5dce889137cdcc
8794 -AUX freebsd-sources-6.1-ntfs.patch 1043 SHA256 2eb0e22bea267d7ac41c3dec81682d3cc1f1744316ea39342e2aaae1f2dca469 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad WHIRLPOOL bf4821beae08e002f290286bc290b2bfeac86db46c1597232f06a23e505d720e34841393d9fb4d7276ff7b98c1c133aae5d58c3ec7b8f12712b51260b981bd14
8795 -AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 SHA256 7857fc90c6d5ed28d848146d50ab5bcd01f79ad3480ad1335929f08e45afbc44 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7 WHIRLPOOL 6841f24f2d3ff569ff0e7bd4d628955c9b61b41aa039bdd1e736fa82f737842101c212d8ae8961d1db335e53ba332cdbec1d021a4c57520e426926981bca4512
8796 -AUX freebsd-sources-7.1-binutils_link.patch 1297 SHA256 957c03640f3aac6141efa3e775f33fcadd501f920612055d0e00b3f80fcd8f17 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0 WHIRLPOOL 5108bd5a1bd49f94a7902b5b478528b29f1e15fe1e06f96a80de6fbf047eaf4f925f00fcd5f83085d44e86828dee50cc2efd150ece362bbd3ab24b292d9e7249
8797 -AUX freebsd-sources-7.1-includes.patch 318 SHA256 70c73d0939325185430a3a133380f0bc10674cb8fbe5c7ebfe3b07630d023369 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7 WHIRLPOOL 5dca685df773113dff0c8aac16f244882728ad586b62b7c20df948240b097e89d1bb62f16ed181f2535e13835471754d8fdd0f4ef02b73ce5077b9169c958557
8798 -AUX freebsd-sources-7.1-types.h-fix.patch 371 SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f WHIRLPOOL d284dd82244a108e4677be143cfc302c18f18e5b39c39fcaa8915c61053d94bf7171e48028f40d25f8058f8ec910c3e55a3753ccecb46bbabbb0e5ba86e808e3
8799 -AUX freebsd-sources-7.2-debug-O2.patch 771 SHA256 ad1fdd8a6dd53186793d70b65e1b37e3d3e7a4e50c32069aa535ae9f8e9aded8 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201 WHIRLPOOL 598f1e3282f5b8ebacd43835e148e5249737d8d7b240eaa459e5374444e0aeb39a692b01d3da5a8bec6aa44b8fe97879ce3bea739796688d8d6b365baac438b6
8800 -AUX freebsd-sources-8.0-gentoo.patch 1138 SHA256 0bb6e4cb59bb6f5fd86c88bfd36ce8c9d148d96e8722f1d6a485f98ba892650c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc WHIRLPOOL bcf25d6f650f6435e7fa7c6d5888a1dbded300f0e4c9f595abc1386663b65fd378805efe1b8355c91efc357e0684ce7722526f93beae55a1102e813aaecbd711
8801 -AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 SHA256 091764c97f4148d2245c24dcfabebd53ef0b4f3175a140fd5b1132788e718ca1 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5 WHIRLPOOL 01e27e011c94641498cf0c04a663e4f8f4844a57bd462aa38a1c23a8b3244e5eec226fb11b5e8e598de7227ac2d3dd33aaa98d16f6e7628329ac59e1e7ce62ae
8802 -AUX freebsd-sources-8.2-unix2.patch 1642 SHA256 6dd35d13a13f5e9333557a84b56c89fc4988d55bc3267cca72e8ca8ca169ce61 SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b WHIRLPOOL 5152dca64e3799cc9b6ffd97019c542f93082631489b9c0e03128a09a3d0c667da4220cfc67039c24d13a2cb527dd325db501029478d528c688c0c35cf2373c7
8803 -AUX freebsd-sources-9.0-disable-optimization.patch 927 SHA256 e8ad8d8ed1f729b7b22839a7af93b3dd667f257b05db95f408c48b270003a486 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b WHIRLPOOL 86f9586a3f07118f95e5fbce1a65fdd3be8dd701ed1bee1379ed2133cef3d9473b437826a13ec2a53c73f7b3e1003256d912a45eb80c86195749a8cd08f9813c
8804 -AUX freebsd-sources-9.0-ipv6refcount.patch 3259 SHA256 18186ef2f9fc020c0da053953b9e8c8629c2302082e0ee172dd7e84a7104bdd5 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658 WHIRLPOOL c0511b2fec1f2ecc8a6e3aba23808a4c60a4c94f45693b6f21a30cb01386e24969fcc9b655584c78a501524579f7e266993fdd6d565525740f4f8e04f47b55a9
8805 -AUX freebsd-sources-9.0-sysctluint.patch 403 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c WHIRLPOOL 1fd9852d59378b3fa8682886085f4f63ccd2a57806161b9a3ccb0cbe0c465be2e5620ed57942a8687656859e1a9df17c7d298ea66ec037514bbe7707783aa9f8
8806 -AUX freebsd-sources-9.1-ciss.patch 2067 SHA256 a450312394a9ed449144c1b320ec323f8fcd6cb744ad6c6862046b0fd5086e4e SHA512 5b8088644813d465443754f248e0068da1c53b4f947b7c1e584ae9dcd9b7b135a53edd70efc463b500aef74c4f8193e2d1d349b39ce183ed1f18284a2c2d7989 WHIRLPOOL 59f1324eaa98e11a094e4fe48e8ad8f468bc373691de101c5082630d1a69d10a3e6d904f3b6138a2107b0f35f37c16f07da575c1efb4bbfa22869a7cf328e5e2
8807 -AUX freebsd-sources-9.1-cve-2013-3077.patch 1064 SHA256 2c0b8a4df43b3a2b15bbb33000f4c0e0e132901dfe5d5531a694a17b9e1fd7b8 SHA512 12244d1335ab626e4a391cdd1d435f9f002ec4142fa2a2a93832b554f03fff69de09e950c4e80c797fd0b568504a69e18341fd35bd952a56e01a05024de8206f WHIRLPOOL 01c9e9270eea92448de3754ab0d6dc2efdec4b8e06a00b0d86c550e318c07c8e4a5b2b32e645008713e399c20b96d5e91e740e5120f889050ab91416763be3fa
8808 -AUX freebsd-sources-9.1-cve-2013-3266.patch 535 SHA256 3ddd63716570d7a08956228d3f2b165e80380d3062cecfa9ed781696542cf7e2 SHA512 04f421724d79a2e8c5a23120a44601bd611b938e4452d064034b7cf91ab36e2b019e3a12af62d5bd180a5da30ca59886f90aeb6f1255dcd2124285aec6b65fa7 WHIRLPOOL e12449b21f4a3200da65d815bdc33972e9aa7b2941560fba13a634be9baad4246b635ee87510a09dee123b65ea614ed57f17e482ba41a0ea2c986e579d75f3a9
8809 -AUX freebsd-sources-9.1-cve-2013-5209.patch 645 SHA256 1b334cae7f7ac266785449bc34a8b4b652b961b7b77acc3488e418f4359b6041 SHA512 1ed132883d22aaf48be98dd9adaa48cea0023f3c986cedb45f986676f1c4a40d3d5463006f516d78fe77a408e5f4821cb7b26d8fbff7091bc2aad9faac2e728a WHIRLPOOL 8ea85c387106009ed4c5ac4652520d349cf403d6568d81aedcc05f81ebdb5ac0c287a188071bb7651b4e847d95abf9874bfc8710a025c9ea1c986993b6d4a0a9
8810 -AUX freebsd-sources-9.1-cve-2013-5691.patch 2854 SHA256 418cb39d555c036013cd87a2205d2b1b9e4c729f409b3bd4c509648282a0a993 SHA512 6c3342e79fe3de90d37d82415b186f5012597dfbc5f522f9aadfa5420d601e4e6042b899ed348b581537491d4c49d6b4959ca3b438f9bda454b8d9b494120534 WHIRLPOOL 7436a1c9402c2de662b98e3615d1a62f290a8638c597d671474dab005a60a5c5b162ea31603902568c9443ebd39a2631297b6e19bd26f343c808e086b78da263
8811 -AUX freebsd-sources-9.1-cve-2013-5710.patch 704 SHA256 c076858b5dd9ab31be241144bef4de2824fa27599f7f114bcab9a2934436a1dd SHA512 a87d571aa060f435e0ac53816307703e300e16365df13c88be0a982d5851d3c224e0cc23b32ef61445413abda86762e0e43b964d475f1d816ca83d2c6b3f7d58 WHIRLPOOL 71bceec1fad2cde48cd32475805f96a33d9fef85ac8f3b69c601874514b6eef89479cf9b372bc8639d48a317dc5216bd7e2f2902570a148da865983845f5fbc6
8812 -AUX freebsd-sources-9.1-cve-2014-1453.patch 2239 SHA256 2605926b9a36cf2eecf65fc3bcc92ed772922562fdfebfd39c99137526f2a440 SHA512 27b48c96447cb961d2de3ad7f67a739ff78ee3904da508b2e6c1948d299090cb169bd3f289b0448e7d242c1c0d39fd5e5fc29700d92ba4877c3e6d013a6cd6a1 WHIRLPOOL 206c18f70756f77050c681ee4b14f7e0d0e38cac42d146ae0ccd9bd79a3977c4db57d1456c3bfe0294dad313eead5dfb748446e0fa401c98105ea53097505e45
8813 -AUX freebsd-sources-9.1-exec.patch 2032 SHA256 8e75954777f69e87b9401f3ed79d65fd6e498bd82bdad4378a076fa088480e8f SHA512 db2ac3a96b9c2bfc3e785a6ea8060e7cf516e6cb25629749a7cae4ca8171b0f3b8f1128c5b646f8dfcd78c21fb3859b548907ba1781a698235dd5cf6a90f824b WHIRLPOOL f0a29fea6f7cd5096deb29a53830c7c7e51b9c5c2eb2b28b2baca42fa0003f54181245cd8c9dc63beafea1d8000f05ac615705cfb573af33d03d6d89ee2712e6
8814 -AUX freebsd-sources-9.1-gentoo.patch 743 SHA256 f75e451259933aac8028ad0a2b6d9ee43d21bf40f7309e556d139c7a125392bd SHA512 9a7abc263c87134534d6f5a727e08c5f5c34b0272b8b03ddb89daf2ea27e4ec1e46d59202347e4b4154ac617e8c8fa8c29be95d498b54e392680b96fdd10cb6c WHIRLPOOL 237fbd8f3770442cc2692a2b62e83ecc732f54510d267a575a388de778f4b5c22a778d6fd8a69822ff8e782118c936e843e845c6461b0694ab357b261608a86e
8815 -AUX freebsd-sources-9.1-ktrace.patch 463 SHA256 328d14c5fd775b1a99f065911ab8c95065823dbd488bc0b1b3bc8bf46fcb8515 SHA512 b0cf73180320e0d1295fcde2c19a281575150f28d71fecd31c5793b6f0e9784005745fbc56b8578d40615e9276cfadf25d6fd3ea5e21f315e3c6beedc0476ffa WHIRLPOOL 03e3e9a090bd14c9f8be2fbf62a0c305da6e6e20ca1f5e30dd66c22b3f031132046ebd959c6f66a9b3227756c339cc3f87f339829592625dace8116f3ed67814
8816 -AUX freebsd-sources-9.1-mmap-2014.patch 758 SHA256 cfc0663e536972ced5a45b5ff491b8590e95739ea6cd34687b9ca56e5d7e63b8 SHA512 fb1f28268355ad0a25705fecb7555222b53b04fd92b1b80af2db4b6f2ac02bf5a948ba0521d1674e31da57a1baf037fe0fe581c03a437d86325e185a8050aaa3 WHIRLPOOL 8995fb9d0751aa3c12bab79206f22c924ffe583060895c2cfc62e53ce89ce1cdde0f511e12e017209221075aa536e839ab68c241b8feffc26910c613aa8753ed
8817 -AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becbaac2bc5e89511f61260e85a914235e SHA512 0daff1ef440be8e4f841eeff8917a36591bd3f4c31d79feb4666f9c3d65d49ee180397b81b07753c8892efd76436bf19d2218979cef3847d3cd46bdfcf166d6b WHIRLPOOL a31b32fb6fe8d7ca4464abae9c444e62d6ff00b4d53beed7c81c89bf0e85e61cf1eed7e70c7861a3559432086a923926737c4f6a727d2e389745de045e6f30cb
8818 -AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9
8819 -AUX freebsd-sources-9.1-random.patch 792 SHA256 46d4035d31e8a64531e1893c08b8235ee92af002848a781d9f1af1a886f17fdc SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99 WHIRLPOOL db318323bd0d757ab0a97ef5e552ee38b9fe5eaf12f87769912abf16dda40b11692ae3715cd5fc34aa11d5ae226366b8bb63feff3067c539b9fc23a9ad14c840
8820 -AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802126382a6ce5dbbc6617e4f81188e7a SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e WHIRLPOOL 6e81938c55e2a40f4d75a53f4bfeac1c4183feebf023bcc320c0179dbf802151cc5f04dde9302e233eff86c33fdca8a6e80dda70d47d0d762da61e22782b1b0d
8821 -AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
8822 -AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
8823 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
8824 -EBUILD freebsd-sources-10.3_rc3.ebuild 4431 SHA256 cf92eaf39954b749f6285b41ef4bd8bbb5a001ee7e701683bed95f006cbadc76 SHA512 3ba92e0d63f05c7498d540feac2ae636e26798e1abe8740ff50e40e990cd1c0e860e1a3a4e20bee55b5a103ba809833d60873032e4d25aac67220273345c87d4 WHIRLPOOL 5a2a02a09597587fca96073e6b6fadfed3b1d0a6aa9ce90ec347862f788a377563aba7da7afc9a03556ce40c52d77448cceb6785506ffd50287c742afe6039e5
8825 -MISC metadata.xml 444 SHA256 c4696a22f747056498f14d7fbac5d3b317ee5ed5d0762351003ae7873475ff39 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc WHIRLPOOL af64f83a4459752b8b8656412abaf5feaedbaa4b06dbbd0a71f31fc440eb945d39617a540e6b9969586b190c984452f1eaded80062481c6b2b0121482cfa61c2
8826
8827 diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO
8828 deleted file mode 100644
8829 index 7c7eb26..0000000
8830 --- a/sys-freebsd/freebsd-sources/files/config-GENTOO
8831 +++ /dev/null
8832 @@ -1,4 +0,0 @@
8833 -# Kernel configuration for Gentoo/FreeBSD.
8834 -include GENERIC
8835 -ident GENTOO
8836 -
8837
8838 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
8839 deleted file mode 100644
8840 index c7e12bd..0000000
8841 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch
8842 +++ /dev/null
8843 @@ -1,22 +0,0 @@
8844 -diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
8845 -index 2939a59..124ef6f 100644
8846 ---- a/sys/conf/kern.mk
8847 -+++ b/sys/conf/kern.mk
8848 -@@ -5,7 +5,7 @@
8849 - #
8850 - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
8851 - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
8852 -- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \
8853 -+ -Wundef -Wno-pointer-sign \
8854 - -Wmissing-include-dirs -fdiagnostics-show-option \
8855 - ${CWARNEXTRA}
8856 - #
8857 -@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS= -fformat-extensions
8858 - #
8859 - .if ${MACHINE_CPUARCH} == "i386"
8860 - .if ${COMPILER_TYPE} != "clang"
8861 --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
8862 -+CFLAGS+= -mpreferred-stack-boundary=2
8863 - .else
8864 - CFLAGS+= -mno-aes -mno-avx
8865 - .endif
8866
8867 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
8868 deleted file mode 100644
8869 index 5cb4cf8..0000000
8870 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch
8871 +++ /dev/null
8872 @@ -1,18 +0,0 @@
8873 -https://svnweb.freebsd.org/base?view=revision&revision=281606
8874 -
8875 -diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h
8876 -index d4ed8b3..79847ee 100644
8877 ---- a/sys/crypto/aesni/aesencdec.h
8878 -+++ b/sys/crypto/aesni/aesencdec.h
8879 -@@ -27,6 +27,11 @@
8880 - *
8881 - */
8882 -
8883 -+#if defined(__GNUC__) && defined(_KERNEL)
8884 -+/* Suppress inclusion of gcc's mm_malloc.h header */
8885 -+#define _MM_MALLOC_H_INCLUDED 1
8886 -+#endif
8887 -+
8888 - #include <wmmintrin.h>
8889 -
8890 - static inline void
8891
8892 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
8893 deleted file mode 100644
8894 index 88710cf..0000000
8895 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch
8896 +++ /dev/null
8897 @@ -1,22 +0,0 @@
8898 -Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
8899 -===================================================================
8900 ---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
8901 -+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l
8902 -@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol
8903 -
8904 - /* Put back everything up until the replacement. */
8905 - while (body_pos > next_match)
8906 -- unput(*--body_pos);
8907 -+ yyunput(*--body_pos, body_head);
8908 -
8909 - /* Perform the replacement. */
8910 - if (match_marg != NULL) {
8911 -@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol
8912 - next_match = match_marg->replacement_text;
8913 - strp = next_match + strlen(next_match);
8914 - while (strp > next_match)
8915 -- unput(*--strp);
8916 -+ yyunput(*--strp, next_match);
8917 -
8918 - /* Skip past the unexpanded macro arg. */
8919 - body_pos -= match.rm_eo - match.rm_so;
8920
8921 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
8922 deleted file mode 100644
8923 index e74fcd3..0000000
8924 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.1-ntfs.patch
8925 +++ /dev/null
8926 @@ -1,32 +0,0 @@
8927 ---- sys/fs/ntfs/ntfs_vnops.c.orig 2006-10-17 17:31:36 -0300
8928 -+++ sys/fs/ntfs/ntfs_vnops.c 2006-10-17 17:30:24 -0300
8929 -@@ -507,8 +507,12 @@
8930 -
8931 - /* Simulate . in every dir except ROOT */
8932 - if( ip->i_number != NTFS_ROOTINO ) {
8933 -- struct dirent dot = { NTFS_ROOTINO,
8934 -- sizeof(struct dirent), DT_DIR, 1, "." };
8935 -+ struct dirent dot;
8936 -+ dot.d_fileno = NTFS_ROOTINO;
8937 -+ dot.d_reclen = sizeof(struct dirent);
8938 -+ dot.d_type = DT_DIR;
8939 -+ dot.d_namlen = 1;
8940 -+ bcopy(".", dot.d_name, 1);
8941 -
8942 - if( uio->uio_offset < sizeof(struct dirent) ) {
8943 - dot.d_fileno = ip->i_number;
8944 -@@ -522,8 +526,12 @@
8945 -
8946 - /* Simulate .. in every dir including ROOT */
8947 - if( uio->uio_offset < 2 * sizeof(struct dirent) ) {
8948 -- struct dirent dotdot = { NTFS_ROOTINO,
8949 -- sizeof(struct dirent), DT_DIR, 2, ".." };
8950 -+ struct dirent dotdot;
8951 -+ dotdot.d_fileno = NTFS_ROOTINO;
8952 -+ dotdot.d_reclen = sizeof(struct dirent);
8953 -+ dotdot.d_type = DT_DIR;
8954 -+ dotdot.d_namlen = 2;
8955 -+ bcopy("..", dotdot.d_name, 2);
8956 -
8957 - error = uiomove((char *)&dotdot,sizeof(struct dirent),uio);
8958 - if(error)
8959
8960 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
8961 deleted file mode 100644
8962 index 13524ef..0000000
8963 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.0-tmpfs_whiteout_stub.patch
8964 +++ /dev/null
8965 @@ -1,44 +0,0 @@
8966 -diff -ur sys/fs/tmpfs.orig/tmpfs_vnops.c sys/fs/tmpfs/tmpfs_vnops.c
8967 ---- sys/fs/tmpfs.orig/tmpfs_vnops.c 2008-06-22 12:17:48 -0300
8968 -+++ sys/fs/tmpfs/tmpfs_vnops.c 2008-06-28 12:05:10 -0300
8969 -@@ -1459,6 +1459,30 @@
8970 - return (0);
8971 - }
8972 -
8973 -+
8974 -+/* --------------------------------------------------------------------- */
8975 -+/* This does absolutely nothing */
8976 -+#ifdef GENTOO_LIVECD
8977 -+static int
8978 -+tmpfs_whiteout(struct vop_whiteout_args *ap)
8979 -+{
8980 -+ switch (ap->a_flags) {
8981 -+ case LOOKUP:
8982 -+ return (0);
8983 -+ break;
8984 -+ case CREATE:
8985 -+ return(EOPNOTSUPP);
8986 -+ break;
8987 -+ case DELETE:
8988 -+ return (0);
8989 -+ break;
8990 -+ default:
8991 -+ return(EOPNOTSUPP);
8992 -+ }
8993 -+ return(0);
8994 -+}
8995 -+#endif
8996 -+
8997 - /* --------------------------------------------------------------------- */
8998 -
8999 - /*
9000 -@@ -1484,6 +1508,9 @@
9001 - .vop_mkdir = tmpfs_mkdir,
9002 - .vop_rmdir = tmpfs_rmdir,
9003 - .vop_symlink = tmpfs_symlink,
9004 -+#ifdef GENTOO_LIVECD
9005 -+ .vop_whiteout = tmpfs_whiteout,
9006 -+#endif
9007 - .vop_readdir = tmpfs_readdir,
9008 - .vop_readlink = tmpfs_readlink,
9009 - .vop_inactive = tmpfs_inactive,
9010
9011 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
9012 deleted file mode 100644
9013 index 43d01ba..0000000
9014 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
9015 +++ /dev/null
9016 @@ -1,37 +0,0 @@
9017 -diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
9018 ---- sys.orig/conf/kern.post.mk 2007-03-23 18:55:59 -0300
9019 -+++ sys/conf/kern.post.mk 2008-06-18 19:51:13 -0300
9020 -@@ -85,7 +85,9 @@
9021 - ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
9022 - @rm -f ${.TARGET}
9023 - @echo linking ${.TARGET}
9024 -- ${SYSTEM_LD}
9025 -+ ${SYSTEM_LD} -o ${.TARGET}.tmp
9026 -+ @sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
9027 -+ ${SYSTEM_LD} "@${.TARGET}.lopt"
9028 - .if defined(CTFMERGE)
9029 - ${SYSTEM_CTFMERGE}
9030 - .endif
9031 -diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
9032 ---- sys.orig/conf/kmod.mk 2008-06-18 09:11:53 -0300
9033 -+++ sys/conf/kmod.mk 2008-06-18 19:50:01 -0300
9034 -@@ -176,7 +176,8 @@
9035 -
9036 - .if ${MACHINE_ARCH} != amd64
9037 - ${FULLPROG}: ${KMOD}.kld
9038 -- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
9039 -+ sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
9040 -+ ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
9041 - .if !defined(DEBUG_FLAGS)
9042 - ${OBJCOPY} --strip-debug ${.TARGET}
9043 - .endif
9044 -diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
9045 ---- sys.orig/tools/gen-ld-u-options 1969-12-31 21:00:00 -0300
9046 -+++ sys/tools/gen-ld-u-options 2008-06-18 19:47:56 -0300
9047 -@@ -0,0 +1,6 @@
9048 -+#!/bin/sh
9049 -+
9050 -+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
9051 -+do
9052 -+ echo -n " -u __start_$i -u __stop_$i "
9053 -+done
9054
9055 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
9056 deleted file mode 100644
9057 index 3db46fa..0000000
9058 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch
9059 +++ /dev/null
9060 @@ -1,13 +0,0 @@
9061 -Make headers usable alone, include the headers they need.
9062 -There are probably much more missing.
9063 -
9064 ---- sys/net/if.h.old 2009-05-15 10:51:50 +0000
9065 -+++ sys/net/if.h 2009-05-15 10:52:05 +0000
9066 -@@ -34,6 +34,7 @@
9067 - #define _NET_IF_H_
9068 -
9069 - #include <sys/cdefs.h>
9070 -+#include <sys/socket.h>
9071 -
9072 - #ifdef _KERNEL
9073 - #include <sys/queue.h>
9074
9075 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
9076 deleted file mode 100644
9077 index 8de5df2..0000000
9078 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-types.h-fix.patch
9079 +++ /dev/null
9080 @@ -1,15 +0,0 @@
9081 -Fixes a compile error if XOPEN_SOURCE 600 is defined.
9082 -
9083 -See: http://www.mailinglistarchive.com/freebsd-current@×××××××.org/msg15011.html
9084 -
9085 ---- sys/sys/types.h.orig
9086 -+++ sys/sys/types.h
9087 -@@ -46,7 +46,7 @@
9088 -
9089 - #include <sys/_pthreadtypes.h>
9090 -
9091 --#if __BSD_VISIBLE
9092 -+#ifndef _POSIX_SOURCE
9093 - typedef unsigned char u_char;
9094 - typedef unsigned short u_short;
9095 - typedef unsigned int u_int;
9096
9097 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
9098 deleted file mode 100644
9099 index 4fa3565..0000000
9100 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
9101 +++ /dev/null
9102 @@ -1,27 +0,0 @@
9103 -My UltraSPARC U5 panics on boot about a memory alignment error when compiled
9104 -with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
9105 -affect debugging.
9106 -
9107 -NOTE: This does not fix the memory alignment panic when loading kernel modules.
9108 -
9109 -Roy Marples (uberlord@g.o)
9110 -
9111 ---- sys/conf/kern.pre.mk.old 2009-05-22 10:09:46 +0000
9112 -+++ sys/conf/kern.pre.mk 2009-05-22 10:10:27 +0000
9113 -@@ -22,15 +22,13 @@
9114 - COPTFLAGS?= -O
9115 - .else
9116 - . if defined(DEBUG)
9117 --_MINUS_O= -O
9118 - CTFFLAGS+= -g
9119 - . else
9120 --_MINUS_O= -O2
9121 - . endif
9122 - . if ${MACHINE_ARCH} == "amd64"
9123 - COPTFLAGS?=-O2 -frename-registers -pipe
9124 - . else
9125 --COPTFLAGS?=${_MINUS_O} -pipe
9126 -+COPTFLAGS?=-O2 -pipe
9127 - . endif
9128 - . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
9129 - COPTFLAGS+= -fno-strict-aliasing
9130
9131 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
9132 deleted file mode 100644
9133 index 0f8d070..0000000
9134 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
9135 +++ /dev/null
9136 @@ -1,33 +0,0 @@
9137 ---- sys/conf/kern.mk.old 2007-05-24 23:53:42.000000000 +0200
9138 -+++ sys/conf/kern.mk 2008-03-14 14:37:47.216420518 +0100
9139 -@@ -12,7 +12,7 @@
9140 - .else
9141 - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
9142 - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
9143 -- ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
9144 -+ ${_wundef} ${_Wno_pointer_sign}
9145 - .if !defined(WITH_GCC3)
9146 - _Wno_pointer_sign=-Wno-pointer-sign
9147 - .endif
9148 -@@ -36,7 +36,7 @@
9149 - # reserved for user applications.
9150 - #
9151 - .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
9152 --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \
9153 -+CFLAGS+= -mpreferred-stack-boundary=2 \
9154 - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
9155 - INLINE_LIMIT?= 8000
9156 - .endif
9157 -Only in ./sys/conf: kern.mk.rej
9158 -Only in ./sys/conf: kern.mk~
9159 ---- sys/dev/aic7xxx/aicasm/Makefile.old 2010-03-10 14:01:50 +0100
9160 -+++ sys/dev/aic7xxx/aicasm/Makefile 2010-03-10 14:01:56 +0100
9161 -@@ -14,7 +14,7 @@
9162 - SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
9163 - CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
9164 - DPADD= ${LIBL}
9165 --LDADD= -ll
9166 -+LDADD= -lfl
9167 - WARNS?= 6
9168 -
9169 - # Correct path for kernel builds
9170
9171 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
9172 deleted file mode 100644
9173 index a7335f6..0000000
9174 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch
9175 +++ /dev/null
9176 @@ -1,21 +0,0 @@
9177 -Fixes changing the default subnet route after removing an ip address.
9178 -
9179 -See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133
9180 -and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html
9181 -
9182 -Thanks to Roy Marples.
9183 ---- sys/netinet/in.c.orig
9184 -+++ sys/netinet/in.c
9185 -@@ -858,6 +858,12 @@
9186 - error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags);
9187 - if (!error)
9188 - target->ia_flags |= IFA_ROUTE;
9189 -+ else if (error == EEXIST) {
9190 -+ /*
9191 -+ * the fact that the route already exists is not an error.
9192 -+ */
9193 -+ error = 0;
9194 -+ }
9195 - return (error);
9196 - }
9197 -
9198
9199 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
9200 deleted file mode 100644
9201 index 50dacd0..0000000
9202 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
9203 +++ /dev/null
9204 @@ -1,55 +0,0 @@
9205 -Index: sys/kern/uipc_usrreq.c
9206 -===================================================================
9207 ---- sys/kern/uipc_usrreq.c (revision 225745)
9208 -+++ sys/kern/uipc_usrreq.c (working copy)
9209 -@@ -462,6 +462,8 @@
9210 - unp = sotounpcb(so);
9211 - KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
9212 -
9213 -+ if (soun->sun_len > sizeof(struct sockaddr_un))
9214 -+ return (EINVAL);
9215 - namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
9216 - if (namelen <= 0)
9217 - return (EINVAL);
9218 -@@ -1252,6 +1254,8 @@
9219 - unp = sotounpcb(so);
9220 - KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
9221 -
9222 -+ if (nam->sa_len > sizeof(struct sockaddr_un))
9223 -+ return (EINVAL);
9224 - len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
9225 - if (len <= 0)
9226 - return (EINVAL);
9227 -Index: sys/compat/linux/linux_socket.c
9228 -===================================================================
9229 ---- sys/compat/linux/linux_socket.c (revision 225919)
9230 -+++ sys/compat/linux/linux_socket.c (working copy)
9231 -@@ -104,6 +104,7 @@
9232 - int oldv6size;
9233 - struct sockaddr_in6 *sin6;
9234 - #endif
9235 -+ int namelen;
9236 -
9237 - if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
9238 - return (EINVAL);
9239 -@@ -166,6 +167,20 @@
9240 - }
9241 - }
9242 -
9243 -+ if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
9244 -+ for (namelen = 0;
9245 -+ namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
9246 -+ namelen++)
9247 -+ if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
9248 -+ break;
9249 -+ if (namelen + offsetof(struct sockaddr_un, sun_path) >
9250 -+ sizeof(struct sockaddr_un)) {
9251 -+ error = EINVAL;
9252 -+ goto out;
9253 -+ }
9254 -+ alloclen = sizeof(struct sockaddr_un);
9255 -+ }
9256 -+
9257 - sa = (struct sockaddr *) kosa;
9258 - sa->sa_family = bdom;
9259 - sa->sa_len = alloclen;
9260
9261 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
9262 deleted file mode 100644
9263 index 4824ff6..0000000
9264 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
9265 +++ /dev/null
9266 @@ -1,32 +0,0 @@
9267 -Taken from debian GNU/kFreeBSD.
9268 -
9269 -Regretably, with GCC 4.4 or later this is the only flag combination
9270 -I could find that doesn't cause kernel panics CPU triple-faults or
9271 -other kind of severe breakage. This is Gentoo Bug #410945.
9272 -
9273 -Clang can use -O2, so we do not force -O1 on it
9274 -
9275 ---- a/sys/conf/kern.pre.mk
9276 -+++ b/sys/conf/kern.pre.mk
9277 -@@ -41,6 +41,9 @@
9278 - .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
9279 - COPTFLAGS+= -fno-strict-aliasing
9280 - .endif
9281 -+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s])
9282 -+COPTFLAGS+= -O1
9283 -+.endif
9284 - .if !defined(NO_CPU_COPTFLAGS)
9285 - COPTFLAGS+= ${_CPUCFLAGS}
9286 - .endif
9287 ---- a/sys/conf/kmod.mk
9288 -+++ b/sys/conf/kmod.mk
9289 -@@ -91,6 +91,9 @@
9290 - .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
9291 - CFLAGS+= -fno-strict-aliasing
9292 - .endif
9293 -+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s])
9294 -+CFLAGS+= -O1
9295 -+.endif
9296 - WERROR?= -Werror
9297 - CFLAGS+= ${WERROR}
9298 - CFLAGS+= -D_KERNEL
9299
9300 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
9301 deleted file mode 100644
9302 index f0984f6..0000000
9303 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-ipv6refcount.patch
9304 +++ /dev/null
9305 @@ -1,128 +0,0 @@
9306 -Index: sys/netinet6/in6.c
9307 -===================================================================
9308 ---- sys/netinet6/in6.c.orig
9309 -+++ sys/netinet6/in6.c
9310 -@@ -1369,6 +1369,8 @@ in6_purgeaddr(struct ifaddr *ifa)
9311 - }
9312 -
9313 - cleanup:
9314 -+ if (ifa0 != NULL)
9315 -+ ifa_free(ifa0);
9316 -
9317 - plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
9318 - if ((ia->ia_flags & IFA_ROUTE) && plen == 128) {
9319 -@@ -1393,8 +1395,6 @@ cleanup:
9320 - return;
9321 - ia->ia_flags &= ~IFA_ROUTE;
9322 - }
9323 -- if (ifa0 != NULL)
9324 -- ifa_free(ifa0);
9325 -
9326 - in6_unlink_ifa(ia, ifp);
9327 - }
9328 -@@ -1667,14 +1667,19 @@ in6_lifaddr_ioctl(struct socket *so, u_long cmd, c
9329 - hostid = IFA_IN6(ifa);
9330 -
9331 - /* prefixlen must be <= 64. */
9332 -- if (64 < iflr->prefixlen)
9333 -+ if (64 < iflr->prefixlen) {
9334 -+ if (ifa != NULL)
9335 -+ ifa_free(ifa);
9336 - return EINVAL;
9337 -+ }
9338 - prefixlen = iflr->prefixlen;
9339 -
9340 - /* hostid part must be zero. */
9341 - sin6 = (struct sockaddr_in6 *)&iflr->addr;
9342 - if (sin6->sin6_addr.s6_addr32[2] != 0 ||
9343 - sin6->sin6_addr.s6_addr32[3] != 0) {
9344 -+ if (ifa != NULL)
9345 -+ ifa_free(ifa);
9346 - return EINVAL;
9347 - }
9348 - } else
9349 -@@ -2265,14 +2265,20 @@ in6_ifawithifp(struct ifnet *ifp, struct in6_addr
9350 - IN6_IFADDR_RUNLOCK();
9351 - return (struct in6_ifaddr *)ifa;
9352 - }
9353 -- IN6_IFADDR_RUNLOCK();
9354 -
9355 - /* use the last-resort values, that are, deprecated addresses */
9356 -- if (dep[0])
9357 -+ if (dep[0]) {
9358 -+ ifa_ref((struct ifaddr *)dep[0]);
9359 -+ IN6_IFADDR_RUNLOCK();
9360 - return dep[0];
9361 -- if (dep[1])
9362 -+ }
9363 -+ if (dep[1]) {
9364 -+ ifa_ref((struct ifaddr *)dep[1]);
9365 -+ IN6_IFADDR_RUNLOCK();
9366 - return dep[1];
9367 -+ }
9368 -
9369 -+ IN6_IFADDR_RUNLOCK();
9370 - return NULL;
9371 - }
9372 -
9373 -Index: sys/netinet6/ip6_input.c
9374 -===================================================================
9375 ---- sys/netinet6/ip6_input.c.orig
9376 -+++ sys/netinet6/ip6_input.c
9377 -@@ -879,19 +879,23 @@ passin:
9378 - * as our interface address (e.g. multicast addresses, addresses
9379 - * within FAITH prefixes and such).
9380 - */
9381 -- if (deliverifp && !ip6_getdstifaddr(m)) {
9382 -+ if (deliverifp) {
9383 - struct in6_ifaddr *ia6;
9384 -
9385 -- ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
9386 -- if (ia6) {
9387 -- if (!ip6_setdstifaddr(m, ia6)) {
9388 -- /*
9389 -- * XXX maybe we should drop the packet here,
9390 -- * as we could not provide enough information
9391 -- * to the upper layers.
9392 -- */
9393 -+ if ((ia6 = ip6_getdstifaddr(m)) != NULL) {
9394 -+ ifa_free(&ia6->ia_ifa);
9395 -+ } else {
9396 -+ ia6 = in6_ifawithifp(deliverifp, &ip6->ip6_dst);
9397 -+ if (ia6) {
9398 -+ if (!ip6_setdstifaddr(m, ia6)) {
9399 -+ /*
9400 -+ * XXX maybe we should drop the packet here,
9401 -+ * as we could not provide enough information
9402 -+ * to the upper layers.
9403 -+ */
9404 -+ }
9405 -+ ifa_free(&ia6->ia_ifa);
9406 - }
9407 -- ifa_free(&ia6->ia_ifa);
9408 - }
9409 - }
9410 -
9411 -Index: sys/netinet/tcp_input.c
9412 -===================================================================
9413 ---- sys/netinet/tcp_input.c.orig
9414 -+++ sys/netinet/tcp_input.c
9415 -@@ -512,6 +512,8 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
9416 - (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
9417 - return IPPROTO_DONE;
9418 - }
9419 -+ if (ia6)
9420 -+ ifa_free(&ia6->ia_ifa);
9421 -
9422 - tcp_input(m, *offp);
9423 - return IPPROTO_DONE;
9424 -@@ -1240,7 +1242,8 @@ relocked:
9425 - rstreason = BANDLIM_RST_OPENPORT;
9426 - goto dropwithreset;
9427 - }
9428 -- ifa_free(&ia6->ia_ifa);
9429 -+ if (ia6)
9430 -+ ifa_free(&ia6->ia_ifa);
9431 - }
9432 - #endif /* INET6 */
9433 - /*
9434
9435 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
9436 deleted file mode 100644
9437 index 751a77c..0000000
9438 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch
9439 +++ /dev/null
9440 @@ -1,13 +0,0 @@
9441 -u_int is defined in sys/types.h
9442 -makes header usable alone.
9443 -
9444 ---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400
9445 -+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400
9446 -@@ -788,6 +788,7 @@
9447 - struct sysctl_req *);
9448 - #else /* !_KERNEL */
9449 - #include <sys/cdefs.h>
9450 -+#include <sys/types.h> /* for u_int */
9451 -
9452 - __BEGIN_DECLS
9453 - int sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
9454
9455 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
9456 deleted file mode 100644
9457 index 697984b..0000000
9458 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ciss.patch
9459 +++ /dev/null
9460 @@ -1,65 +0,0 @@
9461 -Index: sys/dev/ciss/ciss.c
9462 -===================================================================
9463 ---- sys/dev/ciss/ciss.c (revision 264510)
9464 -+++ sys/dev/ciss/ciss.c (revision 264511)
9465 -@@ -180,8 +180,6 @@
9466 - static void ciss_cam_poll(struct cam_sim *sim);
9467 - static void ciss_cam_complete(struct ciss_request *cr);
9468 - static void ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio);
9469 --static struct cam_periph *ciss_find_periph(struct ciss_softc *sc,
9470 -- int bus, int target);
9471 - static int ciss_name_device(struct ciss_softc *sc, int bus, int target);
9472 -
9473 - /* periodic status monitoring */
9474 -@@ -3398,27 +3396,6 @@
9475 -
9476 -
9477 - /********************************************************************************
9478 -- * Find a peripheral attached at (target)
9479 -- */
9480 --static struct cam_periph *
9481 --ciss_find_periph(struct ciss_softc *sc, int bus, int target)
9482 --{
9483 -- struct cam_periph *periph;
9484 -- struct cam_path *path;
9485 -- int status;
9486 --
9487 -- status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
9488 -- target, 0);
9489 -- if (status == CAM_REQ_CMP) {
9490 -- periph = cam_periph_find(path, NULL);
9491 -- xpt_free_path(path);
9492 -- } else {
9493 -- periph = NULL;
9494 -- }
9495 -- return(periph);
9496 --}
9497 --
9498 --/********************************************************************************
9499 - * Name the device at (target)
9500 - *
9501 - * XXX is this strictly correct?
9502 -@@ -3427,12 +3404,22 @@
9503 - ciss_name_device(struct ciss_softc *sc, int bus, int target)
9504 - {
9505 - struct cam_periph *periph;
9506 -+ struct cam_path *path;
9507 -+ int status;
9508 -
9509 - if (CISS_IS_PHYSICAL(bus))
9510 - return (0);
9511 -- if ((periph = ciss_find_periph(sc, bus, target)) != NULL) {
9512 -+
9513 -+ status = xpt_create_path(&path, NULL, cam_sim_path(sc->ciss_cam_sim[bus]),
9514 -+ target, 0);
9515 -+
9516 -+ if (status == CAM_REQ_CMP) {
9517 -+ mtx_lock(&sc->ciss_mtx);
9518 -+ periph = cam_periph_find(path, NULL);
9519 - sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
9520 - periph->periph_name, periph->unit_number);
9521 -+ mtx_unlock(&sc->ciss_mtx);
9522 -+ xpt_free_path(path);
9523 - return(0);
9524 - }
9525 - sc->ciss_logical[bus][target].cl_name[0] = 0;
9526
9527 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch
9528 deleted file mode 100644
9529 index 23f68ed..0000000
9530 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3077.patch
9531 +++ /dev/null
9532 @@ -1,26 +0,0 @@
9533 -Index: sys/netinet/in_mcast.c
9534 -===================================================================
9535 ---- sys/netinet/in_mcast.c (revision 254252)
9536 -+++ sys/netinet/in_mcast.c (working copy)
9537 -@@ -1648,6 +1648,8 @@
9538 - * has asked for, but we always tell userland how big the
9539 - * buffer really needs to be.
9540 - */
9541 -+ if (msfr.msfr_nsrcs > in_mcast_maxsocksrc)
9542 -+ msfr.msfr_nsrcs = in_mcast_maxsocksrc;
9543 - tss = NULL;
9544 - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
9545 - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
9546 -Index: sys/netinet6/in6_mcast.c
9547 -===================================================================
9548 ---- sys/netinet6/in6_mcast.c (revision 254252)
9549 -+++ sys/netinet6/in6_mcast.c (working copy)
9550 -@@ -1625,6 +1625,8 @@
9551 - * has asked for, but we always tell userland how big the
9552 - * buffer really needs to be.
9553 - */
9554 -+ if (msfr.msfr_nsrcs > in6_mcast_maxsocksrc)
9555 -+ msfr.msfr_nsrcs = in6_mcast_maxsocksrc;
9556 - tss = NULL;
9557 - if (msfr.msfr_srcs != NULL && msfr.msfr_nsrcs > 0) {
9558 - tss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,
9559
9560 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
9561 deleted file mode 100644
9562 index 0d1a894..0000000
9563 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-3266.patch
9564 +++ /dev/null
9565 @@ -1,13 +0,0 @@
9566 -Index: sys/fs/nfsserver/nfs_nfsdport.c
9567 -===================================================================
9568 ---- sys/fs/nfsserver/nfs_nfsdport.c (revision 249651)
9569 -+++ sys/fs/nfsserver/nfs_nfsdport.c (working copy)
9570 -@@ -1568,6 +1568,8 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdg
9571 - nd->nd_repstat = NFSERR_BAD_COOKIE;
9572 - #endif
9573 - }
9574 -+ if (!nd->nd_repstat && vp->v_type != VDIR)
9575 -+ nd->nd_repstat = NFSERR_NOTDIR;
9576 - if (nd->nd_repstat == 0 && cnt == 0) {
9577 - if (nd->nd_flag & ND_NFSV2)
9578 - /* NFSv2 does not have NFSERR_TOOSMALL */
9579
9580 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch
9581 deleted file mode 100644
9582 index e6710e3..0000000
9583 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5209.patch
9584 +++ /dev/null
9585 @@ -1,19 +0,0 @@
9586 -Index: sys/netinet/sctp_output.c
9587 -===================================================================
9588 ---- sys/netinet/sctp_output.c (revision 254337)
9589 -+++ sys/netinet/sctp_output.c (revision 254338)
9590 -@@ -5406,6 +5406,14 @@
9591 - }
9592 - SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk);
9593 -
9594 -+ /*
9595 -+ * We might not overwrite the identification[] completely and on
9596 -+ * some platforms time_entered will contain some padding. Therefore
9597 -+ * zero out the cookie to avoid putting uninitialized memory on the
9598 -+ * wire.
9599 -+ */
9600 -+ memset(&stc, 0, sizeof(struct sctp_state_cookie));
9601 -+
9602 - /* the time I built cookie */
9603 - (void)SCTP_GETTIME_TIMEVAL(&stc.time_entered);
9604 -
9605
9606 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch
9607 deleted file mode 100644
9608 index 9aef150..0000000
9609 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5691.patch
9610 +++ /dev/null
9611 @@ -1,89 +0,0 @@
9612 -Index: sys/net/if.c
9613 -===================================================================
9614 ---- sys/net/if.c (revision 254941)
9615 -+++ sys/net/if.c (working copy)
9616 -@@ -2553,11 +2553,23 @@
9617 - CURVNET_RESTORE();
9618 - return (EOPNOTSUPP);
9619 - }
9620 -+
9621 -+ /*
9622 -+ * Pass the request on to the socket control method, and if the
9623 -+ * latter returns EOPNOTSUPP, directly to the interface.
9624 -+ *
9625 -+ * Make an exception for the legacy SIOCSIF* requests. Drivers
9626 -+ * trust SIOCSIFADDR et al to come from an already privileged
9627 -+ * layer, and do not perform any credentials checks or input
9628 -+ * validation.
9629 -+ */
9630 - #ifndef COMPAT_43
9631 - error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
9632 - data,
9633 - ifp, td));
9634 -- if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL)
9635 -+ if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL &&
9636 -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
9637 -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
9638 - error = (*ifp->if_ioctl)(ifp, cmd, data);
9639 - #else
9640 - {
9641 -@@ -2601,7 +2613,9 @@
9642 - data,
9643 - ifp, td));
9644 - if (error == EOPNOTSUPP && ifp != NULL &&
9645 -- ifp->if_ioctl != NULL)
9646 -+ ifp->if_ioctl != NULL &&
9647 -+ cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
9648 -+ cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
9649 - error = (*ifp->if_ioctl)(ifp, cmd, data);
9650 - switch (ocmd) {
9651 -
9652 -Index: sys/netinet6/in6.c
9653 -===================================================================
9654 ---- sys/netinet6/in6.c (revision 254941)
9655 -+++ sys/netinet6/in6.c (working copy)
9656 -@@ -431,6 +431,18 @@
9657 - case SIOCGIFSTAT_ICMP6:
9658 - sa6 = &ifr->ifr_addr;
9659 - break;
9660 -+ case SIOCSIFADDR:
9661 -+ case SIOCSIFBRDADDR:
9662 -+ case SIOCSIFDSTADDR:
9663 -+ case SIOCSIFNETMASK:
9664 -+ /*
9665 -+ * Although we should pass any non-INET6 ioctl requests
9666 -+ * down to driver, we filter some legacy INET requests.
9667 -+ * Drivers trust SIOCSIFADDR et al to come from an already
9668 -+ * privileged layer, and do not perform any credentials
9669 -+ * checks or input validation.
9670 -+ */
9671 -+ return (EINVAL);
9672 - default:
9673 - sa6 = NULL;
9674 - break;
9675 -Index: sys/netnatm/natm.c
9676 -===================================================================
9677 ---- sys/netnatm/natm.c (revision 254941)
9678 -+++ sys/netnatm/natm.c (working copy)
9679 -@@ -339,6 +339,21 @@
9680 - npcb = (struct natmpcb *)so->so_pcb;
9681 - KASSERT(npcb != NULL, ("natm_usr_control: npcb == NULL"));
9682 -
9683 -+ switch (cmd) {
9684 -+ case SIOCSIFADDR:
9685 -+ case SIOCSIFBRDADDR:
9686 -+ case SIOCSIFDSTADDR:
9687 -+ case SIOCSIFNETMASK:
9688 -+ /*
9689 -+ * Although we should pass any non-ATM ioctl requests
9690 -+ * down to driver, we filter some legacy INET requests.
9691 -+ * Drivers trust SIOCSIFADDR et al to come from an already
9692 -+ * privileged layer, and do not perform any credentials
9693 -+ * checks or input validation.
9694 -+ */
9695 -+ return (EINVAL);
9696 -+ }
9697 -+
9698 - if (ifp == NULL || ifp->if_ioctl == NULL)
9699 - return (EOPNOTSUPP);
9700 - return ((*ifp->if_ioctl)(ifp, cmd, arg));
9701
9702 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch
9703 deleted file mode 100644
9704 index 83f30e8..0000000
9705 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2013-5710.patch
9706 +++ /dev/null
9707 @@ -1,28 +0,0 @@
9708 -Index: sys/fs/nullfs/null_vnops.c
9709 -===================================================================
9710 ---- sys/fs/nullfs/null_vnops.c (revision 254941)
9711 -+++ sys/fs/nullfs/null_vnops.c (working copy)
9712 -@@ -858,6 +858,15 @@
9713 - return (error);
9714 - }
9715 -
9716 -+static int
9717 -+null_link(struct vop_link_args *ap)
9718 -+{
9719 -+
9720 -+ if (ap->a_tdvp->v_mount != ap->a_vp->v_mount)
9721 -+ return (EXDEV);
9722 -+ return (null_bypass((struct vop_generic_args *)ap));
9723 -+}
9724 -+
9725 - /*
9726 - * Global vfs data structures
9727 - */
9728 -@@ -871,6 +880,7 @@
9729 - .vop_getwritemount = null_getwritemount,
9730 - .vop_inactive = null_inactive,
9731 - .vop_islocked = vop_stdislocked,
9732 -+ .vop_link = null_link,
9733 - .vop_lock1 = null_lock,
9734 - .vop_lookup = null_lookup,
9735 - .vop_open = null_open,
9736
9737 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
9738 deleted file mode 100644
9739 index fe9e97e..0000000
9740 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-cve-2014-1453.patch
9741 +++ /dev/null
9742 @@ -1,70 +0,0 @@
9743 -Index: sys/fs/nfsserver/nfs_nfsdserv.c
9744 -===================================================================
9745 ---- sys/fs/nfsserver/nfs_nfsdserv.c (revision 264251)
9746 -+++ sys/fs/nfsserver/nfs_nfsdserv.c (working copy)
9747 -@@ -1457,10 +1457,23 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
9748 - nfsvno_relpathbuf(&fromnd);
9749 - goto out;
9750 - }
9751 -+ /*
9752 -+ * Unlock dp in this code section, so it is unlocked before
9753 -+ * tdp gets locked. This avoids a potential LOR if tdp is the
9754 -+ * parent directory of dp.
9755 -+ */
9756 - if (nd->nd_flag & ND_NFSV4) {
9757 - tdp = todp;
9758 - tnes = *toexp;
9759 -- tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred, p, 0);
9760 -+ if (dp != tdp) {
9761 -+ NFSVOPUNLOCK(dp, 0);
9762 -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
9763 -+ p, 0); /* Might lock tdp. */
9764 -+ } else {
9765 -+ tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
9766 -+ p, 1);
9767 -+ NFSVOPUNLOCK(dp, 0);
9768 -+ }
9769 - } else {
9770 - tfh.nfsrvfh_len = 0;
9771 - error = nfsrv_mtofh(nd, &tfh);
9772 -@@ -1481,10 +1494,12 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
9773 - tnes = *exp;
9774 - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor, nd->nd_cred,
9775 - p, 1);
9776 -+ NFSVOPUNLOCK(dp, 0);
9777 - } else {
9778 -+ NFSVOPUNLOCK(dp, 0);
9779 - nd->nd_cred->cr_uid = nd->nd_saveduid;
9780 - nfsd_fhtovp(nd, &tfh, LK_EXCLUSIVE, &tdp, &tnes, NULL,
9781 -- 0, p);
9782 -+ 0, p); /* Locks tdp. */
9783 - if (tdp) {
9784 - tdirfor_ret = nfsvno_getattr(tdp, &tdirfor,
9785 - nd->nd_cred, p, 1);
9786 -@@ -1499,7 +1514,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
9787 - if (error) {
9788 - if (tdp)
9789 - vrele(tdp);
9790 -- vput(dp);
9791 -+ vrele(dp);
9792 - nfsvno_relpathbuf(&fromnd);
9793 - nfsvno_relpathbuf(&tond);
9794 - goto out;
9795 -@@ -1514,7 +1529,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
9796 - }
9797 - if (tdp)
9798 - vrele(tdp);
9799 -- vput(dp);
9800 -+ vrele(dp);
9801 - nfsvno_relpathbuf(&fromnd);
9802 - nfsvno_relpathbuf(&tond);
9803 - goto out;
9804 -@@ -1523,7 +1538,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgr
9805 - /*
9806 - * Done parsing, now down to business.
9807 - */
9808 -- nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 1, exp, p, &fdirp);
9809 -+ nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp);
9810 - if (nd->nd_repstat) {
9811 - if (nd->nd_flag & ND_NFSV3) {
9812 - nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret,
9813
9814 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch
9815 deleted file mode 100644
9816 index c36bed5..0000000
9817 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-exec.patch
9818 +++ /dev/null
9819 @@ -1,66 +0,0 @@
9820 -Index: sys/kern/kern_exec.c
9821 -===================================================================
9822 ---- sys/kern/kern_exec.c (revision 266979)
9823 -+++ sys/kern/kern_exec.c (working copy)
9824 -@@ -280,6 +280,7 @@ kern_execve(td, args, mac_p)
9825 - struct mac *mac_p;
9826 - {
9827 - struct proc *p = td->td_proc;
9828 -+ struct vmspace *oldvmspace;
9829 - int error;
9830 -
9831 - AUDIT_ARG_ARGV(args->begin_argv, args->argc,
9832 -@@ -296,6 +297,8 @@ kern_execve(td, args, mac_p)
9833 - PROC_UNLOCK(p);
9834 - }
9835 -
9836 -+ KASSERT((td->td_pflags & TDP_EXECVMSPC) == 0, ("nested execve"));
9837 -+ oldvmspace = td->td_proc->p_vmspace;
9838 - error = do_execve(td, args, mac_p);
9839 -
9840 - if (p->p_flag & P_HADTHREADS) {
9841 -@@ -310,6 +313,12 @@ kern_execve(td, args, mac_p)
9842 - thread_single_end();
9843 - PROC_UNLOCK(p);
9844 - }
9845 -+ if ((td->td_pflags & TDP_EXECVMSPC) != 0) {
9846 -+ KASSERT(td->td_proc->p_vmspace != oldvmspace,
9847 -+ ("oldvmspace still used"));
9848 -+ vmspace_free(oldvmspace);
9849 -+ td->td_pflags &= ~TDP_EXECVMSPC;
9850 -+ }
9851 -
9852 - return (error);
9853 - }
9854 -Index: sys/sys/proc.h
9855 -===================================================================
9856 ---- sys/sys/proc.h (revision 266979)
9857 -+++ sys/sys/proc.h (working copy)
9858 -@@ -968,4 +968,5 @@ curthread_pflags_restore(int save)
9859 -
9860 - #endif /* _KERNEL */
9861 -
9862 -+#define TDP_EXECVMSPC 0x40000000 /* Execve destroyed old vmspace */
9863 - #endif /* !_SYS_PROC_H_ */
9864 -Index: sys/vm/vm_map.c
9865 -===================================================================
9866 ---- sys/vm/vm_map.c (revision 266979)
9867 -+++ sys/vm/vm_map.c (working copy)
9868 -@@ -3631,6 +3631,8 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
9869 - struct vmspace *oldvmspace = p->p_vmspace;
9870 - struct vmspace *newvmspace;
9871 -
9872 -+ KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0,
9873 -+ ("vmspace_exec recursed"));
9874 - newvmspace = vmspace_alloc(minuser, maxuser);
9875 - if (newvmspace == NULL)
9876 - return (ENOMEM);
9877 -@@ -3647,7 +3649,7 @@ vmspace_exec(struct proc *p, vm_offset_t minuser,
9878 - PROC_VMSPACE_UNLOCK(p);
9879 - if (p == curthread->td_proc)
9880 - pmap_activate(curthread);
9881 -- vmspace_free(oldvmspace);
9882 -+ curthread->td_pflags |= TDP_EXECVMSPC;
9883 - return (0);
9884 - }
9885 -
9886
9887 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
9888 deleted file mode 100644
9889 index b02d8b6..0000000
9890 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-gentoo.patch
9891 +++ /dev/null
9892 @@ -1,21 +0,0 @@
9893 -diff -Nur sys.orig/conf/kern.mk sys/conf/kern.mk
9894 ---- sys.orig/conf/kern.mk 2012-07-12 13:26:37.000000000 +0900
9895 -+++ sys/conf/kern.mk 2012-07-16 02:32:19.000000000 +0900
9896 -@@ -5,7 +5,7 @@
9897 - #
9898 - CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
9899 - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
9900 -- -Wundef -Wno-pointer-sign -fformat-extensions \
9901 -+ -Wundef -Wno-pointer-sign \
9902 - -Wmissing-include-dirs -fdiagnostics-show-option \
9903 - ${CWARNEXTRA}
9904 - #
9905 -@@ -52,7 +52,7 @@
9906 - #
9907 - .if ${MACHINE_CPUARCH} == "i386"
9908 - .if ${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang"
9909 --CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2
9910 -+CFLAGS+= -mpreferred-stack-boundary=2
9911 - .else
9912 - CFLAGS+= -mno-aes -mno-avx
9913 - .endif
9914
9915 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch
9916 deleted file mode 100644
9917 index 0fb6df7..0000000
9918 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-ktrace.patch
9919 +++ /dev/null
9920 @@ -1,12 +0,0 @@
9921 -Index: sys/kern/kern_ktrace.c
9922 -===================================================================
9923 ---- sys/kern/kern_ktrace.c (revision 266771)
9924 -+++ sys/kern/kern_ktrace.c (working copy)
9925 -@@ -119,6 +119,7 @@ static int data_lengths[] = {
9926 - 0, /* KTR_SYSCTL */
9927 - sizeof(struct ktr_proc_ctor), /* KTR_PROCCTOR */
9928 - 0, /* KTR_PROCDTOR */
9929 -+ 0, /* unused */
9930 - sizeof(struct ktr_fault), /* KTR_FAULT */
9931 - sizeof(struct ktr_faultend), /* KTR_FAULTEND */
9932 - };
9933
9934 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
9935 deleted file mode 100644
9936 index fd4040a..0000000
9937 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap-2014.patch
9938 +++ /dev/null
9939 @@ -1,20 +0,0 @@
9940 -Index: sys/vm/vm_map.c
9941 -===================================================================
9942 ---- sys/vm/vm_map.c (revision 259950)
9943 -+++ sys/vm/vm_map.c (revision 259951)
9944 -@@ -1207,6 +1207,7 @@ charged:
9945 - }
9946 - else if ((prev_entry != &map->header) &&
9947 - (prev_entry->eflags == protoeflags) &&
9948 -+ (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
9949 - (prev_entry->end == start) &&
9950 - (prev_entry->wired_count == 0) &&
9951 - (prev_entry->cred == cred ||
9952 -@@ -3339,7 +3340,6 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm
9953 - * NOTE: We explicitly allow bi-directional stacks.
9954 - */
9955 - orient = cow & (MAP_STACK_GROWS_DOWN|MAP_STACK_GROWS_UP);
9956 -- cow &= ~orient;
9957 - KASSERT(orient != 0, ("No stack grow direction"));
9958 -
9959 - if (addrbos < vm_map_min(map) ||
9960
9961 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch
9962 deleted file mode 100644
9963 index ef2d0a7..0000000
9964 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-mmap.patch
9965 +++ /dev/null
9966 @@ -1,20 +0,0 @@
9967 -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:06.mmap.asc
9968 -https://bugs.gentoo.org/show_bug.cgi?id=473688
9969 -
9970 -Index: sys/vm/vm_map.c
9971 -===================================================================
9972 ---- sys/vm/vm_map.c (revision 251636)
9973 -+++ sys/vm/vm_map.c (working copy)
9974 -@@ -3761,6 +3761,12 @@ RetryLookup:;
9975 - vm_map_unlock_read(map);
9976 - return (KERN_PROTECTION_FAILURE);
9977 - }
9978 -+ if ((fault_typea & VM_PROT_COPY) != 0 &&
9979 -+ (entry->max_protection & VM_PROT_WRITE) == 0 &&
9980 -+ (entry->eflags & MAP_ENTRY_COW) == 0) {
9981 -+ vm_map_unlock_read(map);
9982 -+ return (KERN_PROTECTION_FAILURE);
9983 -+ }
9984 -
9985 - /*
9986 - * If this page is not pageable, we have to get it for all possible
9987
9988 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch
9989 deleted file mode 100644
9990 index 767588f..0000000
9991 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-nfsserver.patch
9992 +++ /dev/null
9993 @@ -1,16 +0,0 @@
9994 -http://www.freebsd.org/security/advisories/FreeBSD-SA-13:08.nfsserver.asc
9995 -https://bugs.gentoo.org/show_bug.cgi?id=478314
9996 -
9997 -Index: sys/kern/vfs_export.c
9998 -===================================================================
9999 ---- sys/kern/vfs_export.c (revision 253367)
10000 -+++ sys/kern/vfs_export.c (working copy)
10001 -@@ -208,7 +208,7 @@
10002 - np->netc_anon = crget();
10003 - np->netc_anon->cr_uid = argp->ex_anon.cr_uid;
10004 - crsetgroups(np->netc_anon, argp->ex_anon.cr_ngroups,
10005 -- np->netc_anon->cr_groups);
10006 -+ argp->ex_anon.cr_groups);
10007 - np->netc_anon->cr_prison = &prison0;
10008 - prison_hold(np->netc_anon->cr_prison);
10009 - np->netc_numsecflavors = argp->ex_numsecflavors;
10010
10011 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
10012 deleted file mode 100644
10013 index bb3caba..0000000
10014 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-random.patch
10015 +++ /dev/null
10016 @@ -1,27 +0,0 @@
10017 -Index: sys/dev/random/probe.c
10018 -===================================================================
10019 ---- sys/dev/random/probe.c (revision 260523)
10020 -+++ sys/dev/random/probe.c (working copy)
10021 -@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
10022 -
10023 - #include <sys/types.h>
10024 - #include <sys/param.h>
10025 -+#include <sys/systm.h>
10026 -+#include <sys/kernel.h>
10027 - #include <sys/malloc.h>
10028 - #include <sys/random.h>
10029 - #include <sys/selinfo.h>
10030 -@@ -57,7 +59,12 @@ random_ident_hardware(struct random_systat *systat
10031 - /* Then go looking for hardware */
10032 - #if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
10033 - if (via_feature_rng & VIA_HAS_RNG) {
10034 -- *systat = random_nehemiah;
10035 -+ int enable;
10036 -+
10037 -+ enable = 0;
10038 -+ TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
10039 -+ if (enable)
10040 -+ *systat = random_nehemiah;
10041 - }
10042 - #endif
10043 - }
10044
10045 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
10046 deleted file mode 100644
10047 index 2f82a5f..0000000
10048 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.1-tcp.patch
10049 +++ /dev/null
10050 @@ -1,32 +0,0 @@
10051 -Index: sys/netinet/tcp_reass.c
10052 -===================================================================
10053 ---- sys/netinet/tcp_reass.c (revision 264836)
10054 -+++ sys/netinet/tcp_reass.c (working copy)
10055 -@@ -211,7 +211,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
10056 - * Investigate why and re-evaluate the below limit after the behaviour
10057 - * is understood.
10058 - */
10059 -- if (th->th_seq != tp->rcv_nxt &&
10060 -+ if ((th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) &&
10061 - tp->t_segqlen >= (so->so_rcv.sb_hiwat / tp->t_maxseg) + 1) {
10062 - V_tcp_reass_overflows++;
10063 - TCPSTAT_INC(tcps_rcvmemdrop);
10064 -@@ -234,7 +234,7 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
10065 - */
10066 - te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT);
10067 - if (te == NULL) {
10068 -- if (th->th_seq != tp->rcv_nxt) {
10069 -+ if (th->th_seq != tp->rcv_nxt || !TCPS_HAVEESTABLISHED(tp->t_state)) {
10070 - TCPSTAT_INC(tcps_rcvmemdrop);
10071 - m_freem(m);
10072 - *tlenp = 0;
10073 -@@ -282,7 +282,8 @@ tcp_reass(struct tcpcb *tp, struct tcphdr *th, int
10074 - TCPSTAT_INC(tcps_rcvduppack);
10075 - TCPSTAT_ADD(tcps_rcvdupbyte, *tlenp);
10076 - m_freem(m);
10077 -- uma_zfree(V_tcp_reass_zone, te);
10078 -+ if (te != &tqs)
10079 -+ uma_zfree(V_tcp_reass_zone, te);
10080 - tp->t_segqlen--;
10081 - /*
10082 - * Try to present any queued data
10083
10084 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
10085 deleted file mode 100644
10086 index 9076fd2..0000000
10087 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
10088 +++ /dev/null
10089 @@ -1,13 +0,0 @@
10090 -diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
10091 -index e504f75..7aa63df 100644
10092 ---- a/sys/conf/newvers.sh
10093 -+++ b/sys/conf/newvers.sh
10094 -@@ -86,7 +86,7 @@ fi
10095 - touch version
10096 - v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
10097 - i=`${MAKE:-make} -V KERN_IDENT`
10098 --compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
10099 -+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1)
10100 -
10101 - for dir in /bin /usr/bin /usr/local/bin; do
10102 - if [ -x "${dir}/svnversion" ] ; then
10103
10104 diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
10105 deleted file mode 100644
10106 index 0bf1b61..0000000
10107 --- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
10108 +++ /dev/null
10109 @@ -1,26 +0,0 @@
10110 -Index: sys/amd64/amd64/trap.c
10111 -===================================================================
10112 ---- sys/amd64/amd64/trap.c.orig
10113 -+++ sys/amd64/amd64/trap.c (working copy)
10114 -@@ -972,4 +972,21 @@
10115 - syscallname(td->td_proc, sa.code)));
10116 -
10117 - syscallret(td, error, &sa);
10118 -+
10119 -+ /*
10120 -+ * If the user-supplied value of %rip is not a canonical
10121 -+ * address, then some CPUs will trigger a ring 0 #GP during
10122 -+ * the sysret instruction. However, the fault handler would
10123 -+ * execute with the user's %gs and %rsp in ring 0 which would
10124 -+ * not be safe. Instead, preemptively kill the thread with a
10125 -+ * SIGBUS.
10126 -+ */
10127 -+ if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
10128 -+ ksiginfo_init_trap(&ksi);
10129 -+ ksi.ksi_signo = SIGBUS;
10130 -+ ksi.ksi_code = BUS_OBJERR;
10131 -+ ksi.ksi_trapno = T_PROTFLT;
10132 -+ ksi.ksi_addr = (void *)td->td_frame->tf_rip;
10133 -+ trapsignal(td, &ksi);
10134 -+ }
10135 - }
10136
10137 diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_rc3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3_rc3.ebuild
10138 deleted file mode 100644
10139 index 073893e..0000000
10140 --- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3_rc3.ebuild
10141 +++ /dev/null
10142 @@ -1,157 +0,0 @@
10143 -# Copyright 1999-2016 Gentoo Foundation
10144 -# Distributed under the terms of the GNU General Public License v2
10145 -# $Id$
10146 -
10147 -EAPI=5
10148 -
10149 -inherit bsdmk freebsd flag-o-matic toolchain-funcs
10150 -
10151 -DESCRIPTION="FreeBSD kernel sources"
10152 -SLOT="0"
10153 -LICENSE="BSD zfs? ( CDDL )"
10154 -
10155 -IUSE="+build-kernel debug dtrace zfs"
10156 -
10157 -if [[ ${PV} != *9999* ]]; then
10158 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
10159 - SRC_URI="${SRC_URI}
10160 - $(freebsd_upstream_patches)"
10161 -fi
10162 -
10163 -EXTRACTONLY="
10164 - sys/
10165 - contrib/bmake/
10166 - usr.bin/bmake/
10167 -"
10168 -
10169 -RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
10170 - =sys-freebsd/freebsd-mk-defs-${RV}*
10171 - !sys-freebsd/virtio-kmod
10172 - !sys-fs/fuse4bsd
10173 - !<sys-freebsd/freebsd-sources-9.2_beta1"
10174 -DEPEND="build-kernel? (
10175 - dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
10176 - >=sys-freebsd/freebsd-usbin-9.1
10177 - =sys-freebsd/freebsd-mk-defs-${RV}*
10178 - )"
10179 -
10180 -RESTRICT="strip binchecks"
10181 -
10182 -S="${WORKDIR}/sys"
10183 -
10184 -KERN_BUILD=GENTOO
10185 -
10186 -PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
10187 - "${FILESDIR}/${PN}-10.0-gentoo.patch"
10188 - "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
10189 - "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
10190 - "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
10191 - "${FILESDIR}/${PN}-7.1-includes.patch"
10192 - "${FILESDIR}/${PN}-9.0-sysctluint.patch"
10193 - "${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
10194 - "${FILESDIR}/${PN}-10.1-gcc48.patch" )
10195 -
10196 -pkg_setup() {
10197 - # Add the required source files.
10198 - use zfs && EXTRACTONLY+="cddl/ "
10199 -
10200 - # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
10201 - [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
10202 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="
10203 -}
10204 -
10205 -src_prepare() {
10206 - local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
10207 -
10208 - # This replaces the gentoover patch, it doesn't need reapply every time.
10209 - sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
10210 - -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
10211 - -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
10212 - "${S}/conf/newvers.sh"
10213 -
10214 - # __FreeBSD_cc_version comes from FreeBSD's gcc.
10215 - # on 10.0-RELEASE it's 1000001.
10216 - # FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
10217 - sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
10218 - -i "${S}/conf/kern.pre.mk" \
10219 - -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
10220 -
10221 - # Remove -Werror
10222 - sed -e "s:-Werror:-Wno-error:g" \
10223 - -i "${S}/conf/kern.pre.mk" \
10224 - -i "${S}/conf/kmod.mk" || die
10225 -
10226 - # Set the kernel configuration using USE flags.
10227 - cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
10228 - use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
10229 - use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
10230 -
10231 - # Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
10232 - unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
10233 -}
10234 -
10235 -src_configure() {
10236 - if use build-kernel ; then
10237 - tc-export CC
10238 - cd "${S}/$(tc-arch-kernel)/conf" || die
10239 - config ${KERN_BUILD} || die
10240 - fi
10241 -}
10242 -
10243 -src_compile() {
10244 - if use build-kernel ; then
10245 - if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
10246 - cd "${WORKDIR}"/usr.bin/bmake || die
10247 - CC=${CHOST}-gcc freebsd_src_compile
10248 - export BMAKE="${WORKDIR}/usr.bin/bmake/make"
10249 - fi
10250 - cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
10251 - freebsd_src_compile depend
10252 - freebsd_src_compile
10253 - else
10254 - einfo "Nothing to compile.."
10255 - fi
10256 -}
10257 -
10258 -src_install() {
10259 - if use build-kernel ; then
10260 - cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
10261 - freebsd_src_install
10262 - rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
10263 - cd "${S}"
10264 - fi
10265 -
10266 - insinto "/usr/src/sys"
10267 - doins -r "${S}/".
10268 - if use zfs ; then
10269 - insinto "/usr/src/cddl"
10270 - doins -r "${WORKDIR}/cddl/".
10271 - fi
10272 -}
10273 -
10274 -pkg_preinst() {
10275 - if [[ -L "${ROOT}/usr/src/sys" ]]; then
10276 - einfo "/usr/src/sys is a symlink, removing it..."
10277 - rm -f "${ROOT}/usr/src/sys"
10278 - fi
10279 -
10280 - if use sparc-fbsd ; then
10281 - ewarn "WARNING: kldload currently causes kernel panics"
10282 - ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
10283 - ewarn "we need gcc-4.1 to compile the kernel correctly :/"
10284 - ewarn "Please compile all modules you need into the kernel"
10285 - fi
10286 -
10287 - ewarn "If you want manual compile (not recommended), please don't forget the following step."
10288 - if ! use sparc-fbsd ; then
10289 - ewarn "export CC=clang"
10290 - ewarn "export CXX=clang++"
10291 - fi
10292 - if ! use zfs ; then
10293 - ewarn "export WITHOUT_CDDL="
10294 - ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
10295 - fi
10296 - if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
10297 - ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
10298 - fi
10299 -}
10300
10301 diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml
10302 deleted file mode 100644
10303 index 3860e80..0000000
10304 --- a/sys-freebsd/freebsd-sources/metadata.xml
10305 +++ /dev/null
10306 @@ -1,13 +0,0 @@
10307 -<?xml version="1.0" encoding="UTF-8"?>
10308 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
10309 -<pkgmetadata>
10310 -<maintainer type="project">
10311 - <email>bsd@g.o</email>
10312 - <name>BSD Project</name>
10313 - </maintainer>
10314 - <use>
10315 - <flag name="build-kernel">Build and install a kernel (recommended).</flag>
10316 - <flag name="dtrace">Enable DTrace support.</flag>
10317 - <flag name="zfs">Enable ZFS support.</flag>
10318 - </use>
10319 -</pkgmetadata>
10320
10321 diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
10322 deleted file mode 100644
10323 index cab9802..0000000
10324 --- a/sys-freebsd/freebsd-ubin/Manifest
10325 +++ /dev/null
10326 @@ -1,32 +0,0 @@
10327 -AUX freebsd-ubin-10.0-atf.patch 424 SHA256 31ac8807f4088b75ae4684316f18f3096363ee2d8bb1d5c47d9caab77e6cd5f5 SHA512 b343441f49d3fd41221766c7b54b8f831cf6e19f4400b6a0913e16476e32fd70603c28fc5a8d82eef54afc50c4a999d5151bdd96b243495bca319a0f69a6e860 WHIRLPOOL e4f2ab98d015c7656d3da2364e9dc9c6f675ac95fed05bbb886edf5efc79c843103ba9eaac13376cb9f5c5f02d37fed485a54db508ca350a13d5de2483403045
10328 -AUX freebsd-ubin-10.0-dtc-gcc46.patch 591 SHA256 0adcc784a7fa6a6d8bd867d39b46149c4b61c3751e1ce5eb0a50d0e07d927b60 SHA512 a47ae1540cf2d7f71b718dad84010f725312bc0308cc61b99ab3560a5a18c67c8a34b54d9b99c0974b0662519c20c43c81843fca10d252178f888a14a6990eae WHIRLPOOL 6ae4e254b78d026e634fc1f26c304fc3026b8ceb7a8f7746a5480f61dbd8676aad07d0571f57b31279df119fbace4e8bb2ef7d246cf5d78566905e056bbf4d77
10329 -AUX freebsd-ubin-10.0-kdump-ioctl.patch 1027 SHA256 7fe03c7e7cdbffdabf64557fa63eae0243a28be9025fc735393048ed2dca12c1 SHA512 6fda9d9ab4210d952277b112a5c4a2e75fcff3f63debde980ca791c6f6471038fda26d1e3ddf809384d95525e9ec9140f7b5af17dee8c11967e0b4bc9ea2b850 WHIRLPOOL 1ae5e229824a4371940ef7a0c9d8bae78aada8bcd73371a4479ced9013c55137bd4b153e296ee5873c8a9042607e86273754589e6a2a38519ba5ac78ee442740
10330 -AUX freebsd-ubin-10.0-mandoc.patch 375 SHA256 c4d14aabe0a39bc2c12ca87b6c83628ea1c46640044bbd6946f3e6af343348b6 SHA512 b2789a57ce9afd5b7fe2989f37d246b2034b1578314ac0f6e7c4af26e81f73d043ea3440edee7c30b82fc0ddf5a4592cc3c3c6871ed0eb5fc6932bdf97a88d68 WHIRLPOOL 8e9fa01e662376225c69b41890c1f518c23116ff105ec45c43958d5749b3e265af5dd799e2c2fed5c078e0ca42f8ac988dfe7acb401875c7a769cfe38b14c56a
10331 -AUX freebsd-ubin-10.1-kdump-workaround.patch 415 SHA256 a2812aaacae36bfab6703f72fde31e705f9ebe952d1d394eb91e4e05d06c4c60 SHA512 9ee3e9a8c508f36326e24463b1bdfc5a511d6c994b8fb0da8bd1a0fa30b9eafe968c228825ad6b25849c47d800f17866e4667dc9ae8c76cff6f8181b37148d70 WHIRLPOOL 5f4f2ab4b72bae236d0c34c65404f351520869ea6a083590239f38ab0fe95f74108a4b7cbd7f84dfc5fb22f2140ded334999c492adb3fddc5dcd81ddeed8b6e5
10332 -AUX freebsd-ubin-10.2-bsdxml.patch 367 SHA256 3bedd2e3efc7817c446395866e3ec2ca65430624dd4958bc91296d77cfc4fb90 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d WHIRLPOOL 4946a71b63b05691ede60f15573356d98ef62b44cab40ba40a24d2be11e9655c95c660b62e898ff15ff9cdd8c006402c0dbe43a82d913b7707c1f30a55720863
10333 -AUX freebsd-ubin-10.2-talk-workaround.patch 349 SHA256 8882326b5048b2c2acef041c82f2830ad0eb68684c6773163c6beacae65b12d7 SHA512 5eb04f1769fd4e04a26b9ff69865a6188269d971b83b7e93a5c41def44c9152e5262a192c866e3949cb3aae3b8e0a13663b8e1a438e796b0b923d9171a3e6b27 WHIRLPOOL 3be00db5ef76a3bcf615038cad6a5bd36fdfd349be6b8938a9236fb0ed2a0df6a05b04d73343206905b88ddcbd3c2d1b39928a35f62838f719b28c368adc5770
10334 -AUX freebsd-ubin-10.3-bmake-workaround.patch 301 SHA256 97e14b032622bcc652ede9c5154160e937b3ade0155fddfe19112354bfeb6138 SHA512 8efd4e8199886ec0c647a13a334de54813372d9d6eb09d6b93785000da9a84ec40fb4d28d645a4809b531bee0bb4c11522aaae089285c52e595b2f9749af7dfe WHIRLPOOL 910bb3807c15ee8ced94c508ab2bd1e3112cd890de28bbdf2b152efe5e5ce187e366376938996e2a41e07599d7c76abe741463bbf4475297d604531ac80ea6ae
10335 -AUX freebsd-ubin-6.0-bsdcmp.patch 413 SHA256 a0a99a602538d95ddae2fc4b823150ea58862def87c8196806a379233e3ddb2c SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50 WHIRLPOOL 7a23988970695ccdeaadfce96a0bf05e986736d0c93079cddf0101c0b17b7e5f3421e5da6c1e2b6e0c96ff025dd8d80effc392064ce9ff1cb2e0bce0e8d90b35
10336 -AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d WHIRLPOOL f01e4257b06159c18f64960eb5d55a595f357bd0c6fd6974c6db942b6b0cbd6fff9ca7151cffd67bb8dec23d855975c7ab9c39cd28ba9dae098acd6773fb4c79
10337 -AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9 SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e WHIRLPOOL 48d2be90273b6ce1a0b4701a77d5a10e7e26f9f595b54b35cc410d81266c104c67c1fd1d735b659d41e4c3e02261cc79a85f3fe61c45ce79e4dadd1cf17b877a
10338 -AUX freebsd-ubin-8.0-bsdar.patch 556 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430 WHIRLPOOL 32c57b0ccb3b2256e1169da0f7b4d9a3a6300cf703e792ab7286255a12bbaca983bb65ea1c42f6115fc071ee923b5182401e1d14461bf5407269a17361ce003d
10339 -AUX freebsd-ubin-8.0-xinstall.patch 1014 SHA256 124cd30b5f44425d0914c64fd8ae98242c9649e4eb0cb1f786839137532504d6 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d WHIRLPOOL 94e16b120a39e5331fa5db7bcda4ba970c3c92049122e958f4ea378936bd384671955af700053d8ae89d6a0c118abae61751cc2e866f719f882559801c6db359
10340 -AUX freebsd-ubin-8.2-compress.patch 1658 SHA256 19485003b70669399b363c4579cecac7fe0b59e3127a13a2c2bc103526fe226c SHA512 9b94b608e4dffb27cec0e6994a06de710ff2d73125d18fad2c5bbe9cab3e1f626ba2ade0333cac9d72350e30b2746f1ccf096bb67b472d1b9b0b79da68bf43bc WHIRLPOOL de29a9917312d1b2f20bcf01cfc224df626113b7d6eea86e5c6fdc306d04a08042a452b1c03a30874f9da1d48f8a3a3718026c4305a4a0373df18d331fd57d6a
10341 -AUX freebsd-ubin-9.0-fixmakefiles.patch 445 SHA256 88c90ea1e20afb56ae1b62c4e7ca9de8da8aa9b3726059a96e85beea13935d1c SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955 WHIRLPOOL 35445ccd0d4a63c5ac593157d55b0e08106d37cbab0a0b10a699e63872fd2a5e9bd53fe2c4a94dff7b1441fa27c141c171b6938ee51e7c696de95695938985a0
10342 -AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 SHA256 92a37952790362f73b0c6a1000877e633e7a0055be8397184aa8ad7e15bfecee SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa WHIRLPOOL 4e25ddac55843e725903c28ed009b646ed63eef4b935ee03eb4a60c3fdeb02b158e018ff76adea6ca14a9a40268a1b7347f26f067d407ffb7329fb3c4641da5c
10343 -AUX freebsd-ubin-9.1-bsdar.patch 656 SHA256 86834418e478bc21918d6f310fb422dbfd0aa0df1315bd4fbc0ddd7a8fc62868 SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac WHIRLPOOL b66fd0a613cd32f9037c739146e465fd2ddcc56f78a3fdffc67eec9b92b6f2f78d6948906a77c2418e2bae5d782ab70f9c4f473ee8e256f233b237f6a11ae08c
10344 -AUX freebsd-ubin-9.1-grep.patch 549 SHA256 5ab5dafccdc0c64f07742698abe51a24ab0abe10aba7d4bd80afcf4b5a36066f SHA512 2ddec1a02064ee91a177edb78a964d37b5be14c6e92a78ba9ce0a902c40f673eb7a6449042e341dfb3f31be6bef1a19fdf735af0d32526c0891fe6d9cc060101 WHIRLPOOL 3742f0c0612d2158ce2e5afaea7fb15f3f9cbc95f702fd51ea30c0c97a5cccabdffd4b722d1cb1930b362a4d2256bce77d997a69f02304a4d187391c8f8e0734
10345 -AUX freebsd-ubin-9.1-kdump-ioctl.patch 1001 SHA256 03804b82087884efa28157b36781a746349f41164591b46b73785e0b53088e2a SHA512 aadf3a6d97c5822aa9ff0d1ad8a7bfb2d17fc3193851f864bcb847ef05fe5b7e2b852cb95aaf159194a12b26900697f089113ccb15854c8e3bdb43518de9adf8 WHIRLPOOL 904f1c9dee700cab16a6075216e85768c1a146064da10e865caa319850d400b96255f677df70b2ba1766d4d855b553ad58d74f7e139391bb841f7fc0ef39ebef
10346 -AUX freebsd-ubin-9.1-minigzip.patch 336 SHA256 88ad33268fd33012d37ec3f0f915322a536a4868900aa7c19486226e96125723 SHA512 e25cb6b74b17ee3d999321701fcc5a90ab94abac8ea33a155847f99e7836f16203485618be3426e34a1a5895b7582f5f466f997986486637e52dbc0e6c225dd5 WHIRLPOOL 2fa652c4548eb5b305bafca4b788d9f19f1f52903b0e27cbf402e11bcd7ceb78bdf1dfabf79932b8e78b1bbf898308405ccc19b1ca21198446889c8360db24a7
10347 -AUX freebsd-ubin-lint-stdarg.patch 792 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6 SHA512 0f06547b0b90c65466c5c032efe6563dfd32ca56175fbad0885228310f6dc5f973d3adffe93bdb35d42b8af045ecdc23d1198fd8bad0c96c46512dbedbab3059 WHIRLPOOL 853d89f6f35c91718a30c8cbd2fed72a01c01dd03b3fab28c931fd80f71394122f4e5fe240df17b524dffb91829bc0148a605e797b88827d4f5e48730790fa57
10348 -AUX freebsd-ubin-setXid.patch 3723 SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d SHA512 9edaac765405e28b123fa40b708b1ab05af3e151726e6f2b75ab1c0fd17b6c2a428a58726da999f7a63e9550bdd3e0d274ce63517717137872a7e9c77a591501 WHIRLPOOL 36fff3ad1577981b157e4311226540ee9a0eca7f5d623e27b3fbc585bc5585158c21f27c2355ac773ff190817aee2056293d3a1c0306e7743ae72a3a49d1e670
10349 -AUX locate-updatedb-cron 122 SHA256 63cceb90a3abb02e806af6940542f12d397e7600df37f1b7305104f78694cce9 SHA512 c3127d2ebb837d7fd6edc640604ce31c1639c036703b1e923e84b79f9840e13e28327eb7a5d655546ade8efb9188b041434552bcd0b4b76308c0e66132ad7985 WHIRLPOOL a040f971f7406f2dc022aee9e6b4cbfd4bb37931afabcdb58dcbe82539500bf7ae7fdfdf8651113ae3cea5ffa73771bb57a2a0a0e749701563664ccbf87285ca
10350 -AUX login.1.pamd 145 SHA256 c8b81b422104b58afa8b6bb478b1eda77f97c3037030ac09889b7c3bf3de9fcc SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397 WHIRLPOOL a562ee1210568bdf2339df413ec69eed066738d0d2929c8965f6bfc2b05d60075b23176ca8f744bee2c6a7cfa8448adf4e08a531d36477f78aac78da47f3209c
10351 -AUX login.pamd 309 SHA256 4680e4682c95faeb879e4cf4cc83280e91ec53870a19fc7dd67079ff5eb97c38 SHA512 a5fc8fc6c1ca597f194f1fc801185bc69020c8055211d20b1712cc8c9c3cfd27b3eb2031823771d73c1c2814a0dee29bf14c32319c6831732246800256e38a26 WHIRLPOOL c8df5d4d0f1ad85e42762c30dfecb3bdf84c4593d98ef7a71ca31674c28400b5014c2bb543919cd3741bfcb642e2490dd7f4f9850e743d5c89e8bbbd7b23a2ba
10352 -AUX passwd.1.pamd 154 SHA256 39706dd518995631a8eb6a48498685db9a777124bb84f217e2045f0162357081 SHA512 b89b339facf74c3fb2f68f38cb76d4104f8e497312140e76778ce4673f9a039afe22df78991e7625e1488e6dd1e679ca9cd9953dffb483db9b0bd106755b0a5f WHIRLPOOL cb683ae69af9fc5d1344c40a26e6518941d6ee241b11d2efb53b93ddabd69d9a2c53df8e33d4e68a20ceef4fef27372b5fb93eb653c461217091dd0c3872c0eb
10353 -AUX passwd.pamd 247 SHA256 df5babb31578b5fd56629dac06656a981cffd2e1ef4987e075c0e95029d40399 SHA512 db179adff0d3211b9409cd4efdc09c14212192ab24549acd1d2ecd7788947117d58c991899750530f80fb87b66bc6a7e08a863d0f37f57105af23db86bf278ee WHIRLPOOL 287de39190e8e377503d4a494c5b114af6a6feaff06129832054c9685ced1f127f784fa2f8ddf9a31b0603ca8d999ae0856feb28c82e406a5b830ecc8b218c8b
10354 -AUX su.1.pamd 321 SHA256 18ed54492632b231ca9074fe08aa5343a5dd7049834a7eda3aa45d42d313c779 SHA512 fa27233d99c70c3b968b5aff430cdbd55a3d795a1a4430143f863d3dae7bf7b6b1564d58f82431fe2e8e4a2b1bcc2f12714abf7d48ff75c08c1a65f22cd74d6c WHIRLPOOL 7b82c775ec138873b2754c101fa14c09e87bf052f2497b0bba12fee2cfa80f970b27041febb7fd22c3291977f942363ab558d52a92833fcd4cfdf7ece829c713
10355 -AUX su.pamd 311 SHA256 5090fbcd2807019255062cacf3816e2e28088c0084c6e9f34a3cceda31e08e27 SHA512 d7c7eaf776aace61f2a534e5a8c2f65879fe27311859e6e8bd309f1425693e4effe8867a1a7ecc3f1d5a478989139f1731c1863c4509da49318c3cead5c8b0dd WHIRLPOOL 055d4b0b9f0645a4ee33170f3a69de0f8733dc972330bb3182400cdae54711f82f85536aa5b6b8ccbd66f1d2ab547780fa0198e2134466f6fa5782ff4b02a77d
10356 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
10357 -EBUILD freebsd-ubin-10.3_rc3.ebuild 5946 SHA256 3fa58194e892921e44fe0c1d5cf1fc45188b7e79f669a0b72a7752f7492e92f5 SHA512 624e9b81f076089fb65cd15d856a6ff2758a69669aff365166b885b687463b05b0df96a14cd49c3300d8bb6d64a6fdf56ecf96f9b80f3a3b100a67f280f2ce4e WHIRLPOOL 65fb0245db5a6ae9694907300116f8eb4db0400f400494900ae1e65280a28909f4aca2b3586ce36f2d84217262fa370a6bbd8d8058004c453a2270fafe4b1f27
10358 -MISC metadata.xml 782 SHA256 9d530de89ea94bedcf5f2943f56417fd2a4942bac995425a485acf2ccd01f994 SHA512 50d638f761e118d9892e593dcea9d72805e3968d29cb3bbb1b95cf4eb6a4e3293a3c47b29415a4f9fa937dcccf2c2f09c2af10e62982a15069bad22162d70f3d WHIRLPOOL 8ce25849714014929d8b1b6b6e05a9e88e4671f5a3accb128e266a64994b390395b4d881018090ef778dde7afe6894e15a9047fa591b45bbd31df960cecdea37
10359
10360 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
10361 deleted file mode 100644
10362 index d758c48..0000000
10363 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch
10364 +++ /dev/null
10365 @@ -1,15 +0,0 @@
10366 -diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
10367 -index 4ebdc33..37ff8fa 100644
10368 ---- a/usr.bin/atf/atf-sh/Makefile
10369 -+++ b/usr.bin/atf/atf-sh/Makefile
10370 -@@ -33,8 +33,8 @@ PROG_CXX= atf-sh
10371 - SRCS= atf-sh.cpp
10372 - MAN= atf-sh.1 atf-sh-api.3
10373 -
10374 --CFLAGS+= -DHAVE_CONFIG_H
10375 --CFLAGS+= -I${ATF}
10376 -+CXXFLAGS+= -DHAVE_CONFIG_H
10377 -+CXXFLAGS+= -I${ATF}
10378 -
10379 - DPADD+= ${LIBATF_C} ${LIBATF_CXX}
10380 - LDADD+= -latf-c++ -latf-c
10381
10382 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
10383 deleted file mode 100644
10384 index 1125238..0000000
10385 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch
10386 +++ /dev/null
10387 @@ -1,25 +0,0 @@
10388 -diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh
10389 -index 45bc4fd..6eaf8e4 100644
10390 ---- a/usr.bin/dtc/string.hh
10391 -+++ b/usr.bin/dtc/string.hh
10392 -@@ -32,6 +32,8 @@
10393 -
10394 - #ifndef _STRING_HH_
10395 - #define _STRING_HH_
10396 -+#include <cstdio>
10397 -+#include <cstring>
10398 - #include "input_buffer.hh"
10399 -
10400 - namespace dtc
10401 -diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
10402 -index 7f2ec67..8e13b1c 100644
10403 ---- a/usr.bin/dtc/util.hh
10404 -+++ b/usr.bin/dtc/util.hh
10405 -@@ -33,6 +33,7 @@
10406 - #ifndef _UTIL_HH_
10407 - #define _UTIL_HH_
10408 -
10409 -+#include <stdint.h>
10410 - #include <vector>
10411 -
10412 - // If we aren't using C++11, then just ignore static asserts.
10413
10414 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
10415 deleted file mode 100644
10416 index e106852..0000000
10417 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch
10418 +++ /dev/null
10419 @@ -1,26 +0,0 @@
10420 -diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
10421 -index 38e9df6..5e831c6 100644
10422 ---- a/usr.bin/kdump/Makefile
10423 -+++ b/usr.bin/kdump/Makefile
10424 -@@ -22,7 +22,7 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
10425 -
10426 - ioctl.c: mkioctls
10427 - env MACHINE=${MACHINE} CPP="${CPP}" \
10428 -- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
10429 -+ sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET}
10430 -
10431 - kdump_subr.h: mksubr
10432 - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
10433 -diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
10434 -index 7a49497..bc8b61f 100644
10435 ---- a/usr.bin/truss/Makefile
10436 -+++ b/usr.bin/truss/Makefile
10437 -@@ -24,7 +24,7 @@ syscalls.h: syscalls.master
10438 -
10439 - ioctl.c: ${.CURDIR}/../kdump/mkioctls
10440 - env MACHINE=${MACHINE} CPP="${CPP}" \
10441 -- /bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET}
10442 -+ /bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET}
10443 -
10444 - .if ${MACHINE_CPUARCH} == "i386"
10445 - SRCS+= i386-linux.c linux_syscalls.h
10446
10447 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
10448 deleted file mode 100644
10449 index c5f7706..0000000
10450 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch
10451 +++ /dev/null
10452 @@ -1,13 +0,0 @@
10453 -diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
10454 -index 0995534..1bcb3e0 100644
10455 ---- a/usr.bin/mandoc/Makefile
10456 -+++ b/usr.bin/mandoc/Makefile
10457 -@@ -1,7 +1,7 @@
10458 - # $FreeBSD$
10459 -
10460 - MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
10461 --LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a
10462 -+LIBMANDOC= ${.CURDIR}/../../lib/libmandoc/libmandoc.a
10463 - .PATH: ${MDOCMLDIR}
10464 -
10465 - PROG= mandoc
10466
10467 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
10468 deleted file mode 100644
10469 index 064647c..0000000
10470 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.1-kdump-workaround.patch
10471 +++ /dev/null
10472 @@ -1,13 +0,0 @@
10473 -diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
10474 -index cbf31d0..fa0d04d 100644
10475 ---- a/usr.bin/kdump/Makefile
10476 -+++ b/usr.bin/kdump/Makefile
10477 -@@ -8,7 +8,7 @@ SFX= 32
10478 - .PATH: ${.CURDIR}/../ktrace
10479 -
10480 - PROG= kdump
10481 --SRCS= kdump_subr.c kdump.c ioctl.c subr.c
10482 -+SRCS= kdump_subr.h kdump_subr.c kdump.c ioctl.c subr.c
10483 - DPSRCS= kdump_subr.h
10484 - CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
10485 -
10486
10487 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch
10488 deleted file mode 100644
10489 index 6064717..0000000
10490 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-bsdxml.patch
10491 +++ /dev/null
10492 @@ -1,13 +0,0 @@
10493 -diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
10494 -index af6562b..3121c81 100644
10495 ---- a/usr.bin/mt/mt.c
10496 -+++ b/usr.bin/mt/mt.c
10497 -@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD: stable/10/usr.bin/mt/mt.c 280438 2015-03-24 14:36:10Z ken $"
10498 - #include <unistd.h>
10499 - #include <stdint.h>
10500 - #include <errno.h>
10501 --#include <bsdxml.h>
10502 -+#include <expat.h>
10503 - #include <mtlib.h>
10504 -
10505 - #include <cam/cam.h>
10506
10507 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch
10508 deleted file mode 100644
10509 index 3a65b37..0000000
10510 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.2-talk-workaround.patch
10511 +++ /dev/null
10512 @@ -1,12 +0,0 @@
10513 -diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
10514 -index 4daad7a..1fb9105 100644
10515 ---- a/usr.bin/talk/io.c
10516 -+++ b/usr.bin/talk/io.c
10517 -@@ -50,6 +50,7 @@ static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
10518 - #include <stdlib.h>
10519 - #include <string.h>
10520 - #include <unistd.h>
10521 -+#include <wctype.h>
10522 - #define _XOPEN_SOURCE_EXTENDED
10523 - #include <curses.h>
10524 -
10525
10526 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
10527 deleted file mode 100644
10528 index c0ca444..0000000
10529 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch
10530 +++ /dev/null
10531 @@ -1,13 +0,0 @@
10532 -diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
10533 -index 6c6d8c2..22fec7a 100644
10534 ---- a/usr.bin/bmake/Makefile
10535 -+++ b/usr.bin/bmake/Makefile
10536 -@@ -5,7 +5,7 @@
10537 -
10538 - .sinclude "Makefile.inc"
10539 -
10540 --SRCTOP?= ${.CURDIR:H:H}
10541 -+SRCTOP= ${.CURDIR:H:H}
10542 -
10543 - # look here first for config.h
10544 - CFLAGS+= -I${.CURDIR}
10545
10546 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
10547 deleted file mode 100644
10548 index 1a85529..0000000
10549 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-bsdcmp.patch
10550 +++ /dev/null
10551 @@ -1,13 +0,0 @@
10552 -Index: fbsd-6.0/usr.bin/cmp/Makefile
10553 -===================================================================
10554 ---- fbsd-6.0.orig/usr.bin/cmp/Makefile
10555 -+++ fbsd-6.0/usr.bin/cmp/Makefile
10556 -@@ -1,7 +1,7 @@
10557 - # @(#)Makefile 8.1 (Berkeley) 6/6/93
10558 - # $FreeBSD: src/usr.bin/cmp/Makefile,v 1.6.14.1 2005/09/17 11:33:41 brian Exp $
10559 -
10560 --PROG= cmp
10561 -+PROG= bsdcmp
10562 - SRCS= cmp.c link.c misc.c regular.c special.c
10563 -
10564 - .include <bsd.prog.mk>
10565
10566 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
10567 deleted file mode 100644
10568 index b135a82..0000000
10569 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
10570 +++ /dev/null
10571 @@ -1,35 +0,0 @@
10572 -Index: usr.bin/calendar/Makefile
10573 -===================================================================
10574 ---- usr.bin/calendar/Makefile.orig
10575 -+++ usr.bin/calendar/Makefile
10576 -@@ -10,6 +10,7 @@ FR_LINKS= fr_FR.ISO8859-15
10577 - TEXTMODE?= 444
10578 -
10579 - beforeinstall:
10580 -+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
10581 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
10582 - ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
10583 - .for lang in ${INTER}
10584 -Index: usr.bin/ee/Makefile
10585 -===================================================================
10586 ---- usr.bin/ee/Makefile.orig
10587 -+++ usr.bin/ee/Makefile
10588 -@@ -12,12 +12,12 @@ LDADD= -lncurses
10589 - NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
10590 - uk_UA.KOI8-U ru_RU.KOI8-R
10591 -
10592 --NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
10593 --NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
10594 -- fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
10595 -- fr_FR.ISO8859-15
10596 --NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
10597 -- de_CH.ISO8859-15 de_DE.ISO8859-15
10598 -+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
10599 -+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
10600 -+# fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
10601 -+# fr_FR.ISO8859-15
10602 -+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
10603 -+# de_CH.ISO8859-15 de_DE.ISO8859-15
10604 -
10605 - NLSSRCFILES=ee.msg
10606 - .for lang in ${NLS}
10607
10608 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
10609 deleted file mode 100644
10610 index a89cf52..0000000
10611 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
10612 +++ /dev/null
10613 @@ -1,28 +0,0 @@
10614 -By default the mkioctl program that generates code for kdump does look for
10615 -ioctls in the whole /usr/include tree, but this does break when xorg is merged.
10616 -This patch allows to look for include files only in the source tree.
10617 -
10618 -Index: fbsd-6/usr.bin/kdump/Makefile
10619 -===================================================================
10620 ---- fbsd-6.orig/usr.bin/kdump/Makefile
10621 -+++ fbsd-6/usr.bin/kdump/Makefile
10622 -@@ -10,6 +10,6 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CUR
10623 - CLEANFILES= ioctl.c
10624 -
10625 - ioctl.c: mkioctls
10626 -- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
10627 -+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
10628 -
10629 - .include <bsd.prog.mk>
10630 -Index: fbsd-6/usr.bin/truss/Makefile
10631 -===================================================================
10632 ---- fbsd-6.orig/usr.bin/truss/Makefile
10633 -+++ fbsd-6/usr.bin/truss/Makefile
10634 -@@ -29,6 +29,6 @@ syscalls.h: syscalls.master
10635 - ${.CURDIR}/i386.conf
10636 -
10637 - ioctl.c: ${.CURDIR}/../kdump/mkioctls
10638 -- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
10639 -+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
10640 -
10641 - .include <bsd.prog.mk>
10642
10643 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
10644 deleted file mode 100644
10645 index c966b9b..0000000
10646 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
10647 +++ /dev/null
10648 @@ -1,21 +0,0 @@
10649 ---- usr.bin/ar/Makefile.old 2010-03-12 14:50:30 +0100
10650 -+++ usr.bin/ar/Makefile 2010-03-12 14:50:53 +0100
10651 -@@ -1,6 +1,6 @@
10652 - # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
10653 -
10654 --PROG= ar
10655 -+PROG= freebsd-ar
10656 - SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
10657 -
10658 - WARNS?= 5
10659 -@@ -10,8 +10,7 @@
10660 -
10661 - CFLAGS+=-I. -I${.CURDIR}
10662 -
10663 --NO_SHARED?= yes
10664 --LINKS= ${BINDIR}/ar ${BINDIR}/ranlib
10665 --MLINKS= ar.1 ranlib.1
10666 -+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
10667 -+MLINKS= freebsd-ar.1 freebsd-ranlib.1
10668 -
10669 - .include <bsd.prog.mk>
10670
10671 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
10672 deleted file mode 100644
10673 index e8f978a..0000000
10674 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
10675 +++ /dev/null
10676 @@ -1,26 +0,0 @@
10677 -Parallel make installs often cause 2 concurrent install -d to fail
10678 -while they are creating the path to the target dirs.
10679 -This patch changes the failure to a warning so that a make -j6 install doesn't
10680 -fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install.
10681 -
10682 ---- usr.bin/xinstall/xinstall.c.orig
10683 -+++ usr.bin/xinstall/xinstall.c
10684 -@@ -748,9 +748,17 @@
10685 - ch = *p;
10686 - *p = '\0';
10687 - if (stat(path, &sb)) {
10688 -- if (errno != ENOENT || mkdir(path, 0755) < 0) {
10689 -+ if (errno != ENOENT) {
10690 - err(EX_OSERR, "mkdir %s", path);
10691 - /* NOTREACHED */
10692 -+ } else if (mkdir(path, 0755) < 0) {
10693 -+ /* Previous errno from stat() says that the directory didn't exist (ENOENT)
10694 -+ * But if errno is now EEXIST, then we just hit a parallel make bug.
10695 -+ */
10696 -+ if (errno == EEXIST)
10697 -+ warn("mkdir: %s now exists!", path); /* let me know when this happens */
10698 -+ else
10699 -+ err(EX_OSERR, "mkdir %s", path);
10700 - } else if (verbose)
10701 - (void)printf("install: mkdir %s\n",
10702 - path);
10703
10704 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
10705 deleted file mode 100644
10706 index 5bd1d55..0000000
10707 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
10708 +++ /dev/null
10709 @@ -1,55 +0,0 @@
10710 -Index: usr.bin/compress/zopen.c
10711 -===================================================================
10712 ---- usr.bin/compress/zopen.c (revision 225020)
10713 -+++ usr.bin/compress/zopen.c (working copy)
10714 -@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num)
10715 - block_compress = maxbits & BLOCK_MASK;
10716 - maxbits &= BIT_MASK;
10717 - maxmaxcode = 1L << maxbits;
10718 -- if (maxbits > BITS) {
10719 -+ if (maxbits > BITS || maxbits < 12) {
10720 - errno = EFTYPE;
10721 - return (-1);
10722 - }
10723 -@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num)
10724 - for (code = 255; code >= 0; code--)
10725 - tab_prefixof(code) = 0;
10726 - clear_flg = 1;
10727 -- free_ent = FIRST - 1;
10728 -- if ((code = getcode(zs)) == -1) /* O, untimely death! */
10729 -- break;
10730 -+ free_ent = FIRST;
10731 -+ oldcode = -1;
10732 -+ continue;
10733 - }
10734 - incode = code;
10735 -
10736 -- /* Special case for KwKwK string. */
10737 -+ /* Special case for kWkWk string. */
10738 - if (code >= free_ent) {
10739 -+ if (code > free_ent || oldcode == -1) {
10740 -+ /* Bad stream. */
10741 -+ errno = EINVAL;
10742 -+ return (-1);
10743 -+ }
10744 - *stackp++ = finchar;
10745 - code = oldcode;
10746 - }
10747 -+ /*
10748 -+ * The above condition ensures that code < free_ent.
10749 -+ * The construction of tab_prefixof in turn guarantees that
10750 -+ * each iteration decreases code and therefore stack usage is
10751 -+ * bound by 1 << BITS - 256.
10752 -+ */
10753 -
10754 - /* Generate output characters in reverse order. */
10755 - while (code >= 256) {
10756 -@@ -540,7 +551,7 @@ middle: do {
10757 - } while (stackp > de_stack);
10758 -
10759 - /* Generate the new entry. */
10760 -- if ((code = free_ent) < maxmaxcode) {
10761 -+ if ((code = free_ent) < maxmaxcode && oldcode != -1) {
10762 - tab_prefixof(code) = (u_short) oldcode;
10763 - tab_suffixof(code) = finchar;
10764 - free_ent = code + 1;
10765
10766 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
10767 deleted file mode 100644
10768 index d34eb9e..0000000
10769 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.0-fixmakefiles.patch
10770 +++ /dev/null
10771 @@ -1,11 +0,0 @@
10772 -diff -uNr usr.bin.old/calendar/Makefile usr.bin/calendar/Makefile
10773 ---- usr.bin.old/calendar/Makefile 2011-11-02 18:22:09.000000000 +0000
10774 -+++ usr.bin/calendar/Makefile 2011-11-02 18:22:48.000000000 +0000
10775 -@@ -15,6 +15,7 @@
10776 - WARNS?= 7
10777 -
10778 - beforeinstall:
10779 -+ ${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
10780 - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
10781 - ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
10782 - .for lang in ${INTER}
10783
10784 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
10785 deleted file mode 100644
10786 index d4d89e1..0000000
10787 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-ar-libarchive3.patch
10788 +++ /dev/null
10789 @@ -1,19 +0,0 @@
10790 -diff -Nur usr.bin.orig/ar/ar.c usr.bin/ar/ar.c
10791 ---- usr.bin.orig/ar/ar.c 2012-01-03 12:23:45.000000000 +0900
10792 -+++ usr.bin/ar/ar.c 2012-12-25 20:50:29.000000000 +0900
10793 -@@ -386,13 +386,13 @@
10794 - static void
10795 - bsdar_version(void)
10796 - {
10797 -- (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version());
10798 -+ (void)printf("BSD ar %s - %s\n", BSDAR_VERSION, archive_version_string());
10799 - exit(EX_OK);
10800 - }
10801 -
10802 - static void
10803 - ranlib_version(void)
10804 - {
10805 -- (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version());
10806 -+ (void)printf("ranlib %s - %s\n", BSDAR_VERSION, archive_version_string());
10807 - exit(EX_OK);
10808 - }
10809
10810 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
10811 deleted file mode 100644
10812 index a65185f..0000000
10813 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-bsdar.patch
10814 +++ /dev/null
10815 @@ -1,25 +0,0 @@
10816 -diff -Nur work.orig/usr.bin/ar/Makefile work/usr.bin/ar/Makefile
10817 ---- work.orig/usr.bin/ar/Makefile 2012-07-16 03:59:48.000000000 +0900
10818 -+++ work/usr.bin/ar/Makefile 2012-07-16 04:02:38.000000000 +0900
10819 -@@ -2,7 +2,7 @@
10820 -
10821 - .include <bsd.own.mk>
10822 -
10823 --PROG= ar
10824 -+PROG= freebsd-ar
10825 - SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
10826 -
10827 - DPADD= ${LIBARCHIVE} ${LIBELF}
10828 -@@ -10,10 +10,7 @@
10829 -
10830 - CFLAGS+=-I. -I${.CURDIR}
10831 -
10832 --.if ${MK_SHARED_TOOLCHAIN} == "no"
10833 --NO_SHARED?= yes
10834 --.endif
10835 --LINKS= ${BINDIR}/ar ${BINDIR}/ranlib
10836 --MLINKS= ar.1 ranlib.1
10837 -+LINKS= ${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
10838 -+MLINKS= freebsd-ar.1 freebsd-ranlib.1
10839 -
10840 - .include <bsd.prog.mk>
10841
10842 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
10843 deleted file mode 100644
10844 index 06cc5d2..0000000
10845 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-grep.patch
10846 +++ /dev/null
10847 @@ -1,17 +0,0 @@
10848 -diff -Nur work.orig/usr.bin/grep/Makefile work/usr.bin/grep/Makefile
10849 ---- work.orig/usr.bin/grep/Makefile 2012-07-16 04:59:01.000000000 +0900
10850 -+++ work/usr.bin/grep/Makefile 2012-07-16 05:00:15.000000000 +0900
10851 -@@ -40,13 +40,6 @@
10852 - grep.1 lzfgrep.1
10853 - .endif
10854 -
10855 --LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
10856 -- ${BINDIR}/${PROG} ${BINDIR}/xzegrep \
10857 -- ${BINDIR}/${PROG} ${BINDIR}/xzfgrep \
10858 -- ${BINDIR}/${PROG} ${BINDIR}/lzgrep \
10859 -- ${BINDIR}/${PROG} ${BINDIR}/lzegrep \
10860 -- ${BINDIR}/${PROG} ${BINDIR}/lzfgrep
10861 --
10862 - LDADD= -lz -llzma
10863 - DPADD= ${LIBZ} ${LIBLZMA}
10864 -
10865
10866 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
10867 deleted file mode 100644
10868 index d98e599..0000000
10869 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-kdump-ioctl.patch
10870 +++ /dev/null
10871 @@ -1,24 +0,0 @@
10872 -diff -Nur work.orig/usr.bin/kdump/Makefile work/usr.bin/kdump/Makefile
10873 ---- work.orig/usr.bin/kdump/Makefile 2012-07-12 13:24:01.000000000 +0900
10874 -+++ work/usr.bin/kdump/Makefile 2012-07-16 03:54:14.000000000 +0900
10875 -@@ -21,7 +21,7 @@
10876 -
10877 - ioctl.c: mkioctls
10878 - env CPP="${CPP}" \
10879 -- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
10880 -+ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
10881 -
10882 - kdump_subr.c: mksubr
10883 - sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include > ${.TARGET}
10884 -diff -Nur work.orig/usr.bin/truss/Makefile work/usr.bin/truss/Makefile
10885 ---- work.orig/usr.bin/truss/Makefile 2012-07-12 13:24:03.000000000 +0900
10886 -+++ work/usr.bin/truss/Makefile 2012-07-16 03:54:40.000000000 +0900
10887 -@@ -24,7 +24,7 @@
10888 -
10889 - ioctl.c: ${.CURDIR}/../kdump/mkioctls
10890 - env CPP="${CPP}" \
10891 -- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
10892 -+ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
10893 -
10894 - .if ${MACHINE_CPUARCH} == "i386"
10895 - SRCS+= i386-linux.c linux_syscalls.h
10896
10897 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
10898 deleted file mode 100644
10899 index a9c0622..0000000
10900 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-9.1-minigzip.patch
10901 +++ /dev/null
10902 @@ -1,10 +0,0 @@
10903 -diff -Nur work.orig/usr.bin/minigzip/Makefile work/usr.bin/minigzip/Makefile
10904 ---- work.orig/usr.bin/minigzip/Makefile 2012-07-16 04:39:31.000000000 +0900
10905 -+++ work/usr.bin/minigzip/Makefile 2012-07-16 04:45:30.000000000 +0900
10906 -@@ -10,4 +10,6 @@
10907 - DPADD= ${LIBZ}
10908 - LDADD= -lz
10909 -
10910 -+CFLAGS+= -I${.CURDIR}/../../lib/libz
10911 -+
10912 - .include <bsd.prog.mk>
10913
10914 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
10915 deleted file mode 100644
10916 index 9774724..0000000
10917 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-lint-stdarg.patch
10918 +++ /dev/null
10919 @@ -1,24 +0,0 @@
10920 -diff -ur usr.bin.orig/xlint/llib/llib-lposix usr.bin/xlint/llib/llib-lposix
10921 ---- usr.bin.orig/xlint/llib/llib-lposix 2005-04-29 17:30:03 +0000
10922 -+++ usr.bin/xlint/llib/llib-lposix 2005-05-03 14:12:26 +0000
10923 -@@ -42,7 +42,7 @@
10924 - #include <sys/utsname.h>
10925 - #include <sys/times.h>
10926 - #include <stdio.h>
10927 --#include <stdarg.h>
10928 -+#include <machine/stdarg.h>
10929 - #include <stdlib.h>
10930 - #include <unistd.h>
10931 - #include <math.h>
10932 -diff -ur usr.bin.orig/xlint/llib/llib-lstdc usr.bin/xlint/llib/llib-lstdc
10933 ---- usr.bin.orig/xlint/llib/llib-lstdc 2005-04-29 17:30:03 +0000
10934 -+++ usr.bin/xlint/llib/llib-lstdc 2005-05-03 14:12:35 +0000
10935 -@@ -44,7 +44,7 @@
10936 - #include <math.h>
10937 - #include <setjmp.h>
10938 - #include <signal.h>
10939 --#include <stdarg.h>
10940 -+#include <machine/stdarg.h>
10941 - #include <stddef.h>
10942 - #include <stdio.h>
10943 - #include <stdlib.h>
10944
10945 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
10946 deleted file mode 100644
10947 index 631ee4f..0000000
10948 --- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-setXid.patch
10949 +++ /dev/null
10950 @@ -1,129 +0,0 @@
10951 -diff -ur usr.bin.orig/at/Makefile usr.bin.setXid/at/Makefile
10952 ---- usr.bin.orig/at/Makefile Thu Apr 7 20:52:57 2005
10953 -+++ usr.bin.setXid/at/Makefile Thu Apr 7 21:21:02 2005
10954 -@@ -15,6 +15,8 @@
10955 - BINMODE= 4555
10956 - CLEANFILES+= at.1
10957 -
10958 -+LDFLAGS+=-Wl,-z,now
10959 -+
10960 - at.1: at.man
10961 - @${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
10962 - sed -e \
10963 -diff -ur usr.bin.orig/chpass/Makefile usr.bin.setXid/chpass/Makefile
10964 ---- usr.bin.orig/chpass/Makefile Thu Apr 7 20:52:57 2005
10965 -+++ usr.bin.setXid/chpass/Makefile Thu Apr 7 21:22:40 2005
10966 -@@ -15,6 +15,8 @@
10967 - #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
10968 - CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
10969 -
10970 -+LDFLAGS+=-Wl,-z,now
10971 -+
10972 - DPADD= ${LIBCRYPT} ${LIBUTIL}
10973 - LDADD= -lcrypt -lutil
10974 - .if !defined(NO_NIS)
10975 -diff -ur usr.bin.orig/fstat/Makefile usr.bin.setXid/fstat/Makefile
10976 ---- usr.bin.orig/fstat/Makefile Thu Apr 7 20:52:57 2005
10977 -+++ usr.bin.setXid/fstat/Makefile Thu Apr 7 21:24:35 2005
10978 -@@ -9,4 +9,6 @@
10979 - BINMODE=2555
10980 - WARNS?= 6
10981 -
10982 -+LDFLAGS+=-Wl,-z,now
10983 -+
10984 - .include <bsd.prog.mk>
10985 -diff -ur usr.bin.orig/lock/Makefile usr.bin.setXid/lock/Makefile
10986 ---- usr.bin.orig/lock/Makefile Thu Apr 7 20:52:57 2005
10987 -+++ usr.bin.setXid/lock/Makefile Thu Apr 7 21:24:45 2005
10988 -@@ -7,4 +7,6 @@
10989 - DPADD= ${LIBCRYPT}
10990 - LDADD= -lcrypt
10991 -
10992 -+LDFLAGS+=-Wl,-z,now
10993 -+
10994 - .include <bsd.prog.mk>
10995 -diff -ur usr.bin.orig/login/Makefile usr.bin.setXid/login/Makefile
10996 ---- usr.bin.orig/login/Makefile Thu Apr 7 20:52:57 2005
10997 -+++ usr.bin.setXid/login/Makefile Thu Apr 7 21:24:55 2005
10998 -@@ -13,4 +13,6 @@
10999 - INSTALLFLAGS=-fschg
11000 - .endif
11001 -
11002 -+LDFLAGS+=-Wl,-z,now
11003 -+
11004 - .include <bsd.prog.mk>
11005 -diff -ur usr.bin.orig/netstat/Makefile usr.bin.setXid/netstat/Makefile
11006 ---- usr.bin.orig/netstat/Makefile Thu Apr 7 20:52:58 2005
11007 -+++ usr.bin.setXid/netstat/Makefile Thu Apr 7 21:25:08 2005
11008 -@@ -14,4 +14,6 @@
11009 - DPADD= ${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} ${LIBUTIL}
11010 - LDADD= -lkvm -lipx -lnetgraph -lutil
11011 -
11012 -+LDFLAGS+=-Wl,-z,now
11013 -+
11014 - .include <bsd.prog.mk>
11015 -diff -ur usr.bin.orig/opieinfo/Makefile usr.bin.setXid/opieinfo/Makefile
11016 ---- usr.bin.orig/opieinfo/Makefile Thu Apr 7 20:52:58 2005
11017 -+++ usr.bin.setXid/opieinfo/Makefile Thu Apr 7 21:25:20 2005
11018 -@@ -11,6 +11,8 @@
11019 - DPADD= ${LIBOPIE} ${LIBMD}
11020 - LDADD= -lopie -lmd
11021 -
11022 -+LDFLAGS+=-Wl,-z,now
11023 -+
11024 - BINOWN= root
11025 - BINMODE=4555
11026 - INSTALLFLAGS=-fschg
11027 -diff -ur usr.bin.orig/opiepasswd/Makefile usr.bin.setXid/opiepasswd/Makefile
11028 ---- usr.bin.orig/opiepasswd/Makefile Thu Apr 7 20:52:58 2005
11029 -+++ usr.bin.setXid/opiepasswd/Makefile Thu Apr 7 21:25:29 2005
11030 -@@ -11,6 +11,8 @@
11031 - DPADD= ${LIBOPIE} ${LIBMD}
11032 - LDADD= -lopie -lmd
11033 -
11034 -+LDFLAGS+=-Wl,-z,now
11035 -+
11036 - BINOWN= root
11037 - BINMODE=4555
11038 - INSTALLFLAGS=-fschg
11039 -diff -ur usr.bin.orig/passwd/Makefile usr.bin.setXid/passwd/Makefile
11040 ---- usr.bin.orig/passwd/Makefile Thu Apr 7 20:52:58 2005
11041 -+++ usr.bin.setXid/passwd/Makefile Thu Apr 7 21:25:37 2005
11042 -@@ -10,6 +10,8 @@
11043 - MLINKS = passwd.1 yppasswd.1
11044 - WARNS ?= 4
11045 -
11046 -+LDFLAGS+=-Wl,-z,now
11047 -+
11048 - beforeinstall:
11049 - .for i in passwd yppasswd
11050 - [ ! -e ${DESTDIR}${BINDIR}/$i ] || \
11051 ---- usr.bin.orig/su/Makefile Thu Apr 7 20:52:58 2005
11052 -+++ usr.bin.setXid/su/Makefile Thu Apr 7 21:26:00 2005
11053 -@@ -10,4 +10,6 @@
11054 - BINMODE=4555
11055 - INSTALLFLAGS=-fschg
11056 -
11057 -+LDFLAGS+=-Wl,-z,now
11058 -+
11059 - .include <bsd.prog.mk>
11060 -diff -ur usr.bin.orig/wall/Makefile usr.bin.setXid/wall/Makefile
11061 ---- usr.bin.orig/wall/Makefile Thu Apr 7 20:52:59 2005
11062 -+++ usr.bin.setXid/wall/Makefile Thu Apr 7 21:26:07 2005
11063 -@@ -5,4 +5,6 @@
11064 - BINGRP= tty
11065 - BINMODE=2555
11066 -
11067 -+LDFLAGS+=-Wl,-z,now
11068 -+
11069 - .include <bsd.prog.mk>
11070 -diff -ur usr.bin.orig/write/Makefile usr.bin.setXid/write/Makefile
11071 ---- usr.bin.orig/write/Makefile Thu Apr 7 20:52:59 2005
11072 -+++ usr.bin.setXid/write/Makefile Thu Apr 7 21:26:13 2005
11073 -@@ -4,4 +4,6 @@
11074 - BINMODE=2555
11075 - BINGRP= tty
11076 -
11077 -+LDFLAGS+=-Wl,-z,now
11078 -+
11079 - .include <bsd.prog.mk>
11080
11081 diff --git a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron b/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
11082 deleted file mode 100644
11083 index 323f455..0000000
11084 --- a/sys-freebsd/freebsd-ubin/files/locate-updatedb-cron
11085 +++ /dev/null
11086 @@ -1,6 +0,0 @@
11087 -#! /bin/sh
11088 -
11089 -if [ -x /usr/libexec/locate.updatedb ]
11090 -then
11091 - echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody
11092 -fi
11093
11094 diff --git a/sys-freebsd/freebsd-ubin/files/login.1.pamd b/sys-freebsd/freebsd-ubin/files/login.1.pamd
11095 deleted file mode 100644
11096 index 2c09584..0000000
11097 --- a/sys-freebsd/freebsd-ubin/files/login.1.pamd
11098 +++ /dev/null
11099 @@ -1,4 +0,0 @@
11100 -auth include system-local-login
11101 -account include system-local-login
11102 -session include system-local-login
11103 -password include system-local-login
11104
11105 diff --git a/sys-freebsd/freebsd-ubin/files/login.pamd b/sys-freebsd/freebsd-ubin/files/login.pamd
11106 deleted file mode 100644
11107 index db1c74f..0000000
11108 --- a/sys-freebsd/freebsd-ubin/files/login.pamd
11109 +++ /dev/null
11110 @@ -1,20 +0,0 @@
11111 -#
11112 -# $Id$
11113 -#
11114 -# PAM configuration for the "login" service
11115 -#
11116 -
11117 -# auth
11118 -auth required pam_nologin.so no_warn
11119 -auth sufficient pam_self.so no_warn
11120 -auth include system
11121 -
11122 -# account
11123 -account requisite pam_securetty.so
11124 -account include system
11125 -
11126 -# session
11127 -session include system
11128 -
11129 -# password
11130 -password include system
11131
11132 diff --git a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd b/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
11133 deleted file mode 100644
11134 index bab2eea..0000000
11135 --- a/sys-freebsd/freebsd-ubin/files/passwd.1.pamd
11136 +++ /dev/null
11137 @@ -1,9 +0,0 @@
11138 -#
11139 -# $Id$
11140 -#
11141 -# PAM configuration for the "passwd" service
11142 -#
11143 -
11144 -# passwd(1) does not use the auth, account or session services.
11145 -
11146 -password include system-auth
11147
11148 diff --git a/sys-freebsd/freebsd-ubin/files/passwd.pamd b/sys-freebsd/freebsd-ubin/files/passwd.pamd
11149 deleted file mode 100644
11150 index 44b7e71..0000000
11151 --- a/sys-freebsd/freebsd-ubin/files/passwd.pamd
11152 +++ /dev/null
11153 @@ -1,11 +0,0 @@
11154 -#
11155 -# $Id$
11156 -#
11157 -# PAM configuration for the "passwd" service
11158 -#
11159 -
11160 -# passwd(1) does not use the auth, account or session services.
11161 -
11162 -# password
11163 -#password requisite pam_passwdqc.so enforce=users
11164 -password required pam_unix.so no_warn try_first_pass nullok
11165
11166 diff --git a/sys-freebsd/freebsd-ubin/files/su.1.pamd b/sys-freebsd/freebsd-ubin/files/su.1.pamd
11167 deleted file mode 100644
11168 index 72e2bd1..0000000
11169 --- a/sys-freebsd/freebsd-ubin/files/su.1.pamd
11170 +++ /dev/null
11171 @@ -1,17 +0,0 @@
11172 -#
11173 -# $Id$
11174 -#
11175 -# PAM configuration for the "su" service
11176 -#
11177 -
11178 -# auth
11179 -auth sufficient pam_rootok.so no_warn
11180 -auth sufficient pam_self.so no_warn
11181 -auth requisite pam_group.so no_warn group=wheel root_only fail_safe
11182 -auth include system-auth
11183 -
11184 -# account
11185 -account include system-auth
11186 -
11187 -# session
11188 -session required pam_permit.so
11189
11190 diff --git a/sys-freebsd/freebsd-ubin/files/su.pamd b/sys-freebsd/freebsd-ubin/files/su.pamd
11191 deleted file mode 100644
11192 index 57019c5..0000000
11193 --- a/sys-freebsd/freebsd-ubin/files/su.pamd
11194 +++ /dev/null
11195 @@ -1,17 +0,0 @@
11196 -#
11197 -# $Id$
11198 -#
11199 -# PAM configuration for the "su" service
11200 -#
11201 -
11202 -# auth
11203 -auth sufficient pam_rootok.so no_warn
11204 -auth sufficient pam_self.so no_warn
11205 -auth requisite pam_group.so no_warn group=wheel root_only fail_safe
11206 -auth include system
11207 -
11208 -# account
11209 -account include system
11210 -
11211 -# session
11212 -session required pam_permit.so
11213
11214 diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_rc3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_rc3.ebuild
11215 deleted file mode 100644
11216 index e97f6ee..0000000
11217 --- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3_rc3.ebuild
11218 +++ /dev/null
11219 @@ -1,207 +0,0 @@
11220 -# Copyright 1999-2016 Gentoo Foundation
11221 -# Distributed under the terms of the GNU General Public License v2
11222 -# $Id$
11223 -
11224 -EAPI=5
11225 -
11226 -inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
11227 -
11228 -DESCRIPTION="FreeBSD's base system source for /usr/bin"
11229 -SLOT="0"
11230 -IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
11231 -LICENSE="BSD zfs? ( CDDL )"
11232 -
11233 -if [[ ${PV} != *9999* ]]; then
11234 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
11235 - SRC_URI="${SRC_URI}
11236 - $(freebsd_upstream_patches)"
11237 -fi
11238 -
11239 -EXTRACTONLY="
11240 - usr.bin/
11241 - contrib/
11242 - lib/
11243 - etc/
11244 - bin/
11245 - include/
11246 -"
11247 -
11248 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
11249 - ssl? ( dev-libs/openssl:0= )
11250 - kerberos? ( virtual/krb5 )
11251 - ar? ( >=app-arch/libarchive-3 )
11252 - virtual/pam
11253 - sys-libs/zlib
11254 - >=sys-libs/ncurses-5.9:0=
11255 - !sys-process/fuser-bsd
11256 - !dev-util/csup
11257 - !dev-libs/libiconv
11258 - !sys-freebsd/freebsd-contrib"
11259 -
11260 -DEPEND="${RDEPEND}
11261 - sys-devel/flex
11262 - !build? ( =sys-freebsd/freebsd-sources-${RV}* )
11263 - =sys-freebsd/freebsd-sbin-${RV}*
11264 - =sys-freebsd/freebsd-mk-defs-${RV}*"
11265 -
11266 -RDEPEND="${RDEPEND}
11267 - >=sys-auth/pambase-20080219.1
11268 - sys-process/cronbase"
11269 -
11270 -S="${WORKDIR}/usr.bin"
11271 -
11272 -PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
11273 - "${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
11274 - "${FILESDIR}/${PN}-setXid.patch"
11275 - "${FILESDIR}/${PN}-lint-stdarg.patch"
11276 - "${FILESDIR}/${PN}-8.0-xinstall.patch"
11277 - "${FILESDIR}/${PN}-9.1-bsdar.patch"
11278 - "${FILESDIR}/${PN}-9.1-minigzip.patch"
11279 - "${FILESDIR}/${PN}-10.0-atf.patch"
11280 - "${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
11281 - "${FILESDIR}/${PN}-10.0-kdump-ioctl.patch"
11282 - "${FILESDIR}/${PN}-10.0-mandoc.patch"
11283 - "${FILESDIR}/${PN}-10.2-bsdxml.patch"
11284 - "${FILESDIR}/${PN}-10.2-talk-workaround.patch"
11285 - "${FILESDIR}/${PN}-10.3-bmake-workaround.patch" )
11286 -
11287 -# Here we remove some sources we don't need because they are already
11288 -# provided by portage's packages or similar. In order:
11289 -# - Archiving tools, provided by their own ebuilds
11290 -# - ncurses stuff
11291 -# - less stuff
11292 -# - bind utils
11293 -# - rsh stuff
11294 -# - binutils gprof
11295 -# - dc stuff
11296 -# and the rest are misc utils we already provide somewhere else.
11297 -REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
11298 - gzip gprof
11299 - lzmainfo xz xzdec
11300 - unzip
11301 - tput tset tabs
11302 - less lessecho lesskey
11303 - hesinfo host
11304 - rsh rlogin rusers rwho ruptime
11305 - compile_et lex vi smbutil file vacation nc ftp telnet
11306 - c99 c89
11307 - bc dc
11308 - whois tftp man"
11309 -
11310 -pkg_setup() {
11311 - # Add the required source files.
11312 - use zfs && EXTRACTONLY+="cddl/ "
11313 - use build && EXTRACTONLY+="sys/ "
11314 -
11315 - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
11316 - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
11317 - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
11318 - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
11319 - use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
11320 - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
11321 - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
11322 - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
11323 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
11324 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
11325 - mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= "
11326 -}
11327 -
11328 -pkg_preinst() {
11329 - # bison installs a /usr/bin/yacc symlink ...
11330 - # we need to remove it to avoid triggering
11331 - # collision-protect errors
11332 - if [[ -L ${ROOT}/usr/bin/yacc ]] ; then
11333 - rm -f "${ROOT}"/usr/bin/yacc
11334 - fi
11335 -}
11336 -
11337 -src_prepare() {
11338 - if [[ ! -e "${WORKDIR}/sys" ]]; then
11339 - use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
11340 - fi
11341 -
11342 - # Rename manpage for renamed cmp
11343 - mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
11344 - # Rename manpage for renamed ar
11345 - mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
11346 - # Fix whereis(1) manpath search.
11347 - sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h"
11348 -
11349 - # Build a dynamic make
11350 - sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
11351 -
11352 - # Disable it here otherwise our patch wont apply
11353 - use ar || dummy_mk ar
11354 -
11355 - # Preparing to build xlint
11356 - export LINT=xlint
11357 -}
11358 -
11359 -setup_multilib_vars() {
11360 - if ! multilib_is_native_abi ; then
11361 - cd "${WORKDIR}/usr.bin/ldd" || die
11362 - export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
11363 - else
11364 - cd "${S}" || die
11365 - fi
11366 - "$@"
11367 -}
11368 -
11369 -src_compile() {
11370 - # Preparing to build mandoc
11371 - cd "${WORKDIR}/lib/libmandoc" || die
11372 - freebsd_src_compile -j1
11373 -
11374 - cd "${S}" || die
11375 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
11376 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1
11377 -}
11378 -
11379 -src_install() {
11380 - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
11381 - multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
11382 -
11383 - # baselayout requires these in /bin
11384 - dodir /bin
11385 - for bin in sed printf ; do
11386 - mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
11387 - dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
11388 - done
11389 -
11390 - for pamdfile in login passwd su; do
11391 - newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
11392 - done
11393 -
11394 - cd "${WORKDIR}/etc" || die
11395 - insinto /etc
11396 - doins remote phones opieaccess fbtab || die
11397 -
11398 - exeinto /etc/cron.daily
11399 - newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
11400 -
11401 - # tip requires /var/spool/lock/, bug #200700
11402 - keepdir /var/spool/lock
11403 -
11404 - # create locate database #472468
11405 - local f=/var/db/locate.database
11406 - mkdir "${ED}${f%/*}" || die
11407 - touch "${ED}${f}" || die
11408 - fowners nobody:nobody ${f}
11409 -}
11410 -
11411 -pkg_postinst() {
11412 - # We need to ensure that login.conf.db is up-to-date.
11413 - if [[ -e "${ROOT}"etc/login.conf ]] ; then
11414 - einfo "Updating ${ROOT}etc/login.conf.db"
11415 - "${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf
11416 - elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
11417 - fi
11418 -}
11419 -
11420 -pkg_postrm() {
11421 - # and if we uninstall yacc but keep bison,
11422 - # lets restore the /usr/bin/yacc symlink
11423 - if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
11424 - ln -s yacc.bison "${ROOT}"/usr/bin/yacc
11425 - fi
11426 -}
11427
11428 diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml
11429 deleted file mode 100644
11430 index a7fa78a..0000000
11431 --- a/sys-freebsd/freebsd-ubin/metadata.xml
11432 +++ /dev/null
11433 @@ -1,24 +0,0 @@
11434 -<?xml version="1.0" encoding="UTF-8"?>
11435 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
11436 -<pkgmetadata>
11437 - <maintainer type="project">
11438 - <email>bsd@g.o</email>
11439 - <name>BSD Project</name>
11440 - </maintainer>
11441 - <use>
11442 - <flag name="audit">
11443 - Build auditing tools.
11444 - </flag>
11445 - <flag name="netware">
11446 - Build libraries and tools to work with NetWare protocols (IPX
11447 - and NCP).
11448 - </flag>
11449 - <flag name="ar">
11450 - Build FreeBSD's ar and ranlib replacements based on libarchive. The
11451 - toolchain will still use binutils' version but you can play with it.
11452 - They have been renamed to freebsd-ar and freebsd-ranlib not to collide
11453 - with binutils.
11454 - </flag>
11455 - <flag name="zfs">Enable ZFS support (for fstat actually).</flag>
11456 - </use>
11457 -</pkgmetadata>
11458
11459 diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
11460 deleted file mode 100644
11461 index c6aab76..0000000
11462 --- a/sys-freebsd/freebsd-usbin/Manifest
11463 +++ /dev/null
11464 @@ -1,32 +0,0 @@
11465 -AUX freebsd-usbin-10.0-bsdxml2expat.patch 835 SHA256 765ab05ef6d5d828d2cc54e78e0676dc2b6caac7193788524a7dd4cc5a983c8c SHA512 23bcfdc1657c1dd7fdb59c3717af5a5560c8f3c10d498aaae539e1779838a0a33cf247ae806c72c09d298fc9be3c02b5c3d1d9f1a879493c0e5d1aeb4dbf3509 WHIRLPOOL 2342438a26ef915f29d487aecedfd0920baa6c2130b3efd6fbd64d7a2bf81f74444e7409ceaceb29d4c5ad210af4cee0a4d98b0935131ff577a6103023f83f44
11466 -AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 SHA256 ddf45cbb311c6b1ba49617db48c54eac1f4d5279a40f038e64aef52732a04049 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd WHIRLPOOL fad08c17acc523e240a6ef9c0fbf79e12bd048d9bf4e688cad58ebd5f5b7ec69a39b8786e67f73c5baee4d606abae48a204b94a5b7753e25bc7d137e614a890b
11467 -AUX freebsd-usbin-7.0-nowrap.patch 1185 SHA256 a3c35cd997a22f4d212c3fe08d20fa7552b6de64527fee0166249ae76a3e49c8 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee WHIRLPOOL 7049020fc9383c374ca33b4b4ad5d8eb8b9f014922362fe67be1423da649c6ae2afbfeb6e8e0a13e5f77cc4b8f214b8e60d1ddb848a96213e65a2a77220db66b
11468 -AUX freebsd-usbin-8.2-newsyslog.patch 400 SHA256 f13d5ea43531f42ff0cb42438b58875afce4046c650a7459fd2eac62dc11696e SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56 WHIRLPOOL eb011fcc84e20873e8e86a0bbd101e4651c087b2f22716599bccd55b7ba28607520a450a2c98461ea7d78b2b52f233e6bfc4bf44cb11ec002ad7db631273ca24
11469 -AUX freebsd-usbin-9.0-libarchive.patch 409 SHA256 105ce2534fdcf17bdbda21154a4679aba76e75b541ae06f9783333f8b7acd30a SHA512 f30851631a7a181b12f7e749d0bf8d3ce1a93d9cfa74e0ae0b8a96d7278192bb5569f100d9c9bc423a7dc9d37dcbebdc69ac993ff11c6aa19f49eaf83bd3b4f1 WHIRLPOOL c1a5a32cb070ebbd94f4a6b30ca79d0b75525c4a04e52b565e60e94aa22b533e26d038f3757d2a4aee4e2893ed6a729482aee6a933fd1f34193bcff1ee05b3b6
11470 -AUX freebsd-usbin-9.0-newsyslog.patch 507 SHA256 d5f910655c66a3e766f227c25837347d11d796655d71480c3cf3526f4136d557 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae WHIRLPOOL 0551fde1581f3642535d1e34f2b111ed1404fc153ed14f4d7d4c75bc96715ed1eb3f218fc55fb2bb038616a929e106b8d8355f2de95447f7a93c09c515cdd511
11471 -AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 SHA256 43f0ebe5406f6065d7dad45b4270f0645e7dc1d6db1bcdf1443e32aede9d7af6 SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0 WHIRLPOOL 17c14ef758cede73619f774710afd38862609da6302e0d2378e7b5124d38dd60c427218f140f67e1ea255a24f7eb6d900df1ad5835d23a135cef7cb5cc94bc73
11472 -AUX freebsd-usbin-9.1-kldxref.patch 756 SHA256 b9021def1c9e1a6ffcd66cc86e4086e75b3630e9d6ce40bd8c29b961bd0c570b SHA512 8d1e0c80a6698729bdf40e60ac0373ed76e4c394f7fc93e9ae78e9e8bb06d63c99d04dbb942e90cc9240fc429be7048c4fee22c3ce593b49be90c9df3fc549ec WHIRLPOOL ec37a7350499f5ad5225f3b41151d2b8b060e210cd441cac56e2d87471b08ef0e8cdcca6daad299988808b9c1083afcbbe4c281885a003bca95177b3de0e6c86
11473 -AUX freebsd-usbin-adduser.patch 428 SHA256 2e91737ffefd3b7ce3b55da4ce98eb0425961bba2d4a7c4e7c7ffabc1d38f2af SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3 WHIRLPOOL 15a5a7e2c123a3103546134a27baad0a459758ec66bb0a7011684f367c7dd46435688f837d9d5fb5a9a51e95a58d6ce0e672c57a9dc2ef16a1e094a4b6e78931
11474 -AUX iscsid.initd 428 SHA256 6cff138e8987dc1bad2047bdb598a4ef3d1e67a96f471fcb23fe352d85a2834f SHA512 b16ce5fdfbb697c6097701696b52033e347bb0446559faae01cadd5f9b44a12604914e07f7e0c7aa806f6b8992e97fd01e116e36c1c5ae1dfbde146bb2d62bde WHIRLPOOL 36118b63a06a26ef82c75f93f0498dd35920582526f713d563b3d4c51347562b784fa598a0d4f146f589337135cba6e7df5a45b7adbb9a3c6c357a07e1288a72
11475 -AUX mountd.patch 542 SHA256 da895dabdb52c63d876c13605aa1ef446f8babb47100932b5b451155181a759f SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5 WHIRLPOOL a57f31ff146950d5aba5998dbd163f98321373dde5f731584c81bb841a8594422bb2ec44c63bd9e2742dbed3a03e200497948777a12b471d6dd7af9998578ad3
11476 -AUX moused.confd 713 SHA256 c85c4c59e7e23a3ac98c3a4beebbe452506bcb6614315810c0f79c7b2f335715 SHA512 247bd942e83a211f953b0bfae8f4cc7db517a1b53231557f652526b5440a173ec4e8b7e3207ad7c0765fa949c91c170edb4771329fa2d9921f60595cbdec0dd7 WHIRLPOOL 797dbaa3d90d1a3e62a0c4492207e0ef90612a44a972b590c42040d9aeb554d41ced104a61ea5e9f44d948c8bc88b144deb202af588eb06c7b59e5f5f0e1e9a9
11477 -AUX moused.initd 1669 SHA256 39b9d38bbbbc1bfbc96829aefa12c28f356b4d2cbedfbebd2e0a96dd7f533ed9 SHA512 997ae72e052fdba31619c02f4aadf326116f52d9ba4223ee2ce65a86d39b1d0d412fb91cadef88ab5d5cb412ba7746b54b982d46707d64a7b2039f824eb9da75 WHIRLPOOL 1b08abff403e87004829589add2596d57328695dbce5623678bb8839b634ca5291aa6cdd91d23a8bdaa764ae3ee1dcdb41a3757219c74c6f0cf17e89fafcce4a
11478 -AUX nfs.confd 303 SHA256 5714e0cbcc45a077ab2348ee4fea521ce9f739927094dccb4b91817f1edaccb8 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a WHIRLPOOL 70bfff7d5288c692ed767c1e09d48db6c8546d90955a1957de87fd67cb42ed5b1efa0101cf2eea71e4702e1170eadeed9cc45937b742e51cee42c9edd00a1ee9
11479 -AUX nfs.initd 1423 SHA256 304047cc48ab6923b5d492c84417b5fcdae441fe0536830f1c75f6de58bba1ff SHA512 83326ec4cc35beeacfd640f582b6bc3001fd274a46f690cc04b1774db16b22ce74d993c92cd62d37d37eb8c421f5f386f95088a3204d045370d07206d06aa895 WHIRLPOOL ee29e0df0b1792a5368ebf036129b434e3b697c85c5bcee9b8d62d8568feaede64a74bd8efcc1f97aebb63aeb9a0c1e32a372dfacc7f13bfdd8d91e61cafa987
11480 -AUX nfsmount.initd 1480 SHA256 3b092f86099ee2284cbc6e53c6ad29f24cb757b152ce1635995b7c77fb34146c SHA512 6f3ad628937da47aa723f4289fc4d7c8528dbdab221800a7eab9250bc4a8db6b795d61c0a1cbbb5993b42ff4a59a752b9186630f6d0e3ad6f0c4b9bc4afc52f5 WHIRLPOOL bcb454d2b22262bfbd888478898b8e3ae595120e6c03d4a5b0870e4476329dc83c2cbd2c79696e2547222fd529f29d1e9d182de3db31754d674357cc2eab2214
11481 -AUX nfsuserd.confd 153 SHA256 9575adaba684100f78ff1d60ca5e7b6f5be6fcda9e2d8fac2a1ab4aaf8944a59 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073 WHIRLPOOL 4e4aabc4c936c067d99133620a117d9c1fc539e23acfe9b15b4a7ebb57e3cb55b4ffab34b2af93fcfdf7fe81e4372e3afa38994ee999093aa1ec0a80c3c12175
11482 -AUX nfsuserd.initd 446 SHA256 e3fe4e31b746f092064b2f2c5b4a7185ef00bd5f2b14b5591531ab7d9c688c2b SHA512 e1fa87b7b5d332c235e6b47e2963c943a646d783cac7a378a352e49ea8b299f931ddc83425ba9e221cc1d742f7f0c1331212315fb51c7d82ba3885b1e4a1e557 WHIRLPOOL 8c6e2eddc20209ce58b9140e57c22b089eafc91bd608ac8fbe5aa4b54ff4184dc1bf845bf976e3802de4e2a06356e04aa9b8c3213b08bee9377003d8bb1aa3b5
11483 -AUX powerd.confd 254 SHA256 39dc617f9aafc732762302120aa686ef8694591b0a2ec0cca79e7dc46ee9cfbc SHA512 c3e449561450e3579f93f5bda1c93f01a68ede2e9b6da56a7cb2f4eecf1313993fb4a384a2e65a1fd04e78b80732fab31349ee309368e28034f9467296cd1e0d WHIRLPOOL c1b07fd7ebf4231b9986850fdb41704b434c37f2b5f4b2d3517217f4195f38449bc0724d8fac736801f10cc67feabc6fa49d9ee86e793f05178f9328c9ae6acb
11484 -AUX powerd.initd 660 SHA256 071f3e4140343a8df2402f728897b7ca2207260068577999310322296682fd73 SHA512 ab932526c53ab429d984587ad5fab696aeed9bf0dfb0198a81648efa5d76f1b20ef7160fade9cdfaf8e3a89ff50acf4fe33d5cdfd0bfa59b092df60f035fad5a WHIRLPOOL 1dc0f558edd7594f1b57501fd34f6c467488e35b0371480b070ea9f6de4c1ff7a7a16ba1b6ad081319b14e88a2d275aec1968811966d622ce3d3af6c0fbd0008
11485 -AUX pw.conf 179 SHA256 0aa508e3911a80ccd1dc5005ec6f2e86e7c4fc5c99ca127f4d7e479d133c69ef SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891 WHIRLPOOL 4edd4ba1aa0c2255fbd38dc9120a673d8e0b5a8fea50d95aa13c08df448c3fc584adfe8330cfce5bb5b06385d5855c2fed9beb210f8fb5f8e4d695bdedb6909c
11486 -AUX rarpd.confd 155 SHA256 0c0f02cddf4ddfb2c2e01276f93f2d3470a75dc83e396209d6cbeff52e9b424b SHA512 95fb1b2ecc60f5cc434d949957dbd49a02afa7eee860e5b13fcc110c705560ea519f491e530de8fa9cbeb2577b9f0835ac98b762f6fa1c5cdb8292322821566d WHIRLPOOL 4641c548e2a5f0300138038032c472ffc12140ef7b4f1010166386a75fa1fb637ab8a735aeaa863b341b724970b0a45ba8ec0207d023846bfa09099b0fb98bd8
11487 -AUX rarpd.initd 753 SHA256 6c0e6e0a52640b17f6618e786761edffb525e692b1b6182b45e5e7c1a0459367 SHA512 d690abb8cce2d1564d32af1c5febd7c93263f7d5eb83b35bbd15c92c4446c9f519dbe2a5f78bc9fdc63fe28e6b4585239e5aedc5ed432140590bd242f3dbe37f WHIRLPOOL 5d99b06f479379fc6671762dc6a92ca7d4f646aaf9a67b16445b5a1de3634b4949345dc84ca563f85fa7a4d025faa04b8f0b85f9095b883eb53838c963628e06
11488 -AUX rpc.lockd.initd 529 SHA256 cce3495d04cae9141ea4f27ebc853b47c00fdad0a468292e128efad627e2992a SHA512 85301f3e7bb7bbb027654d5c95556ae0994e96cf12050e789c6859cd186fc07af8172f713e251e8db1dc7225545acf2001ee30fe53499f8d7c8a0817493df112 WHIRLPOOL e72e342aad839bcf4b4cabdedc3124da73fc5409fe1c5884575ddca9994348d1d93438354b95b6660d8747e30413d76eace485c463c8b0461499109c394db2f9
11489 -AUX rpc.statd.initd 519 SHA256 3674fcff99faec3f3d16ac67fc91aee9449f06aac42498ae8c9d26336e103ef2 SHA512 168e58b2ed7ff5047495f3d1efb2d648c1b69b278af9d4c167365db631b5d85e07d7a975459183b42017bf46dc218f78c7a7d3215592acaaef90a7874161774a WHIRLPOOL c08aef9a68e15959eafb2bdb311d8674d2d0318b2d5d2f3d31b46a38194ddc98ae8e86ea3836deba875abacb8f11155de5d79dded1c68fda4d0ff490526a9610
11490 -AUX rpcbind.initd 601 SHA256 dbeb5e51aa52d53742715a3bcc48dd8a28d6f5f7af88b4f05e73541a3962ca70 SHA512 bcbc974b16010cc942cad14226d9edaf000d1012717cad64b2cbef7584262b802d5017638ab0bba99d3a1c4613a21a63b5a5b4ae2d3bd90c1110be79910330f9 WHIRLPOOL e245d6f26d6741dcdc7f6962a01bfc451dd3d39d79722edbcbd1ffd22d36cc6b10c82eadc24a5cf7bb476170e934af739d7f48298d25fdefa1ee7f75361f6c84
11491 -AUX syscons.confd 348 SHA256 8d963ed1d6b63eed6b9f8bc1492c1e589458051e99f601e1ee0a8131890b0e70 SHA512 3dd50c0f223a93c0b0544fc9e85624fa78e045d2b6846242f431ea1ce4f121a33c1f3a0a2ef0763f45230dac0033d04c0d397e268f633d809e2466c269c22993 WHIRLPOOL a1ddfccb0aeb448e8d5086f9ba0554c0ff9fdd52003bf98bc2a1efbc7e2d835a79ea52886ac58e3818f9b5bc1d705658d2c8c1f05bad4bd7e5ef916ffe542451
11492 -AUX syscons.initd 1598 SHA256 187055f4395438ad54ab339b6bf3a42ab02ed3bac0bc259a25b151ed7c7fa14a SHA512 7933c4484ae52da4f1f5af3f3853292faa794add22991bd0c01613daa35e7b9f5121cf5e9d6a2db1f6dc0b02350c6a8b202678631dbb44dc3638c024ff2f5599 WHIRLPOOL b10117fe41245263aa17ef3e4151f2456846499db3e370b043cd654b56665a7e3f2ddab86e1d2786606e1ae3a11121ece1f98f1b0c48eb5526433be9dad1f8b7
11493 -AUX syslogd.initd 456 SHA256 3654435b79efdeab6d8c496670d31bf576fe81a51a8d1dd91584454f2ec34e3a SHA512 c3e3247301475a689759f52a376af11704d8a0ab23ff6e9522fad9738b19306aa881f3acc13a9296dabbe70699cce8b524975e5134264a2a398205f2e46ed68e WHIRLPOOL 61043039b6bd4e9c8c7a51f43f89c69ec8b4d23480663c54628059fa10d2bac80ed303dc03267b0970237254729ebf736966b8172547d3a3e7998ac7da815395
11494 -DIST freebsd-src-10.3_rc3.tar.xz 127080532 SHA256 a051e163360951432dfe1e9314d7dfb6c2960ac76f5c3e85491b269afdca7c0e SHA512 7a0a80043761bbab3d13794a68b78bdda62ddbc0945a2193f71db1c66fc993dd21c30a1f45c7f8f6a29b8f1cd636ff9e24ed5925180ca53e1e315f2b6e6a98b1 WHIRLPOOL ca2492c317233f872894901a788218f421bbbcfc6a5acb8535bb287ac095a58f76a37766eca214a5d3da8018cd972931b83b29f752790f69b480445f1429f2fb
11495 -EBUILD freebsd-usbin-10.3_rc3.ebuild 5497 SHA256 de4121055754bd823e4ab2d2048e386dad6ed8a0ce988d3b00c67c88977b6926 SHA512 a2b65486e51b55fd59a595f712535dc787e3f55aa682417fe99d945cebeebfc5ef5718958e441f9d0cbf74fc1a4dc67da98938cb9a857ecaa71c1a9e2b31400f WHIRLPOOL e6c6f1a60ae537e6a5207fb7ef1be01eb212cd6b20ae5127c4d3ae2b6f9fa474a64f3b908174e759d4e55e23f760dbcbc141413f75ae4d4b7d1220601fa3aec6
11496 -MISC metadata.xml 599 SHA256 3f2851ed1214525bc9fd9887db068c00324b466bc9f54342517f3101d34f2659 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99 WHIRLPOOL 3514ef434513a233cd7e525442c9a4de763deb680c2d2a3e380a5d69f2f31e397a97c5e0d4512045c957c650777e8b66a803b0a6c008cf1e79f0c87d597f7ae5
11497
11498 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
11499 deleted file mode 100644
11500 index a84f96d..0000000
11501 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch
11502 +++ /dev/null
11503 @@ -1,24 +0,0 @@
11504 -diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
11505 ---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900
11506 -+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900
11507 -@@ -60,7 +60,7 @@
11508 - #include <errno.h>
11509 - #include <err.h>
11510 - #include <ctype.h>
11511 --#include <bsdxml.h>
11512 -+#include <expat.h>
11513 - #include <cam/scsi/scsi_all.h>
11514 - #include <cam/scsi/scsi_message.h>
11515 - #include <cam/ctl/ctl.h>
11516 -diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c
11517 ---- work.orig/usr.sbin/ctld/kernel.c 2013-09-20 21:55:45.000000000 +0900
11518 -+++ work/usr.sbin/ctld/kernel.c 2013-09-20 22:01:17.000000000 +0900
11519 -@@ -45,7 +45,7 @@
11520 - #include <sys/sbuf.h>
11521 - #include <sys/capability.h>
11522 - #include <assert.h>
11523 --#include <bsdxml.h>
11524 -+#include <expat.h>
11525 - #include <ctype.h>
11526 - #include <errno.h>
11527 - #include <fcntl.h>
11528
11529 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
11530 deleted file mode 100644
11531 index 207b6ab..0000000
11532 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.3-bsdxml2expat.patch
11533 +++ /dev/null
11534 @@ -1,13 +0,0 @@
11535 -diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c
11536 -index 88c648e..edf9c8b 100644
11537 ---- a/usr.sbin/camdd/camdd.c
11538 -+++ b/usr.sbin/camdd/camdd.c
11539 -@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD: stable/10/usr.sbin/camdd/camdd.c 293409 2016-01-08 02:56:21Z
11540 - #include <libutil.h>
11541 - #include <pthread.h>
11542 - #include <assert.h>
11543 --#include <bsdxml.h>
11544 -+#include <expat.h>
11545 -
11546 - #include <cam/cam.h>
11547 - #include <cam/cam_debug.h>
11548
11549 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
11550 deleted file mode 100644
11551 index 9b11104..0000000
11552 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
11553 +++ /dev/null
11554 @@ -1,45 +0,0 @@
11555 -diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
11556 ---- usr.sbin.orig/rpcbind/Makefile 2007-04-21 12:02:30 +0000
11557 -+++ usr.sbin/rpcbind/Makefile 2007-04-21 12:05:32 +0000
11558 -@@ -8,13 +8,20 @@
11559 - SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
11560 - rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
11561 -
11562 --CFLAGS+= -DPORTMAP -DLIBWRAP
11563 -+CFLAGS+= -DPORTMAP
11564 -
11565 - .if ${MK_INET6_SUPPORT} != "no"
11566 - CFLAGS+= -DINET6
11567 - .endif
11568 -
11569 --DPADD= ${LIBWRAP} ${LIBUTIL}
11570 --LDADD= -lwrap -lutil
11571 -+DPADD= ${LIBUTIL}
11572 -+LDADD= -lutil
11573 -+
11574 -+.if !defined(NO_WRAP)
11575 -+CFLAGS+= -DLIBWRAP
11576 -+DPADD+= ${LIBWRAP}
11577 -+LDADD+= -lwrap
11578 -+.endif
11579 -+
11580 -
11581 - .include <bsd.prog.mk>
11582 -diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
11583 ---- usr.sbin.orig/ypserv/Makefile 2007-04-21 12:02:31 +0000
11584 -+++ usr.sbin/ypserv/Makefile 2007-04-21 12:06:53 +0000
11585 -@@ -8,10 +8,13 @@
11586 - SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
11587 - ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
11588 -
11589 --CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
11590 -+CFLAGS+= -DDB_CACHE -I.
11591 -
11592 -+.if !defined(NO_WRAP)
11593 -+CFLAGS+= -DTCP_WRAPPER
11594 - DPADD= ${LIBWRAP}
11595 - LDADD= -lwrap
11596 -+.endif
11597 -
11598 - CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
11599 -
11600
11601 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
11602 deleted file mode 100644
11603 index a098391..0000000
11604 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
11605 +++ /dev/null
11606 @@ -1,10 +0,0 @@
11607 ---- usr.sbin/newsyslog/pathnames.h.orig 2001-07-30 18:17:17.000000000 +0300
11608 -+++ usr.sbin/newsyslog/pathnames.h 2009-09-11 08:32:57.508226240 +0300
11609 -@@ -24,5 +24,5 @@
11610 -
11611 - #define _PATH_CONF "/etc/newsyslog.conf"
11612 - #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid"
11613 --#define _PATH_BZIP2 "/usr/bin/bzip2"
11614 --#define _PATH_GZIP "/usr/bin/gzip"
11615 -+#define _PATH_BZIP2 "/bin/bzip2"
11616 -+#define _PATH_GZIP "/bin/gzip"
11617
11618 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch
11619 deleted file mode 100644
11620 index bfe4794..0000000
11621 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-libarchive.patch
11622 +++ /dev/null
11623 @@ -1,12 +0,0 @@
11624 ---- usr.sbin/bsdinstall/distextract/distextract.c.old 2011-11-02 20:28:08.000000000 +0000
11625 -+++ usr.sbin/bsdinstall/distextract/distextract.c 2011-11-02 20:28:57.000000000 +0000
11626 -@@ -32,6 +32,9 @@
11627 - #include <limits.h>
11628 - #include <archive.h>
11629 - #include <dialog.h>
11630 -+#ifndef archive_read_free
11631 -+#define archive_read_free(x) archive_read_finish(x)
11632 -+#endif
11633 -
11634 - static int extract_files(int nfiles, const char **files);
11635 -
11636
11637 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
11638 deleted file mode 100644
11639 index 1d83865..0000000
11640 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.0-newsyslog.patch
11641 +++ /dev/null
11642 @@ -1,12 +0,0 @@
11643 -diff -uNr usr.sbin/newsyslog.old/pathnames.h usr.sbin/newsyslog/pathnames.h
11644 ---- usr.sbin/newsyslog.old/pathnames.h 2011-11-02 20:12:37.000000000 +0000
11645 -+++ usr.sbin/newsyslog/pathnames.h 2011-11-02 20:12:50.000000000 +0000
11646 -@@ -24,6 +24,6 @@
11647 -
11648 - #define _PATH_CONF "/etc/newsyslog.conf"
11649 - #define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid"
11650 --#define _PATH_BZIP2 "/usr/bin/bzip2"
11651 --#define _PATH_GZIP "/usr/bin/gzip"
11652 -+#define _PATH_BZIP2 "/bin/bzip2"
11653 -+#define _PATH_GZIP "/bin/gzip"
11654 - #define _PATH_XZ "/usr/bin/xz"
11655
11656 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
11657 deleted file mode 100644
11658 index bddc0c7..0000000
11659 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-bsdxml2expat.patch
11660 +++ /dev/null
11661 @@ -1,12 +0,0 @@
11662 -diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
11663 ---- work.orig/usr.sbin/ctladm/ctladm.c 2012-07-12 13:25:58.000000000 +0900
11664 -+++ work/usr.sbin/ctladm/ctladm.c 2012-07-16 05:37:14.000000000 +0900
11665 -@@ -60,7 +60,7 @@
11666 - #include <errno.h>
11667 - #include <err.h>
11668 - #include <ctype.h>
11669 --#include <bsdxml.h>
11670 -+#include <expat.h>
11671 - #include <cam/scsi/scsi_all.h>
11672 - #include <cam/scsi/scsi_message.h>
11673 - #include <cam/ctl/ctl.h>
11674
11675 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
11676 deleted file mode 100644
11677 index 95bd665..0000000
11678 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-9.1-kldxref.patch
11679 +++ /dev/null
11680 @@ -1,30 +0,0 @@
11681 -Index: usr.sbin/kldxref/kldxref.c
11682 -===================================================================
11683 ---- usr.sbin/kldxref/kldxref.c (revision 265111)
11684 -+++ usr.sbin/kldxref/kldxref.c (working copy)
11685 -@@ -274,6 +274,16 @@ usage(void)
11686 - exit(1);
11687 - }
11688 -
11689 -+static int
11690 -+compare(const FTSENT *const *a, const FTSENT *const *b)
11691 -+{
11692 -+ if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
11693 -+ return 1;
11694 -+ if ((*a)->fts_info != FTS_D && (*b)->fts_info == FTS_D)
11695 -+ return -1;
11696 -+ return strcmp((*a)->fts_name, (*b)->fts_name);
11697 -+}
11698 -+
11699 - int
11700 - main(int argc, char *argv[])
11701 - {
11702 -@@ -315,7 +325,7 @@ main(int argc, char *argv[])
11703 - err(1, "%s", argv[0]);
11704 - }
11705 -
11706 -- ftsp = fts_open(argv, fts_options, 0);
11707 -+ ftsp = fts_open(argv, fts_options, compare);
11708 - if (ftsp == NULL)
11709 - exit(1);
11710 -
11711
11712 diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
11713 deleted file mode 100644
11714 index 39177b4..0000000
11715 --- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-adduser.patch
11716 +++ /dev/null
11717 @@ -1,20 +0,0 @@
11718 ---- usr.sbin/adduser/adduser.sh.old 2006-10-01 13:41:16 +0000
11719 -+++ usr.sbin/adduser/adduser.sh 2006-10-01 13:41:38 +0000
11720 -@@ -809,7 +809,7 @@
11721 - NOHOME="/nonexistent"
11722 - NOLOGIN="nologin"
11723 - NOLOGIN_PATH="/usr/sbin/nologin"
11724 --GREPCMD="/usr/bin/grep"
11725 -+GREPCMD="/bin/grep"
11726 - DATECMD="/bin/date"
11727 -
11728 - # Set default values
11729 -@@ -823,7 +823,7 @@
11730 - uhome=
11731 - upass=
11732 - ushell=
11733 --udotdir=/usr/share/skel
11734 -+udotdir=/etc/skel
11735 - ugroups=
11736 - uexpire=
11737 - upwexpire=
11738
11739 diff --git a/sys-freebsd/freebsd-usbin/files/iscsid.initd b/sys-freebsd/freebsd-usbin/files/iscsid.initd
11740 deleted file mode 100755
11741 index dc7aa29..0000000
11742 --- a/sys-freebsd/freebsd-usbin/files/iscsid.initd
11743 +++ /dev/null
11744 @@ -1,20 +0,0 @@
11745 -#!/sbin/runscript
11746 -# Copyright 1999-2015 Gentoo Foundation
11747 -# Distributed under the terms of the GNU General Public License v2
11748 -
11749 -depend() {
11750 - need net
11751 -}
11752 -
11753 -start() {
11754 - ebegin "Starting iscsid"
11755 - start-stop-daemon --start --quiet --exec \
11756 - /usr/sbin/iscsid -- $iscsidopts
11757 - eend $? "Error starting iscsid"
11758 -}
11759 -
11760 -stop() {
11761 - ebegin "Stopping iscsid"
11762 - start-stop-daemon --stop --quiet --exec /usr/sbin/iscsid
11763 - eend $? "Error stopping iscsid"
11764 -}
11765
11766 diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch
11767 deleted file mode 100644
11768 index 3cb9f03..0000000
11769 --- a/sys-freebsd/freebsd-usbin/files/mountd.patch
11770 +++ /dev/null
11771 @@ -1,15 +0,0 @@
11772 -http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc
11773 -
11774 -Index: usr.sbin/mountd/mountd.c
11775 -===================================================================
11776 ---- usr.sbin/mountd/mountd.c 20 Dec 2010 09:28:28 -0000 1.107
11777 -+++ usr.sbin/mountd/mountd.c 1 Mar 2011 11:47:16 -0000 1.108
11778 -@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i
11779 -
11780 - for (i = 0; i < len; i++) {
11781 - bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
11782 -- *p++ = (1 << bits) - 1;
11783 -+ *p++ = (u_char)~0 << (CHAR_BIT - bits);
11784 - bitlen -= bits;
11785 - }
11786 - return 0;
11787
11788 diff --git a/sys-freebsd/freebsd-usbin/files/moused.confd b/sys-freebsd/freebsd-usbin/files/moused.confd
11789 deleted file mode 100644
11790 index 4d64933..0000000
11791 --- a/sys-freebsd/freebsd-usbin/files/moused.confd
11792 +++ /dev/null
11793 @@ -1,20 +0,0 @@
11794 -# $Id$
11795 -
11796 -# See the moused man page for available settings.
11797 -
11798 -# Set to your mouse device psm[0-9] for PS/2 ports, ums[0-9] for USB ports
11799 -# Leave blank to try to autodetect it
11800 -MOUSED_DEVICE=""
11801 -
11802 -# Any additional flags requires
11803 -MOUSED_FLAGS=""
11804 -
11805 -# If 0xd0-0xd3 default range is occupied in your language code table, specify
11806 -# alternative range start like MOUSECHAR_START="3", see vidcontrol(1)
11807 -MOUSECHAR_START=""
11808 -
11809 -# You can also multiplex the init script for each device like so
11810 -# ln -s moused /etc/init.d/moused.ums0
11811 -# This enables you to have a config file per mouse (forces MOUSED_DEVICE
11812 -# to ums0 in this case) and control each mouse.
11813 -# devd can also start and stop these mice, which laptop users will find handy.
11814
11815 diff --git a/sys-freebsd/freebsd-usbin/files/moused.initd b/sys-freebsd/freebsd-usbin/files/moused.initd
11816 deleted file mode 100644
11817 index f13f5ec..0000000
11818 --- a/sys-freebsd/freebsd-usbin/files/moused.initd
11819 +++ /dev/null
11820 @@ -1,66 +0,0 @@
11821 -#!/sbin/runscript
11822 -# Copyright 1999-2005 Gentoo Foundation
11823 -# Distributed under the terms of the GNU General Public License v2
11824 -# $Id$
11825 -
11826 -MOUSED_NAME=${SVCNAME##*.}
11827 -if [ -n "${MOUSED_NAME}" ] && [ ${MOUSED_NAME} != "moused" ] ; then
11828 - MOUSED_DEVICE=/dev/"${MOUSED_NAME}"
11829 - MOUSED_PIDFILE=/var/run/moused-"${MOUSED_NAME}".pid
11830 -else
11831 - MOUSED_NAME=
11832 - MOUSED_PIDFILE=/var/run/moused.pid
11833 -fi
11834 -
11835 -depend() {
11836 - need localmount
11837 -}
11838 -
11839 -start() {
11840 - ebegin "Starting the Console Mouse Daemon" "${MOUSED_NAME}"
11841 -
11842 - if [ -z ${MOUSED_DEVICE} ] ; then
11843 - for x in /dev/psm[0-9]* /dev/ums[0-9]* ; do
11844 - if [ -e "${x}" ] && \
11845 - [ ! -e /var/run/moused-$(basename "${x}").pid ] ; then
11846 - MOUSED_DEVICE=${x}
11847 - eindent
11848 - einfo "Using mouse on ${MOUSED_DEVICE}"
11849 - eoutdent
11850 - break
11851 - fi
11852 - done
11853 - fi
11854 -
11855 - if [ -z "${MOUSED_DEVICE}" ] ; then
11856 - eend 1 "No device specified in" "/etc/conf.d/${SVCNAME}" \
11857 - "and no mouse detected"
11858 - return 1
11859 - fi
11860 -
11861 - local opts="${MOUSED_FLAGS} -p ${MOUSED_DEVICE}"
11862 - start-stop-daemon --start --quiet --exec /usr/sbin/moused \
11863 - --pidfile "${MOUSED_PIDFILE}" \
11864 - -- ${opts} -I "${MOUSED_PIDFILE}"
11865 - local retval=$?
11866 -
11867 - [ -n "${MOUSE_CHAR_START}" ] && MOUSE_CHAR_START="-M ${MOUSE_CHAR_START}"
11868 - local ttyv=
11869 - for ttyv in /dev/ttyv* ; do
11870 - vidcontrol < "${ttyv}" ${MOUSE_CHAR_START} -m on || retval=1
11871 - done
11872 -
11873 - eend ${retval} "Failed to start moused"
11874 -}
11875 -
11876 -stop() {
11877 - ebegin "Stopping the Console Mouse Daemon" "${MOUSED_NAME}"
11878 - # Don't specify the binary as >1 instance of moused may be running
11879 - # which is perfectly valid as we can be multiplexed.
11880 - start-stop-daemon --stop --exec /usr/sbin/moused \
11881 - --pidfile "${MOUSED_PIDFILE}"
11882 - eend $? "Failed to stop moused"
11883 -}
11884 -
11885 -# vim: set ts=4 :
11886 -
11887
11888 diff --git a/sys-freebsd/freebsd-usbin/files/nfs.confd b/sys-freebsd/freebsd-usbin/files/nfs.confd
11889 deleted file mode 100644
11890 index 844252f..0000000
11891 --- a/sys-freebsd/freebsd-usbin/files/nfs.confd
11892 +++ /dev/null
11893 @@ -1,10 +0,0 @@
11894 -# Config file for /etc/init.d/nfs
11895 -# Options for nfsd (see man nfsd)
11896 -# Example: 8 nfsd servers started:
11897 -#nfsdopts="-n 8"
11898 -
11899 -# Options for mountd (see man mountd)
11900 -# Example: allow non-root users to mount shares:
11901 -#mountdopts="-n"
11902 -# Specify t he exports file, this is the default:
11903 -#exportsfile="/etc/exports"
11904
11905 diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
11906 deleted file mode 100755
11907 index fa54bdb..0000000
11908 --- a/sys-freebsd/freebsd-usbin/files/nfs.initd
11909 +++ /dev/null
11910 @@ -1,54 +0,0 @@
11911 -#!/sbin/runscript
11912 -# Copyright 1999-2013 Gentoo Foundation
11913 -# Distributed under the terms of the GNU General Public License v2
11914 -
11915 -#---------------------------------------------------------------------------
11916 -# This script starts/stops nfsd and mountd
11917 -# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
11918 -# should be started from inetd on FreeBSD.
11919 -#---------------------------------------------------------------------------
11920 -
11921 -extra_started_commands="reload"
11922 -
11923 -# The binary locations
11924 -nfsd=/usr/sbin/nfsd
11925 -mountd=/usr/sbin/mountd
11926 -
11927 -depend() {
11928 - use ypbind net rpc.lockd
11929 - need rpcbind
11930 - after quota
11931 -}
11932 -
11933 -start() {
11934 - ebegin "Starting NFS daemon"
11935 - start-stop-daemon --start --quiet --exec \
11936 - $nfsd -- ${nfsdopts}
11937 - eend $? "Error starting NFS daemon"
11938 -
11939 - # Start mountd
11940 - ebegin "Starting NFS mountd"
11941 - start-stop-daemon --start --quiet --exec \
11942 - $mountd -- ${mountdopts} ${exportsfile}
11943 - eend $? "Error starting NFS mountd"
11944 -}
11945 -
11946 -stop() {
11947 - ebegin "Stopping NFS mountd"
11948 - start-stop-daemon --stop --quiet --exec $mountd \
11949 - --pidfile /var/run/mountd.pid
11950 - eend $? "Error stopping NFS mountd"
11951 -
11952 - ebegin "Stopping NFS daemon"
11953 - start-stop-daemon --stop --signal USR1 --quiet \
11954 - --name nfsd --user root
11955 - eend $? "Error stopping NFS daemon"
11956 -}
11957 -
11958 -reload() {
11959 - # Hangup signal to mountd reloads /etc/exports.
11960 - ebegin "Reloading /etc/exports"
11961 - start-stop-daemon --signal 1 --quiet --exec $mountd \
11962 - --pidfile /var/run/mountd.pid
11963 - eend $?
11964 -}
11965
11966 diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
11967 deleted file mode 100755
11968 index dfa9a10..0000000
11969 --- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd
11970 +++ /dev/null
11971 @@ -1,63 +0,0 @@
11972 -#!/sbin/runscript
11973 -# Copyright 1999-2004 Gentoo Foundation
11974 -# Distributed under the terms of the GNU General Public License v2
11975 -# $Id$
11976 -
11977 -depend() {
11978 - need net rpcbind
11979 - use ypbind
11980 -}
11981 -
11982 -start_statd() {
11983 - # Don't start rpc.statd if already started by init.d/nfs
11984 - killall -0 rpc.statd 2>/dev/null && return 0
11985 - ebegin "Starting NFS statd"
11986 - rpc.statd
11987 - eend $? "Error starting NFS statd"
11988 -}
11989 -
11990 -stop_statd() {
11991 - # Don't stop rpc.statd if it's in use by init.d/nfs
11992 - killall -0 nfsd 2>/dev/null && return 0
11993 - # Make sure it's actually running
11994 - killall -0 rpc.statd 2>/dev/null || return 0
11995 - # Okay, all tests passed, stop rpc.statd
11996 - ebegin "Stopping NFS statd"
11997 - killall rpc.statd
11998 - eend $? "Error stopping NFS statd"
11999 -}
12000 -
12001 -start_lockd() {
12002 - # Don't start rpc.lockd if already started by init.d/nfs
12003 - killall -0 rpc.lockd 2>/dev/null && return 0
12004 - ebegin "Starting NFS lockd"
12005 - rpc.lockd
12006 - eend $? "Error starting NFS lockd"
12007 -}
12008 -
12009 -stop_lockd() {
12010 - # Don't stop rpc.lockd if it's in use by init.d/nfs
12011 - killall -0 nfsd 2>/dev/null && return 0
12012 - # Make sure it's actually running
12013 - killall -0 rpc.lockd 2>/dev/null || return 0
12014 - # Okay, all tests passed, stop rpc.lockd
12015 - ebegin "Stopping NFS lockd"
12016 - killall rpc.lockd
12017 - eend $? "Error stopping NFS lockd"
12018 -}
12019 -
12020 -start() {
12021 - start_statd
12022 - start_lockd
12023 - ebegin "Mounting NFS filesystems"
12024 - mount -a -t nfs
12025 - eend $? "Error mounting NFS filesystems"
12026 -}
12027 -
12028 -stop() {
12029 - ebegin "Unmounting NFS filesystems"
12030 - umount -a -t nfs
12031 - eend $? "Error unmounting NFS filesystems"
12032 - stop_statd
12033 - stop_lockd
12034 -}
12035
12036 diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd b/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
12037 deleted file mode 100644
12038 index f8f3ea1..0000000
12039 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.confd
12040 +++ /dev/null
12041 @@ -1,5 +0,0 @@
12042 -# Config file for /etc/init.d/nfsuserd
12043 -# Options for nfsuserd (see man nfsuserd)
12044 -# Example: set domain example.com:
12045 -#nfsuserdopts="-domain example.com"
12046 -
12047
12048 diff --git a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd b/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
12049 deleted file mode 100755
12050 index 1d7bf00..0000000
12051 --- a/sys-freebsd/freebsd-usbin/files/nfsuserd.initd
12052 +++ /dev/null
12053 @@ -1,20 +0,0 @@
12054 -#!/sbin/runscript
12055 -# Copyright 1999-2015 Gentoo Foundation
12056 -# Distributed under the terms of the GNU General Public License v2
12057 -
12058 -depend() {
12059 - need net nfs
12060 -}
12061 -
12062 -start() {
12063 - ebegin "Starting nfsuserd"
12064 - start-stop-daemon --start --quiet --exec \
12065 - /usr/sbin/nfsuserd -- $nfsuserdopts
12066 - eend $? "Error starting nfsuserd"
12067 -}
12068 -
12069 -stop() {
12070 - ebegin "Stopping nfsuserd"
12071 - start-stop-daemon --stop --quiet --exec /usr/sbin/nfsuserd
12072 - eend $? "Error stopping nfsuserd"
12073 -}
12074
12075 diff --git a/sys-freebsd/freebsd-usbin/files/powerd.confd b/sys-freebsd/freebsd-usbin/files/powerd.confd
12076 deleted file mode 100644
12077 index e5db5a1..0000000
12078 --- a/sys-freebsd/freebsd-usbin/files/powerd.confd
12079 +++ /dev/null
12080 @@ -1,14 +0,0 @@
12081 -# Copyright 2006 Gentoo Foundation
12082 -# Distributed under the terms of the GNU General Public License v2
12083 -# $Id$
12084 -
12085 -# Mode allowed: maximum, minimum, adaptive
12086 -# Default unless specified is adaptive
12087 -
12088 -AC_MODE="maximum"
12089 -
12090 -#BATTERY_MODE="minimum"
12091 -
12092 -POWERD_OPTS=""
12093 -
12094 -
12095
12096 diff --git a/sys-freebsd/freebsd-usbin/files/powerd.initd b/sys-freebsd/freebsd-usbin/files/powerd.initd
12097 deleted file mode 100755
12098 index 2930417..0000000
12099 --- a/sys-freebsd/freebsd-usbin/files/powerd.initd
12100 +++ /dev/null
12101 @@ -1,27 +0,0 @@
12102 -#!/sbin/runscript
12103 -# Copyright 2006 Gentoo Foundation
12104 -# Distributed under the terms of the GNU General Public License v2
12105 -# $Id$
12106 -
12107 -depend() {
12108 - need localmount
12109 -}
12110 -
12111 -start() {
12112 - local args=
12113 - [ -n "${BATTERY_MODE}" ] && args="${args} -b ${BATTERY_MODE}"
12114 - [ -n "${AC_MODE}" ] && args="${args} -a ${AC_MODE}"
12115 -
12116 - ebegin "Starting Power Control Daemon"
12117 - start-stop-daemon --start --exec /usr/sbin/powerd \
12118 - --pidfile /var/run/powerd.pid \
12119 - -- ${args} ${POWERD_OPTS}
12120 - eend $? "Failed to start powerd"
12121 -}
12122 -
12123 -stop() {
12124 - ebegin "Stopping Power Control Daemon"
12125 - start-stop-daemon --stop --exec /usr/sbin/powerd \
12126 - --pidfile /var/run/powerd.pid
12127 - eend $? "Failed to stop powerd"
12128 -}
12129
12130 diff --git a/sys-freebsd/freebsd-usbin/files/pw.conf b/sys-freebsd/freebsd-usbin/files/pw.conf
12131 deleted file mode 100644
12132 index 29a246f..0000000
12133 --- a/sys-freebsd/freebsd-usbin/files/pw.conf
12134 +++ /dev/null
12135 @@ -1,5 +0,0 @@
12136 -# Change this to Gentoo's Default, instead of FreeBSD's default of
12137 -# /usr/share/skel, so that bash and other packages installs the files on the
12138 -# right place.
12139 -skeleton /etc/skel
12140 -
12141
12142 diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.confd b/sys-freebsd/freebsd-usbin/files/rarpd.confd
12143 deleted file mode 100644
12144 index b56fdd5..0000000
12145 --- a/sys-freebsd/freebsd-usbin/files/rarpd.confd
12146 +++ /dev/null
12147 @@ -1,7 +0,0 @@
12148 -# $Id$
12149 -
12150 -# Configuration file for /etc/init.d/rarpd
12151 -
12152 -# To start rarpd only for a given interface, set the
12153 -# following variable
12154 -# RARPD_ONLY_INTERFACE="rl0"
12155
12156 diff --git a/sys-freebsd/freebsd-usbin/files/rarpd.initd b/sys-freebsd/freebsd-usbin/files/rarpd.initd
12157 deleted file mode 100644
12158 index eef6616..0000000
12159 --- a/sys-freebsd/freebsd-usbin/files/rarpd.initd
12160 +++ /dev/null
12161 @@ -1,35 +0,0 @@
12162 -#!/sbin/runscript
12163 -# Copyright 2006 Gentoo Foundation
12164 -# Distributed under the terms of the GNU General Public License v2
12165 -# $Id$
12166 -
12167 -depend() {
12168 - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
12169 - need net
12170 - else
12171 - need net."${RARPD_ONLY_INTERFACE}"
12172 - fi
12173 -}
12174 -
12175 -start() {
12176 - local rarpd_opts
12177 -
12178 - if [ -z "${RARPD_ONLY_INTERFACE}" ]; then
12179 - rarpd_opts="${rarpd_opts} -a"
12180 - else
12181 - rarpd_opts="${rarpd_opts} ${RARPD_ONLY_INTERFACE}"
12182 - fi
12183 -
12184 - ebegin "Starting reverse ARP daemon"
12185 - start-stop-daemon --start --background \
12186 - --pidfile /var/run/rarpd.pid --make-pidfile \
12187 - --exec /usr/sbin/rarpd -- -f ${rarpd_opts}
12188 - eend $?
12189 -}
12190 -
12191 -stop() {
12192 - ebegin "Stopping reverse ARP daemon"
12193 - start-stop-daemon --stop --pidfile /var/run/rarpd.pid \
12194 - --exec /usr/sbin/rarpd -- ${rarpd_opts}
12195 - eend $?
12196 -}
12197
12198 diff --git a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd b/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
12199 deleted file mode 100755
12200 index 0c74b9f..0000000
12201 --- a/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd
12202 +++ /dev/null
12203 @@ -1,20 +0,0 @@
12204 -#!/sbin/runscript
12205 -# Copyright 1999-2008 Gentoo Foundation
12206 -# Distributed under the terms of the GNU General Public License v2
12207 -
12208 -depend() {
12209 - need net rpcbind rpc.statd
12210 -}
12211 -
12212 -start() {
12213 - ebegin "Starting NFS lockd"
12214 - start-stop-daemon --start --quiet --exec \
12215 - /usr/sbin/rpc.lockd -- $rpclockdopts
12216 - eend $? "Error starting NFS lockd"
12217 -}
12218 -
12219 -stop() {
12220 - ebegin "Stopping NFS lockd"
12221 - start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
12222 - eend $? "Error stopping NFS lockd"
12223 -}
12224
12225 diff --git a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd b/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
12226 deleted file mode 100755
12227 index 5c3cf30..0000000
12228 --- a/sys-freebsd/freebsd-usbin/files/rpc.statd.initd
12229 +++ /dev/null
12230 @@ -1,20 +0,0 @@
12231 -#!/sbin/runscript
12232 -# Copyright 1999-2008 Gentoo Foundation
12233 -# Distributed under the terms of the GNU General Public License v2
12234 -
12235 -depend() {
12236 - need net rpcbind
12237 -}
12238 -
12239 -start() {
12240 - ebegin "Starting NFS statd"
12241 - start-stop-daemon --start --quiet --exec \
12242 - /usr/sbin/rpc.statd -- $rpcstatdopts
12243 - eend $? "Error starting NFS statd"
12244 -}
12245 -
12246 -stop() {
12247 - ebegin "Stopping NFS statd"
12248 - start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
12249 - eend $? "Error stopping NFS statd"
12250 -}
12251
12252 diff --git a/sys-freebsd/freebsd-usbin/files/rpcbind.initd b/sys-freebsd/freebsd-usbin/files/rpcbind.initd
12253 deleted file mode 100755
12254 index 47cb0d3..0000000
12255 --- a/sys-freebsd/freebsd-usbin/files/rpcbind.initd
12256 +++ /dev/null
12257 @@ -1,30 +0,0 @@
12258 -#!/sbin/runscript
12259 -# Copyright 1999-2005 Gentoo Foundation
12260 -# Distributed under the terms of the GNU General Public License v2
12261 -# $Id$
12262 -
12263 -depend() {
12264 - need localmount
12265 - use net
12266 - before inetd
12267 - before xinetd
12268 -}
12269 -
12270 -start() {
12271 - ebegin "Starting rpcbind"
12272 - start-stop-daemon --start --exec /usr/sbin/rpcbind
12273 - local ret=$?
12274 - eend ${ret}
12275 -
12276 - # without, if a service depending on portmap is started too fast,
12277 - # connecting to portmap will fail -- azarah
12278 - # doing that for rpcbind, too -- flameeyes
12279 - sleep 1
12280 - return ${ret}
12281 -}
12282 -
12283 -stop() {
12284 - ebegin "Stopping rpcbind"
12285 - start-stop-daemon --stop --exec /usr/sbin/rpcbind
12286 - eend $?
12287 -}
12288
12289 diff --git a/sys-freebsd/freebsd-usbin/files/syscons.confd b/sys-freebsd/freebsd-usbin/files/syscons.confd
12290 deleted file mode 100644
12291 index 7ba81ff..0000000
12292 --- a/sys-freebsd/freebsd-usbin/files/syscons.confd
12293 +++ /dev/null
12294 @@ -1,14 +0,0 @@
12295 -# $Id$
12296 -# Example syscons config file. This is the place to set things like keymap, etc.
12297 -
12298 -# Set the keymap to "uk.iso".
12299 -#KEYMAP="uk.iso"
12300 -
12301 -# Set the keyboard rate to 250ms delay, and 34 repeat rate.
12302 -#KEYRATE="250.34"
12303 -
12304 -# Change the behaviour of F-unction keys (see kbdcontrol(1)).
12305 -#KEYCHANGE="10 'ssh myhost'"
12306 -
12307 -# See vidcontrol(1) -t
12308 -#BLANKTIME="off"
12309
12310 diff --git a/sys-freebsd/freebsd-usbin/files/syscons.initd b/sys-freebsd/freebsd-usbin/files/syscons.initd
12311 deleted file mode 100755
12312 index 7edcafa..0000000
12313 --- a/sys-freebsd/freebsd-usbin/files/syscons.initd
12314 +++ /dev/null
12315 @@ -1,78 +0,0 @@
12316 -#!/sbin/runscript
12317 -# Copyright 1999-2006 Gentoo Foundation
12318 -# Distributed under the terms of the GNU General Public License v2
12319 -# $Id$
12320 -
12321 -depend() {
12322 - need localmount
12323 -}
12324 -
12325 -start() {
12326 - ebegin "Configuring system console"
12327 -
12328 - if [ -n "${MODE}" ] ; then
12329 - einfo "Setting mode to ${MODE}"
12330 - vidcontrol "${MODE}"
12331 - eend $?
12332 - fi
12333 -
12334 - # XXX: This should handle serial consoles.
12335 -
12336 - # Set the keymap.
12337 - if [ -n "${KEYMAP}" ]; then
12338 - einfo "Setting keymap to" "${KEYMAP}"
12339 - kbdcontrol -l ${KEYMAP} < /dev/console
12340 - fi
12341 -
12342 - if [ -n "${KEYRATE}" ]; then
12343 - einfo "Setting keyrate to" "${KEYRATE}"
12344 - kbdcontrol -r ${KEYRATE} < /dev/console
12345 - fi
12346 -
12347 - if [ -n "${KEYCHANGE}" ]; then
12348 - einfo "Changing function keys..."
12349 - eval set -- "${KEYCHANGE}"
12350 - eindent
12351 - while [ $# -gt 0 ] ; do
12352 - veinfo "F$1 -> \`$2'"
12353 - kbdcontrol -f "$1" "$2" < /dev/console
12354 - shift ; shift
12355 - done
12356 - eoutdent
12357 - fi
12358 -
12359 - if [ -n "${CURSOR}" ]; then
12360 - einfo "Setting cursor"
12361 - vidcontrol -c ${CURSOR}
12362 - fi
12363 -
12364 - einfo "Setting custom fonts..."
12365 - # Nothing to see here, move along...
12366 - for v in FONT8x16 FONT8x14 FONT8x8; do
12367 - f=$(eval \$"${v}")
12368 - if [ -n "${f}" ]; then
12369 - vidcontrol -f ${v##FONT} ${f}
12370 - fi
12371 - done
12372 -
12373 - if [ -n "${BLANKTIME}" ]; then
12374 - einfo "Setting blanktime"
12375 - vidcontrol -t ${BLANKTIME}
12376 - fi
12377 -
12378 - if [ -n "${SAVER}" ]; then
12379 - for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do
12380 - kldunload ${i}
12381 - done
12382 - kldstat -v | grep -q _saver || kldload ${SAVER}_saver
12383 - fi
12384 -
12385 - if [ -n "${KBDFLAGS}" ]; then
12386 - einfo "Setting keyboard flags for all screens"
12387 - for ttyv in /dev/ttyv*; do
12388 - kbdcontrol ${KBDFLAGS} <${ttyv} >${ttyv} 2>&1
12389 - done
12390 - fi
12391 -
12392 - eend 0
12393 -}
12394
12395 diff --git a/sys-freebsd/freebsd-usbin/files/syslogd.initd b/sys-freebsd/freebsd-usbin/files/syslogd.initd
12396 deleted file mode 100755
12397 index 4367b40..0000000
12398 --- a/sys-freebsd/freebsd-usbin/files/syslogd.initd
12399 +++ /dev/null
12400 @@ -1,25 +0,0 @@
12401 -#!/sbin/runscript
12402 -# Copyright 1999-2005 Gentoo Foundation
12403 -# Distributed under the terms of the GNU General Public License v2
12404 -# $Id$
12405 -
12406 -depend() {
12407 - provide logger
12408 - need localmount
12409 -}
12410 -
12411 -start() {
12412 - ebegin "Starting System Logger"
12413 - start-stop-daemon --start --quiet --exec /usr/sbin/syslogd \
12414 - -- ${SYSLOGD_OPTS}
12415 - eend $?
12416 -}
12417 -
12418 -stop() {
12419 - ebegin "Stopping System Logger"
12420 - start-stop-daemon --stop --quiet --pidfile /var/run/syslog.pid
12421 - eend $?
12422 -}
12423 -
12424 -
12425 -
12426
12427 diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_rc3.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_rc3.ebuild
12428 deleted file mode 100644
12429 index d27d339..0000000
12430 --- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3_rc3.ebuild
12431 +++ /dev/null
12432 @@ -1,187 +0,0 @@
12433 -# Copyright 1999-2016 Gentoo Foundation
12434 -# Distributed under the terms of the GNU General Public License v2
12435 -# $Id$
12436 -
12437 -EAPI=5
12438 -
12439 -inherit bsdmk freebsd flag-o-matic eutils
12440 -
12441 -DESCRIPTION="FreeBSD /usr/sbin tools"
12442 -SLOT="0"
12443 -LICENSE="BSD zfs? ( CDDL )"
12444 -
12445 -if [[ ${PV} != *9999* ]]; then
12446 - KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
12447 - SRC_URI="${SRC_URI}
12448 - $(freebsd_upstream_patches)"
12449 -fi
12450 -
12451 -EXTRACTONLY="
12452 - usr.sbin/
12453 - contrib/
12454 - usr.bin/
12455 - lib/
12456 - sbin/
12457 - etc/
12458 - gnu/
12459 -"
12460 -
12461 -RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
12462 - =sys-freebsd/freebsd-libexec-${RV}*
12463 - build? ( sys-apps/baselayout )
12464 - ssl? ( dev-libs/openssl:0 )
12465 - >=app-arch/libarchive-3
12466 - sys-apps/tcp-wrappers
12467 - dev-util/dialog
12468 - >=dev-libs/libedit-20120311.3.0-r1
12469 - net-libs/libpcap
12470 - kerberos? ( app-crypt/heimdal )"
12471 -DEPEND="${RDEPEND}
12472 - =sys-freebsd/freebsd-mk-defs-${RV}*
12473 - =sys-freebsd/freebsd-ubin-${RV}*
12474 - zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
12475 - !build? ( =sys-freebsd/freebsd-sources-${RV}* )
12476 - sys-apps/texinfo
12477 - sys-devel/flex"
12478 -
12479 -S="${WORKDIR}/usr.sbin"
12480 -
12481 -IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
12482 -
12483 -pkg_setup() {
12484 - # Add the required source files.
12485 - use nis && EXTRACTONLY+="libexec/ "
12486 - use build && EXTRACTONLY+="sys/ include/ "
12487 - use zfs && EXTRACTONLY+="cddl/ "
12488 -
12489 - # Release crunch is something like minimal. It seems to remove everything
12490 - # which is not needed to work.
12491 - use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
12492 -
12493 - use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
12494 - use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
12495 - use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
12496 - use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
12497 - use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
12498 - use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
12499 - use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
12500 - use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
12501 - use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
12502 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
12503 - use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
12504 - use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
12505 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
12506 -
12507 - mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
12508 -
12509 - append-flags $(test-flags -fno-strict-aliasing)
12510 -}
12511 -
12512 -PATCHES=(
12513 - "${FILESDIR}/${PN}-adduser.patch"
12514 - "${FILESDIR}/${PN}-9.0-newsyslog.patch"
12515 - "${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
12516 - "${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
12517 - )
12518 -
12519 -REMOVE_SUBDIRS="
12520 - tcpdchk tcpdmatch
12521 - sendmail praliases editmap mailstats makemap
12522 - pc-sysinstall cron mailwrapper ntp bsnmpd
12523 - tcpdump ndp inetd
12524 - wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
12525 - zic amd
12526 - pkg pkg_install freebsd-update service sysrc"
12527 -
12528 -src_prepare() {
12529 - if ! use build; then
12530 - [[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
12531 - [[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
12532 - else
12533 - dummy_mk mount_smbfs
12534 - fi
12535 - # Don't install mtree format manpage
12536 - # it's installed by libarchive.
12537 - sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
12538 -}
12539 -
12540 -src_compile() {
12541 - # Preparing to build nmtree
12542 - cd "${WORKDIR}/lib/libnetbsd" || die
12543 - freebsd_src_compile
12544 -
12545 - cd "${S}" || die
12546 - freebsd_src_compile
12547 -}
12548 -
12549 -src_install() {
12550 - # By creating these directories we avoid having to do a
12551 - # more complex hack
12552 - dodir /usr/share/doc
12553 - dodir /sbin
12554 - dodir /usr/libexec
12555 - dodir /usr/bin
12556 -
12557 - # FILESDIR is used by some makefiles which will install files
12558 - # in the wrong place, just put it in the doc directory.
12559 - mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
12560 -
12561 - # Most of these now come from openrc.
12562 - for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
12563 - newinitd "${FILESDIR}/"${util}.initd ${util} || die
12564 - if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
12565 - newconfd "${FILESDIR}"/${util}.confd ${util} || die
12566 - fi
12567 - done
12568 -
12569 - for class in daily monthly weekly; do
12570 - cat - > "${T}/periodic.${class}" <<EOS
12571 -#!/bin/sh
12572 -/usr/sbin/periodic ${class}
12573 -EOS
12574 - exeinto /etc/cron.${class}
12575 - newexe "${T}/periodic.${class}" periodic
12576 - done
12577 -
12578 - # Install the pw.conf file to let pw use Gentoo's skel location
12579 - insinto /etc
12580 - doins "${FILESDIR}/pw.conf" || die
12581 -
12582 - cd "${WORKDIR}/etc" || die
12583 - doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
12584 -
12585 - insinto /etc/ppp
12586 - doins ppp/ppp.conf || die
12587 -
12588 - if use bluetooth; then
12589 - insinto /etc/bluetooth
12590 - doins bluetooth/* || die
12591 - rm -f "${D}"/etc/bluetooth/Makefile
12592 - fi
12593 -
12594 - # Install the periodic stuff (needs probably to be ported in a more
12595 - # gentooish way)
12596 - cd "${WORKDIR}/etc/periodic" || die
12597 -
12598 - doperiodic daily daily/*.accounting
12599 - doperiodic monthly monthly/*.accounting
12600 -}
12601 -
12602 -pkg_postinst() {
12603 - # We need to run pwd_mkdb if key files are not present
12604 - # If they are, then there is no need to run pwd_mkdb
12605 - if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
12606 - if [[ -e "${ROOT}etc/master.passwd" ]] ; then
12607 - einfo "Generating passwd files from ${ROOT}etc/master.passwd"
12608 - "${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
12609 - else
12610 - eerror "${ROOT}etc/master.passwd does not exist!"
12611 - eerror "You will no be able to log into your system!"
12612 - fi
12613 - fi
12614 -
12615 - for logfile in messages security auth.log maillog lpd-errs xferlog cron \
12616 - debug.log slip.log ppp.log; do
12617 - [[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
12618 - done
12619 -}
12620
12621 diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
12622 deleted file mode 100644
12623 index 45c930b..0000000
12624 --- a/sys-freebsd/freebsd-usbin/metadata.xml
12625 +++ /dev/null
12626 @@ -1,19 +0,0 @@
12627 -<?xml version="1.0" encoding="UTF-8"?>
12628 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
12629 -<pkgmetadata>
12630 - <maintainer type="project">
12631 - <email>bsd@g.o</email>
12632 - <name>BSD Project</name>
12633 - </maintainer>
12634 - <use>
12635 - <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
12636 - <flag name="audit">
12637 - Build auditing tools.
12638 - </flag>
12639 - <flag name="netware">
12640 - Build libraries and tools to work with NetWare protocols (IPX
12641 - and NCP).
12642 - </flag>
12643 - <flag name='zfs'>Enable ZFS support.</flag>
12644 - </use>
12645 -</pkgmetadata>