libtelnet: SunOS/C99 build fixes.

5 files changed, 29 insertions, 16 deletions

diff --git a/net/libtelnet/Makefile b/net/libtelnet/Makefile
index b17c5cd8f08..0f3e33c5644 100644
--- a/net/libtelnet/Makefile
+++ b/net/libtelnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/12/15 21:12:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/20 16:02:10 jperkin Exp $
 
 DISTNAME=	libtelnet-0.21
 CATEGORIES=	net
@@ -15,8 +15,6 @@ GNU_CONFIGURE=	yes
 
 # __EXTENSIONS__ needed by patch-util_telnet-client.c
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__
-# Needed on at least NetBSD for addrinfo
-CPPLAGS+=		-D_XOPEN_SOURCE=520
 LIBS.SunOS+=		-lnsl -lsocket
 
 PKGCONFIG_OVERRIDE+=	libtelnet.pc.in
diff --git a/net/libtelnet/distinfo b/net/libtelnet/distinfo
index 88ab0d34cbb..e86c4b74aaa 100644
--- a/net/libtelnet/distinfo
+++ b/net/libtelnet/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2016/04/30 20:18:38 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/03/20 16:02:10 jperkin Exp $
 
 SHA1 (libtelnet-0.21.tar.gz) = 2101bb5689b77ae8562b07b8364e208a62d4e6f3
 RMD160 (libtelnet-0.21.tar.gz) = 81fe34610211ab5c794aea4c5e9268d275b6633a
 SHA512 (libtelnet-0.21.tar.gz) = 69dc0ac4741c81d932136cd736b48a11a05cd2738da6255d6050844f50a2f16c575c747e5c758bbdbc6b1e3309ce02e4979f0002b40fed32a3711aa8f22e04f1
 Size (libtelnet-0.21.tar.gz) = 240486 bytes
 SHA1 (patch-configure.ac) = 9b29ea8995eefbfbe786c9217089577d9de9850d
-SHA1 (patch-util_telnet-chatd.c) = bfbea72913ebf543fd2220ac6da06cfabaad59f1
-SHA1 (patch-util_telnet-client.c) = f8187bb07338d427fc12fbdec2b2c3c56196dc80
-SHA1 (patch-util_telnet-proxy.c) = 7e455cec62c522c7abb55afc2a49aa064635a76c
+SHA1 (patch-util_telnet-chatd.c) = d2d5e6c6748e19d8eaf56a810820080311c4114f
+SHA1 (patch-util_telnet-client.c) = 08bccc6d36415db8a340dca90bf1326a664f7c15
+SHA1 (patch-util_telnet-proxy.c) = 2b5749a8dc56cc7b82ab0fc3dee1548e322aa443
diff --git a/net/libtelnet/patches/patch-util_telnet-chatd.c b/net/libtelnet/patches/patch-util_telnet-chatd.c
index 9d0af3ddc53..164bc943970 100644
--- a/net/libtelnet/patches/patch-util_telnet-chatd.c
+++ b/net/libtelnet/patches/patch-util_telnet-chatd.c
@@ -1,14 +1,19 @@
-$NetBSD: patch-util_telnet-chatd.c,v 1.1 2016/04/30 20:18:38 joerg Exp $
+$NetBSD: patch-util_telnet-chatd.c,v 1.2 2019/03/20 16:02:10 jperkin Exp $
 
 Uses strdup.
 
---- util/telnet-chatd.c.orig	2016-04-27 08:59:27.691493917 +0000
+--- util/telnet-chatd.c.orig	2012-03-18 21:07:49.000000000 +0000
 +++ util/telnet-chatd.c
-@@ -10,6 +10,7 @@
+@@ -10,9 +10,12 @@
   */
  
  #if !defined(_WIN32)
++#  if !defined(__sun) || __STDC_VERSION__-0 < 199901L
 +#	define _XOPEN_SOURCE 520
  #	if !defined(_POSIX_SOURCE)
  #		define _POSIX_SOURCE
  #	endif
++#  endif
+ #	if !defined(_BSD_SOURCE)
+ #		define _BSD_SOURCE
+ #	endif
diff --git a/net/libtelnet/patches/patch-util_telnet-client.c b/net/libtelnet/patches/patch-util_telnet-client.c
index 987ce2f6c8e..0878c8a0eee 100644
--- a/net/libtelnet/patches/patch-util_telnet-client.c
+++ b/net/libtelnet/patches/patch-util_telnet-client.c
@@ -1,22 +1,27 @@
-$NetBSD: patch-util_telnet-client.c,v 1.2 2016/04/30 20:18:38 joerg Exp $
+$NetBSD: patch-util_telnet-client.c,v 1.3 2019/03/20 16:02:10 jperkin Exp $
 
 Provide workaround for a non-POSIX cfmakeraw call.
 Uses getaddrinfo.
 
 --- util/telnet-client.c.orig	2012-03-18 21:07:49.000000000 +0000
 +++ util/telnet-client.c
-@@ -9,6 +9,10 @@
+@@ -9,9 +9,15 @@
   * all present and future rights to this code under copyright law. 
   */
  
 +#ifdef __NetBSD__
 +#define _NETBSD_SOURCE
 +#endif
++#if !defined(__sun) || __STDC_VERSION__-0 < 199901L
 +#define _XOPEN_SOURCE 520
  #if !defined(_POSIX_SOURCE)
  #	define _POSIX_SOURCE
  #endif
-@@ -199,7 +203,15 @@ int main(int argc, char **argv) {
++#endif
+ #if !defined(_BSD_SOURCE)
+ #	define _BSD_SOURCE
+ #endif
+@@ -199,7 +205,15 @@ int main(int argc, char **argv) {
  	tcgetattr(STDOUT_FILENO, &orig_tios);
  	atexit(_cleanup);
  	tios = orig_tios;
diff --git a/net/libtelnet/patches/patch-util_telnet-proxy.c b/net/libtelnet/patches/patch-util_telnet-proxy.c
index 52ff3d6e02f..c72f5216fa9 100644
--- a/net/libtelnet/patches/patch-util_telnet-proxy.c
+++ b/net/libtelnet/patches/patch-util_telnet-proxy.c
@@ -1,14 +1,19 @@
-$NetBSD: patch-util_telnet-proxy.c,v 1.1 2016/04/30 20:18:38 joerg Exp $
+$NetBSD: patch-util_telnet-proxy.c,v 1.2 2019/03/20 16:02:10 jperkin Exp $
 
 Uses getaddrinfo and friends.
 
---- util/telnet-proxy.c.orig	2016-04-27 08:57:41.984443954 +0000
+--- util/telnet-proxy.c.orig	2012-03-18 21:07:49.000000000 +0000
 +++ util/telnet-proxy.c
-@@ -10,6 +10,7 @@
+@@ -10,9 +10,12 @@
   */
  
  #if !defined(_WIN32)
++#  if !defined(__sun) || __STDC_VERSION__-0 < 199901L
 +#	define _XOPEN_SOURCE 520
  #	if !defined(_POSIX_SOURCE)
  #		define _POSIX_SOURCE
  #	endif
++#  endif
+ #	if !defined(_BSD_SOURCE)
+ #		define _BSD_SOURCE
+ #	endif