public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2012-09-11 17:10 Alexis Ballier
  0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2012-09-11 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     f7bc0307105418b1bbbe2c4d0aeb365a8cee6717
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 17:00:16 2012 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 17:00:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=f7bc0307

remove freebsd-cddl, merged to the main tree

---
 sys-freebsd/freebsd-cddl/Manifest                  |   18 --
 .../files/freebsd-cddl-7.1-libpaths.patch          |  102 ------------
 .../files/freebsd-cddl-7.1-xdr_header.patch        |   16 --
 .../files/freebsd-cddl-8.0-libpaths.patch          |  114 -------------
 .../files/freebsd-cddl-8.2-libpaths.patch          |   22 ---
 .../files/freebsd-cddl-9.0-bsdxml.patch            |   28 ----
 .../files/freebsd-cddl-9.0-libpaths.patch          |  167 --------------------
 .../files/freebsd-cddl-9.0-underlink.patch         |   22 ---
 sys-freebsd/freebsd-cddl/files/zfs.initd           |   24 ---
 sys-freebsd/freebsd-cddl/files/zvol.initd          |   47 ------
 sys-freebsd/freebsd-cddl/files/zvol.initd-9.0      |   45 ------
 .../freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild       |   62 -------
 12 files changed, 0 insertions(+), 667 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
