Remove -DHAVE_GETNAMEINFO frome makefiles.

Pointed out by ho@

10 files changed, 18 insertions, 23 deletions

diff --git a/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep b/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep
index ac0e6e114c2..3840fec3d0b 100644
--- a/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/bsdi/Makefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sysdep,v 1.5 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.6 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -51,7 +51,7 @@ CFLAGS+=	-I/usr/build/keynote
 LDFLAGS+=	-L/usr/build/keynote
 .endif
 
-CFLAGS+=	-DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS \
+CFLAGS+=	-DNO_IDEA -DNO_RC5 -DHAVE_GETIFADDRS \
 		-I${.CURDIR}/sysdep/common
 CFLAGS+=	-I/usr/include -I/usr/contrib/include
 
diff --git a/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep
index 0f36184e2a4..09f888d93d5 100644
--- a/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/darwin/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.2 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: GNUmakefile.sysdep,v 1.3 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999,2002 Håkan Olsson.  All rights reserved.
@@ -34,7 +34,7 @@ LDADD+=		-lipsec
 # gcc under MacOS X does not seem to like building things -static
 LDSTATIC=	
 
-CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL -DHAVE_GETNAMEINFO
+CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
 CFLAGS+=	-DHAVE_GETIFADDRS
 
 FEATURES=	debug tripledes des blowdish cast ec aggressive x509
diff --git a/sbin/isakmpd/sysdep/darwin/Makefile.sysdep b/sbin/isakmpd/sysdep/darwin/Makefile.sysdep
index f65dc0c147d..834347d2b80 100644
--- a/sbin/isakmpd/sysdep/darwin/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/darwin/Makefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sysdep,v 1.2 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.3 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -34,8 +34,7 @@ FEATURES+=	rawkey isakmp_cfg
 
 LDADD+=		-lipsec
 
-CFLAGS+=	-DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS \
-		-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
+CFLAGS+=	-DHAVE_GETIFADDRS -DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
 
 IPSEC_SRCS=	pf_key_v2.c
 IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
diff --git a/sbin/isakmpd/sysdep/freebsd/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/freebsd/GNUmakefile.sysdep
index ccd25c21245..618ef5fb44c 100644
--- a/sbin/isakmpd/sysdep/freebsd/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/freebsd/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.5 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: GNUmakefile.sysdep,v 1.6 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Håkan Olsson.  All rights reserved.
@@ -37,8 +37,6 @@ LIBSYSDEP:=	${LIBSYSDEPDIR}/libsysdep.a
 LDADD+=		-lgmp ${LIBSYSDEP}
 DPADD+=		${LIBGMP} ${LIBSYSDEP}
 
-CFLAGS+=	-DHAVE_GETNAMEINFO
-
 FEATURES=	debug tripledes des blowdish cast ec aggressive
 # Not yet
 #FEATURES+=	policy x509
diff --git a/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep b/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
index b9d760a1631..03dae50adee 100644
--- a/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/freebsd/Makefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sysdep,v 1.9 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.10 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -43,7 +43,7 @@ LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
 LDADD+=		-lgmp ${LIBSYSDEPDIR}/libsysdep.a -lipsec -L/usr/local/lib
 DPADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a
 
-CFLAGS+=	-DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS \
+CFLAGS+=	-DHAVE_GETIFADDRS \
 		-I${.CURDIR}/sysdep/common -I/usr/include \
 		-I/usr/local/include -I/usr/local/include/openssl
 
diff --git a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
index d161d24770f..7dab28a2fb3 100644
--- a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.7 2003/06/03 15:20:41 ho Exp $
+#	$OpenBSD: GNUmakefile.sysdep,v 1.8 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -33,7 +33,7 @@ LIBSYSDEP:=	${LIBSYSDEPDIR}/libsysdep.a
 LDADD+=		-lgmp ${LIBSYSDEP} ${LIBCRYPTO}
 DPADD+=		${LIBGMP} ${LIBSYSDEP}
 
-CFLAGS+=	-DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
+CFLAGS+=	-DUSE_OLD_SOCKADDR -DHAVE_PCAP \
 		-DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP \
 		-I/usr/src/linux/include -I${.CURDIR}/sysdep/common \
 		-I/usr/include/openssl
diff --git a/sbin/isakmpd/sysdep/netbsd/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/netbsd/GNUmakefile.sysdep
index 6c6cf033a33..e506ddc59bc 100644
--- a/sbin/isakmpd/sysdep/netbsd/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/netbsd/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.7 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: GNUmakefile.sysdep,v 1.8 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -38,7 +38,7 @@ FEATURES=	debug tripledes des blowfish cast ec aggressive x509
 # Not yet
 #FEATURES+=	policy
 
-CFLAGS+=	-DNO_RSA -DNO_RC5 -DNO_IDEA -DHAVE_GETNAMEINFO \
+CFLAGS+=	-DNO_RSA -DNO_RC5 -DNO_IDEA \
 		-I${.CURDIR}/sysdep/common -I/usr/include/openssl \
 		-I/usr/include/machine -I/usr/pkg/include
 
diff --git a/sbin/isakmpd/sysdep/netbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/netbsd/Makefile.sysdep
index ee2932eb88c..fbc75ccc147 100644
--- a/sbin/isakmpd/sysdep/netbsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/netbsd/Makefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sysdep,v 1.9 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.10 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -38,7 +38,7 @@ LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
 LDADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a -lipsec
 DPADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC}
 
-CFLAGS+=	-DNO_RSA -DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO \
+CFLAGS+=	-DNO_RSA -DNO_IDEA -DNO_RC5 \
 		-DHAVE_GETIFADDRS \
 		-I${.CURDIR}/sysdep/common
 .if exists(/usr/pkg/include/openssl/rsa.h)
diff --git a/sbin/isakmpd/sysdep/openbsd/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/openbsd/GNUmakefile.sysdep
index cd74dc385c2..8a46424d9fe 100644
--- a/sbin/isakmpd/sysdep/openbsd/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/openbsd/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: GNUmakefile.sysdep,v 1.4 2003/06/03 14:53:11 ho Exp $
+#	$OpenBSD: GNUmakefile.sysdep,v 1.5 2004/06/26 03:40:57 mcbride Exp $
 
 #
 # Copyright (c) 1999 Håkan Olsson.  All rights reserved.
@@ -36,8 +36,6 @@ LIBCRYPTO:=	/usr/lib/libcrypto.a
 IPSEC_SRCS=	pf_key_v2.c
 IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
 
-CFLAGS+=	-DHAVE_GETNAMEINFO
-
 USE_LIBCRYPTO=	defined
 ifneq (${MACHINE_ARCH},alpha)
 ifneq (${MACHINE_ARCH},vax)
diff --git a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
index 837ac27cd15..86688bdb9fd 100644
--- a/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
+++ b/sbin/isakmpd/sysdep/openbsd/Makefile.sysdep
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sysdep,v 1.23 2004/03/31 10:47:16 ho Exp $
+#	$OpenBSD: Makefile.sysdep,v 1.24 2004/06/26 03:40:57 mcbride Exp $
 #	$EOM: Makefile.sysdep,v 1.18 2001/01/26 10:55:22 niklas Exp $
 
 #
@@ -32,7 +32,7 @@
 IPSEC_SRCS=	pf_key_v2.c
 IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
 
-CFLAGS+=	-DHAVE_GETNAMEINFO -DHAVE_GETIFADDRS -DHAVE_PCAP
+CFLAGS+=	-DHAVE_GETIFADDRS -DHAVE_PCAP
 CFLAGS+=	-DHAVE_CLOSEFROM
 
 USE_LIBCRYPTO=	defined