#
# Removal in 30 days. Bug #683284.
sys-freebsd/boot0
-sys-freebsd/freebsd-cddl
# Lars Wendler <polynomial-c@gentoo.org> (2019-09-04)
# Unofficial build. Superseded by official 2.49.5 release.
+++ /dev/null
-DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
-DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
+++ /dev/null
-diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
-index 1e386e5..a4c08ee 100644
---- a/cddl/sbin/zfs/Makefile
-+++ b/cddl/sbin/zfs/Makefile
-@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-
--LIBADD= jail nvpair uutil zfs_core zfs
-+LIBADD= jail nvpair uutil zfs_core zfs umem avl
-
- .include <bsd.prog.mk>
-diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
-index ebf0f90..c70a3c4 100644
---- a/cddl/sbin/zpool/Makefile
-+++ b/cddl/sbin/zpool/Makefile
-@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-
--LIBADD= geom nvpair uutil zfs
-+LIBADD= geom nvpair uutil zfs umem avl zfs_core
-
- .include <bsd.prog.mk>
-diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
-index fc68904..9af6ff2 100644
---- a/cddl/usr.sbin/lockstat/Makefile
-+++ b/cddl/usr.sbin/lockstat/Makefile
-@@ -21,6 +21,6 @@ CFLAGS+= -DNEED_ERRLOC -g
-
- #YFLAGS+= -d
-
--LIBADD= elf dtrace rt
-+LIBADD= elf dtrace rt ctf
-
- .include <bsd.prog.mk>
-diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
-index 77b6139..7737efd 100644
---- a/cddl/usr.sbin/plockstat/Makefile
-+++ b/cddl/usr.sbin/plockstat/Makefile
-@@ -18,6 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- -I${.CURDIR}/../../../cddl/lib/libdtrace \
- -I${.CURDIR}/../../../sys
-
--LIBADD= dtrace proc
-+LIBADD= dtrace proc ctf
-
- .include <bsd.prog.mk>
-diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
-index 3609502..71526f7 100644
---- a/cddl/usr.sbin/zdb/Makefile
-+++ b/cddl/usr.sbin/zdb/Makefile
-@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
--LIBADD= nvpair umem uutil zfs zpool
-+LIBADD= nvpair umem uutil zfs zpool avl zfs_core
-
- # Since there are many asserts in this program, it makes no sense to compile
- # it without debugging.
-diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common
-index a545609..034d418 100644
---- a/cddl/usr.sbin/zfsd/Makefile.common
-+++ b/cddl/usr.sbin/zfsd/Makefile.common
-@@ -35,7 +35,7 @@ CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
-
- DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
- ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
--LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil
-+LIBADD= devdctl zfs zfs_core util geom bsdxml sbuf nvpair uutil umem avl
-
- cscope:
- find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
-diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
-index 02c51ac..d9b79a9 100644
---- a/cddl/usr.sbin/zhack/Makefile
-+++ b/cddl/usr.sbin/zhack/Makefile
-@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
--LIBADD= nvpair zfs zpool
-+LIBADD= nvpair zfs zpool umem uutil avl zfs_core
-
- CFLAGS+= -DDEBUG=1
- #DEBUG_FLAGS+= -g
+++ /dev/null
-diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common
-index 6c71bdf..6b71908 100644
---- a/cddl/usr.sbin/zfsd/Makefile.common
-+++ b/cddl/usr.sbin/zfsd/Makefile.common
-@@ -31,6 +31,7 @@ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
- INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
-
- CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
-+CXXFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
-
- DPADD= ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
- ${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
+++ /dev/null
-diff -ur cddl.old/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.old/sbin/zfs/Makefile 2011-11-04 10:01:46.000000000 +0000
-+++ cddl/sbin/zfs/Makefile 2011-11-04 10:07:15.000000000 +0000
-@@ -21,8 +21,8 @@
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-
--DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
-+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-
- .include <bsd.prog.mk>
-diff -ur cddl.old/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.old/sbin/zpool/Makefile 2011-11-04 10:01:46.000000000 +0000
-+++ cddl/sbin/zpool/Makefile 2011-11-04 10:06:38.000000000 +0000
-@@ -26,8 +26,8 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-
--DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
-+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-
- .include <bsd.prog.mk>
+++ /dev/null
-diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
---- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000
-@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+
- .include <bsd.lib.mk>
-diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
---- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000
-@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt
- CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
- LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
-
-diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
---- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000
-@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+
- DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
- LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
---- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000
-@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
- LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
---- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000
-@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
-+
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD= -lctf -ldwarf -lelf -lz -lpthread
-
-diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
---- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000
-@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libctf
-+
- DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD= -lctf -ldwarf -lelf -lz -lpthread
-
-diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
---- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000
-@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- ${LIBZFS} ${LIBZPOOL}
- LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
---- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
---- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000
-+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000
-@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
---- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000
-+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
---- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000
-+++ b/cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000
-@@ -24,6 +24,8 @@
- #CFLAGS+= -DNEED_ERRLOC
- #YFLAGS+= -d
-
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- ${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
---- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000
-+++ b/cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000
-@@ -23,6 +23,8 @@
-
- CFLAGS+= -DNEED_ERRLOC -g
-
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+= -d
-
- DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
+++ /dev/null
---- cddl/lib/libzfs/Makefile.old 2011-11-04 10:27:30.000000000 +0000
-+++ cddl/lib/libzfs/Makefile 2011-11-04 10:28:59.000000000 +0000
-@@ -7,7 +7,7 @@
-
- LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
--LDADD= -lmd -lpthread -lumem -lutil
-+LDADD= -lmd -lpthread -lumem -lutil -luutil -lnvpair -lm -lgeom
-
- SRCS= deviceid.c \
- fsshare.c \
---- cddl/lib/libzpool/Makefile.old 2011-11-04 18:22:28.000000000 +0000
-+++ cddl/lib/libzpool/Makefile 2011-11-04 18:24:01.000000000 +0000
-@@ -57,7 +57,7 @@
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD= -lmd -lpthread -lz
-+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
-
- # atomic.S doesn't like profiling.
- NO_PROFILE=
+++ /dev/null
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need hostid
- before fsck
-}
-
-start() {
- einfo "Starting zfs ..."
- zfs mount -a
- zfs share -a
- if [ ! -r /etc/zfs/exports ]; then
- touch /etc/zfs/exports
- fi
-}
-
-stop() {
- einfo "Stopping zfs ..."
- zfs unshare -a
- zfs unmount -a
-}
+++ /dev/null
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need hostid
- before fsck
-}
-
-start() {
- einfo "Starting zfs volumes..."
- eend $?
- # Enable swap on ZVOLs that have org.freebsd:swap=on.
- zfs list -H -o org.freebsd:swap,name -t volume | \
- while read state name; do
- case "${state}" in
- [oO][nN])
- einfo "Enabling swap on zvol ${name}"
- swapon /dev/zvol/${name}
- eend $?
- ;;
- esac
- done
-}
-
-stop() {
- # Disable what we had enabled before.
- zfs list -H -o org.freebsd:swap,name -t volume | \
- while read state name; do
- case "${state}" in
- [oO][nN])
- einfo "Disabling swap on zvol ${name}"
- swapoff /dev/zvol/${name}
- eend $?
- ;;
- esac
- done
- einfo "Stopping zfs volumes..."
- eend $?
-}
-
-restart() {
- :
-}
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs multilib usr-ldscript
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-# sys is required.
-EXTRACTONLY="
- cddl/
- contrib/
- usr.bin/
- lib/
- sbin/
- sys/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch"
- "${FILESDIR}/${PN}-11.0-add-libs.patch" )
-
-pkg_setup() {
- # Add the required source files.
- use build && EXTRACTONLY+="include/ "
- [[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd"
-}
-
-src_prepare() {
- if [[ ! -e "${WORKDIR}/include" ]]; then
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
- fi
- for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do
- LDFLAGS="${LDFLAGS} -L${S}/lib/${d}"
- done
-}
-
-src_compile() {
- cd "${S}"/lib || die
- freebsd_src_compile
- cd "${S}" || die
- freebsd_src_compile
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}"
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
+++ /dev/null
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bsdmk freebsd toolchain-funcs multilib usr-ldscript
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
- mirror://gentoo/${CONTRIB}.tar.bz2
- mirror://gentoo/${UBIN}.tar.bz2
- mirror://gentoo/${LIB}.tar.bz2
- mirror://gentoo/${SBIN}.tar.bz2
- mirror://gentoo/${SYS}.tar.bz2
- build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
- =sys-freebsd/freebsd-libexec-${RV}*
- build? ( sys-apps/baselayout )
- dev-libs/libelf"
-
-DEPEND="${RDEPEND}
- =sys-freebsd/freebsd-mk-defs-${RV}*
- !build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
- "${FILESDIR}/${PN}-9.0-underlink.patch"
- "${FILESDIR}/${PN}-9.0-libpaths.patch" )
-
-src_unpack() {
- freebsd_src_unpack
- # Link in include headers.
- ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
- # Install libraries proper place
- local mylibdir=$(get_libdir)
- mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
- gen_usr_ldscript -a avl nvpair umem uutil zfs zpool
-
- # Install zfs volinit script.
- newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
- # Install zfs script
- newinitd "${FILESDIR}"/zfs.initd zfs
-
- keepdir /etc/zfs
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>bsd@gentoo.org</email>
- <name>BSD Project</name>
-</maintainer>
-</pkgmetadata>
projects / gentoo.git / commitdiff