From ec230b0fd47c728350457f98eafd656e198b7693 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 15 Jul 2001 19:17:00 +0000
Subject: [PATCH] Update to 1.1.6 and fix fake; submitted by maintainer.

---
 net/pdnsd/Makefile                      |  4 ++--
 net/pdnsd/files/md5                     |  6 +++---
 net/pdnsd/patches/patch-Makefile_in     | 12 ++++++++++++
 net/pdnsd/patches/patch-doc_Makefile_in | 12 ++++++++++++
 net/pdnsd/patches/patch-icmp_c          | 14 --------------
 5 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 net/pdnsd/patches/patch-Makefile_in
 create mode 100644 net/pdnsd/patches/patch-doc_Makefile_in
 delete mode 100644 net/pdnsd/patches/patch-icmp_c

diff --git a/net/pdnsd/Makefile b/net/pdnsd/Makefile
index d995aacdac9..ae82fc4eeca 100644
--- a/net/pdnsd/Makefile
+++ b/net/pdnsd/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/06/14 14:46:07 camield Exp $
+# $OpenBSD: Makefile,v 1.2 2001/07/15 19:17:00 naddy Exp $
 
 COMMENT=		"threaded dns daemon, optimized for caching"
 
-DISTNAME=		pdnsd-1.1.5
+DISTNAME=		pdnsd-1.1.6
 CATEGORIES=     	net
 NEED_VERSION=		1.414
 HOMEPAGE=		http://home.t-online.de/home/Moestl/
diff --git a/net/pdnsd/files/md5 b/net/pdnsd/files/md5
index ebb8e88b45a..987182f2ba7 100644
--- a/net/pdnsd/files/md5
+++ b/net/pdnsd/files/md5
@@ -1,3 +1,3 @@
-MD5 (pdnsd-1.1.5.tar.gz) = 847376a31a8546f5a800d18011beca32
-RMD160 (pdnsd-1.1.5.tar.gz) = 55a28a46427e63cf0142615795d9a976ad1e5a46
-SHA1 (pdnsd-1.1.5.tar.gz) = 759a49ed69db0ebb93ae957c1506828279ab2554
+MD5 (pdnsd-1.1.6.tar.gz) = 124cb906dffcda11966d9d162fae6f9d
+RMD160 (pdnsd-1.1.6.tar.gz) = 6275f535c89915c4142987b598bc4b05ff841195
+SHA1 (pdnsd-1.1.6.tar.gz) = f057f653f55190d072d704b6fb5d904e6c9d9455
diff --git a/net/pdnsd/patches/patch-Makefile_in b/net/pdnsd/patches/patch-Makefile_in
new file mode 100644
index 00000000000..2d8eb15d474
--- /dev/null
+++ b/net/pdnsd/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/07/15 19:17:00 naddy Exp $
+--- Makefile.in.orig	Mon Jul  2 21:37:32 2001
++++ Makefile.in	Sun Jul 15 20:42:16 2001
+@@ -374,7 +374,7 @@ install-data-hook:
+ 	else \
+ 	  touch $(DESTDIR)$(cachedir)/pdnsd.cache; \
+ 	fi
+-	if test `whoami` = "root"; then \
++	if test `userinfo -e pdnsd`; then \
+ 	  chown $(def_id) $(DESTDIR)$(cachedir)/pdnsd.cache; \
+ 	  chown $(def_id) $(DESTDIR)$(cachedir); \
+ 	fi
diff --git a/net/pdnsd/patches/patch-doc_Makefile_in b/net/pdnsd/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..f34e9a5ea9c
--- /dev/null
+++ b/net/pdnsd/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/07/15 19:17:00 naddy Exp $
+--- doc/Makefile.in.orig	Mon Jul  2 21:37:36 2001
++++ doc/Makefile.in	Sun Jul 15 20:42:16 2001
+@@ -229,7 +229,7 @@ maintainer-clean-generic clean mostlycle
+ install-data-hook:
+ 	$(mkinstalldirs) $(DESTDIR)/$(sysconfdir)
+ 	# For both source installs and RPM builds
+-	if test `whoami` = "root"; then \
++	if test `userinfo -e pdnsd`; then \
+ 	  $(INSTALL) -o 0 -g 0 -m 644 pdnsd.conf $(DESTDIR)/$(sysconfdir)/pdnsd.conf.sample ; \
+ 	else \
+ 	  $(INSTALL) -m 644 pdnsd.conf $(DESTDIR)/$(sysconfdir)/pdnsd.conf.sample ; \
diff --git a/net/pdnsd/patches/patch-icmp_c b/net/pdnsd/patches/patch-icmp_c
deleted file mode 100644
index bd86a2eaf44..00000000000
--- a/net/pdnsd/patches/patch-icmp_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-icmp_c,v 1.2 2001/07/13 13:30:02 naddy Exp $
-
---- src/icmp.c.orig	Wed May  9 19:51:52 2001
-+++ src/icmp.c	Thu Jun 14 11:09:30 2001
-@@ -48,7 +48,9 @@ Boston, MA 02111-1307, USA.  */
- # include <netinet/ip6.h>
- # include <netinet/icmp6.h>
- #endif
-+#ifndef __OpenBSD__
- #include <netinet/ip.h>
-+#endif
- #include <netdb.h>
- #include "icmp.h"
- #include "error.h"