Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse4bsd/, sys-fs/fuse4bsd/files/
Date: Sun, 03 Nov 2019 17:05:23
Message-Id: 1572800712.7c1ee1bf3f79aff0f6ac6e40a1136144a28963b6.zlogene@gentoo
1 commit: 7c1ee1bf3f79aff0f6ac6e40a1136144a28963b6
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 3 17:03:29 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 17:05:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1ee1bf
7
8 sys-fs/fuse4bsd: remove last rited pkg
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11
12 sys-fs/fuse4bsd/Manifest | 2 -
13 .../files/fuse4bsd-0.3.9_pre1-fbsd91.patch | 15 -
14 .../fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch | 475 ---------------------
15 sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild | 58 ---
16 sys-fs/fuse4bsd/metadata.xml | 5 -
17 5 files changed, 555 deletions(-)
18
19 diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest
20 deleted file mode 100644
21 index f3b7e8654bb..00000000000
22 --- a/sys-fs/fuse4bsd/Manifest
23 +++ /dev/null
24 @@ -1,2 +0,0 @@
25 -DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac8fbba5aabc67d1ddf7e2309e4b20d37ae43a64ca0ce46100963e68c57131c263291d0f747fe849ed65b05c0e SHA512 6427d888cea5b1519c4ae92ec8ec640535692c59dd8ca987a32574050239c9ff4cb92a4cf6b34f3c1363becdd9fd75c031f5db4bda34b298898466066740845a
26 -DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
27
28 diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch
29 deleted file mode 100644
30 index cc3ea70ec7a..00000000000
31 --- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch
32 +++ /dev/null
33 @@ -1,15 +0,0 @@
34 -Taken from FreeBSD ports
35 -
36 -extra-patch-fuse_module__fuse_vnops.c
37 -
38 ---- fuse_module/fuse_vfsops.c.orig 2008-02-05 07:25:57.000000000 +0200
39 -+++ fuse_module/fuse_vfsops.c 2011-09-08 10:27:43.000000000 +0300
40 -@@ -224,7 +231,7 @@
41 - struct cdev *fdev;
42 - struct sx *slock;
43 - struct fuse_data *data;
44 -- int mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0;
45 -+ uint64_t mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0;
46 - unsigned max_read = ~0;
47 - struct vnode *rvp;
48 - struct fuse_vnode_data *fvdat;
49
50 diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch
51 deleted file mode 100644
52 index cf4cf444119..00000000000
53 --- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch
54 +++ /dev/null
55 @@ -1,475 +0,0 @@
56 -Taken from FreeBSD Ports
57 -
58 -cat sysutils/fusefs-kmod/files/patch-* > fuse4bsd-0.3.9_pre20080208-ports.patch
59 -
60 -
61 ---- fuse_module/Makefile.orig 2008-02-05 08:25:57.000000000 +0300
62 -+++ fuse_module/Makefile 2009-01-14 00:29:13.000000000 +0300
63 -@@ -1,3 +1,5 @@
64 -+.undef KERNCONF
65 -+
66 - .include "../Makefile.common"
67 -
68 - SRCS = fuse_main.c \
69 -@@ -22,7 +24,8 @@
70 -
71 - .if defined(KERNCONF)
72 - KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g'
73 --KERNCONFDIR= /usr/obj/usr/src/sys/${KERNCONF1}
74 -+KRNLOBJDIR!= make -C /usr/src -f /usr/src/Makefile.inc1 -V KRNLOBJDIR
75 -+KERNCONFDIR= ${KRNLOBJDIR}/${KERNCONF1}
76 - .endif
77 -
78 - .if defined(KERNCONFDIR)
79 ---- fuse_module/fuse.h.orig 2008-02-05 00:25:57.000000000 -0500
80 -+++ fuse_module/fuse.h 2009-05-13 18:40:19.000000000 -0400
81 -@@ -25,6 +25,22 @@
82 - #endif
83 - #endif
84 -
85 -+#ifndef VFSOPS_TAKES_THREAD
86 -+#if __FreeBSD_version >= 800087
87 -+#define VFSOPS_TAKES_THREAD 0
88 -+#else
89 -+#define VFSOPS_TAKES_THREAD 1
90 -+#endif
91 -+#endif
92 -+
93 -+#ifndef VOP_ACCESS_TAKES_ACCMODE_T
94 -+#if __FreeBSD_version >= 800052
95 -+#define VOP_ACCESS_TAKES_ACCMODE_T 1
96 -+#else
97 -+#define VOP_ACCESS_TAKES_ACCMODE_T 0
98 -+#endif
99 -+#endif
100 -+
101 - #ifndef VOP_OPEN_TAKES_FP
102 - #if __FreeBSD_version >= 700044
103 - #define VOP_OPEN_TAKES_FP 1
104 -@@ -49,6 +65,14 @@
105 - #endif
106 - #endif
107 -
108 -+#ifndef VOP_GETATTR_TAKES_THREAD
109 -+#if __FreeBSD_version >= 800046
110 -+#define VOP_GETATTR_TAKES_THREAD 0
111 -+#else
112 -+#define VOP_GETATTR_TAKES_THREAD 1
113 -+#endif
114 -+#endif
115 -+
116 - #ifndef USE_PRIVILEGE_API
117 - /*
118 - * __FreeBSD_version bump was omitted for introduction of
119 ---- fuse_module/fuse_dev.c
120 -+++ fuse_module/fuse_dev.c
121 -@@ -52,8 +52,13 @@
122 - .d_read = fusedev_read,
123 - .d_write = fusedev_write,
124 - .d_version = D_VERSION,
125 -+#ifndef D_NEEDMINOR
126 -+#define D_NEEDMINOR 0
127 -+#endif
128 - #if ! DO_GIANT_MANUALLY
129 -- .d_flags = D_NEEDGIANT,
130 -+ .d_flags = D_NEEDMINOR|D_NEEDGIANT,
131 -+#else
132 -+ .d_flags = D_NEEDMINOR,
133 - #endif
134 - };
135 -
136 -@@ -548,7 +553,12 @@
137 - /* find any existing device, or allocate new unit number */
138 - i = clone_create(&fuseclones, &fuse_cdevsw, &unit, dev, 0);
139 - if (i) {
140 -- *dev = make_dev(&fuse_cdevsw, unit2minor(unit),
141 -+ *dev = make_dev(&fuse_cdevsw,
142 -+#if __FreeBSD_version < 800062
143 -+ unit2minor(unit),
144 -+#else /* __FreeBSD_version >= 800062 */
145 -+ unit,
146 -+#endif /* __FreeBSD_version < 800062 */
147 - UID_ROOT, GID_OPERATOR,
148 - S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
149 - "fuse%d", unit);
150 ---- fuse_module/fuse_io.c.orig 2008-02-05 00:25:57.000000000 -0500
151 -+++ fuse_module/fuse_io.c 2009-07-13 09:31:24.000000000 -0400
152 -@@ -35,6 +35,10 @@
153 - #include <vm/vnode_pager.h>
154 - #include <vm/vm_object.h>
155 -
156 -+#if (__FreeBSD_version >= 800000)
157 -+#define vfs_bio_set_validclean vfs_bio_set_valid
158 -+#endif
159 -+
160 - #include "fuse.h"
161 - #include "fuse_session.h"
162 - #include "fuse_vnode.h"
163 -@@ -157,7 +161,11 @@
164 - goto out;
165 -
166 - if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {
167 -- if ((err = VOP_GETATTR(vp, &va, cred, td)))
168 -+ if ((err = VOP_GETATTR(vp, &va, cred
169 -+#if VOP_GETATTR_TAKES_THREAD
170 -+ , td
171 -+#endif
172 -+ )))
173 - goto out;
174 - uio->uio_offset = va.va_size;
175 - } else if ((flags & FOF_OFFSET) == 0)
176 -@@ -227,7 +235,7 @@
177 - return (0);
178 -
179 - biosize = vp->v_mount->mnt_stat.f_iosize;
180 -- bcount = min(MAXBSIZE, biosize);
181 -+ bcount = MIN(MAXBSIZE, biosize);
182 -
183 - DEBUG2G("entering loop\n");
184 - do {
185 -@@ -352,7 +360,7 @@
186 - fri = fdi.indata;
187 - fri->fh = fufh->fh_id;
188 - fri->offset = uio->uio_offset;
189 -- fri->size = min(uio->uio_resid,
190 -+ fri->size = MIN(uio->uio_resid,
191 - fusefs_get_data(vp->v_mount)->max_read);
192 -
193 - DEBUG2G("fri->fh %llu, fri->offset %d, fri->size %d\n",
194 -@@ -399,7 +407,7 @@
195 - while (uio->uio_resid > 0) {
196 - int transfersize;
197 -
198 -- chunksize = min(iov->iov_len, nmax);
199 -+ chunksize = MIN(iov->iov_len, nmax);
200 -
201 - if (uio->uio_rw == UIO_READ) {
202 - struct fuse_read_in *fri;
203 -@@ -464,7 +472,7 @@
204 - {
205 - int err;
206 -
207 -- if ((err = uiomove(buf, min(reqsize, bufsize), uio)))
208 -+ if ((err = uiomove(buf, MIN(reqsize, bufsize), uio)))
209 - return (err);
210 -
211 - if (bufsize < reqsize)
212 -@@ -502,7 +510,7 @@
213 - }
214 -
215 - while (uio->uio_resid > 0) {
216 -- chunksize = min(uio->uio_resid,
217 -+ chunksize = MIN(uio->uio_resid,
218 - fusefs_get_data(vp->v_mount)->max_write);
219 -
220 - fdi.iosize = sizeof(*fwi) + chunksize;
221 -@@ -569,7 +577,7 @@
222 - do {
223 - lbn = uio->uio_offset / biosize;
224 - on = uio->uio_offset & (biosize-1);
225 -- n = min((unsigned)(biosize - on), uio->uio_resid);
226 -+ n = MIN((unsigned)(biosize - on), uio->uio_resid);
227 -
228 - DEBUG2G("lbn %d, on %d, n %d, uio offset %d, uio resid %d\n",
229 - (int)lbn, on, n, (int)uio->uio_offset, uio->uio_resid);
230 -@@ -739,8 +747,8 @@
231 - */
232 - if (n) {
233 - if (bp->b_dirtyend > 0) {
234 -- bp->b_dirtyoff = min(on, bp->b_dirtyoff);
235 -- bp->b_dirtyend = max((on + n), bp->b_dirtyend);
236 -+ bp->b_dirtyoff = MIN(on, bp->b_dirtyoff);
237 -+ bp->b_dirtyend = MAX((on + n), bp->b_dirtyend);
238 - } else {
239 - bp->b_dirtyoff = on;
240 - bp->b_dirtyend = on + n;
241 -@@ -823,7 +831,11 @@
242 - #if FUSELIB_CONFORM_BIOREAD
243 - struct vattr va;
244 -
245 -- if ((err = VOP_GETATTR(vp, &va, cred, curthread)))
246 -+ if ((err = VOP_GETATTR(vp, &va, cred
247 -+#if VOP_GETATTR_TAKES_THREAD
248 -+ , curthread
249 -+#endif
250 -+ )))
251 - goto out;
252 - #endif
253 -
254 -@@ -831,7 +843,7 @@
255 - bp->b_resid = bp->b_bcount;
256 - while (bp->b_resid > 0) {
257 - DEBUG2G("starting bio with resid %ld\n", bp->b_resid);
258 -- chunksize = min(bp->b_resid,
259 -+ chunksize = MIN(bp->b_resid,
260 - fusefs_get_data(vp->v_mount)->max_read);
261 - fdi.iosize = sizeof(*fri);
262 - if (! op)
263 -@@ -842,8 +854,8 @@
264 - fri->fh = fufh->fh_id;
265 - fri->offset = ((off_t)bp->b_blkno) * biosize + ioff;
266 - #if FUSELIB_CONFORM_BIOREAD
267 -- chunksize = min(chunksize,
268 -- min(fri->offset + bp->b_resid,
269 -+ chunksize = MIN(chunksize,
270 -+ MIN(fri->offset + bp->b_resid,
271 - va.va_size) - fri->offset);
272 - if (chunksize == 0) {
273 - respsize = -1;
274 -@@ -901,7 +913,7 @@
275 -
276 - bufdat = bp->b_data + bp->b_dirtyoff;
277 - while (bp->b_dirtyend > bp->b_dirtyoff) {
278 -- chunksize = min(bp->b_dirtyend - bp->b_dirtyoff,
279 -+ chunksize = MIN(bp->b_dirtyend - bp->b_dirtyoff,
280 - fusefs_get_data(vp->v_mount)->max_write);
281 -
282 - fdi.iosize = sizeof(*fwi);
283 ---- fuse_module/fuse_main.c.00 2010-08-15 14:40:29.000000000 +0400
284 -+++ fuse_module/fuse_main.c 2010-08-15 15:56:56.000000000 +0400
285 -@@ -108,6 +108,9 @@
286 - switch (what) {
287 - case MOD_LOAD: /* kldload */
288 -
289 -+#if __FreeBSD_version > 800009
290 -+ fuse_fileops.fo_truncate = vnops.fo_truncate;
291 -+#endif
292 - fuse_fileops.fo_ioctl = vnops.fo_ioctl;
293 - fuse_fileops.fo_poll = vnops.fo_poll;
294 - fuse_fileops.fo_kqfilter = vnops.fo_kqfilter;
295 -
296 -
297 ---- fuse_module/fuse_vfsops.c.orig 2008-02-05 00:25:57.000000000 -0500
298 -+++ fuse_module/fuse_vfsops.c 2009-05-13 18:54:01.000000000 -0400
299 -@@ -18,6 +18,7 @@
300 - #include <sys/namei.h>
301 - #include <sys/mount.h>
302 - #include <sys/sysctl.h>
303 -+#include <sys/fcntl.h>
304 -
305 - #include "fuse.h"
306 - #include "fuse_session.h"
307 -@@ -213,8 +214,14 @@
308 - * Mount system call
309 - */
310 - static int
311 -+#if VFSOPS_TAKES_THREAD
312 - fuse_mount(struct mount *mp, struct thread *td)
313 - {
314 -+#else
315 -+fuse_mount(struct mount *mp)
316 -+{
317 -+ struct thread *td = curthread;
318 -+#endif
319 - int err = 0;
320 - size_t len;
321 - char *fspec, *subtype = NULL;
322 -@@ -529,8 +536,14 @@
323 - * Unmount system call
324 - */
325 - static int
326 -+#if VFSOPS_TAKES_THREAD
327 - fuse_unmount(struct mount *mp, int mntflags, struct thread *td)
328 - {
329 -+#else
330 -+fuse_unmount(struct mount *mp, int mntflags)
331 -+{
332 -+ struct thread *td = curthread;
333 -+#endif
334 - int flags = 0, err = 0;
335 - struct fuse_data *data;
336 - struct fuse_secondary_data *fsdat = NULL;
337 -@@ -633,8 +646,14 @@
338 -
339 - /* stolen from portalfs */
340 - static int
341 -+#if VFSOPS_TAKES_THREAD
342 - fuse_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td)
343 - {
344 -+#else
345 -+fuse_root(struct mount *mp, int flags, struct vnode **vpp)
346 -+{
347 -+ struct thread *td = curthread;
348 -+#endif
349 - /*
350 - * Return locked reference to root.
351 - */
352 -@@ -650,7 +669,11 @@
353 - data = fsdat->master;
354 - sx_slock(&data->mhierlock);
355 - if (data->mpri == FM_PRIMARY)
356 -- err = fuse_root(data->mp, flags, vpp, td);
357 -+ err = fuse_root(data->mp, flags, vpp
358 -+#if VFSOPS_TAKES_THREAD
359 -+ , td
360 -+#endif
361 -+ );
362 - else
363 - err = ENXIO;
364 - sx_sunlock(&data->mhierlock);
365 -@@ -667,7 +690,11 @@
366 - if (vp->v_type == VNON) {
367 - struct vattr va;
368 -
369 -- (void)VOP_GETATTR(vp, &va, td->td_ucred, td);
370 -+ (void)VOP_GETATTR(vp, &va, td->td_ucred
371 -+#if VOP_GETATTR_TAKES_THREAD
372 -+ , td
373 -+#endif
374 -+ );
375 - }
376 - *vpp = vp;
377 - #if _DEBUG2G
378 -@@ -678,8 +705,14 @@
379 - }
380 -
381 - static int
382 -+#if VFSOPS_TAKES_THREAD
383 - fuse_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
384 - {
385 -+#else
386 -+fuse_statfs(struct mount *mp, struct statfs *sbp)
387 -+{
388 -+ struct thread *td = curthread;
389 -+#endif
390 - struct fuse_dispatcher fdi;
391 - struct fuse_statfs_out *fsfo;
392 - struct fuse_data *data;
393 -@@ -696,7 +729,11 @@
394 -
395 - sx_slock(&data->mhierlock);
396 - if (data->mpri == FM_PRIMARY)
397 -- err = fuse_statfs(data->mp, sbp, td);
398 -+ err = fuse_statfs(data->mp, sbp
399 -+#if VFSOPS_TAKES_THREAD
400 -+ , td
401 -+#endif
402 -+ );
403 - else
404 - err = ENXIO;
405 - sx_sunlock(&data->mhierlock);
406 -@@ -794,7 +831,11 @@
407 - if (nodeid == FUSE_ROOT_ID) {
408 - if (parentid != FUSE_NULL_ID)
409 - return (ENOENT);
410 -- err = VFS_ROOT(mp, myflags, vpp, td);
411 -+ err = VFS_ROOT(mp, myflags, vpp
412 -+#if VFSOPS_TAKES_THREAD
413 -+ , td
414 -+#endif
415 -+ );
416 - if (err)
417 - return (err);
418 - KASSERT(*vpp, ("we neither err'd nor found the root node"));
419 ---- ./fuse_module/fuse_vnops.c.orig 2012-09-19 06:04:10.512413490 +0200
420 -+++ ./fuse_module/fuse_vnops.c 2012-09-19 06:20:44.949613892 +0200
421 -@@ -799,8 +799,11 @@
422 - struct vnode *vp = ap->a_vp;
423 - struct vattr *vap = ap->a_vap;
424 - struct ucred *cred = ap->a_cred;
425 -+#if VOP_GETATTR_TAKES_THREAD
426 - struct thread *td = ap->a_td;
427 --
428 -+#else
429 -+ struct thread *td = curthread;
430 -+#endif
431 - struct fuse_dispatcher fdi;
432 - struct timespec uptsp;
433 - int err = 0;
434 -@@ -871,7 +874,11 @@
435 - fuse_access(ap)
436 - struct vop_access_args /* {
437 - struct vnode *a_vp;
438 -+#if VOP_ACCESS_TAKES_ACCMODE_T
439 -+ accmode_t a_accmode;
440 -+#else
441 - int a_mode;
442 -+#endif
443 - struct ucred *a_cred;
444 - struct thread *a_td;
445 - } */ *ap;
446 -@@ -886,7 +893,13 @@
447 - else
448 - facp.facc_flags |= FACCESS_DO_ACCESS;
449 -
450 -- return fuse_access_i(vp, ap->a_mode, ap->a_cred, ap->a_td, &facp);
451 -+ return fuse_access_i(vp,
452 -+#if VOP_ACCESS_TAKES_ACCMODE_T
453 -+ ap->a_accmode,
454 -+#else
455 -+ ap->a_mode,
456 -+#endif
457 -+ ap->a_cred, ap->a_td, &facp);
458 - }
459 -
460 - /*
461 -@@ -946,7 +959,11 @@
462 - /* We are to do the check in-kernel */
463 -
464 - if (! (facp->facc_flags & FACCESS_VA_VALID)) {
465 -- err = VOP_GETATTR(vp, VTOVA(vp), cred, td);
466 -+ err = VOP_GETATTR(vp, VTOVA(vp), cred
467 -+#if VOP_GETATTR_TAKES_THREAD
468 -+ , td
469 -+#endif
470 -+ );
471 - if (err)
472 - return (err);
473 - facp->facc_flags |= FACCESS_VA_VALID;
474 -@@ -1544,7 +1561,7 @@
475 - struct fuse_vnode_data *fvdat = VTOFUD(vp);
476 - uint64_t parentid = fvdat->parent_nid;
477 - struct componentname *cnp = fvdat->germcnp;
478 -- struct fuse_open_in *foi;
479 -+ struct fuse_create_in *foi;
480 - struct fuse_entry_out *feo;
481 - struct fuse_mknod_in fmni;
482 - int err;
483 -@@ -1929,7 +1946,11 @@
484 - * It will not invalidate pages which are dirty, locked, under
485 - * writeback or mapped into pagetables.")
486 - */
487 -+#if VOP_GETATTR_TAKES_THREAD
488 - err = vinvalbuf(vp, 0, td, PCATCH, 0);
489 -+#else
490 -+ err = vinvalbuf(vp, 0, PCATCH, 0);
491 -+#endif
492 - fufh->flags |= FOPEN_KEEP_CACHE;
493 - }
494 -
495 -@@ -3005,8 +3026,11 @@
496 - struct vattr *vap = ap->a_vap;
497 - struct vnode *vp = ap->a_vp;
498 - struct ucred *cred = ap->a_cred;
499 -+#if VOP_GETATTR_TAKES_THREAD
500 - struct thread *td = ap->a_td;
501 --
502 -+#else
503 -+ struct thread *td = curthread;
504 -+#endif
505 - int err = 0;
506 - struct fuse_dispatcher fdi;
507 - struct fuse_setattr_in *fsai;
508 ---- mount_fusefs/mount_fusefs.c 2008-02-05 07:25:57.000000000 +0200
509 -+++ mount_fusefs/mount_fusefs.c 2012-01-07 21:07:35.000000000 +0200
510 -@@ -44,6 +44,7 @@
511 - #include <getopt.h>
512 - #include <libgen.h>
513 - #include <limits.h>
514 -+#include <osreldate.h>
515 - #include <paths.h>
516 -
517 - #include "fuse4bsd.h"
518 -@@ -312,7 +313,12 @@
519 - * Resolve the mountpoint with realpath(3) and remove unnecessary
520 - * slashes from the devicename if there are any.
521 - */
522 -+#if __FreeBSD_version >= 1000005
523 -+ if (checkpath(dir, mntpath) != 0)
524 -+ err(1, "%s", mntpath);
525 -+#else
526 - (void)checkpath(dir, mntpath);
527 -+#endif
528 - (void)rmslashes(dev, dev);
529 -
530 - if (strcmp(dev, "auto") == 0)
531
532 diff --git a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild b/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
533 deleted file mode 100644
534 index 710c35f8bc0..00000000000
535 --- a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
536 +++ /dev/null
537 @@ -1,58 +0,0 @@
538 -# Copyright 1999-2018 Gentoo Foundation
539 -# Distributed under the terms of the GNU General Public License v2
540 -
541 -EAPI=5
542 -
543 -inherit portability toolchain-funcs eutils flag-o-matic
544 -
545 -DESCRIPTION="Fuse for FreeBSD"
546 -HOMEPAGE="http://fuse4bsd.creo.hu/"
547 -# -sbin is needed for getmntopts.c, hardcoding 6.2 is nasty but can't think of
548 -# any better solution right now
549 -SRC_URI="http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/fuse4bsd/498acaef33b0.tar.gz
550 - mirror://gentoo/freebsd-sbin-9.1.tar.bz2"
551 -S="${WORKDIR}/fuse4bsd-498acaef33b0"
552 -
553 -LICENSE="BSD"
554 -SLOT="0"
555 -KEYWORDS=""
556 -IUSE=""
557 -
558 -DEPEND=">=sys-freebsd/freebsd-sources-9.1
559 - virtual/pmake"
560 -RDEPEND="sys-fs/fuse"
561 -
562 -QA_TEXTRELS="boot/modules/fuse.ko"
563 -
564 -src_prepare() {
565 - cp /usr/include/fuse/fuse_kernel.h fuse_module/ || die
566 - cp "${WORKDIR}/sbin/mount/getmntopts.c" mount_fusefs/ || die
567 - epatch "${FILESDIR}"/${P}-ports.patch
568 - epatch "${FILESDIR}"/${P}-fbsd91.patch
569 -}
570 -
571 -src_compile() {
572 - filter-ldflags "-Wl,--hash-style=*"
573 - tc-export CC
574 - cd "${S}"/fuse_module
575 - $(get_bmake) \
576 - KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
577 - MOUNT="${WORKDIR}/sbin/mount" LDFLAGS="$(raw-ldflags)" \
578 - || die "$(get_bmake) failed"
579 -
580 - cd "${S}"/mount_fusefs
581 - $(get_bmake) \
582 - KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
583 - MOUNT="${WORKDIR}/sbin/mount" \
584 - || die "$(get_bmake) failed"
585 -}
586 -
587 -src_install() {
588 - dodir /boot/modules
589 - $(get_bmake) \
590 - KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
591 - DESTDIR="${ED}" install \
592 - || die "$(get_bmake) failed"
593 -
594 - dodoc doc/{CREDITS,README}
595 -}
596
597 diff --git a/sys-fs/fuse4bsd/metadata.xml b/sys-fs/fuse4bsd/metadata.xml
598 deleted file mode 100644
599 index 6f49eba8f49..00000000000
600 --- a/sys-fs/fuse4bsd/metadata.xml
601 +++ /dev/null
602 @@ -1,5 +0,0 @@
603 -<?xml version="1.0" encoding="UTF-8"?>
604 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
605 -<pkgmetadata>
606 -<!-- maintainer-needed -->
607 -</pkgmetadata>