dillo

www/dillo2:

* Add patches from NetBSD conditionally, fixes OpenSSL 1.1.x when SSL is enabled
* Add missing libraries linked, listed in stage-qa

PR:             233985
Submitted by:   Nathan <[email protected]>
Approved by:    portmgr (Unmaintained port)

Index: www/dillo2/Makefile
===================================================================
--- www/dillo2/Makefile	(revision 486476)
+++ www/dillo2/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dillo
 PORTVERSION=	3.0.5
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.dillo.org/download/ LOCAL/bf/dillo/ \
 		TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
@@ -16,10 +17,13 @@
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
+LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk libpng16.so:graphics/png \
+               libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	wget:ftp/wget
 
-USES=		gmake iconv pkgconfig tar:bzip2
+USES=		gmake iconv jpeg pkgconfig tar:bzip2
+USE_XORG=	x11 xcursor xext xfixes xft xinerama xrender
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec
 CONFLICTS=	dillo-i18n-[0-9]* \
@@ -31,12 +35,12 @@
 
 COOKIES_DESC=		Cookie support
 HYPHENATION_DESC=	Hyphenation file(s) for HYPHENATION_LANGS
-SSL_DESC=		Experimental HTTPS support
 
 SSL_USES=			ssl
 COOKIES_CONFIGURE_ENABLE=	cookies
 IPV6_CONFIGURE_ENABLE=		ipv6
 SSL_CONFIGURE_ENABLE=		ssl
+SSL_EXTRA_PATCHES=	${PATCHDIR}/extra-patches-openssl
 THREADS_CONFIGURE_ENABLE=	threaded-dns
 
 .include <bsd.port.pre.mk>
Index: www/dillo2/distinfo
===================================================================
--- www/dillo2/distinfo	(revision 486476)
+++ www/dillo2/distinfo	(working copy)
@@ -1,3 +1,4 @@
+TIMESTAMP = 1544764518
 SHA256 (dillo/dillo-3.0.5.tar.bz2) = db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
 SIZE (dillo/dillo-3.0.5.tar.bz2) = 734472
 SHA256 (dillo/hyph-af.pat.txt) = 094be0ccc966cb8a9919abffb4d481566bbc25d62bb182647be9feb431de5b5b
@@ -18,12 +19,12 @@
 SIZE (dillo/hyph-cy.pat.txt) = 43100
 SHA256 (dillo/hyph-da.pat.txt) = a093ef99375717fe34d261b05d2fdc8e64f8a9f741578c020204374f4c39a20c
 SIZE (dillo/hyph-da.pat.txt) = 6153
-SHA256 (dillo/hyph-de-1901.pat.txt) = aa18580882fc20cac0b330c04cef10dd023216ae8f2c9b0208afe25aecaed6dd
-SIZE (dillo/hyph-de-1901.pat.txt) = 104907
+SHA256 (dillo/hyph-de-1901.pat.txt) = 9af55f28b39c5e4b54b5a51424721cfaf431cc15ebe7a666c08f5c23bcb46fc9
+SIZE (dillo/hyph-de-1901.pat.txt) = 170329
 SHA256 (dillo/hyph-de-1996.pat.txt) = 36953568ac154ad587e35159bc4e7e2d084b07f55cbb1a6e83c387f1dd886226
 SIZE (dillo/hyph-de-1996.pat.txt) = 101489
-SHA256 (dillo/hyph-de-ch-1901.pat.txt) = 37e836c9d3212e264bbcf0ff77e327d7c48f4f28e246881e4d21e3cdca6c9246
-SIZE (dillo/hyph-de-ch-1901.pat.txt) = 103095
+SHA256 (dillo/hyph-de-ch-1901.pat.txt) = 5df2c7948174e5734214356a83a6b7a29eb9234379a2b061f026e0dae8aff6ac
+SIZE (dillo/hyph-de-ch-1901.pat.txt) = 167577
 SHA256 (dillo/hyph-el-monoton.pat.txt) = ae58ac05e9c88dcfa6a2ebecb2fd6aebb08c3f36c4bf3c4e96984c0a2a71ad2e
 SIZE (dillo/hyph-el-monoton.pat.txt) = 3905
 SHA256 (dillo/hyph-el-polyton.pat.txt) = ee93362de2e568ec0254dad0595aa79804d1c26815976cace38522f5afac3ff6
Index: www/dillo2/files/extra-patches-openssl
===================================================================
--- www/dillo2/files/extra-patches-openssl	(nonexistent)
+++ www/dillo2/files/extra-patches-openssl	(working copy)
@@ -0,0 +1,41 @@
+Patches obtained from:
+http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/dillo/patches/
+
+$NetBSD: patch-configure,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Detect OpenSSL 1.1.0
+
+--- configure.orig	2015-06-30 14:07:22.000000000 +0000
++++ configure
+@@ -6018,11 +6018,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++void OPENSSL_config ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++OPENSSL_config ();
+   ;
+   return 0;
+ }
+$NetBSD: patch-dpi_https.c,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Support OpenSSL 1.1.0
+
+--- dpi/https.c.orig	2015-06-30 14:06:08.000000000 +0000
++++ dpi/https.c
+@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;

Property changes on: www/dillo2/files/extra-patches-openssl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property