Fix multilib-strictness and make it compatible with FreeBSD.

Package-Manager: portage-2.0.52-r1

3 files changed, 40 insertions, 17 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index 6a00ffc41a50..cf2f22d90709 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mDNSResponder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.18 2005/09/12 11:42:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.19 2005/09/25 22:19:55 flameeyes Exp $
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mDNSResponder-107.1.ebuild:
+  Fix multilib-strictness and make it compatible with FreeBSD.
 
   12 Sep 2005; Aron Griffis <agriffis@gentoo.org> mDNSResponder-98.ebuild:
   Mark 98 stable on alpha
diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest
index dc8cb551f445..01226247e9bb 100644
--- a/net-misc/mDNSResponder/Manifest
+++ b/net-misc/mDNSResponder/Manifest
@@ -1,14 +1,24 @@
-MD5 8b9973be78c16e99631d189e4ac4c775 mDNSResponder-107.1.ebuild 2146
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 e3228fa5e9074e7ecd1308c9b5a2ef03 ChangeLog 2635
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e110f34bac8e308172df60f7aa54244a ChangeLog 2783
 MD5 8b3554909fb9a64630ea24a3a85d850d mDNSResponder-98.ebuild 1015
-MD5 7087496865b0e264a209619124877965 files/mDNSResponder-98-Makefiles.patch 3631
+MD5 642f4d4d00cc80310934d0f8c3839f5a mDNSResponder-107.1.ebuild 2311
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 526779dd93f31199a9486a8c97b3d859 files/dnsextd.init.d 998
-MD5 dc4d5a4581328c0742083dbf8794512c files/digest-mDNSResponder-107.1 72
 MD5 b74cd777522f1afe94e70f9fe28f8152 files/mDNSResponderPosix.conf.d 67
-MD5 6bfaec39e5143be17c23ebdbdd0ada06 files/mDNSResponderPosix.conf 437
-MD5 854ae89c0e0738fa68590659fe262309 files/digest-mDNSResponder-98 69
 MD5 27629c08c7cc567113bdd270b670feaf files/mdnsd.init.d 845
-MD5 ccbbf27de7cb7a7a00b82ce91dc784ee files/dnsextd.conf.d 426
+MD5 dc4d5a4581328c0742083dbf8794512c files/digest-mDNSResponder-107.1 72
 MD5 3e72df7f18d10cc944d1d2756f75a543 files/mDNSResponderPosix.init.d 1247
+MD5 ccbbf27de7cb7a7a00b82ce91dc784ee files/dnsextd.conf.d 426
+MD5 854ae89c0e0738fa68590659fe262309 files/digest-mDNSResponder-98 69
+MD5 6bfaec39e5143be17c23ebdbdd0ada06 files/mDNSResponderPosix.conf 437
+MD5 7087496865b0e264a209619124877965 files/mDNSResponder-98-Makefiles.patch 3631
 MD5 2550bc56ecb633b4002835a7256d4734 files/mDNSResponder-107.1-Makefiles.patch 5442
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNyKgj5H05b2HAEkRAlZJAJ0U7XgdxpG80RfByEg8s42EliCePQCffvZQ
+hA9MOPBny+++/N/rkzua7vY=
+=LFRq
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild
index fbf2b09eed93..dff5f0566312 100644
--- a/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild
+++ b/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild,v 1.1 2005/08/27 16:46:45 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.1.ebuild,v 1.2 2005/09/25 22:19:55 flameeyes Exp $
 
-inherit eutils
+inherit eutils multilib base
 
 DESCRIPTION="The mDNSResponder project is a component of Bonjour, Apple's initiative for zero-configuration networking."
 HOMEPAGE="http://developer.apple.com/networking/bonjour/index.html"
@@ -13,9 +13,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-Makefiles.patch"
+PATCHES="${FILESDIR}/${P}-Makefiles.patch"
+
+pkg_setup() {
+	if use elibc_FreeBSD; then
+		os=freebsd
+	else
+		os=linux
+	fi
 }
 
 src_compile() {
@@ -25,10 +30,10 @@ src_compile() {
 	fi
 
 	cd ${S}/mDNSPosix
-	emake os=linux ${debug} || die "make mDNSPosix failed"
+	emake os=${os} ${debug} || die "make mDNSPosix failed"
 
 	cd ${S}/Clients
-	emake os=linux ${debug} || die "make Clients failed"
+	emake os=${os} ${debug} || die "make Clients failed"
 }
 
 src_install() {
@@ -49,7 +54,7 @@ src_install() {
 		objdir=debug
 	fi
 
-	emake DESTDIR="${D}" os=linux ${debug} install || die "install failed"
+	make DESTDIR="${D}" os=${os} ${debug} install || die "install failed"
 
 	dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd
 	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix
@@ -69,6 +74,10 @@ src_install() {
 	doins ${FILESDIR}/mDNSResponderPosix.conf
 
 	dodoc ${S}/README.txt
+
+	# Fix multilib-strictness
+	mv ${D}/lib ${D}/$(get_libdir)
+	mv ${D}/usr/lib ${D}/usr/$(get_libdir)
 }
 
 pkg_postinst() {