reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-freebsd/freebsd-cddl
19 files changed, 1178 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
new file mode 100644
index 000000000000..5994f856a377
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -0,0 +1,37 @@
+AUX freebsd-cddl-10.2-libpaths.patch 9569 SHA256 80350e3493fd667840555d06e453769e02604da8362d6e76280573a30dd9185b SHA512 615caa713eee62030a9f4630578f8f7ae8c4a2df71307237083115e2226734646ba1923f5de46aaf1523ffaa6b4c83b5fc64ceee552b15cb0244583408736ed4 WHIRLPOOL 3fd3f8d42057ab01965b4314f4565009076ea54da83401efdedd838299cf554092717d7795ba7a4dca22420c993d521411021dc4f521a273af4ff894bb938353
+AUX freebsd-cddl-10.3-underlink.patch 437 SHA256 ac486d44bf8ed4dd1b30d6200c59446e552e9e21f30535077533a080a28280ef SHA512 9ef6768be960a0c08cef094ba220e045b434aef6cfdb0be4631a63ea0b233158e927ca32c4f1d47a2f9a1e4a568f3850e61f56dcab35bd26cf1cea49035240fd WHIRLPOOL 8d5de341ceeca0e4a6c22b3bde9ddfdd611b1508344e837d34b926a3f8ac411a9daebaf30198fb323197d0860f102dc5b76172b7213a4cd4d41e623b79111393
+AUX freebsd-cddl-11.0-add-libs.patch 3401 SHA256 d722c667769b403a0b1485d7df23e6b37a5406c2ed3c9b09959e7f0ac1851b19 SHA512 7a3da3a57bde26a79784dcb023961ed0a292da4945c49e07c4a69035fe6cd0773e09cec25eab638a64c6ccc54bb775c169b1553743f7a9b4af60ce49f1fee54c WHIRLPOOL aae94c0c23568359c135db4f3f2745280292fc337c3bf03516182ef38b920b4344049fe260a71d6769f3ecd8b53d7497361e768b7d67fdab3eba126128051cad
+AUX freebsd-cddl-11.0-workaround.patch 576 SHA256 38f7af5e9560ead4ea3cae3a756b73a3d605e7053c944b4ed8abc0a0c9788723 SHA512 0a2280caeb23622454351657d61e8e465c597b82bf49cb534a924758844cd7da2df330434ba6282e159d9bc2e6ade27c2a9db41980ada6370bcab59c6a57da22 WHIRLPOOL 8a6afdbb8f5243822e6040d07af966a45c21c52bb0e916aea2b1be03b3ff6cfec40da5c3b0268881abbf6b2edc8b43bf005fca81714461567a0e6edc15178073
+AUX freebsd-cddl-8.0-libpaths.patch 4418 SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5 WHIRLPOOL 0ed3869833b9606ce325b30874f01106c2d288c6bff703398f63abe00602c6d3adf1d2faf2dc629a220dcfeb4c3d819f672875ce3b7bb4ab969977b5ce6920fd
+AUX freebsd-cddl-8.2-libpaths.patch 822 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567 WHIRLPOOL 3ecdb9ea5050d4309b2561dd37082982450180e6eb8b77373ca3949f62ccd7719e5178a3c3a61346b2820fa827e0bc13075d2266d5500a5f80d8efab16adb414
+AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5 WHIRLPOOL 5af01d3ba6e1e4a038de1f3274bf3bd241264db05b021fa374c5a56c805901320a4c30c2234013902eb2f5ca879a4972d3468e0157315dd98e73ce1ee4359e0a
+AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278 WHIRLPOOL 1f6798ac319bba9dedb0a0776e09cbce01637e057e38f77d59410c942f68c7051b7ccc10bfed748b72eeabf9254bc52262b5c9cc3fa3a4187f8698ede2d27d4f
+AUX freebsd-cddl-9.0-underlink.patch 755 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9 WHIRLPOOL c6403e8e56f2c2e9d67387137eab77eae0f6e1a8c4c4d595c1950ee3ab3bff8d0d8a0f15ca83a7b65aa05d35dafa86ff75ff8fec7ce8f320a2e1d44be38c0995
+AUX zfs.initd 368 SHA256 b24cbadc9bf67b0eba0af43730ff8a24c6fa3b337c26f62f0c9436630f8083e3 SHA512 6b1c0342cbd4dd7e84df58240be3ef8bdc9924a32abe9258d76c87b187be5cb5776125c5989b9dc9bd1210f46216b8f478d2ecb8cc9d165a960157fadc9b5ff8 WHIRLPOOL 0856d73c97f3ac67903d981328c79caa85621f417dcc66d0ee9a04c6590684352395aba72c72fd0427816287f38d03debe0acb962b53b55ce2024ce6517565f7
+AUX zvol.initd 838 SHA256 47a549c68ccedc71c4bcced9304141b7b43356d5190818d34351f3d664427207 SHA512 7a535e3f698bdde4e181ae420d88d76d11f308b0e38d8acfcae41281e05ec05166a2df9df0b3a57844991d166429229ba725561799dc26cbb2e7585094f9783e WHIRLPOOL 6c8873107b71f89618a4cd5ce40cfb55c0c30f48d907d9bb7dc5b53ae96face6bf08ab86b706db964425c1873b9599e1868252a0e28558f78be2d0fad78d2fe2
+AUX zvol.initd-9.0 812 SHA256 d4c083233f2e5c21d57fbc40cc9bd34247540aec9d91c2771d6ad1009efccaf2 SHA512 dbd113cb8f072b001e5f696ddb142df063f12b29a5b16af99f3b00b8c511af87a6094bd210f384ad03a300c2afd7af249cdf278a6179a3f53edc439c3a80f566 WHIRLPOOL bcdfefa27d760b3fe9ea7e953af00eae5d510b2a5e450893d38aab795bf13d08fb204f158a3fda5128e61fd86d3cca7488f3a64c4f003ef51bbff358ba1fc050
+DIST freebsd-cddl-8.2.tar.bz2 823706 SHA256 6d2b2362ce60538bcba4afa47bd6baa98b05292babae4b20d6ba08592ce98698 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721 WHIRLPOOL 0150d972fc5200efcf22b5baded0bc7d826f03420a8328bc9ce1f53f39d1f3cd07dc367fcb3b0c8bdcc3b33bc9045f262928d76532c91820fd3c6bc8c9ee57c9
+DIST freebsd-cddl-9.1.tar.bz2 899348 SHA256 bcc79fb002052128e9e91b16beb3083ee152be0936494715c6c159bfc8d2ca3a SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd WHIRLPOOL 2c4a5baf162dbb698af45b9262f104e27c05e6a2630c3e7b1765e76c8987a330c315f741df69c8771d2509708d2934db2a07f2e0218aa59d0100dfc3f952bf72
+DIST freebsd-contrib-8.2.tar.bz2 40931651 SHA256 8b9cb688e81c2980b3fc66411d00ab277a24dadd50d5bdd5e0e6c63ac687b9b6 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476 WHIRLPOOL edd3d9e26e8d22d9028082e107ec1a44402e206dab8722f34b445676959305996c3f699152af42ace249b7f58498492787823b172fb6bcb273119c6bb50a35f0
+DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
+DIST freebsd-include-8.2.tar.bz2 138992 SHA256 fade90621a8e4880c9583c1ee49965400c88e53ac6c07cb5dcf320e4f069271d SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3 WHIRLPOOL 64d3160c4ac46a62f5969058e07bd160c92284f08805ed917f2073ba1cb5907cfca16c5893daf30254d39b4fcdf641ab6afb9817607f65e7789d3049e8103947
+DIST freebsd-include-9.1.tar.bz2 146881 SHA256 861dce3f39e6806762b102361017cbe148f0e2b768b3fca152f8426f44a2942f SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9 WHIRLPOOL e16ba45d380591ba007ca59579d45f61ffc1aa1a4c08fc11ed2794979b0a189a346c81b4f70a44ee199d50a72024930f28587ad62a9cd6854fc937eb466ec115
+DIST freebsd-lib-8.2.tar.bz2 3323878 SHA256 e3590c12794fcb5ba8eb7a1f58b497587cf19f9200b3254c194a793da3b5bfb0 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007 WHIRLPOOL 95f98a372f44a89bc8ac3029ec065dbbfec338e6f889d057d75644bfcdfb9d27fdc0421d7e392cad5a823712b97f0857297ec3d321580254c63032c22b95792e
+DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-sbin-8.2.tar.bz2 1211665 SHA256 8b7e21a66b4696e8763d29b8b02b2d35f29fc51820a194d1e469e7cace84c527 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959 WHIRLPOOL 2a21cd0f15f95d66718031680ac87f1fe73f1e1b03cb012e1db1dd1bd2fe2bb7897457a8ba2f5a28c8806775611dca542cbadec16566c47ab9efa673e2cb53f3
+DIST freebsd-sbin-9.1.tar.bz2 1273913 SHA256 45008b0733b232ef03707ef5fa3e5c889e3b3728393d736bd9a869ea83be6447 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc WHIRLPOOL 20920dfa9607a0ce854319cef29bbd77fb1b31f6f6cfd5ac60cbd678169e43929e215743fe636d0c224443f3e6149a8f07c292d647f7f901592795ac292699f9
+DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad
+DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
+DIST freebsd-src-11.1.tar.xz 147661560 SHA256 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca WHIRLPOOL 3f88b15153c25c7878d1a730213e5bc8c200c05427895ae97280c4412680bb8e67cf4f8170f9e2b0f21d63ec42365f44f7d5eafe614e9b8726f4bc3cc3825202
+DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
+DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
+DIST freebsd-ubin-8.2.tar.bz2 1808012 SHA256 6b99554f3ad6ee052069b347eb6e6219b71598d7b222acb90a24cbfc805c7b68 SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29 WHIRLPOOL ea8f3a29a37b42c2b5bcc0f2c343fa1538522157ef075363c94606a4620a590e9a03f856ce2494e3e727935b62431991d0aa9fde71de699e78b4fe225bdf1c2c
+DIST freebsd-ubin-9.1.tar.bz2 1910472 SHA256 ff6e586f213534b6ec2e65002c0dee64063d76ddad515c12221b1a80a1815e48 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e WHIRLPOOL c85a3c9cf2bceff2c60ff03556bcc81d3aca22b0bce3c9538990071ac0a907236eee5ae7743ad22c5fd309b047ebf392aaaf2fe177ef5790ea869aff3da7e2fe
+EBUILD freebsd-cddl-10.3.ebuild 1463 SHA256 fcc4ca421df2a326af68a11de8055c4a2da6939b0a11527d616043904ae1a36a SHA512 4effdc2fd7ad27672cc2f3b20ad4612866ab1b6b03f0e30441275b1cfae98bdf55244aba4c9f7c162409d555b40ad78b21a620202f0a291a186e8d39be57be36 WHIRLPOOL bb9c74d2133e2d814b38cc07c679e7a03efce46d9b1bce261a72818e56182c2b9a9a9e127d6882a3cc6d111458ac94747fbe09a311c0338527b85f64183019b1
+EBUILD freebsd-cddl-11.0.ebuild 1701 SHA256 303b70ac8277ad1d27444046241869ba482ca9bdea19e4cb523e1666341f1a5c SHA512 8bca512b17065adb06aa6d64d8911b0d15f989cdef8de9faef92110d38d90ead5182b78cc99e8071b53015882a6859156ce9afcef7454049ddfd9cc0f69408ce WHIRLPOOL 402a1bc0b91fde4b1303d113ff41b4a7617ae209286c44f56f5cbc91b0e29895af1a8bbb6539556b2fa724090930b4f4188444a5b66b6090fd9b9e325213df75
+EBUILD freebsd-cddl-11.1.ebuild 1664 SHA256 b1fa42270e26a6e786df73c2e65a4966586e8e29b63059f2eca7dc5300994963 SHA512 9540e2ab16ffc95451d3439eef6382484a80ea4a06ee1c65b77e9892159a1ddec1ef74bee79222db6e94e17953e65dec6142caae1a6054d10882ddf832dfa3d1 WHIRLPOOL 493e64886d4c340b753b3f9937974b40f6c5a6165086425abab81a3561d33db41fd99d38fd6b3df585f4c66fe7861610840798acc5d69bf442527213e2838f48
+EBUILD freebsd-cddl-8.2.ebuild 1176 SHA256 ae3be474a44060d80627e40167189a822abbd32d20be86693396a875a24a1a97 SHA512 d3c56ea3410338b56db20132f6f4485e60116bb9d959eca263bda5372e007a650dc23c308dc63e10ef53618531ed7d4f7924dfe2326dc2e9093941f749908a60 WHIRLPOOL 45b4431d24722a8c42188f515abe81f9c87df3a4b27cdf5968f531704e4c52f45b396bd5276ee95eb0c328af7d261023fc6102d2fdd00abe2414f2c66b095008
+EBUILD freebsd-cddl-9.1.ebuild 1477 SHA256 d3c121e6f840d333f4be075db9d16ecea976303396678fc8cc7cee6a5b6d6661 SHA512 22724b107c8fe47f3148eb32982e7e46deb9c18fa9f54af2be7cf2733db83cdc1213fd873b62dd425232fa3dbc08f569fcd1edbdd89bc7b86d283327bd1e8883 WHIRLPOOL 4e777664678a82af1bf33e709789dbd80234e91e4068b6e2d98a70b8c71c06bb5a2f8bf2ec3733d1b6c31712a0893784c27bc9959a225699b9a9cb1e9557e092
+MISC ChangeLog 4478 SHA256 b3015626f5dc8f3c09e5f51b9477be34dd77056ab02b24738b3489ed5c241152 SHA512 c230706f2024b0b9eb90e0981047abda54dd2ba49d484e8aa3bebaaf1de52fb8cd884ca7055bf3e2d92d451f2c911e9f61e68f97a5657a11e9774675cf85138d WHIRLPOOL 9d1fdcdea186d08e7e66d7cc0cec1cd6cc35ff093cea999cd7717a0de4b93dd2d8bf9a239e3fcea32174cbde19976b754622fa55921f78f86ae3fac23218c37a
+MISC ChangeLog-2015 7084 SHA256 863266e79f79fbabe3480a98224819bd49ead871630dcadc547a9520ba275e37 SHA512 ac6b61c9733186e2ce9993bea73949d2043739023f62bef501e95cc40e1af1f35a98a87a013031ccb991396d6e4c2fae61624ca49e60c4784b21ba99f1f8b815 WHIRLPOOL 5e00cc04749d6bd051c150002523df4d62ae9fc7e69f7704802dc6e7657a11d4befa64c4791705ede20cba0f977511c4685bb248816b4d9b09c0a50ea7c62d95
+MISC metadata.xml 238 SHA256 501d93b0c41ed422505100f002758cd173cd9783ae7fbb53e2ec5f238c868340 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d WHIRLPOOL 4ca51d994f011a5e7e4939f02a54b5c2f9f3e526665893c9ac2876c9871b7dc80361393d41c5247b3a5520e82d31d0dd10da520e7715c94b806a94ce0fed2a5a
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
new file mode 100644
index 000000000000..9af7cfbb8c31
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch
@@ -0,0 +1,220 @@
+diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
+index d8bcccb..2cebbcb 100644
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
++LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
++LDFLAGS+= -L${.CURDIR}/../../lib/libumem
++LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
+ 
+diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
+index 262d3e9..9643210 100644
+--- a/cddl/lib/libzfs_core/Makefile
++++ b/cddl/lib/libzfs_core/Makefile
+@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+ 
++LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
++
+ .include <bsd.lib.mk>
+diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
+index 83cefca..55c56d5 100644
+--- a/cddl/lib/libzpool/Makefile
++++ b/cddl/lib/libzpool/Makefile
+@@ -56,6 +56,10 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/thread
+ 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} ${LIBNVPAIR} \
+ 		${LIBAVL} ${LIBUMEM}
+ LDADD=		-lmd -lpthread -lz -lnvpair -lavl -lumem
+diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
+index 1f909aa..2590302 100644
+--- a/cddl/sbin/zfs/Makefile
++++ b/cddl/sbin/zfs/Makefile
+@@ -22,6 +22,12 @@ 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
+ 
++LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
++LDFLAGS+= -L${.CURDIR}/../../lib/libumem
++LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
+ 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+ LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
+diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
+index 4b5b898..f89d010 100644
+--- a/cddl/sbin/zpool/Makefile
++++ b/cddl/sbin/zpool/Makefile
+@@ -27,6 +27,13 @@ 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
+ 
++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/libzfs_core
++
+ DPADD=	${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
+ 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
+ LDADD=	-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
+diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
+index 6cb9529..e76fbc4 100644
+--- a/cddl/usr.bin/ctfconvert/Makefile
++++ b/cddl/usr.bin/ctfconvert/Makefile
+@@ -36,6 +36,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+ 		-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 --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
+index 673c7e3..5fff940 100644
+--- a/cddl/usr.bin/ctfmerge/Makefile
++++ b/cddl/usr.bin/ctfmerge/Makefile
+@@ -33,6 +33,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+ 		-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 --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
+index b6605cb..7028630 100644
+--- a/cddl/usr.bin/zinject/Makefile
++++ b/cddl/usr.bin/zinject/Makefile
+@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
+ 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
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
+ 	${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD=	-lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
+diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
+index 888b9af..523ba44 100644
+--- a/cddl/usr.bin/zstreamdump/Makefile
++++ b/cddl/usr.bin/zstreamdump/Makefile
+@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+ 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 --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
+index f6f7e03..6fed691 100644
+--- a/cddl/usr.bin/ztest/Makefile
++++ b/cddl/usr.bin/ztest/Makefile
+@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+ 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
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ 	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
+ LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
+diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
+index fb5729f..ea9a752 100644
+--- a/cddl/usr.sbin/dtrace/Makefile
++++ b/cddl/usr.sbin/dtrace/Makefile
+@@ -25,4 +25,7 @@ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
+ LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
+ 		-lrtld_db
+ 
++LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
++LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
++
+ .include <bsd.prog.mk>
+diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
+index ccd8189..827a197 100644
+--- a/cddl/usr.sbin/lockstat/Makefile
++++ b/cddl/usr.sbin/lockstat/Makefile
+@@ -20,6 +20,9 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+ 
+ CFLAGS+=	-DNEED_ERRLOC -g
+ 
++LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
++LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
++
+ #YFLAGS+=	-d
+ 
+ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
+diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
+index c2a6b1d..f411fc0 100644
+--- a/cddl/usr.sbin/zdb/Makefile
++++ b/cddl/usr.sbin/zdb/Makefile
+@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+ 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
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+ 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
+diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
+index 1957aad..9a5570a 100644
+--- a/cddl/usr.sbin/zhack/Makefile
++++ b/cddl/usr.sbin/zhack/Makefile
+@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+ CFLAGS+= -I${.CURDIR}/../../lib/libumem
+ 
++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
++LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
++
+ DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+ 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
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
new file mode 100644
index 000000000000..c8ce8e1a2943
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
@@ -0,0 +1,12 @@
+diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
+index 2a66337..04988d7 100644
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -12,6 +12,7 @@ DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ 
+ LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+ 	-lbsdxml -lgeom -lnvpair -lz -lzfs_core
++LDFLAGS+= -L${.CURDIR}/../../lib/libavl
+ 
+ SRCS=	deviceid.c \
+ 	fsshare.c \
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch
new file mode 100644
index 000000000000..46f25217bdac
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch
@@ -0,0 +1,87 @@
+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
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch
new file mode 100644
index 000000000000..839b6b5a7924
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch
@@ -0,0 +1,12 @@
+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}
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
new file mode 100644
index 000000000000..ad5c83eca3de
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
@@ -0,0 +1,114 @@
+diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
+--- cddl.orig/lib/libctf/Makefile	2009-01-24 03:36:33 -0200
++++ cddl/lib/libctf/Makefile	2009-01-24 03:55:10 -0200
+@@ -4,6 +4,7 @@
+ 
+ LIB=		ctf
+ SHLIB_MAJOR=	2
++LDADD+=-lz
+ 
+ SRCS=		ctf_create.c \
+ 		ctf_decl.c \
+diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
+--- cddl.orig/lib/libdtrace/Makefile	2009-01-24 00:18:47 -0200
++++ cddl/lib/libdtrace/Makefile	2009-01-24 03:31:06 -0200
+@@ -74,7 +74,7 @@
+ .endif
+ 
+ LFLAGS+=-l
+-
++LDADD+=-lz -lproc
+ YFLAGS+=-d
+ 
+ CLEANFILES=	dt_errtags.c dt_names.c
+diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
+--- cddl.orig/lib/libzfs/Makefile	2008-06-22 10:26:18 -0300
++++ cddl/lib/libzfs/Makefile	2008-06-22 10:26:26 -0300
+@@ -7,7 +7,8 @@
+
+ LIB=	zfs
+ DPADD=	${LIBUTIL}
+-LDADD=	-lutil
++LDADD=	-lutil -lgeom -lm -luutil -lumem
++LDFLAGS+=      -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem
+
+ SRCS=	deviceid.c \
+ 	mnttab.c \
+diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
+--- cddl.orig/lib/libzpool/Makefile	2008-06-22 10:35:15 -0300
++++ cddl/lib/libzpool/Makefile	2008-06-22 10:37:06 -0300
+@@ -42,7 +42,8 @@
+ CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+ 
+ DPADD=		${LIBPTHREAD} ${LIBZ}
+-LDADD=		-lpthread -lz
++LDADD=		-lpthread -lz -lavl -lumem
++LDFLAGS+=	-L${.CURDIR}/../libavl -L${.CURDIR}/../libumem
+ 
+ # atomic.S doesn't like profiling.
+ NO_PROFILE=
+diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
+--- cddl.orig/sbin/zfs/Makefile	2008-06-22 10:02:30 -0300
++++ cddl/sbin/zfs/Makefile	2008-06-22 10:14:23 -0300
+@@ -23,5 +23,7 @@
+ 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+ LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+ 	-lm -lnvpair -luutil -lutil
++LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
++	-L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
+ 
+ .include <bsd.prog.mk>
+diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
+--- cddl.orig/sbin/zpool/Makefile	2008-06-22 10:02:30 -0300
++++ cddl/sbin/zpool/Makefile	2008-06-22 10:14:47 -0300
+@@ -23,5 +23,7 @@
+ 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+ LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+ 	-lm -lnvpair -luutil -lutil
++LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl  -L/lib -L/usr/lib \
++	-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
+ 
+ .include <bsd.prog.mk>
+diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
+--- cddl.orig/usr.bin/ztest/Makefile	2008-06-22 10:02:30 -0300
++++ cddl/usr.bin/ztest/Makefile	2008-06-22 10:12:40 -0300
+@@ -18,5 +18,7 @@
+ DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+ LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
++LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
++	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
+ 
+ .include <bsd.prog.mk>
+diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
+--- cddl.orig/usr.bin/Makefile.inc   2009-01-10 07:21:10 +0000
++++ cddl/usr.bin/Makefile.inc        2009-01-10 07:18:55 +0000
+@@ -1,5 +1,6 @@
+ # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
+ 
+ BINDIR?=	/usr/bin
++LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
+ 
+ .include "../Makefile.inc"
+--- cddl.orig/usr.sbin/zdb/Makefile	2010-03-11 13:19:48 +0100
++++ cddl/usr.sbin/zdb/Makefile	2010-03-11 13:20:08 +0100
+@@ -22,6 +22,8 @@
+ DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+ 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
+ LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
++LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
++	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs
+ 
+ CSTD=	c99
+ 
+--- cddl.orig/usr.bin/zinject/Makefile	2010-03-11 13:30:32 +0100
++++ cddl/usr.bin/zinject/Makefile	2010-03-11 13:33:27 +0100
+@@ -21,5 +21,8 @@
+ DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
+ 	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+ LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
++LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \
++	-L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \
++	-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool
+ 
+ .include <bsd.prog.mk>
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
new file mode 100644
index 000000000000..a0e567790473
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
@@ -0,0 +1,22 @@
+--- cddl/usr.sbin/dtrace/Makefile.old	2011-07-06 00:09:01.000000000 +0000
++++ 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 \
+--- cddl/usr.sbin/lockstat/Makefile.old	2011-07-06 00:10:33.000000000 +0000
++++ 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} \
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
new file mode 100644
index 000000000000..b3d95bb7741e
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch
@@ -0,0 +1,28 @@
+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>
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
new file mode 100644
index 000000000000..c81a2c3a9cdf
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch
@@ -0,0 +1,167 @@
+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} \
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
new file mode 100644
index 000000000000..ff87d2c6ef9b
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch
@@ -0,0 +1,22 @@
+--- 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=
diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
new file mode 100644
index 000000000000..a62d7fbeb1c2
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zfs.initd
@@ -0,0 +1,23 @@
+#!/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
+}
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
new file mode 100644
index 000000000000..28eba8e8c687
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zvol.initd
@@ -0,0 +1,46 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need hostid
+	before fsck
+}
+
+start() {
+	einfo "Starting zfs volumes..."
+	zfs volinit
+	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..."
+	zfs volfini
+	eend $?
+}
+
+restart() {
+	:
+}
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
new file mode 100644
index 000000000000..c4071474fc2f
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
@@ -0,0 +1,44 @@
+#!/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() {
+	:
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild
new file mode 100644
index 000000000000..44c9ae6d6386
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bsdmk freebsd toolchain-funcs multilib
+
+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}*
+	=sys-freebsd/freebsd-libexec-${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}-10.2-libpaths.patch"
+	"${FILESDIR}/${PN}-10.3-underlink.patch"
+	)
+
+pkg_setup() {
+	# Add the required source files.
+	use build && EXTRACTONLY+="include/ "
+}
+
+src_prepare() {
+	if [[ ! -e "${WORKDIR}/include" ]]; then
+		# Link in include headers.
+		ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
+	fi
+}
+
+src_compile() {
+	# Disable parallel make.
+	freebsd_src_compile -j1
+}
+
+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 zfs_core
+
+	# Install zfs volinit script.
+	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
+
+	# Install zfs script
+	newinitd "${FILESDIR}"/zfs.initd zfs
+
+	keepdir /etc/zfs
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
new file mode 100644
index 000000000000..cebbb02e7f49
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bsdmk freebsd toolchain-funcs multilib
+
+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}*
+	=sys-freebsd/freebsd-libexec-${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
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.1.ebuild
new file mode 100644
index 000000000000..673b4bd19b29
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bsdmk freebsd toolchain-funcs multilib
+
+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
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
new file mode 100644
index 000000000000..32d09d66b25d
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
+SLOT="0"
+KEYWORDS="~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/libedit
+	dev-libs/libelf"
+
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
+
+S="${WORKDIR}/cddl"
+
+PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" "${FILESDIR}/${PN}-8.2-libpaths.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+	# Link in include headers.
+	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
+}
+
+src_install() {
+	freebsd_src_install
+	# Install zfs volinit script.
+	newinitd "${FILESDIR}"/zvol.initd zvol
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.ebuild
new file mode 100644
index 000000000000..9191274069da
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit bsdmk freebsd toolchain-funcs multilib
+
+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
+}
diff --git a/sys-freebsd/freebsd-cddl/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml
new file mode 100644
index 000000000000..a00f3aeb1f81
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-freebsd/freebsd-cddl