sys-freebsd/*-9.9999: drop patch level.

sys-freebsd/*-9.2.9999_p253912: added FreeBSD 9.2-RC1

4 files changed, 65 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 1073bf5..2c8924a 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,7 +1,8 @@
 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 9212 SHA256 bf53fe0918b5746e269fadf1c1a4986a8f0b41584967f4384f462537663d1f16 SHA512 4920d1002ff2c67f99c112a4a4bf9b0fb6a8e7bab2577d4a7ef4e13d34c8d8c3187d000cd5a86f75edf143393f7a6dc1dfb359255a071b7965be7cb0f0a5f1e5 WHIRLPOOL b77361c90eacaa3f9e2ffb0da699e6bfc7a929eb1da7fa5f43e1c290a4f0a225e32769b23bc184ba744dfc9296fc4481775fef99a237d88682696e6280197643
+AUX freebsd-cddl-9.2-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_p253698.ebuild 1456 SHA256 adc943cda348184935f79a5f8f144d5428e01bff98eba3f49caba8fbb9d8be0c SHA512 73347ff609d6b816410bc18be9ff6bce858adb678b85d941fe05dc58ed1c55704675432793e6ccaf417b060872cc576d81f5d8b9f734e329bfdfedd1d365abfa WHIRLPOOL c0a351cdc43b1dac60a37323a63e3d54dafcf264df441ac046fdb13f9e8b3c55f4be24e8d6226b15d72b4388dd6d0c1d52317816080489202fd9757c800d91bf
+EBUILD freebsd-cddl-9.2.9999_p253912.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3
+EBUILD freebsd-cddl-9.9999.ebuild 1453 SHA256 7df02d86f5c25e34a973a10dd38767822f2f926d167050ee8adc7c325e3defb1 SHA512 17bab0702255841f961c9639ad6a33e5d538b2309b86344b65e7d59421ad599bcb89f49c18742c45f527a692bdf01f738c1e2d39ffb595df3bbaff3e4e8743ed WHIRLPOOL f557b2cb24baf4e8c4b3996abf0eb9f22b5ee86691bc5519f7181a4fe12880bff1434b4b7c71832e580d93bb18da8443d702b53f97c02a56d3de27cab8ce43b3
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
index 36eb570..36eb570 100644
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.9999-libpaths.patch
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.2-libpaths.patch
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999_p253698.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.9999_p253912.ebuild
index 64e8aaf..5749239 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999_p253698.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.2.9999_p253912.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/cddl"
 
-PATCHES=( "${FILESDIR}/${PN}-9.9999-libpaths.patch" )
+PATCHES=( "${FILESDIR}/${PN}-9.2-libpaths.patch" )
 
 src_unpack() {
 	freebsd_src_unpack
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
new file mode 100644
index 0000000..5749239
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 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"
+
+IUSE="build"
+LICENSE="CDDL GPL-2"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+			mirror://gentoo/${CONTRIB}.tar.bz2
+			mirror://gentoo/${UBIN}.tar.bz2
+			mirror://gentoo/${LIB}.tar.bz2
+			mirror://gentoo/${SBIN}.tar.bz2
+			mirror://gentoo/${SYS}.tar.bz2
+			build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
+fi
+
+# 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.2-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
+}