diff options
Diffstat (limited to 'sys-freebsd/freebsd-cddl')
16 files changed, 0 insertions, 1123 deletions
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest deleted file mode 100644 index 55d9aa4..0000000 --- a/sys-freebsd/freebsd-cddl/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -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 freebsd-cddl-9.2-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643 -AUX zfs.initd 375 SHA256 4d87977d430ba846a0b1c8ef383838891d93b40480d4a2816c94902b0cbe274d SHA512 b70d0c2e6214bb09e1258548f3bbca09aeade26550e27a212d53691d5d5778d3ced78402449612ca753f44e04863382692d12a4777c4e451f9b25a18e34fa221 WHIRLPOOL 7b906d372fcc064ba0780fcbb71c2ce3e734531fbf17679b5d695b851586274df06cf8a99a71b08e544d23f4e27f66765eb0d6e63199d4911abe64ba70f2e5b5 -AUX zvol.initd 845 SHA256 70f237d969b5e539ad1c83fa49b0e5e85d4e2f588e97c1f2e65161edc9c93484 SHA512 18b706cd611858299228a7b74314149fc9a30351f03695accea8a0afbae164acfd8b10df4018b8103273adea1b6e764ca52e0ee3cb07d8f3ff8952b16201edb0 WHIRLPOOL 430d429b43c7be432133859dcd12820362ea03ea4a28a3f335230d66873bcc1658dcbb62e779942de06e7e8a987be30fc968194f31d5431f3b0e3e609509e79a -AUX zvol.initd-9.0 819 SHA256 42d8b9a3eed04273e1638e0e7f7aa1f3b939e925c068260ef11a760fc61b5afb SHA512 1d59d5001ecb0ab4416f4bea8e2f4ff2c7ca19891d23b2a24cd1f389ca66f7cbe3a12bf913633dd90c013b730301dd704c072b94e5d95f7724203d3810314c70 WHIRLPOOL bdb6f1da1c420a254fb12776c0af378619b98c030c0830bcb3fcf2ee6eabf3e89576079d1a31a797e311e9b98d45dfcdf0ea22bddfe7ebc0a1936016474a469b -DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827 -EBUILD freebsd-cddl-11.0.ebuild 1708 SHA256 5639b9aa8083c825eb2e8df97f336dbfde36094072b820363af4f2d5d1bf6d9a SHA512 82579abdd555463b191143c210e57c3db4c179dfaa6365b07632f5f92e9db82ba01f6f7148ca369d4ce84a263293783219c67f7073a6d61166d054c6e8f49f04 WHIRLPOOL 549801fee4dc1270e854dd8029b17f5739670c9fbe716ce041da08e7232b1c9d390ec3ee2d3ee058999a9e7735dba364dc6991ec33c681653fd3ef4ddc73cfee -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 deleted file mode 100644 index 9af7cfb..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch +++ /dev/null @@ -1,220 +0,0 @@ -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 deleted file mode 100644 index c8ce8e1..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 46f2521..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-add-libs.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 deleted file mode 100644 index 839b6b5..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-11.0-workaround.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index ad5c83e..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index a0e5677..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 deleted file mode 100644 index b3d95bb..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-bsdxml.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index c81a2c3..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch +++ /dev/null @@ -1,167 +0,0 @@ -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 deleted file mode 100644 index ff87d2c..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-underlink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/freebsd-cddl-9.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch deleted file mode 100644 index 36eb570..0000000 --- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff --git a/lib/libzfs/Makefile b/lib/libzfs/Makefile -index 5b6b47d..c8549b4 100644 ---- a/lib/libzfs/Makefile -+++ b/lib/libzfs/Makefile -@@ -55,6 +55,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/lib/libzfs_core/Makefile b/lib/libzfs_core/Makefile -index a470fbc..ae8c649 100644 ---- a/lib/libzfs_core/Makefile -+++ b/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/lib/libzpool/Makefile b/lib/libzpool/Makefile -index 417c1cc..838cdb5 100644 ---- a/lib/libzpool/Makefile -+++ b/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} - LDADD= -lmd -lpthread -lz - -diff --git a/sbin/zfs/Makefile b/sbin/zfs/Makefile -index a49d278..b22442e 100644 ---- a/sbin/zfs/Makefile -+++ b/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/sbin/zpool/Makefile b/sbin/zpool/Makefile -index 1884d24..5f06d5f 100644 ---- a/sbin/zpool/Makefile -+++ b/sbin/zpool/Makefile -@@ -26,6 +26,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/usr.bin/ctfconvert/Makefile b/usr.bin/ctfconvert/Makefile -index 7e4a05a..72327ad 100644 ---- a/usr.bin/ctfconvert/Makefile -+++ b/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/usr.bin/ctfmerge/Makefile b/usr.bin/ctfmerge/Makefile -index ba4840e..845d28c 100644 ---- a/usr.bin/ctfmerge/Makefile -+++ b/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/usr.bin/zinject/Makefile b/usr.bin/zinject/Makefile -index 8c5c141..3db2b29 100644 ---- a/usr.bin/zinject/Makefile -+++ b/usr.bin/zinject/Makefile -@@ -19,6 +19,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} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} - LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool -diff --git a/usr.bin/zstreamdump/Makefile b/usr.bin/zstreamdump/Makefile -index 304ff7c..5f0b00e 100644 ---- a/usr.bin/zstreamdump/Makefile -+++ b/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/usr.bin/ztest/Makefile b/usr.bin/ztest/Makefile -index 965300e..ad40a92 100644 ---- a/usr.bin/ztest/Makefile -+++ b/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/usr.sbin/dtrace/Makefile b/usr.sbin/dtrace/Makefile -index 3930f01..4bdbd1a 100644 ---- a/usr.sbin/dtrace/Makefile -+++ b/usr.sbin/dtrace/Makefile -@@ -25,4 +25,7 @@ DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ - LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \ - -lrtld_db - -+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -+LDFLAGS+= -L${.CURDIR}/../../lib/libctf -+ - .include <bsd.prog.mk> -diff --git a/usr.sbin/lockstat/Makefile b/usr.sbin/lockstat/Makefile -index 70515ef..d65e4c3 100644 ---- a/usr.sbin/lockstat/Makefile -+++ b/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/usr.sbin/zdb/Makefile b/usr.sbin/zdb/Makefile -index 8068385..337e324 100644 ---- a/usr.sbin/zdb/Makefile -+++ b/usr.sbin/zdb/Makefile -@@ -23,6 +23,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/usr.sbin/zhack/Makefile b/usr.sbin/zhack/Makefile -index f09d2d8..fc3d7a4 100644 ---- a/usr.sbin/zhack/Makefile -+++ b/usr.sbin/zhack/Makefile -@@ -22,6 +22,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/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd deleted file mode 100644 index 7daf445..0000000 --- a/sys-freebsd/freebsd-cddl/files/zfs.initd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 deleted file mode 100644 index 0f9fcb9..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 deleted file mode 100644 index bfba28f..0000000 --- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 +++ /dev/null @@ -1,45 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild deleted file mode 100644 index 2efbb35..0000000 --- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/metadata.xml b/sys-freebsd/freebsd-cddl/metadata.xml deleted file mode 100644 index a00f3ae..0000000 --- a/sys-freebsd/freebsd-cddl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?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> |