summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-11-03 02:24:26 +0000
committerRoy Marples <uberlord@gentoo.org>2007-11-03 02:24:26 +0000
commit8d0b60133c547fb7b2cd80c3a36ad48c58483380 (patch)
tree3a1a248193d88794dfbb276ed84797e5d8705657
parentKeyworded ~sparc-fbsd, #197275. (diff)
downloadgentoo-2-8d0b60133c547fb7b2cd80c3a36ad48c58483380.tar.gz
gentoo-2-8d0b60133c547fb7b2cd80c3a36ad48c58483380.tar.bz2
gentoo-2-8d0b60133c547fb7b2cd80c3a36ad48c58483380.zip
Remove the internal hesiod support and use the ebuild instead.
(Portage version: 2.1.3.16)
-rw-r--r--sys-freebsd/freebsd-lib/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild12
2 files changed, 17 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 831a2cc5ed57..73c0310e0866 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-lib
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.57 2007/10/23 12:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.58 2007/11/03 02:24:26 uberlord Exp $
+
+ 03 Nov 2007; Roy Marples <uberlord@gentoo.org> freebsd-lib-6.2-r3.ebuild:
+ Remove the internal hesiod support and use the ebuild instead.
+
+ 03 Nov 2007; Roy Marples <uberlord@gentoo.org> freebsd-lib-6.2-r3.ebuild:
+ Remove the internal hesiod support and use the ebuild instead.
*freebsd-lib-6.2-r3 (23 Oct 2007)
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
index 6eb6111fa85c..69effa620184 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild,v 1.1 2007/10/23 12:02:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r3.ebuild,v 1.2 2007/11/03 02:24:26 uberlord Exp $
inherit bsdmk freebsd flag-o-matic toolchain-funcs
@@ -8,7 +8,7 @@ DESCRIPTION="FreeBSD's base system libraries"
SLOT="6.0"
KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap"
# Crypto is needed to have an internal OpenSSL header
# sys is needed for libalias, probably we can just extract that instead of
@@ -25,6 +25,7 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
RDEPEND="ssl? ( dev-libs/openssl )
+ hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
!sys-freebsd/freebsd-headers"
DEPEND="${RDEPEND}
@@ -60,6 +61,7 @@ pkg_setup() {
use atm || mymakeopts="${mymakeopts} NO_ATM= "
use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+ use hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= "
use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
@@ -126,6 +128,12 @@ src_unpack() {
rm "${x}".bak
done
+ # Don't install the hesiod man page or header
+ rm "${WORKDIR}"/include/hesiod.h || die
+ sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+ sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+ "${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
# from catalyst, then don't do anything else
if use build; then