Add patch to fix compilation on bsd, clean out some stale files and previous version.

(Portage version: 2.1.2-r9)

7 files changed, 40 insertions, 85 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index ec7031a2a7e1..ea3e999fddc0 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.110 2007/02/05 17:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.111 2007/02/08 15:28:18 chutzpah Exp $
+
+  08 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  -files/dnsmasq232-ldflags.diff, +files/dnsmasq-2.37-bsd.patch,
+  -files/dnsmasq221-netlink.diff, -dnsmasq-2.36.ebuild, dnsmasq-2.37.ebuild:
+  Add patch to fix compilation on bsd, clean out some stale files and previous
+  version.
 
 *dnsmasq-2.37 (05 Feb 2007)
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.36.ebuild b/net-dns/dnsmasq/dnsmasq-2.36.ebuild
deleted file mode 100644
index 0561404fde53..000000000000
--- a/net-dns/dnsmasq/dnsmasq-2.36.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.36.ebuild,v 1.2 2007/01/26 03:56:26 chutzpah Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${P/_/}"
-MY_PV="${PV/_rc*/}"
-DESCRIPTION="Small forwarding DNS server"
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-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 ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dbus isc resolvconf tftp"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.51
-	dbus? ( sys-apps/dbus )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
-
-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() {
-	use tftp || append-flags -DNO_TFTP
-	use dbus && sed -i '$ a #define HAVE_DBUS' src/config.h
-	use isc && sed -i '$ a #define HAVE_ISC_READER' src/config.h
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make \
-		PREFIX=/usr \
-		MANDIR=/usr/share/man \
-		DESTDIR="${D}" \
-		install || die
-	dodoc CHANGELOG FAQ
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/dnsmasq-init dnsmasq
-	newconfd "${FILESDIR}"/dnsmasq.confd dnsmasq
-	insinto /etc
-	newins dnsmasq.conf.example dnsmasq.conf
-
-	if use resolvconf ; then
-		exeinto /etc/resolvconf/update.d
-		newexe ${FILESDIR}/resolvconf.dnsmasq dnsmasq
-	fi
-}
diff --git a/net-dns/dnsmasq/dnsmasq-2.37.ebuild b/net-dns/dnsmasq/dnsmasq-2.37.ebuild
index 74b700b11cbf..e0d5b441cf67 100644
--- a/net-dns/dnsmasq/dnsmasq-2.37.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.37.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/net-dns/dnsmasq/dnsmasq-2.37.ebuild,v 1.1 2007/02/05 17:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.37.ebuild,v 1.2 2007/02/08 15:28:18 chutzpah Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -29,6 +29,9 @@ src_unpack() {
 
 	# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
 	epatch "${FILESDIR}/${PN}-fbsd-config.patch"
+
+	# fix compiliationn on bsd
+	epatch "${FILESDIR}/${P}-bsd.patch"
 }
 
 src_compile() {
diff --git a/net-dns/dnsmasq/files/digest-dnsmasq-2.36 b/net-dns/dnsmasq/files/digest-dnsmasq-2.36
deleted file mode 100644
index f046a4c2cf28..000000000000
--- a/net-dns/dnsmasq/files/digest-dnsmasq-2.36
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 392bf22dbff84eae010e149f15cd4136 dnsmasq-2.36.tar.gz 268105
-RMD160 14d1616cb0d57addf4afa3a9725a97cf5f479884 dnsmasq-2.36.tar.gz 268105
-SHA256 0acc17cf059bb9b0ecde9a57ca5f09aadfebf99fe6b4ebcddf5800875aee3242 dnsmasq-2.36.tar.gz 268105
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
new file mode 100644
index 000000000000..dd7e42c549d5
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.37-bsd.patch
@@ -0,0 +1,29 @@
+--- src/rfc2131.c.orig	2007-02-07 20:52:07.000000000 +0000
++++ src/rfc2131.c	2007-02-06 22:13:02.000000000 +0000
+@@ -101,16 +101,22 @@
+ {
+   if (hwlen == 0 && clid && clid_len > 3)
+     {
+-      if ((clid[0] ==  ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394) || clid[0]  == hwtype)
++      if (clid[0]  == hwtype)
+ 	{
+ 	  *len_out = clid_len - 1 ;
+ 	  return clid + 1;
+ 	}
+-      else
++
++#if defined(ARPHRD_EUI64) && defined(ARPHRD_IEEE1394)
++      if (clid[0] ==  ARPHRD_EUI64 && hwtype == ARPHRD_IEEE1394)
+ 	{
+-	  *len_out = clid_len;
+-	  return clid;
++	  *len_out = clid_len - 1 ;
++	  return clid + 1;
+ 	}
++#endif
++      
++      *len_out = clid_len;
++      return clid;
+     }
+   
+   *len_out = hwlen;
diff --git a/net-dns/dnsmasq/files/dnsmasq221-netlink.diff b/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
deleted file mode 100644
index 221114765434..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq221-netlink.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN dnsmasq-2.21.orig/src/netlink.c dnsmasq-2.21/src/netlink.c
---- dnsmasq-2.21.orig/src/netlink.c  2005-03-13 10:37:44.000000000 +0100
-+++ dnsmasq-2.21/src/netlink.c  2005-03-24 12:31:52.000000000 +0100
-@@ -16,6 +16,7 @@
-
- #ifdef HAVE_RTNETLINK
-
-+#include <linux/types.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
diff --git a/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff b/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff
deleted file mode 100644
index 1eb7deb859ae..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq232-ldflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- bld/Makefile	2006-06-08 21:22:22.000000000 +0200
-+++ bld/Makefile	2006-06-08 21:22:56.000000000 +0200
-@@ -9,7 +9,7 @@
- 	$(CC) $(CFLAGS) $(COPTS) $(I18N) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1` $(RPM_OPT_FLAGS) -Wall -W -c $<
- 
- dnsmasq : $(OBJS)
--	$(CC) -o $@  $(OBJS) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1` $(LIBS) 
-+	$(CC) $(LDFLAGS) -o $@  $(OBJS) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1` $(LIBS) 
- 
- dnsmasq.pot : $(OBJS:.o=.c) dnsmasq.h config.h
- 	xgettext -d dnsmasq --foreign-user --keyword=_ -o dnsmasq.pot -i $(OBJS:.o=.c)