summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-11-24 11:26:01 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-11-24 11:26:01 +0000
commit52ca0c65d81f8cc6526ca8c33829dab55b1f39e8 (patch)
tree411a1fa2bcb7cfc37cb88d40bd412a058d6aca52 /sys-freebsd
parentAdd epatch_user support in freebsd_do_patches, bug #444506 by Yuta SATOH (diff)
downloadgentoo-2-52ca0c65d81f8cc6526ca8c33829dab55b1f39e8.tar.gz
gentoo-2-52ca0c65d81f8cc6526ca8c33829dab55b1f39e8.tar.bz2
gentoo-2-52ca0c65d81f8cc6526ca8c33829dab55b1f39e8.zip
Simplify to call freebsd_src_unpack, bug #444506 by Yuta SATOH
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd')
-rw-r--r--sys-freebsd/freebsd-pam-modules/ChangeLog6
-rw-r--r--sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild11
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index 02c0000605aa..0244b2284176 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-freebsd/freebsd-pam-modules
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.36 2012/11/06 12:55:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.37 2012/11/24 11:26:01 aballier Exp $
+
+ 24 Nov 2012; Alexis Ballier <aballier@gentoo.org>
+ freebsd-pam-modules-9.1_rc3.ebuild:
+ Simplify to call freebsd_src_unpack, bug #444506 by Yuta SATOH
*freebsd-pam-modules-9.1_rc3 (06 Nov 2012)
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild
index c605c0c70315..43838c22c5f6 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild,v 1.1 2012/11/06 12:55:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1_rc3.ebuild,v 1.2 2012/11/24 11:26:01 aballier Exp $
inherit bsdmk freebsd multilib pam
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/lib/libpam/modules
+PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
+
pkg_setup() {
# Avoid installing pam_ssh as that has its own ebuild.
mymakeopts="${mymakeopts} NO_OPENSSH= "
@@ -29,16 +31,11 @@ pkg_setup() {
}
src_unpack() {
- unpack ${A}
-
- cd "${WORKDIR}"/lib
+ freebsd_src_unpack
for module in pam_deny pam_passwdqc pam_permit; do
sed -i -e "s:${module}::" "${S}"/modules.inc
done
-
- # Avoid using static versions; use gentoo /lib/security dir
- epatch "${FILESDIR}"/${PN}-9.0-gentoo.patch
}
src_install() {