diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-09-13 08:32:12 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-09-13 08:32:12 +0000 |
| commit | 8428c2aeb61c9116656ba00f13b4c07681971934 (patch) | |
| tree | 031882fcde9bb4a1f9d56b02e7efea09afdd7742 /net-dns/dnsmasq | |
| parent | Marked ~amd64. (diff) | |
| download | gentoo-2-8428c2aeb61c9116656ba00f13b4c07681971934.tar.gz gentoo-2-8428c2aeb61c9116656ba00f13b4c07681971934.tar.bz2 gentoo-2-8428c2aeb61c9116656ba00f13b4c07681971934.zip | |
Keyword ~x86-fbsd
Add a patch to default dnsmasq.conf location to /etc on fbsd
(Portage version: 2.1.1)
Diffstat (limited to 'net-dns/dnsmasq')
| -rw-r--r-- | net-dns/dnsmasq/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.33.ebuild | 7 | ||||
| -rw-r--r-- | net-dns/dnsmasq/files/dnsmasq-fbsd-config.patch | 15 |
3 files changed, 26 insertions, 3 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/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" |