bump to 8.2

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

3 files changed, 78 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 8966bc3ecb66..495bedc156d8 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.11 2011/07/06 05:51:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.12 2011/07/06 05:55:02 aballier Exp $
+
+*freebsd-cddl-8.2 (06 Jul 2011)
+
+  06 Jul 2011; Alexis Ballier <aballier@gentoo.org> +freebsd-cddl-8.2.ebuild,
+  +files/freebsd-cddl-8.2-libpaths.patch:
+  bump to 8.2
 
   06 Jul 2011; Alexis Ballier <aballier@gentoo.org> files/zvol.initd:
   fix zvol init script
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
new file mode 100644
index 000000000000..a0e567790473
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
@@ -0,0 +1,22 @@
+--- cddl/usr.sbin/dtrace/Makefile.old	2011-07-06 00:09:01.000000000 +0000
++++ cddl/usr.sbin/dtrace/Makefile	2011-07-06 00:09:48.000000000 +0000
+@@ -24,6 +24,8 @@
+ #CFLAGS+=	-DNEED_ERRLOC
+ #YFLAGS+=	-d
+ 
++LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
++
+ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
+ 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
+ LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
+--- cddl/usr.sbin/lockstat/Makefile.old	2011-07-06 00:10:33.000000000 +0000
++++ cddl/usr.sbin/lockstat/Makefile	2011-07-06 00:10:57.000000000 +0000
+@@ -23,6 +23,8 @@
+ 
+ CFLAGS+=	-DNEED_ERRLOC -g
+ 
++LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
++
+ #YFLAGS+=	-d
+ 
+ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
new file mode 100644
index 000000000000..e41054003e3f
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
@@ -0,0 +1,49 @@
+# 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/freebsd-cddl-8.2.ebuild,v 1.1 2011/07/06 05:55:02 aballier Exp $
+
+inherit bsdmk freebsd flag-o-matic eutils
+
+DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
+SLOT="0"
+KEYWORDS="~x86-fbsd"
+
+IUSE="build"
+LICENSE="CDDL"
+
+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/libedit
+	dev-libs/libelf"
+
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
+
+S="${WORKDIR}/cddl"
+
+PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" "${FILESDIR}/${PN}-8.2-libpaths.patch" )
+
+src_unpack() {
+	freebsd_src_unpack
+	# Link in include headers.
+	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
+}
+
+src_install() {
+	freebsd_src_install
+	# Install zfs volinit script.
+	newinitd "${FILESDIR}"/zvol.initd zvol
+}