summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-freebsd/freebsd-contrib/ChangeLog6
-rw-r--r--sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild16
2 files changed, 6 insertions, 16 deletions
diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 95a281091266..2a95d36f0522 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-contrib
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.45 2013/08/09 21:35:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.46 2013/08/11 19:21:09 aballier Exp $
+
+ 11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+ freebsd-contrib-9.2_rc1.ebuild:
+ Simplify a bit to call freebsd_src_unpack, bug #476646 by Yuta SATOH
*freebsd-contrib-9.2_rc1 (09 Aug 2013)
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild
index 8c9e632e08d0..1c83f8c8db32 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild,v 1.1 2013/08/09 21:35:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.2_rc1.ebuild,v 1.2 2013/08/11 19:21:09 aballier Exp $
inherit bsdmk freebsd flag-o-matic multilib
@@ -20,20 +20,6 @@ DEPEND="=sys-freebsd/freebsd-sources-${RV}*
S="${WORKDIR}/gnu"
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- freebsd_src_unpack
- else
- echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libodialog gnu/usr.bin/sort gnu/usr.bin/patch
- echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
- tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
- freebsd_do_patches
- freebsd_rename_libraries
- fi
-}
-
src_compile() {
cd "${S}/lib/libodialog"
freebsd_src_compile