From 8c28f5812033d14159a919a2d2334bfd84555ae4 Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Wed, 29 Sep 2010 12:24:48 +0000
Subject: Set USE_BSD_MAKEFILE, and remove redundant things.

---
 net/host/Makefile         |  5 ++---
 net/host/distinfo         |  4 ++--
 net/host/patches/patch-ab | 27 +--------------------------
 3 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'net')

diff --git a/net/host/Makefile b/net/host/Makefile
index 8ddbcb72bc1..fe3de004838 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/03/11 18:47:41 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2010/09/29 12:24:48 obache Exp $
 
 DISTNAME=	host-20040812
 CATEGORIES=	net
@@ -11,10 +11,9 @@ COMMENT=	Powerful DNS query and testing tool
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 NO_CONFIGURE =	yes
 
-MAKE_ENV+=	${BSD_MAKE_ENV}
+USE_BSD_MAKEFILE=	yes
 MAKE_FILE=	Makefile.BSD
 MAKE_FLAGS+=	__NetBSD__=1
-MAKE_FLAGS+=	SHARE=/${PKGMANDIR}
 
 USE_TOOLS+=	nroff
 
diff --git a/net/host/distinfo b/net/host/distinfo
index 273b928ab4b..54e63e4cc1f 100644
--- a/net/host/distinfo
+++ b/net/host/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/10/03 14:25:55 schwarz Exp $
+$NetBSD: distinfo,v 1.10 2010/09/29 12:24:48 obache Exp $
 
 SHA1 (host-20040812.tar.gz) = 02027effe88a851e6cecf133cef8ba096af48258
 RMD160 (host-20040812.tar.gz) = d8fc5a0a4218eae75bcd14cce4353f82f049175e
 Size (host-20040812.tar.gz) = 147758 bytes
 SHA1 (patch-aa) = d8f3d0e446463338d6fc7328990895ba9c8246f9
-SHA1 (patch-ab) = 4a5cde3d31deb4855f25a31af0d429d1278689c0
+SHA1 (patch-ab) = 459185f9340d2834c80628905609696b6e679255
 SHA1 (patch-ac) = 35cf473a23b32b2f13f46bc6faba826c1ea3ae7c
diff --git a/net/host/patches/patch-ab b/net/host/patches/patch-ab
index a944ac38e21..269128f5052 100644
--- a/net/host/patches/patch-ab
+++ b/net/host/patches/patch-ab
@@ -1,32 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2006/03/16 17:32:03 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2010/09/29 12:24:48 obache Exp $
 
 --- Makefile.BSD.orig	2004-08-12 22:30:04.000000000 +0200
 +++ Makefile.BSD
-@@ -52,14 +52,17 @@ NOSHARED = YES
- BINDIR ?= ${PREFIX}/bin
- BINOWN ?= root
- 
--.if defined(__NetBSD__)
--MANDIR ?= ${PREFIX}/share/man
--.elif defined(__FreeBSD__)
--MANDIR ?= ${PREFIX}/share/man/man
--.else
-+#.if defined(__NetBSD__)
-+#MANDIR ?= ${PREFIX}/share/man
-+#.elif defined(__FreeBSD__)
-+#MANDIR ?= ${PREFIX}/share/man/man
-+#.else
- # 4.4BSD, including BSD/OS
--MANDIR ?= ${PREFIX}/share/man/cat
--.endif
-+#MANDIR ?= ${PREFIX}/share/man/cat
-+#.endif
-+
-+# Pkgsrc
-+MANDIR?=	${PREFIX}/man
- 
- # this check is a nasty hack and will break building 'host' in the
- # NetBSD source tree on any host that doesn't have this file....
 @@ -124,7 +127,6 @@ CWARNFLAGS += -Wcomment
  CWARNFLAGS += -Wtraditional
  CWARNFLAGS += -Wcast-qual
-- 
cgit v1.2.3