From 9c08d1746ae803e26580ca6dacf488b9839256cd Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 24 Jan 2013 16:28:37 +0000
Subject: Don't install telnet.h if it will be installed by libtelnet.

---
 include/arpa/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/arpa')

diff --git a/include/arpa/Makefile b/include/arpa/Makefile
index a480b31341e5..6b00641e65ee 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -1,7 +1,12 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 NO_OBJ=
-INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
+INCS=	ftp.h inet.h nameser.h nameser_compat.h tftp.h
+.if ${MK_TELNET} == "NO"
+INCS+=	telnet.h
+.endif
 INCSDIR=${INCLUDEDIR}/arpa
 
 .include <bsd.prog.mk>
-- 
cgit v1.2.3


From 1a00a68e375f8567320cd22dfdd5119244e8c1ea Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 25 Jan 2013 17:40:10 +0000
Subject: MK_* variable should be compared to "no" not "NO".

Submitted by:	"b.f." <bf1783@googlemail.com>
---
 include/arpa/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/arpa')

diff --git a/include/arpa/Makefile b/include/arpa/Makefile
index 6b00641e65ee..8a7f63d5a26a 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -4,7 +4,7 @@
 
 NO_OBJ=
 INCS=	ftp.h inet.h nameser.h nameser_compat.h tftp.h
-.if ${MK_TELNET} == "NO"
+.if ${MK_TELNET} == "no"
 INCS+=	telnet.h
 .endif
 INCSDIR=${INCLUDEDIR}/arpa
-- 
cgit v1.2.3