Now that I am attached to 6bone....

sumikawa@ebina.hitachi.co.jp sumikawa@ebina.hitachi.co.jp
Tue, 05 Sep 2000 09:27:52 +0900 (JST)


ume> Lynx 2.8.4dev.7 is IPv6 ready.  But, it seems not enabled in
ume> ports/www/lynx-current.

Try this patch. It will be merged in ports-current on FreeBSD.

---
Munechika SUMIKAWA @ Hitachi, Ltd. / KAME Project / FreeBSD.org

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/lynx-current/Makefile,v
retrieving revision 1.119
diff -u -r1.119 Makefile
--- Makefile	2000/08/20 20:22:31	1.119
+++ Makefile	2000/09/04 07:05:24
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=    2.8.4d7
-CATEGORIES=	www
+PORTVERSION=    2.8.4d9
+CATEGORIES=	www ipv6
 MASTER_SITES=   http://lynx.isc.org/current/
-DISTNAME=       ${PORTNAME}2.8.4dev.7
+DISTNAME=       ${PORTNAME}2.8.4dev.9
 
 MAINTAINER=	ache@FreeBSD.org
 
@@ -22,6 +22,14 @@
 CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
 		--enable-nls
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 400014
+CONFIGURE_ARGS+=--enable-ipv6
+.else
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
 CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
 MAKE_FLAGS=     helpdir=${L_HELP} docdir=${L_DOC} -f
 MAKEFILE=       makefile
@@ -37,4 +45,4 @@
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/www/lynx-current/files/md5,v
retrieving revision 1.152
diff -u -r1.152 md5
--- files/md5	2000/08/20 20:22:34	1.152
+++ files/md5	2000/09/04 07:05:24
@@ -1 +1 @@
-MD5 (lynx2.8.4dev.7.tar.bz2) = bb44496c4ba2d90958a0548054c8b529
+MD5 (lynx2.8.4dev.9.tar.bz2) = d8863a4c212f8dd61f63db1adafaebb8
Index: patches/patch-ab
===================================================================
RCS file: patch-ab
diff -N patch-ab
--- /dev/null	Mon Sep  4 16:05:19 2000
+++ patch-ab	Mon Sep  4 16:05:24 2000
@@ -0,0 +1,61 @@
+--- WWW/Library/Implementation/www_tcp.h.orig	Fri Aug 25 10:30:11 2000
++++ WWW/Library/Implementation/www_tcp.h	Mon Sep  4 11:03:13 2000
+@@ -56,29 +56,6 @@
+ #define INVSOC (-1)             /* Unix invalid socket */
+ 		/* NB: newer libwww has something different for Windows */
+ 
+-/* IPv6 support */
+-#if defined(HAVE_GETADDRINFO) && defined(HAVE_GAI_STRERROR) && defined(ENABLE_IPV6)
+-#	define INET6
+-#endif /* HAVE_GETADDRINFO && HAVE_GAI_STRERROR && ENABLE_IPV6 */
+-
+-#if !defined(__MINGW32__)
+-#ifdef INET6
+-typedef struct sockaddr_storage SockA;  /* See netinet/in.h */
+-#else
+-typedef struct sockaddr_in SockA;  /* See netinet/in.h */
+-#endif /* INET6 */
+-#endif
+-
+-#ifdef INET6
+-#ifdef SIN6_LEN
+-#define SOCKADDR_LEN(soc_address) ((struct sockaddr *)&soc_address)->sa_len
+-#else
+-#define SOCKADDR_LEN(soc_address) SA_LEN((struct sockaddr *)&soc_address)
+-#endif /* SIN6_LEN */
+-#else
+-#define SOCKADDR_LEN(soc_address) sizeof(soc_address)
+-#endif /* INET6 */
+-
+ #ifndef VMS
+ 
+ #include <sys/types.h>
+@@ -803,5 +780,28 @@
+ #else
+ #define set_errno(value) /* we do not know how */
+ #endif
++
++/* IPv6 support */
++#if defined(HAVE_GETADDRINFO) && defined(HAVE_GAI_STRERROR) && defined(ENABLE_IPV6)
++#	define INET6
++#endif /* HAVE_GETADDRINFO && HAVE_GAI_STRERROR && ENABLE_IPV6 */
++
++#if !defined(__MINGW32__)
++#ifdef INET6
++typedef struct sockaddr_storage SockA;  /* See netinet/in.h */
++#else
++typedef struct sockaddr_in SockA;  /* See netinet/in.h */
++#endif /* INET6 */
++#endif
++
++#ifdef INET6
++#ifdef SIN6_LEN
++#define SOCKADDR_LEN(soc_address) ((struct sockaddr *)&soc_address)->sa_len
++#else
++#define SOCKADDR_LEN(soc_address) SA_LEN((struct sockaddr *)&soc_address)
++#endif /* SIN6_LEN */
++#else
++#define SOCKADDR_LEN(soc_address) sizeof(soc_address)
++#endif /* INET6 */
+ 
+ #endif /* TCP_H */