Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sys-freebsd/freebsd-share/files/, sys-freebsd/freebsd-share/
Date: Fri, 11 Oct 2019 15:17:02
Message-Id: 1570806996.72dd0b8f703f76eb0bca96487ad88b469dc6646f.mgorny@gentoo
1 commit: 72dd0b8f703f76eb0bca96487ad88b469dc6646f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 15:13:37 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 15:16:36 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72dd0b8f
7
8 sys-freebsd/freebsd-share: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/683284
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sys-freebsd/freebsd-share/Manifest | 1 -
15 .../files/freebsd-share-10.0-gentoo-eapi3.patch | 17 ---
16 .../files/freebsd-share-10.2-gnu-miscfiles.patch | 30 -----
17 .../files/freebsd-share-10.3-gentoo-skel.patch | 20 ----
18 .../files/freebsd-share-SA-1808-tcp-11.patch | 23 ----
19 .../files/freebsd-share-SA-1810-ip.patch | 113 -------------------
20 .../freebsd-share/freebsd-share-11.1.ebuild | 118 --------------------
21 .../freebsd-share/freebsd-share-11.1_p1.ebuild | 122 ---------------------
22 sys-freebsd/freebsd-share/metadata.xml | 11 --
23 10 files changed, 456 deletions(-)
24
25 diff --git a/profiles/package.mask b/profiles/package.mask
26 index 2fbdf5f1658..b906cfdb6d9 100644
27 --- a/profiles/package.mask
28 +++ b/profiles/package.mask
29 @@ -756,7 +756,6 @@ sys-freebsd/freebsd-mk-defs
30 sys-freebsd/freebsd-pam-modules
31 sys-freebsd/freebsd-pf
32 sys-freebsd/freebsd-rescue
33 -sys-freebsd/freebsd-share
34
35 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
36 # Unofficial build. Superseded by official 2.49.5 release.
37
38 diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
39 deleted file mode 100644
40 index f3dcd89d595..00000000000
41 --- a/sys-freebsd/freebsd-share/Manifest
42 +++ /dev/null
43 @@ -1 +0,0 @@
44 -DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
45
46 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
47 deleted file mode 100644
48 index 1d0a53ef10c..00000000000
49 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.0-gentoo-eapi3.patch
50 +++ /dev/null
51 @@ -1,17 +0,0 @@
52 -diff --git a/share/i18n/esdb/Makefile.part b/share/i18n/esdb/Makefile.part
53 -index 9ca8577..329e9fb 100644
54 ---- a/share/i18n/esdb/Makefile.part
55 -+++ b/share/i18n/esdb/Makefile.part
56 -@@ -13,10 +13,10 @@ PART!= sed '/^\#/d;/^ *$$/d' ${PARTFILE}
57 - .endif
58 - .if !defined(NO_EPREFIX)
59 - CODESETS?= ${PART:C/^/${CODE}${SEP}/}
60 --EPREFIX?= ${CODE}${SEP}
61 -+EPREFIX= ${CODE}${SEP}
62 - .else
63 - CODESETS?= ${PART}
64 --EPREFIX?=
65 -+EPREFIX=
66 - .endif
67 - ESUBDIR?= ${CODE}
68 - ESDB?= ${CODESETS:C/$/.esdb/:S/:/@/}
69
70 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
71 deleted file mode 100644
72 index 1dc848873a6..00000000000
73 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.2-gnu-miscfiles.patch
74 +++ /dev/null
75 @@ -1,30 +0,0 @@
76 -diff --git a/share/dict/Makefile b/share/dict/Makefile
77 -index 3e2a0df..5395077 100644
78 ---- a/share/dict/Makefile
79 -+++ b/share/dict/Makefile
80 -@@ -4,8 +4,7 @@
81 - NO_OBJ=
82 -
83 - # XXX MISSING: connectives words
84 --FILES= README propernames web2 web2a freebsd
85 -+FILES= README freebsd
86 - FILESDIR= ${BINDIR}/dict
87 --SYMLINKS= web2 ${FILESDIR}/words
88 -
89 - .include <bsd.prog.mk>
90 -diff --git a/share/misc/Makefile b/share/misc/Makefile
91 -index ffd42d8..7eb90bb 100644
92 ---- a/share/misc/Makefile
93 -+++ b/share/misc/Makefile
94 -@@ -5,9 +5,9 @@
95 -
96 - .PATH: ${.CURDIR}/../../sys/dev/usb
97 -
98 --FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
99 -+FILES= bsd-family-tree committers-doc.dot committers-ports.dot \
100 - committers-src.dot eqnchar flowers init.ee \
101 -- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
102 -+ iso3166 iso639 man.template mdoc.template pci_vendors \
103 - scsi_modes \
104 - organization.dot
105 -
106
107 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
108 deleted file mode 100644
109 index 79e29e989e2..00000000000
110 --- a/sys-freebsd/freebsd-share/files/freebsd-share-10.3-gentoo-skel.patch
111 +++ /dev/null
112 @@ -1,20 +0,0 @@
113 -diff --git a/share/skel/Makefile b/share/skel/Makefile
114 -index 024985c..6f6e563 100644
115 ---- a/share/skel/Makefile
116 -+++ b/share/skel/Makefile
117 -@@ -2,11 +2,11 @@
118 - # $FreeBSD: stable/10/share/skel/Makefile 291794 2015-12-04 18:21:05Z bdrewery $
119 -
120 - FILESGROUPS= FILES1 FILES2
121 --FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
122 -+FILES1= dot.login_conf dot.mailrc \
123 - dot.shrc
124 --FILES2= dot.mail_aliases dot.rhosts
125 --FILES1DIR= ${SHAREDIR}/skel
126 --FILES2DIR= ${SHAREDIR}/skel
127 -+FILES2= dot.mail_aliases
128 -+FILES1DIR= /etc/skel
129 -+FILES2DIR= /etc/skel
130 - FILES1MODE= 0644
131 - FILES2MODE= 0600
132 - NO_OBJ=
133
134 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch
135 deleted file mode 100644
136 index b7d2a750c78..00000000000
137 --- a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1808-tcp-11.patch
138 +++ /dev/null
139 @@ -1,23 +0,0 @@
140 ---- share/man/man4/tcp.4.orig
141 -+++ share/man/man4/tcp.4
142 -@@ -445,6 +445,20 @@
143 - Reseeding should not be necessary, and will break
144 - .Dv TIME_WAIT
145 - recycling for a few minutes.
146 -+.It Va reass.cursegments
147 -+The current total number of segments present in all reassembly queues.
148 -+.It Va reass.maxsegments
149 -+The maximum limit on the total number of segments across all reassembly
150 -+queues.
151 -+The limit can be adjusted as a tunable.
152 -+.It Va reass.maxqueuelen
153 -+The maximum number of segments allowed in each reassembly queue.
154 -+By default, the system chooses a limit based on each TCP connection's
155 -+receive buffer size and maximum segment size (MSS).
156 -+The actual limit applied to a session's reassembly queue will be the lower of
157 -+the system-calculated automatic limit and the user-specified
158 -+.Va reass.maxqueuelen
159 -+limit.
160 - .It Va rexmit_min , rexmit_slop
161 - Adjust the retransmit timer calculation for
162 - .Tn TCP .
163
164 diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch b/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch
165 deleted file mode 100644
166 index 1fee32f348b..00000000000
167 --- a/sys-freebsd/freebsd-share/files/freebsd-share-SA-1810-ip.patch
168 +++ /dev/null
169 @@ -1,113 +0,0 @@
170 ---- share/man/man4/inet.4.orig
171 -+++ share/man/man4/inet.4
172 -@@ -28,7 +28,7 @@
173 - .\" From: @(#)inet.4 8.1 (Berkeley) 6/5/93
174 - .\" $FreeBSD$
175 - .\"
176 --.Dd Feb 4, 2016
177 -+.Dd August 14, 2018
178 - .Dt INET 4
179 - .Os
180 - .Sh NAME
181 -@@ -229,15 +229,38 @@
182 - cycle greatly.
183 - Default is 0 (sequential IP IDs).
184 - IPv6 flow IDs and fragment IDs are always random.
185 -+.It Va ip.maxfrags
186 -+Integer: maximum number of fragments the host will accept and simultaneously
187 -+hold across all reassembly queues in all VNETs.
188 -+If set to 0, reassembly is disabled.
189 -+If set to -1, this limit is not applied.
190 -+This limit is recalculated when the number of mbuf clusters is changed.
191 -+This is a global limit.
192 - .It Va ip.maxfragpackets
193 --Integer: maximum number of fragmented packets the host will accept and hold
194 --in the reassembling queue simultaneously.
195 --0 means that the host will not accept any fragmented packets.
196 --\-1 means that the host will accept as many fragmented packets as it receives.
197 -+Integer: maximum number of fragmented packets the host will accept and
198 -+simultaneously hold in the reassembly queue for a particular VNET.
199 -+0 means that the host will not accept any fragmented packets for that VNET.
200 -+\-1 means that the host will not apply this limit for that VNET.
201 -+This limit is recalculated when the number of mbuf clusters is changed.
202 -+This is a per-VNET limit.
203 -+.It Va ip.maxfragbucketsize
204 -+Integer: maximum number of reassembly queues per bucket.
205 -+Fragmented packets are hashed to buckets.
206 -+Each bucket has a list of reassembly queues.
207 -+The system must compare the incoming packets to the existing reassembly queues
208 -+in the bucket to find a matching reassembly queue.
209 -+To preserve system resources, the system limits the number of reassembly
210 -+queues allowed in each bucket.
211 -+This limit is recalculated when the number of mbuf clusters is changed or
212 -+when the value of
213 -+.Va ip.maxfragpackets
214 -+changes.
215 -+This is a per-VNET limit.
216 - .It Va ip.maxfragsperpacket
217 - Integer: maximum number of fragments the host will accept and hold
218 --in the reassembling queue for a packet.
219 --0 means that the host will not accept any fragmented packets.
220 -+in the reassembly queue for a packet.
221 -+0 means that the host will not accept any fragmented packets for the VNET.
222 -+This is a per-VNET limit.
223 - .El
224 - .Sh SEE ALSO
225 - .Xr ioctl 2 ,
226 ---- share/man/man4/inet6.4.orig
227 -+++ share/man/man4/inet6.4
228 -@@ -29,7 +29,7 @@
229 - .\"
230 - .\" $FreeBSD$
231 - .\"
232 --.Dd September 2, 2009
233 -+.Dd August 14, 2018
234 - .Dt INET6 4
235 - .Os
236 - .Sh NAME
237 -@@ -219,12 +219,41 @@
238 - This value applies to all the transport protocols on top of
239 - .Tn IPv6 .
240 - There are APIs to override the value.
241 -+.It Dv IPV6CTL_MAXFRAGS
242 -+.Pq ip6.maxfrags
243 -+Integer: maximum number of fragments the host will accept and simultaneously
244 -+hold across all reassembly queues in all VNETs.
245 -+If set to 0, fragment reassembly is disabled.
246 -+If set to -1, this limit is not applied.
247 -+This limit is recalculated when the number of mbuf clusters is changed.
248 -+This is a global limit.
249 - .It Dv IPV6CTL_MAXFRAGPACKETS
250 - .Pq ip6.maxfragpackets
251 --Integer: default maximum number of fragmented packets the node will accept.
252 --0 means that the node will not accept any fragmented packets.
253 ---1 means that the node will accept as many fragmented packets as it receives.
254 --The flag is provided basically for avoiding possible DoS attacks.
255 -+Integer: maximum number of fragmented packets the node will accept and
256 -+simultaneously hold in the reassembly queue for a particular VNET.
257 -+0 means that the node will not accept any fragmented packets for that VNET.
258 -+-1 means that the node will not apply this limit for that VNET.
259 -+This limit is recalculated when the number of mbuf clusters is changed.
260 -+This is a per-VNET limit.
261 -+.It Dv IPV6CTL_MAXFRAGBUCKETSIZE
262 -+.Pq ip6.maxfragbucketsize
263 -+Integer: maximum number of reassembly queues per bucket.
264 -+Fragmented packets are hashed to buckets.
265 -+Each bucket has a list of reassembly queues.
266 -+The system must compare the incoming packets to the existing reassembly queues
267 -+in the bucket to find a matching reassembly queue.
268 -+To preserve system resources, the system limits the number of reassembly
269 -+queues allowed in each bucket.
270 -+This limit is recalculated when the number of mbuf clusters is changed or
271 -+when the value of
272 -+.Va ip6.maxfragpackets
273 -+changes.
274 -+This is a per-VNET limit.
275 -+.It Dv IPV6CTL_MAXFRAGSPERPACKET
276 -+.Pq ip6.maxfragsperpacket
277 -+Integer: maximum number of fragments the host will accept and hold in the
278 -+ressembly queue for a packet.
279 -+This is a per-VNET limit.
280 - .It Dv IPV6CTL_ACCEPT_RTADV
281 - .Pq ip6.accept_rtadv
282 - Boolean: the default value of a per-interface flag to
283
284 diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
285 deleted file mode 100644
286 index 27899c51835..00000000000
287 --- a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
288 +++ /dev/null
289 @@ -1,118 +0,0 @@
290 -# Copyright 1999-2018 Gentoo Foundation
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI=5
294 -
295 -inherit bsdmk freebsd
296 -
297 -DESCRIPTION="FreeBSD shared tools/files"
298 -SLOT="0"
299 -LICENSE="BSD zfs? ( CDDL )"
300 -
301 -IUSE="doc usb zfs"
302 -
303 -if [[ ${PV} != *9999* ]]; then
304 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
305 -fi
306 -
307 -EXTRACTONLY="
308 - share/
309 - contrib/
310 - gnu/
311 - usr.bin/
312 - usr.sbin/
313 - sbin/
314 - bin/
315 - lib/
316 - etc/
317 - tools/tools/locale/
318 -"
319 -
320 -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
321 - =sys-freebsd/freebsd-sources-${RV}*"
322 -RDEPEND="sys-apps/miscfiles"
323 -
324 -RESTRICT="strip"
325 -
326 -S="${WORKDIR}/share"
327 -
328 -pkg_setup() {
329 - # Add the required source files.
330 - use zfs && EXTRACTONLY+="cddl/ "
331 -
332 - use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= "
333 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
334 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
335 -
336 - has_version "<sys-freebsd/freebsd-ubin-10.1" && mymakeopts="${mymakeopts} WITHOUT_VT= "
337 - has_version "<sys-freebsd/freebsd-ubin-11.0" && mymakeopts="${mymakeopts} WITHOUT_LOCALES= "
338 - has_version "<sys-freebsd/freebsd-lib-9.1-r11" && mymakeopts="${mymakeopts} WITHOUT_ICONV= "
339 -
340 - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= "
341 -}
342 -
343 -REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
344 -
345 -PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
346 - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
347 - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" )
348 -
349 -src_prepare() {
350 - # Remove make.conf manpage as it describes bsdmk's make.conf.
351 - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
352 - # Remove rc.conf manpage as it describes bsd's rc.conf.
353 - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
354 - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
355 - # Remove mailer.conf manpage
356 - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
357 - # Remove pbm and moduli(ssh) manpages
358 - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
359 - # Remove builtins manpage
360 - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
361 - # Remove rc manpages
362 - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
363 - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
364 - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
365 -
366 - # Don't install the arch-specific directories in subdirectories
367 - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
368 -
369 - # Remove them so that they can't be included by error
370 - rm -rf "${S}"/mk/*.mk
371 -
372 - # Make proper symlinks by defining the full target.
373 - local sdir
374 - for sdir in colldef monetdef msgdef numericdef timedef
375 - do
376 - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
377 - "${S}/${sdir}/Makefile" || \
378 - die "Error fixing ${sdir}/Makefile"
379 - done
380 - if [[ ! -e "${WORKDIR}/sys" ]]; then
381 - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
382 - fi
383 -}
384 -
385 -src_compile() {
386 - export ESED="/usr/bin/sed"
387 -
388 - # libiconv support.
389 - if ! has_version "<sys-freebsd/freebsd-lib-9.1-r11" ; then
390 - # i18n/csmapper/APPLE requires mkcsmapper_static
391 - # i18n/esdb/APPLE requires mkesdb_static
392 - for pkg in mkcsmapper_static mkesdb_static
393 - do
394 - cd "${WORKDIR}"/usr.bin/${pkg} || die
395 - freebsd_src_compile
396 - done
397 - fi
398 -
399 - # This is a groff problem and not a -shared problem.
400 - cd "${S}" || die
401 - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
402 - freebsd_src_compile -j1 || die "emake failed"
403 -}
404 -
405 -src_install() {
406 - freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF}
407 -}
408
409 diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild
410 deleted file mode 100644
411 index a8b673e53ec..00000000000
412 --- a/sys-freebsd/freebsd-share/freebsd-share-11.1_p1.ebuild
413 +++ /dev/null
414 @@ -1,122 +0,0 @@
415 -# Copyright 1999-2018 Gentoo Foundation
416 -# Distributed under the terms of the GNU General Public License v2
417 -
418 -EAPI=5
419 -
420 -inherit bsdmk freebsd
421 -
422 -DESCRIPTION="FreeBSD shared tools/files"
423 -SLOT="0"
424 -LICENSE="BSD zfs? ( CDDL )"
425 -
426 -IUSE="doc usb zfs"
427 -
428 -if [[ ${PV} != *9999* ]]; then
429 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
430 -fi
431 -
432 -EXTRACTONLY="
433 - share/
434 - contrib/
435 - gnu/
436 - usr.bin/
437 - usr.sbin/
438 - sbin/
439 - bin/
440 - lib/
441 - etc/
442 - tools/tools/locale/
443 -"
444 -
445 -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
446 - =sys-freebsd/freebsd-sources-${RV}*"
447 -RDEPEND="sys-apps/miscfiles"
448 -
449 -RESTRICT="strip"
450 -
451 -S="${WORKDIR}/share"
452 -
453 -pkg_setup() {
454 - # Add the required source files.
455 - use zfs && EXTRACTONLY+="cddl/ "
456 -
457 - use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= "
458 - use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
459 - use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
460 -
461 - has_version "<sys-freebsd/freebsd-ubin-10.1" && mymakeopts="${mymakeopts} WITHOUT_VT= "
462 - has_version "<sys-freebsd/freebsd-ubin-11.0" && mymakeopts="${mymakeopts} WITHOUT_LOCALES= "
463 - has_version "<sys-freebsd/freebsd-lib-9.1-r11" && mymakeopts="${mymakeopts} WITHOUT_ICONV= "
464 -
465 - mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= "
466 -}
467 -
468 -REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
469 -
470 -PATCHES=(
471 - "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
472 - "${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
473 - "${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch"
474 - "${FILESDIR}/${PN}-SA-1808-tcp-11.patch"
475 - "${FILESDIR}/${PN}-SA-1810-ip.patch"
476 -)
477 -
478 -src_prepare() {
479 - # Remove make.conf manpage as it describes bsdmk's make.conf.
480 - sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
481 - # Remove rc.conf manpage as it describes bsd's rc.conf.
482 - sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
483 - sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
484 - # Remove mailer.conf manpage
485 - sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
486 - # Remove pbm and moduli(ssh) manpages
487 - sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
488 - # Remove builtins manpage
489 - sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
490 - # Remove rc manpages
491 - sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
492 - # Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
493 - sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
494 -
495 - # Don't install the arch-specific directories in subdirectories
496 - sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
497 -
498 - # Remove them so that they can't be included by error
499 - rm -rf "${S}"/mk/*.mk
500 -
501 - # Make proper symlinks by defining the full target.
502 - local sdir
503 - for sdir in colldef monetdef msgdef numericdef timedef
504 - do
505 - sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
506 - "${S}/${sdir}/Makefile" || \
507 - die "Error fixing ${sdir}/Makefile"
508 - done
509 - if [[ ! -e "${WORKDIR}/sys" ]]; then
510 - ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
511 - fi
512 -}
513 -
514 -src_compile() {
515 - export ESED="/usr/bin/sed"
516 -
517 - # libiconv support.
518 - if ! has_version "<sys-freebsd/freebsd-lib-9.1-r11" ; then
519 - # i18n/csmapper/APPLE requires mkcsmapper_static
520 - # i18n/esdb/APPLE requires mkesdb_static
521 - for pkg in mkcsmapper_static mkesdb_static
522 - do
523 - cd "${WORKDIR}"/usr.bin/${pkg} || die
524 - freebsd_src_compile
525 - done
526 - fi
527 -
528 - # This is a groff problem and not a -shared problem.
529 - cd "${S}" || die
530 - export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
531 - freebsd_src_compile -j1 || die "emake failed"
532 -}
533 -
534 -src_install() {
535 - freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF}
536 -}
537
538 diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
539 deleted file mode 100644
540 index a470eb89458..00000000000
541 --- a/sys-freebsd/freebsd-share/metadata.xml
542 +++ /dev/null
543 @@ -1,11 +0,0 @@
544 -<?xml version="1.0" encoding="UTF-8"?>
545 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
546 -<pkgmetadata>
547 - <maintainer type="project">
548 - <email>bsd@g.o</email>
549 - <name>BSD Project</name>
550 - </maintainer>
551 - <use>
552 - <flag name="zfs">Enable ZFS support.</flag>
553 - </use>
554 -</pkgmetadata>