From 87d60349d55788cbe876f3c87c0e8491ecf53eef Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Fri, 13 Sep 2013 13:35:11 -0400
Subject: contrib is merged upstream :D

---
 .../dnsmasq/files/dnsmasq-2.47-fbsd-config.patch   | 16 --------------
 net-dns/dnsmasq/files/dnsmasq-init-r2              | 25 ----------------------
 net-dns/dnsmasq/files/dnsmasq.confd-r1             |  4 ----
 3 files changed, 45 deletions(-)
 delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch
 delete mode 100644 net-dns/dnsmasq/files/dnsmasq-init-r2
 delete mode 100644 net-dns/dnsmasq/files/dnsmasq.confd-r1

(limited to 'net-dns/dnsmasq/files')

diff --git a/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch b/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch
deleted file mode 100644
index 38a3679..0000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h
---- dnsmasq-2.47.orig/src/config.h	2009-02-05 07:14:24.000000000 -0500
-+++ dnsmasq-2.47/src/config.h	2009-03-30 00:04:52.000000000 -0400
-@@ -50,11 +50,7 @@
- #endif
- 
- #ifndef CONFFILE
--#   if defined(__FreeBSD__)
--#      define CONFFILE "/usr/local/etc/dnsmasq.conf"
--#   else
--#      define CONFFILE "/etc/dnsmasq.conf"
--#   endif
-+#   define CONFFILE "/etc/dnsmasq.conf"
- #endif
- 
- #define DEFLEASE 3600 /* default lease time, 1 hour */
diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r2 b/net-dns/dnsmasq/files/dnsmasq-init-r2
deleted file mode 100644
index 08e747d..0000000
--- a/net-dns/dnsmasq/files/dnsmasq-init-r2
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init-r2,v 1.1 2012/03/07 21:59:19 chutzpah Exp $
-
-extra_started_commands="reload"
-
-pidfile="/var/run/dnsmasq.pid"
-command="/usr/sbin/dnsmasq"
-command_args="-x ${pidfile} ${DNSMASQ_OPTS}"
-start_stop_daemon_args="--retry TERM/3/TERM/5"
-
-depend() {
-	provide dns
-	need localmount net
-	after bootmisc
-	use logger
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--exec ${command} --pidfile ${pidfile}
-	eend $?
-}
diff --git a/net-dns/dnsmasq/files/dnsmasq.confd-r1 b/net-dns/dnsmasq/files/dnsmasq.confd-r1
deleted file mode 100644
index 0e94463..0000000
--- a/net-dns/dnsmasq/files/dnsmasq.confd-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq
-
-# See the dnsmasq(8) man page for possible options to put here.
-DNSMASQ_OPTS="--user=dnsmasq --group=dnsmasq"
-- 
cgit v1.2.3-65-gdbad