[patch] backport patch for freebsd-rescue-9.1.ebuild

454508-freebsd-rescue-9.1.ebuild.patch (text/plain), 1.92 KB, created by Yuta SATOH on 2013-08-13 13:34:00 UTC

diff --git a/freebsd-rescue-9.1.ebuild b/freebsd-rescue-9.1.ebuild
index 1a67171..cf889c3 100644
--- a/freebsd-rescue-9.1.ebuild
+++ b/freebsd-rescue-9.1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-9.1.ebuild,v 1.1 2013/01/27 21:27:12 aballier Exp $
 
-EAPI=2
+EAPI=5
 
-inherit bsdmk freebsd
+inherit bsdmk freebsd toolchain-funcs
 
 DESCRIPTION="FreeBSD's rescue binaries"
 SLOT="0"
@@ -27,7 +27,6 @@ SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
 
 RDEPEND=""
 DEPEND="sys-devel/flex
-	>=app-arch/libarchive-3.0.3[static-libs]
 	app-arch/xz-utils[static-libs]
 	sys-libs/ncurses[static-libs]
 	dev-libs/expat[static-libs]
@@ -37,10 +36,10 @@ DEPEND="sys-devel/flex
 	dev-libs/openssl[static-libs]
 	sys-libs/zlib[static-libs]
 	sys-libs/readline[static-libs]
-	virtual/pkgconfig
 	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
 	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
+	=sys-freebsd/freebsd-mk-defs-${RV}*
+	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
 
 S="${WORKDIR}/rescue"
 
@@ -49,14 +48,25 @@ pkg_setup() {
 	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
 	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+	mymakeopts="${mymakeopts} NO_PIC= "
 }
 
 src_prepare() {
 	# As they are patches from ${WORKDIR} apply them by hand
 	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
 	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-	epatch "${FILESDIR}/${PN}"-9.1-libcleverlink.patch
-	epatch "${FILESDIR}/${PN}"-9.1-bsdtar.patch
 	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
 }
+
+src_compile() {
+	tc-export CC
+
+	cd "${WORKDIR}/lib/libarchive"
+	echo "#include <expat.h>" > bsdxml.h
+	freebsd_src_compile
+	export CC="${CC} -L${WORKDIR}/lib/libarchive"
+
+	cd "${S}"
+	freebsd_src_compile
+}
+