Keyword ~x86-fbsd

Add a patch to default dnsmasq.conf location to /etc on fbsd
Package-Manager: portage-2.1.1

4 files changed, 38 insertions, 11 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 646012b97fe2..df06fba49449 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.100 2006/09/13 04:39:52 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.101 2006/09/13 08:32:12 uberlord Exp $
+
+  13 Sep 2006; Roy Marples <uberlord@gentoo.org>
+  +files/dnsmasq-fbsd-config.patch, dnsmasq-2.33.ebuild:
+  Keyword ~x86-fbsd
+  Add a patch to default dnsmasq.conf location to /etc on fbsd
 
   13 Sep 2006; Jon Portnoy <avenj@gentoo.org> dnsmasq-2.33.ebuild :
   Added net-dns/resolvconf support
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 77d5dcfe15cb..ab4e048bdf83 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,3 +1,7 @@
+AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
+MD5 76c037c6372d10106bfaddc92bc6f898 files/dnsmasq-fbsd-config.patch 451
+RMD160 c9103d329ff429cdadea346db59678815fe3317d files/dnsmasq-fbsd-config.patch 451
+SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359 files/dnsmasq-fbsd-config.patch 451
 AUX dnsmasq-init 612 RMD160 d208b2048fbca19f18949311abbec5fea1080b23 SHA1 9b6a395709a1b2a7e932ab263cfe770b00f95e02 SHA256 6f3503921c6b2448cd7013b4428b633143b00816a3b66fcc8774802e2ff9aa48
 MD5 bd6146f8e6623df5220cd06ceb3d4269 files/dnsmasq-init 612
 RMD160 d208b2048fbca19f18949311abbec5fea1080b23 files/dnsmasq-init 612
@@ -39,14 +43,14 @@ EBUILD dnsmasq-2.32.ebuild 1057 RMD160 539cf491c316881ac7dcef65812b574f570a4bde
 MD5 626fc40777fd6c429f94fda20eddca91 dnsmasq-2.32.ebuild 1057
 RMD160 539cf491c316881ac7dcef65812b574f570a4bde dnsmasq-2.32.ebuild 1057
 SHA256 761eb96831a6607ab467ad69c657beb9f422a8e40929bb2e07cb6dfa2cdc94ab dnsmasq-2.32.ebuild 1057
-EBUILD dnsmasq-2.33.ebuild 1180 RMD160 4b41459d450ede61bcca7cef0eccde2711593f1e SHA1 b2252c244603c3a2b2ce835a613451e1d2b1f11c SHA256 cb6e92e017603289549856fd1c60a4ef7353d96e5984ffd7fddd169ead8a87ad
-MD5 98847ea83c9e57436cb40ed2b871a4e3 dnsmasq-2.33.ebuild 1180
-RMD160 4b41459d450ede61bcca7cef0eccde2711593f1e dnsmasq-2.33.ebuild 1180
-SHA256 cb6e92e017603289549856fd1c60a4ef7353d96e5984ffd7fddd169ead8a87ad dnsmasq-2.33.ebuild 1180
-MISC ChangeLog 12059 RMD160 d93dab08ed4377bb31b17fac228d3aeac4e59fea SHA1 655649a7ffaf94eac1af2b608dcd50c0be8f60fb SHA256 fab0eab34dc8ec8bdb993ec3ac5a32247f1d2d709565aee1e7569d187c79f996
-MD5 828aea94dff593a7fc5868b7e8041ab7 ChangeLog 12059
-RMD160 d93dab08ed4377bb31b17fac228d3aeac4e59fea ChangeLog 12059
-SHA256 fab0eab34dc8ec8bdb993ec3ac5a32247f1d2d709565aee1e7569d187c79f996 ChangeLog 12059
+EBUILD dnsmasq-2.33.ebuild 1316 RMD160 a04532d01d080b079ba8d16c94f0d48707db0d0c SHA1 23d93e471a51ae18f820a0ef2782e1b05cb1bb5e SHA256 edcb40e17eba5f4e1181738be35d07c0c0f510e3f0f332efd1c388ab95c40696
+MD5 ee497fe74abb414fa6917b4349823884 dnsmasq-2.33.ebuild 1316
+RMD160 a04532d01d080b079ba8d16c94f0d48707db0d0c dnsmasq-2.33.ebuild 1316
+SHA256 edcb40e17eba5f4e1181738be35d07c0c0f510e3f0f332efd1c388ab95c40696 dnsmasq-2.33.ebuild 1316
+MISC ChangeLog 12252 RMD160 915e039d98d763f1521eabf5291555ba87b38219 SHA1 fdf8b4c4b863e146dc5bd2bb0f254178089b4adb SHA256 6aa039b152986493f943ccbc44f402ecd5cccdc18ed9d1a96a280bf1bee6da28
+MD5 70e998e4720367960f0c421ae49372fd ChangeLog 12252
+RMD160 915e039d98d763f1521eabf5291555ba87b38219 ChangeLog 12252
+SHA256 6aa039b152986493f943ccbc44f402ecd5cccdc18ed9d1a96a280bf1bee6da28 ChangeLog 12252
 MISC metadata.xml 245 RMD160 81d0c116517a0ed796a727cc156601c038f8462c SHA1 740f14d7efbc4fb579755a1b740af85f20d71d2b SHA256 4c25e96fc0d5c20b7bc313c4a67637523833173070f8badca27273ab6a1b6a02
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
 RMD160 81d0c116517a0ed796a727cc156601c038f8462c metadata.xml 245
diff --git a/net-dns/dnsmasq/dnsmasq-2.33.ebuild b/net-dns/dnsmasq/dnsmasq-2.33.ebuild
index 3c7b2c839205..1af1ff28fffa 100644
--- a/net-dns/dnsmasq/dnsmasq-2.33.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.33.ebuild,v 1.3 2006/09/13 07:16:52 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.33.ebuild,v 1.4 2006/09/13 08:32:12 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="resolvconf"
 
 RDEPEND=""
@@ -25,6 +25,9 @@ S=${WORKDIR}/${PN}-${MY_PV}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
+	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
+	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
 }
 
 src_compile() {
diff --git a/net-dns/dnsmasq/files/dnsmasq-fbsd-config.patch b/net-dns/dnsmasq/files/dnsmasq-fbsd-config.patch
new file mode 100644
index 000000000000..168c8ac80280
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-fbsd-config.patch
@@ -0,0 +1,15 @@
+--- src/config.h.orig	2006-09-12 14:24:54 +0000
++++ src/config.h	2006-09-12 14:25:23 +0000
+@@ -39,11 +39,7 @@
+ #else
+ #   define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+ #endif
+-#if defined(__FreeBSD__)
+-#   define CONFFILE "/usr/local/etc/dnsmasq.conf"
+-#else
+-#   define CONFFILE "/etc/dnsmasq.conf"
+-#endif
++#define CONFFILE "/etc/dnsmasq.conf"
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+ #define CHUSER "nobody"
+ #define CHGRP "dip"