1 files changed, 65 insertions, 21 deletions

diff --git a/src/lib/libc/net/Makefile.inc b/src/lib/libc/net/Makefile.inc
index 2d220067e4..db2738f868 100644
--- a/src/lib/libc/net/Makefile.inc
+++ b/src/lib/libc/net/Makefile.inc
@@ -1,46 +1,90 @@
-#       $NetBSD: Makefile.inc,v 1.23 1995/03/02 09:09:07 chopps Exp $
-#       @(#)Makefile.inc        8.2 (Berkeley) 9/5/93
+#       $OpenBSD: Makefile.inc,v 1.42 2005/10/02 14:48:48 jmc Exp $
 
 # net sources
-.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/net ${.CURDIR}/net
+.PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net ${LIBCSRCDIR}/net
 
-SRCS+=  gethostnamadr.c getnetbyaddr.c getnetbyname.c getnetent.c \
-        getproto.c getprotoent.c getprotoname.c getservbyname.c \
-        getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
-        inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c \
-        iso_addr.c linkaddr.c ns_addr.c ns_ntoa.c rcmd.c recv.c res_comp.c \
-        res_debug.c res_init.c res_mkquery.c res_query.c res_send.c \
-        send.c sethostent.c ethers.c
+CFLAGS+=-DRESOLVSORT
+
+SRCS+=  base64.c freeaddrinfo.c gai_strerror.c getaddrinfo.c gethostnamadr.c \
+        getifaddrs.c getnameinfo.c getnetbyaddr.c getnetbyname.c getnetent.c \
+        getnetnamadr.c getproto.c getprotoent.c getprotoname.c \
+        getservbyname.c getservbyport.c getservent.c getrrsetbyname.c \
+        herror.c if_indextoname.c if_nameindex.c if_nametoindex.c inet_addr.c \
+        inet_lnaof.c inet_makeaddr.c inet_neta.c inet_netof.c inet_network.c \
+        inet_net_ntop.c inet_net_pton.c inet_ntoa.c inet_ntop.c inet_pton.c \
+        ipx_addr.c ipx_ntoa.c linkaddr.c net_addrcmp.c nsap_addr.c \
+        rcmd.c rresvport.c recv.c res_comp.c res_data.c res_debug.c \
+        res_debug_syms.c \
+        res_init.c res_mkquery.c res_query.c res_random.c res_send.c send.c \
+        sethostent.c ethers.c rcmdsh.c
+
+# IPv6
+SRCS+=  ip6opt.c rthdr.c vars6.c
 
 # machine-dependent net sources
 # m-d Makefile.inc must include sources for:
 #       htonl() htons() ntohl() ntohs()
 
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc"
+.include "${LIBCSRCDIR}/arch/${MACHINE_ARCH}/net/Makefile.inc"
 
-MAN+=   byteorder.3 gethostbyname.3 getnetent.3 getprotoent.3 getservent.3 \
-        inet.3 linkaddr.3 ns.3 rcmd.3 resolver.3 ethers.3
+MAN+=   byteorder.3 ethers.3 gai_strerror.3 getaddrinfo.3 gethostbyname.3 \
+        getifaddrs.3 getnameinfo.3 getnetent.3 getprotoent.3 \
+        getrrsetbyname.3 getservent.3 if_indextoname.3 inet.3 \
+        inet_net.3 inet6_option_space.3 inet6_rthdr_space.3 \
+        ipx.3 link_addr.3 net_addrcmp.3 \
+        rcmd.3 rcmdsh.3 resolver.3
 
 MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
-        byteorder.3 ntohs.3
+        byteorder.3 ntohs.3 byteorder.3 htobe16.3 byteorder.3 htobe32.3 \
+        byteorder.3 htobe64.3 byteorder.3 betoh16.3 byteorder.3 betoh32.3 \
+        byteorder.3 betoh64.3 byteorder.3 htole16.3 byteorder.3 htole32.3 \
+        byteorder.3 htole64.3 byteorder.3 letoh16.3 byteorder.3 letoh32.3 \
+        byteorder.3 letoh64.3 byteorder.3 swap16.3 byteorder.3 swap32.3 \
+        byteorder.3 swap64.3
 MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
         ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
+MLINKS+=getaddrinfo.3 freeaddrinfo.3
 MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
         gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
-        gethostbyname.3 herror.3
+        gethostbyname.3 herror.3 gethostbyname.3 gethostbyname2.3 \
+        gethostbyname.3 hstrerror.3
+MLINKS+=getifaddrs.3 freeifaddrs.3
 MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
         getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
 MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
-        getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
+        getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3 \
+        getprotoent.3 getprotoent_r.3 getprotoent.3 getprotobyname_r.3 \
+        getprotoent.3 getprotobynumber_r.3 getprotoent.3 setprotoent_r.3 \
+        getprotoent.3 endprotoent_r.3
 MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
-        getservent.3 getservbyport.3 getservent.3 setservent.3
+        getservent.3 getservbyport.3 getservent.3 setservent.3 \
+        getservent.3 getservent_r.3 getservent.3 getservbyname_r.3 \
+        getservent.3 getservbyport_r.3 setservent.3 setservent_r.3 \
+        setservent.3 endservent_r.3
+MLINKS+= if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
+        if_indextoname.3 if_freenameindex.3
 MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
         inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
         inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 network.3 \
-        inet.3 ntoa.3
-MLINKS+=linkaddr.3 linkntoa.3
-MLINKS+=ns.3 ns_addr.3 ns.3 ns_ntoa.3
-MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3
+        inet.3 ntoa.3 inet.3 inet_ntop.3 inet.3 inet_pton.3
+MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
+MLINKS+=link_addr.3 link_ntoa.3
+MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
+MLINKS+=rcmd.3 iruserok.3 rcmd.3 rresvport.3 rcmd.3 ruserok.3 \
+        rcmd.3 rresvport_af.3 rcmd.3 rcmd_af.3 rcmd.3 iruserok_sa.3
 MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
         resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
         resolver.3 res_search.3
+MLINKS+=getrrsetbyname.3 freerrset.3
+MLINKS+=inet6_option_space.3 inet6_option_init.3 \
+        inet6_option_space.3 inet6_option_append.3 \
+        inet6_option_space.3 inet6_option_alloc.3 \
+        inet6_option_space.3 inet6_option_next.3 \
+        inet6_option_space.3 inet6_option_find.3
+MLINKS+=inet6_rthdr_space.3 inet6_rthdr_init.3 \
+        inet6_rthdr_space.3 inet6_rthdr_add.3 \
+        inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \
+        inet6_rthdr_space.3 inet6_rthdr_reverse.3 \
+        inet6_rthdr_space.3 inet6_rthdr_segments.3 \
+        inet6_rthdr_space.3 inet6_rthdr_getaddr.3 \
+        inet6_rthdr_space.3 inet6_rthdr_getflags.3