deleted file mode 100644
index 70f8517..0000000
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-AUX freebsd-cddl-7.1-libpaths.patch 3739 RMD160 93f97c9d820bc875954ab2b18268a7cc4f107a4a SHA1 ca17300a24df00cafcc4e990dd7727375a2992f5 SHA256 f07e90c67926b5ff1af3b1839797fd95f7eeecb7ec5cd938bb3eaf598de05287
-AUX freebsd-cddl-7.1-xdr_header.patch 380 RMD160 84ca8934581eb1e7728b690edbf0609ac5862265 SHA1 e107524735127ee5b290c64aab786e743e583134 SHA256 cb9d14f3770866c3d07d9aa09067428f0f1de432a7ac60567f57089a43704762
-AUX freebsd-cddl-8.0-libpaths.patch 4418 RMD160 5d21119466909363012ce062a2525d4a7a990b52 SHA1 d01a290b365624e5ddee879fc7347e0ad8b747dc SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c
-AUX freebsd-cddl-8.2-libpaths.patch 822 RMD160 df5cb25f474da011973a1c4cf3acfc833c0f5d39 SHA1 d792e7fcac8c087e59f97db14e222a26f6cf0ad7 SHA256 f6884f9c471f2d1bf522c26b2f2607e9506d7fea9612c24b4392f1e861a1a5db
-AUX freebsd-cddl-9.0-bsdxml.patch 1419 RMD160 41e1a1a1ac5eb17709634a6198b1782768a6066d SHA1 a339d43ef9260faa254d5166fcdc5c18243735bb SHA256 0a5c5f5b242e17d0a378778ec39ff43d410e1efed144dd14a46cbd2cf4a44542
-AUX freebsd-cddl-9.0-libpaths.patch 7621 RMD160 5a6e4429826314892f5309fed3c9645d4cbda0c9 SHA1 77a4f692dbc9cb0480f4ac07a6d10a50ea834fbe SHA256 392593d858b1cbd6c5d6a6da25d9fda48f412d4eb75c0dfeba20cd9e8ad6d762
-AUX freebsd-cddl-9.0-underlink.patch 755 RMD160 fd26244f69dececaf488efe196866b095595d3e3 SHA1 5775f9691c5c64e2165d8f7f8267a5f28c9355a9 SHA256 12d2dbbbb19c7b4920d84d01c48b6cc331b8a244eaaabe72081c7a5c6ff2300c
-AUX zfs.initd 481 RMD160 5a12f8be72bc71d605479f0677d7f31b8d3bff1d SHA1 bad2add2bedef6f110d47afc67c82bd1b139e0b6 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61
-AUX zvol.initd 955 RMD160 cfd7bda7514f8217edc42a7ca103c92b174046fa SHA1 5e5af05dd5a0dc4bda75cf1548387ebe06c5b81c SHA256 6252345dca575d479621de99e4b19a384d76d0db1490fc1048ce742a065e9467
-AUX zvol.initd-9.0 930 RMD160 2a776a61c6c30083b152e57ce607c351f7f8118c SHA1 1bc21a74ae70573f31d4d40e7fec2c8d86e78ca2 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a
-DIST freebsd-cddl-9.1_rc1.tar.bz2 910010 RMD160 54476d310621277b6d56ba6f7ffcff7bfe05dff2 SHA1 f92527d3dd6aa0278fb0882f3c633315c521ce49 SHA256 ac64b78bb3313d811d065bf1f4299897c3fd78d1f976eedf218ae361c56d0fd7
-DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d
-DIST freebsd-include-9.1_rc1.tar.bz2 146409 RMD160 ced0903d8c1eff121e1b5c7acc8da946132227c0 SHA1 7cbaa00e333299eb8453ae551ac983f5333037f3 SHA256 c6febd4ace254d2109375d38c1ec4a960999aa62c1409c9ea9f2d336595d42c5
-DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12
-DIST freebsd-sbin-9.1_rc1.tar.bz2 1275480 RMD160 35c59e08d21e0c500203962717ee5f86654dc303 SHA1 11102237cbb7c5e8ad0f71722287aefa0dd12f0b SHA256 dd97eb984cfc28d8b385c1adfaf6345b04629c7ec64e0b2967500f89dff15e52
-DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f
-DIST freebsd-ubin-9.1_rc1.tar.bz2 1905717 RMD160 9c5a16d07f1cd94e04509426b5cbc7d913256829 SHA1 9e462bfca4d42c694b014f7e62756c5039120931 SHA256 0e79a1e1619915b29f01f3d63393330ab74717e5e7abb290803819db455a4979
-EBUILD freebsd-cddl-9.1_rc1.ebuild 1524 RMD160 76cfbea7ab3f37057fd9f5be4bbce6f9fdde48ef SHA1 6ed1ca77401bb0fd4b58c18b7419628c57ceb2b9 SHA256 d16bcc6fe29047a307bc02f8c6208cda7eaa150c121f69fc74df8db17902909c

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch
deleted file mode 100644
index e50fe5e..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-libpaths.patch
+++ /dev/null
@@ -1,102 +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=	1
-+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,7 @@
-
- LIB=	zfs
- DPADD=	${LIBUTIL}
--LDADD=	-lutil
-+LDADD=	-lutil -lgeom -lm
-
- 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
-+LDFLAGS+=	-L${.CURDIR}/../libavl
- 
- # 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.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile
---- cddl.orig/usr.sbin/zdb/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/usr.sbin/zdb/Makefile	2008-06-22 10:13:31 -0300
-@@ -19,5 +19,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"

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch
deleted file mode 100644
index 0abc089..0000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-7.1-xdr_header.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- sys/cddl/compat/opensolaris/rpc/xdr.h.orig	2007-04-05 22:09:06 -0300
-+++ sys/cddl/compat/opensolaris/rpc/xdr.h	2008-06-22 09:46:28 -0300
-@@ -55,13 +55,6 @@
- 
- #define	XDR_GET_BYTES_AVAIL 1
- 
--struct xdr_bytesrec {
--	bool_t xc_is_last_record;
--	size_t xc_num_avail;
--};
--
--typedef struct xdr_bytesrec xdr_bytesrec;
--
- /*
-  * These are the request arguments to XDR_CONTROL.
-  *

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/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
deleted file mode 100644
index a2b0f97..0000000
--- a/sys-freebsd/freebsd-cddl/files/zfs.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zfs.initd,v 1.1 2012/05/27 06:23:07 naota Exp $
-
-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 100755
index 738ec23..0000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd,v 1.2 2011/07/06 05:51:32 aballier Exp $
-
-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 100755
index 5086680..0000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0,v 1.1 2012/05/12 07:57:13 naota Exp $
-
-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-9.1_rc1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild
deleted file mode 100644
index 1477b4e..0000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.1_rc1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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/${SYS}.tar.bz2
-			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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2013-02-16  9:49 Yuta SATOH
  0 siblings, 0 replies; 6+ messages in thread
From: Yuta SATOH @ 2013-02-16  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     da7727abc0a562f0e282c92c0d97c018e6e8e5b9
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Feb 16 09:48:26 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Feb 16 09:48:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=da7727ab

freebsd-cddl-9.9999-libpaths.patch: Since source code has been changed, update the patch.

http://svnweb.freebsd.org/base?view=revision&revision=246723

---
 sys-freebsd/freebsd-cddl/Manifest                  |    2 +-
 .../files/freebsd-cddl-9.9999-libpaths.patch       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 95c7ec6..84aad7e 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,7 +1,7 @@
 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.9999-libpaths.patch 8332 SHA256 ccf18ef3daf9afe5509d95b7c01f868d613f8b597ca1abf5592a6f6ffbd86703 SHA512 edf2b63851b9fe9047e6a638a9e8697629a3c3cfb8800ff8d5d556efc5568e4c4a607d507fae067a98b329ffae54a3bbd14fa441e1bdecae1a96cbb4e29afd6e WHIRLPOOL f8e36d2c75b25ec78df65aa064a594a1b0335ee80c08038e456c71face42ea0b515eef5dd7d01ab8ad16f524aa939cfba5bbf4a8e49b7b6827ce97a60cd13978
+AUX freebsd-cddl-9.9999-libpaths.patch 8350 SHA256 7c2fef14078fb41396d928931ec4da7fa79bebb24dd17bf4d35f0f1845068fb7 SHA512 10ffe639b1e26d866ead6fdfad549692896e4f43f9b2b9a0076da7b317911cc8ed2bdcdde321c7100d259d0fe81a63145ec6155c49b94daba0464f5be290edb9 WHIRLPOOL 3c744c39bcfd3e63aabc1984f77d7b42846aadf7f807eb03431903322f0c4782920315ae19cb157213013282dd237c44d5a56565974d0d2a0808ba2f4add47bf
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 EBUILD freebsd-cddl-9.9999.ebuild 1456 SHA256 adc943cda348184935f79a5f8f144d5428e01bff98eba3f49caba8fbb9d8be0c SHA512 73347ff609d6b816410bc18be9ff6bce858adb678b85d941fe05dc58ed1c55704675432793e6ccaf417b060872cc576d81f5d8b9f734e329bfdfedd1d365abfa WHIRLPOOL c0a351cdc43b1dac60a37323a63e3d54dafcf264df441ac046fdb13f9e8b3c55f4be24e8d6226b15d72b4388dd6d0c1d52317816080489202fd9757c800d91bf

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
index e5bd0ab..af44eed 100644
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
@@ -36,9 +36,9 @@ diff -Nur cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
 +LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
 +LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
 +
- DPADD=	${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
+ DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
  	${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
- LDADD=	-lgeom -lnvpair -lumem -lutil -luutil -lzfs
+ LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
 diff -Nur cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
 --- cddl.orig/sbin/zpool/Makefile	2012-12-31 18:30:35.000000000 +0900
 +++ cddl/sbin/zpool/Makefile	2012-12-31 18:31:12.000000000 +0900


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2013-04-20  9:44 Yuta SATOH
  0 siblings, 0 replies; 6+ messages in thread
From: Yuta SATOH @ 2013-04-20  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c7a25987e1cc495e7b6b2e3312ce6e3776cc7a8b
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Apr 20 09:44:38 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Apr 20 09:44:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=c7a25987

freebsd-cddl-9.9999-libpaths.patch: Since source code has been changed, update the patch.

---
 sys-freebsd/freebsd-cddl/Manifest                  |    2 +-
 .../files/freebsd-cddl-9.9999-libpaths.patch       |  202 +++++++++++---------
 2 files changed, 116 insertions(+), 88 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 84aad7e..7aae9ff 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,7 +1,7 @@
 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.9999-libpaths.patch 8350 SHA256 7c2fef14078fb41396d928931ec4da7fa79bebb24dd17bf4d35f0f1845068fb7 SHA512 10ffe639b1e26d866ead6fdfad549692896e4f43f9b2b9a0076da7b317911cc8ed2bdcdde321c7100d259d0fe81a63145ec6155c49b94daba0464f5be290edb9 WHIRLPOOL 3c744c39bcfd3e63aabc1984f77d7b42846aadf7f807eb03431903322f0c4782920315ae19cb157213013282dd237c44d5a56565974d0d2a0808ba2f4add47bf
+AUX freebsd-cddl-9.9999-libpaths.patch 9334 SHA256 f65e92ca7c67d0a791e4cabb0566186df84a47b47efc286837a1f654a8bfdaf1 SHA512 a71c27a633902ff4068de429b0fb469c40e40966b39891b716f5008b505f7c451accedecefca4953868e013c0e16db1dd3f2ad02dbadc5705676076143c5df19 WHIRLPOOL 97eadde23a2838b72418a0b9c6ca808596d2a42b2c7d4b4da6d1d74fe5eb3a2f83a739a0bb9ca3da9973b6e970026fd2aa6740ef7aca3e0f1417f79eebfe3c41
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 EBUILD freebsd-cddl-9.9999.ebuild 1456 SHA256 adc943cda348184935f79a5f8f144d5428e01bff98eba3f49caba8fbb9d8be0c SHA512 73347ff609d6b816410bc18be9ff6bce858adb678b85d941fe05dc58ed1c55704675432793e6ccaf417b060872cc576d81f5d8b9f734e329bfdfedd1d365abfa WHIRLPOOL c0a351cdc43b1dac60a37323a63e3d54dafcf264df441ac046fdb13f9e8b3c55f4be24e8d6226b15d72b4388dd6d0c1d52317816080489202fd9757c800d91bf

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
index af44eed..8779c39 100644
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
@@ -1,33 +1,50 @@
-diff -Nur cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.orig/lib/libzfs/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/lib/libzfs/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -55,4 +55,8 @@
+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
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/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 -Nur cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.orig/lib/libzpool/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/lib/libzpool/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -56,6 +56,10 @@
+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
++LDFLAGS+=	-L${.CURDIR}/../../lib/libavl
++LDFLAGS+=	-L${.CURDIR}/../../lib/libnvpair
++LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
 +
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
  LDADD=		-lmd -lpthread -lz
  
-diff -Nur cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.orig/sbin/zfs/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/sbin/zfs/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -21,6 +21,11 @@
+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
  
@@ -35,14 +52,16 @@ diff -Nur cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
 +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}
- LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs
-diff -Nur cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.orig/sbin/zpool/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/sbin/zpool/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -26,6 +26,12 @@
+ 	${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
  
@@ -51,14 +70,16 @@ diff -Nur cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
 +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}
- LDADD=	-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
-diff -Nur cddl.orig/usr.bin/ctfconvert/Makefile cddl/usr.bin/ctfconvert/Makefile
---- cddl.orig/usr.bin/ctfconvert/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.bin/ctfconvert/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -36,6 +36,8 @@
+ 	${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
  
@@ -67,10 +88,11 @@ diff -Nur cddl.orig/usr.bin/ctfconvert/Makefile cddl/usr.bin/ctfconvert/Makefile
  DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
  LDADD=		-lctf -ldwarf -lelf -lz -lpthread
  
-diff -Nur cddl.orig/usr.bin/ctfmerge/Makefile cddl/usr.bin/ctfmerge/Makefile
---- cddl.orig/usr.bin/ctfmerge/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.bin/ctfmerge/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -33,6 +33,8 @@
+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
  
@@ -79,10 +101,11 @@ diff -Nur cddl.orig/usr.bin/ctfmerge/Makefile cddl/usr.bin/ctfmerge/Makefile
  DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
  LDADD=		-lctf -ldwarf -lelf -lz -lpthread
  
-diff -Nur cddl.orig/usr.bin/zinject/Makefile cddl/usr.bin/zinject/Makefile
---- cddl.orig/usr.bin/zinject/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.bin/zinject/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -19,6 +19,13 @@
+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
  
@@ -92,14 +115,16 @@ diff -Nur cddl.orig/usr.bin/zinject/Makefile cddl/usr.bin/zinject/Makefile
 +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} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-diff -Nur cddl.orig/usr.bin/zstreamdump/Makefile cddl/usr.bin/zstreamdump/Makefile
---- cddl.orig/usr.bin/zstreamdump/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.bin/zstreamdump/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -18,6 +18,11 @@
+ 	${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
  
@@ -111,58 +136,58 @@ diff -Nur cddl.orig/usr.bin/zstreamdump/Makefile cddl/usr.bin/zstreamdump/Makefi
  DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
  	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
  LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff -Nur cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
---- cddl.orig/usr.bin/ztest/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.bin/ztest/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -18,6 +18,11 @@
+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} ${LIBUUTIL}
- LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs -luutil
-diff -Nur cddl.orig/usr.sbin/dtrace/Makefile.rej cddl/usr.sbin/dtrace/Makefile.rej
---- cddl.orig/usr.sbin/dtrace/Makefile.rej	1970-01-01 09:00:00.000000000 +0900
-+++ cddl/usr.sbin/dtrace/Makefile.rej	2012-12-31 18:31:12.000000000 +0900
-@@ -0,0 +1,17 @@
-+***************
-+*** 20,25 ****
-+  #CFLAGS+=	-DNEED_ERRLOC
-+  #YFLAGS+=	-d
-+  
-+  DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
-+  		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
-+  LDADD=		-lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lutil \
-+--- 20,27 ----
-+  #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 -ll -lproc -lctf -lelf -lz -lutil \
-diff -Nur cddl.orig/usr.sbin/lockstat/Makefile cddl/usr.sbin/lockstat/Makefile
---- cddl.orig/usr.sbin/lockstat/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.sbin/lockstat/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -20,6 +20,8 @@
+ 	${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
+@@ -20,6 +20,9 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
+ #CFLAGS+=	-DNEED_ERRLOC
+ #YFLAGS+=	-d
+ 
++LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
++LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
++
+ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
+ 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
+ LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
+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 -L${.CURDIR}/../../lib/libctf
++LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
++LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
 +
  #YFLAGS+=	-d
  
  DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
-diff -Nur cddl.orig/usr.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile
---- cddl.orig/usr.sbin/zdb/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.sbin/zdb/Makefile	2012-12-31 18:31:12.000000000 +0900
-@@ -23,6 +23,13 @@
+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
  
@@ -172,14 +197,16 @@ diff -Nur cddl.orig/usr.sbin/zdb/Makefile cddl/usr.sbin/zdb/Makefile
 +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} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
-diff -Nur cddl.orig/usr.sbin/zhack/Makefile cddl/usr.sbin/zhack/Makefile
---- cddl.orig/usr.sbin/zhack/Makefile	2012-12-31 18:30:35.000000000 +0900
-+++ cddl/usr.sbin/zhack/Makefile	2012-12-31 18:32:26.000000000 +0900
-@@ -22,6 +22,12 @@
+ 	${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
  
@@ -188,7 +215,8 @@ diff -Nur cddl.orig/usr.sbin/zhack/Makefile cddl/usr.sbin/zhack/Makefile
 +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} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
+ 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
+ LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2013-04-20 10:00 Yuta SATOH
  0 siblings, 0 replies; 6+ messages in thread
From: Yuta SATOH @ 2013-04-20 10:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0404b5806a8ec0071bee80dcb4bb3b74db63101c
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Sat Apr 20 10:00:16 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Sat Apr 20 10:00:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=0404b580

freebsd-cddl-9.9999-libpaths.patch: fixed to be applied correctly.

---
 sys-freebsd/freebsd-cddl/Manifest                  |    2 +-
 .../files/freebsd-cddl-9.9999-libpaths.patch       |   10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 7aae9ff..072f354 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,7 +1,7 @@
 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.9999-libpaths.patch 9334 SHA256 f65e92ca7c67d0a791e4cabb0566186df84a47b47efc286837a1f654a8bfdaf1 SHA512 a71c27a633902ff4068de429b0fb469c40e40966b39891b716f5008b505f7c451accedecefca4953868e013c0e16db1dd3f2ad02dbadc5705676076143c5df19 WHIRLPOOL 97eadde23a2838b72418a0b9c6ca808596d2a42b2c7d4b4da6d1d74fe5eb3a2f83a739a0bb9ca3da9973b6e970026fd2aa6740ef7aca3e0f1417f79eebfe3c41
+AUX freebsd-cddl-9.9999-libpaths.patch 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 EBUILD freebsd-cddl-9.9999.ebuild 1456 SHA256 adc943cda348184935f79a5f8f144d5428e01bff98eba3f49caba8fbb9d8be0c SHA512 73347ff609d6b816410bc18be9ff6bce858adb678b85d941fe05dc58ed1c55704675432793e6ccaf417b060872cc576d81f5d8b9f734e329bfdfedd1d365abfa WHIRLPOOL c0a351cdc43b1dac60a37323a63e3d54dafcf264df441ac046fdb13f9e8b3c55f4be24e8d6226b15d72b4388dd6d0c1d52317816080489202fd9757c800d91bf

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
index 8779c39..36eb570 100644
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
@@ -159,16 +159,14 @@ 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
-@@ -20,6 +20,9 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- #CFLAGS+=	-DNEED_ERRLOC
- #YFLAGS+=	-d
+@@ -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
 +
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
- 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
+ .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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2013-08-30 18:30 Yuta SATOH
  0 siblings, 0 replies; 6+ messages in thread
From: Yuta SATOH @ 2013-08-30 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3fc4f2d09fd25375f1b48ae0f7e558c89b8aa94c
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 18:01:02 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 18:01:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=3fc4f2d0

freebsd-cddl-9.2-underlink.patch: syncd latest tree.

---
 sys-freebsd/freebsd-cddl/Manifest                               | 2 +-
 sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index b29ef68..3dc951b 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -2,7 +2,7 @@ AUX freebsd-cddl-9.0-bsdxml.patch 1419 SHA256 0a5c5f5b242e17d0a378778ec39ff43d41
 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 freebsd-cddl-9.2-underlink.patch 924 SHA256 d60e1ce05468ed95b9179c819693f0eb3bbbf89e79fc2d1622d81858aa84bf2d SHA512 aca1093f050463d9fa3feefda73c1e150f5fff79d44079aa10d14ab972dfedcb0fec27e931972e5f518716b4bdcff0c05b66d134fffe57ee546c4e5cdc53bcea WHIRLPOOL 2257ceb51964183694dae2c561c658266f436396d3788dd76963216ce7a06dff6b6b4aa2b02508a9e2c4dc943cf580d8002947ec493dc15e97029dfbe540b22d
+AUX freebsd-cddl-9.2-underlink.patch 967 SHA256 43ede354a9e0e3db0496eeccaf64a9746ea19bc2ba141be2ad6fc1b493f34e42 SHA512 8b26c0937abf9a2811d6d7842f9b236ba19435b1ea2d6f028b77bcb397cf395b555c3d5d23afeec000143709e56154d167b2acb89941bdb70d068516ec9c462b WHIRLPOOL a89f3599eac2893c01f3143f25aff8cdc1bb1f9149b33ab7b9d87aaf1a1d6df99df29d601941d3285ed51c34d3c303a59bd033e904aca53605e8b33839f88d66
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 EBUILD freebsd-cddl-9.9999.ebuild 1488 SHA256 492cdc15fef9e873347cd200c0394b0ffe0826f2074b014f34f372982bb368b7 SHA512 19d4ace1b3b755a2b283498fe1f2264e757cd67611dc0f8fc847e9175aaa5152ed6cf0ac27a8e1abaa26c2d7a1ea42b386d240356b88f3ec8d03831b13bf1abe WHIRLPOOL 6aa2289d3176b5e185f3fc262edc18820c0ca8ee2d1dc703c9ee5847414b6457c8c4a1ee560e4793dd8aa492054ba39e540c5c3fb38b94d03c7bccb4e8c75fa1

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
index 19d1e30..be1ff9f 100644
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-underlink.patch
@@ -1,12 +1,14 @@
 diff -uNr cddl.old/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
 --- cddl.old/lib/libzfs/Makefile	2013-08-09 17:37:00.000000000 -0400
 +++ cddl/lib/libzfs/Makefile	2013-08-09 17:44:08.000000000 -0400
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,9 @@
  LIB=	zfs
  DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
  	${LIBZFS_CORE}
 -LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core
 +LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core -lgeom -luutil -lavl
++
++LDFLAGS+= -L${.CURDIR}/../../lib/libavl
  
  SRCS=	deviceid.c \
  	fsshare.c \


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/
@ 2014-07-13  3:14 Yuta SATOH
  0 siblings, 0 replies; 6+ messages in thread
From: Yuta SATOH @ 2014-07-13  3:14 UTC (permalink / raw
  To: gentoo-commits

commit:     988af59ad620922060d41949a22e40d13ce650e5
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Thu May 29 15:00:49 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Thu May 29 15:00:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=988af59a

added freebsd-cddl-9.3-underlink.patch

---
 sys-freebsd/freebsd-cddl/Manifest                  |  3 ++-
 .../files/freebsd-cddl-9.3-underlink.patch         | 27 ++++++++++++++++++++++
 .../freebsd-cddl/freebsd-cddl-9.9999.ebuild        |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 5e7a6f4..ffea7ac 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -3,7 +3,8 @@ AUX freebsd-cddl-9.0-libpaths.patch 7621 SHA256 392593d858b1cbd6c5d6a6da25d9fda4
 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 freebsd-cddl-9.2-underlink.patch 967 SHA256 43ede354a9e0e3db0496eeccaf64a9746ea19bc2ba141be2ad6fc1b493f34e42 SHA512 8b26c0937abf9a2811d6d7842f9b236ba19435b1ea2d6f028b77bcb397cf395b555c3d5d23afeec000143709e56154d167b2acb89941bdb70d068516ec9c462b WHIRLPOOL a89f3599eac2893c01f3143f25aff8cdc1bb1f9149b33ab7b9d87aaf1a1d6df99df29d601941d3285ed51c34d3c303a59bd033e904aca53605e8b33839f88d66
+AUX freebsd-cddl-9.3-underlink.patch 942 SHA256 f5a0139191b98584832075f22880e6ea9212a835cbb1e9aa15fa4e9364758a15 SHA512 67777ff41978c4e90c6e73f6cd2736732b838f42cc4e86f3d47bc5928f7ff4fcedfab84d599156255d243f81fc5a00daa0534ec6704ff820478fab39ce8dafbd WHIRLPOOL a7640e2be2a4fa97932a86a1f4dd68709f83d57a8bf5d043fa4f413474560c73960264fa3687b0154c568365c97d1a928511e207135be53f08acf65845dd6b99
 AUX zfs.initd 481 SHA256 8078bfd9241d694ca97364044ce5386015669a5102ef3702be0b1b1d70fdab61 SHA512 9734a3faeb2c5d555a311fd71821c249bb110c221f973f7efe9c3d2bb150286ec68e60e3fcb7639b7b62804484d4d2fce34465ef89568aa946243f729bb9a843 WHIRLPOOL 766477f8743f0b1c898860a2904d31a2b725cbdfa4aacc8a3ae8790361f693d0cbe74ed932eb3e8e993e5fd5b9de3d15fcf175528f7e060dee311ccc77336e5c
 AUX zvol.initd-9.0 930 SHA256 5b3aed77ab896f1d522d36c697718afe69cf5799a753c704c4beae7ec1c6b44a SHA512 998864b0a7b6f8765311e604b3f1e22d59ccf329bd6d0b9e8649f6da49e42832babee26a837516de99e6a949d6f933b9952cfe98687b274c031f6d07375372f3 WHIRLPOOL 361f8bcb86c9274757f1a087bc935bfe708ba2ac3b6ae945e62fb59080322b4ded2dfc8d2a6862529b9e661aeeb8ffe0782aedcf535f784761f0c26dfc7f7d87
 EBUILD freebsd-cddl-10.0.0.9999.ebuild 1510 SHA256 f987838a5db4415b187ba6dbb283320a19d70eb69ae4e3816fff87699d788d73 SHA512 9d4223729e66cee65cfa448ac88c4eea049fc83caeba83aec7a6b1bc06465020073e7084c67fef1315b89e2f9704d5779acd28c0145265afd1acd723116b67ae WHIRLPOOL d4c007208fc9c0383f29672573e39135670cfe63c97890ca75271472c64c956527ea1adf2ee33bdeac5d9ee230bf2391a20bfc0bcad213b14f700ce56ffaaf09
-EBUILD freebsd-cddl-9.9999.ebuild 1536 SHA256 554b77961c6c7df25fcc0dc3af38c80d4f52f4967cf37c2b772dab576fe02b51 SHA512 7bf1e533aa4900f844751391fd84bc11b86e5f8acdb45326db7173acea393dd5ed6f4de14e99d9742180d561eb933f6a8d39ac9b7b88eab764933d678a208f15 WHIRLPOOL 5592afee4f4ed8828957b4537b03354793a410dbc59cac6949c5e7df0486d166f83d170273f70ed7cc7680235244013d7e002a5b9bdbf27ffbe831f3f47666f3
+EBUILD freebsd-cddl-9.9999.ebuild 1536 SHA256 f91f1dd41730b250c7826dfd3f52f2bc791fe7281d7b8b788245d561963620a4 SHA512 58264f74d15f8791b303db1fa9ab771f342e429e68aead739d2548a68794ea5d878d0a9367d654bc84a7371f03cc44e469b83811f5262d7c437380608ad2af1e WHIRLPOOL ad44c4523b5234beb73ffaff40a4b3ad4a437cbe851392bc9b0e8f7208ca391b77af5b407c0e805ea4508bc891414c6b0effa300bf9d9601bdb3fd52f0840fd2

diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch
new file mode 100644
index 0000000..62d5326
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.3-underlink.patch
@@ -0,0 +1,27 @@
+diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
+index cc0f363..065281f 100644
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -8,7 +8,8 @@
+ LIB=	zfs
+ DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
+ 	${LIBAVL} ${LIBZFS_CORE}
+-LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
++LDADD=	-lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core -lgeom -luutil
++LDFLAGS+= -L${.CURDIR}/../../lib/libavl
+ 
+ SRCS=	deviceid.c \
+ 	fsshare.c \
+diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
+index 61c4788..4888cc7 100644
+--- a/cddl/lib/libzpool/Makefile
++++ b/cddl/lib/libzpool/Makefile
+@@ -61,7 +61,7 @@ LDFLAGS+=	-L${.CURDIR}/../../lib/libnvpair
+ LDFLAGS+=	-L${.CURDIR}/../../lib/libumem
+ 
+ DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
+-LDADD=		-lmd -lpthread -lz
++LDADD=		-lmd -lpthread -lz -lumem -lavl
+ 
+ # atomic.S doesn't like profiling.
+ NO_PROFILE=

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
index 69f8a72..677ed95 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}/cddl"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.2-libpaths.patch"
-	"${FILESDIR}/${PN}-9.2-underlink.patch"
+	"${FILESDIR}/${PN}-9.3-underlink.patch"
 	)
 
 src_unpack() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-13  3:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 17:10 [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-cddl/files/, sys-freebsd/freebsd-cddl/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2013-02-16  9:49 Yuta SATOH
2013-04-20  9:44 Yuta SATOH
2013-04-20 10:00 Yuta SATOH
2013-08-30 18:30 Yuta SATOH
2014-07-13  3:14 Yuta SATOH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox