Index: branches/2018Q4/www/libwww/Makefile
===================================================================
--- branches/2018Q4/www/libwww/Makefile	(revision 482467)
+++ branches/2018Q4/www/libwww/Makefile	(revision 482468)
@@ -1,32 +1,30 @@
 # Created by: torstenb
 # $FreeBSD$
 
 PORTNAME=	libwww
 PORTVERSION=	5.4.2
 CATEGORIES=	www devel
 MASTER_SITES=	https://www.w3.org/Library/Distribution/ \
 		https://www.w3.org/Library/Distribution/old/
 DISTNAME=	w3c-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	W3C Reference Library
 
 LICENSE=	W3C
 LICENSE_NAME=	W3C IPR SOFTWARE NOTICE
 LICENSE_FILE=	${WRKSRC}/LICENSE.html
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_SSL=		openssl-devel
-
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USES=		gmake libtool localbase perl5 ssl tar:tgz
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-zlib --with-ssl=${OPENSSLBASE}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
Index: branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c
===================================================================
--- branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c	(revision 482467)
+++ branches/2018Q4/www/libwww/files/patch-Library_src_SSL_HTSSL.c	(revision 482468)
@@ -1,19 +1,55 @@
---- Library/src/SSL/HTSSL.c.orig	2018-07-04 23:30:19 UTC
+--- Library/src/SSL/HTSSL.c.orig	2017-06-24 05:51:38 UTC
 +++ Library/src/SSL/HTSSL.c
-@@ -214,12 +214,16 @@ PUBLIC BOOL HTSSL_init (void)
+@@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL * s, int wher
+ PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx)
+ {
+     char buf[256];
++    int ctx_error;
+     X509 * err_cert = X509_STORE_CTX_get_current_cert(ctx);
+     int err = X509_STORE_CTX_get_error(ctx);
+     int depth = X509_STORE_CTX_get_error_depth(ctx);
+@@ -115,24 +116,28 @@ PRIVATE int verify_callback (int ok, X509_STORE_CTX * 
+ 	    verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
+ 	}
+     }
+-    switch (ctx->error) {
++    switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
  
+     case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++	X509_NAME_oneline(X509_get_issuer_name(X509_STORE_CTX_get0_cert(ctx)), buf, 256);
++#else
+ 	X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
++#endif
+ 	HTTRACE(PROT_TRACE, "issuer= %s\n" _ buf);
+ 	break;
+ 
+     case X509_V_ERR_CERT_NOT_YET_VALID:
+     case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+ 	HTTRACE(PROT_TRACE, "notBefore=");
+-//	ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
++//	ASN1_TIME_print(bio_err,X509_get_notBefore(X509_STORE_CTX_get0_cert(ctx)));
+ 	HTTRACE(PROT_TRACE, "\n");
+ 	break;
+ 
+     case X509_V_ERR_CERT_HAS_EXPIRED:
+     case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+ 	HTTRACE(PROT_TRACE, "notAfter=");
+-//	ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
++//	ASN1_TIME_print(bio_err,X509_get_notAfter(X509_STORE_CTX_get0_cert(ctx)));
+ 	HTTRACE(PROT_TRACE, "\n");
+ 	break;
+     }
+@@ -214,12 +219,6 @@ PUBLIC BOOL HTSSL_init (void)
+ 
  	/* select the protocol method */
  	switch (ssl_prot_method) {
-+#ifndef OPENSSL_NO_SSL2
- 	case HTSSL_V2:
- 	  meth = SSLv2_client_method();
- 	  break;
-+#endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- 	case HTSSL_V3:
- 	  meth = SSLv3_client_method();
- 	  break;
-+#endif
+-	case HTSSL_V2:
+-	  meth = SSLv2_client_method();
+-	  break;
+-	case HTSSL_V3:
+-	  meth = SSLv3_client_method();
+-	  break;
  	case HTSSL_V23:
  	  meth = SSLv23_client_method();
  	  break;
Index: branches/2018Q4/www/libwww/files/patch-configure
===================================================================
--- branches/2018Q4/www/libwww/files/patch-configure	(revision 482467)
+++ branches/2018Q4/www/libwww/files/patch-configure	(revision 482468)
@@ -1,15 +1,27 @@
---- configure.orig	2018-07-04 23:24:12 UTC
+--- configure.orig	2017-06-24 06:11:34 UTC
 +++ configure
-@@ -16416,8 +16416,11 @@ $as_echo "no" >&6; }
+@@ -15439,7 +15439,7 @@ if test "x$ac_cv_func_remove" = xyes; then :
+ 
+ fi
+ 
+-     if test "$ac_cv_func_remove" == yes ; then
++     if test "$ac_cv_func_remove" = yes ; then
+ 
+ $as_echo "#define unlink remove" >>confdefs.h
+ 
+@@ -16416,10 +16416,14 @@ $as_echo "no" >&6; }
      if test "x$withval" = "xyes"; then
        withval=$ssllib
        SSLINC=$sslinc
 +      LIBS="$LIBS $withval"
 +    else
 +      SSLINC="-I$withval/include/openssl"
 +      LIBS="$LIBS -L$withval/lib -lssl -lcrypto"
      fi
 -    LIBS="$LIBS $withval"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
++#include <openssl/ssl.h>
  
+ int
+ main ()
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 482467)
+++ branches/2018Q4	(revision 482468)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r482007,482200