Date: Fri, 7 Jun 2019 23:52:19 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503677 - in head/www/dillo2: . files Message-ID: <201906072352.x57NqJ0S070778@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Jun 7 23:52:19 2019 New Revision: 503677 URL: https://svnweb.freebsd.org/changeset/ports/503677 Log: www/dillo2: various improvements and adoption [1] - Refresh distinfo [1] - Fix SSL [2] - Add missing dependencies [1] - Assign maintainer to submitter [1] - Make PNG and JPEG support optional [1] PR: 238356 [1] PR: 233985 [2] Submitted by: Lorenzo Salvadore <phascolarctos@protonmail.ch> [1] Submitted by: Nathan <ndowens@yahoo.com> [2] Reported by: tigersharke@gmail.com [1] Reported by: jhibbits [2] Added: head/www/dillo2/files/ head/www/dillo2/files/extra-patches-openssl (contents, props changed) Modified: head/www/dillo2/Makefile (contents, props changed) head/www/dillo2/distinfo (contents, props changed) Modified: head/www/dillo2/Makefile ============================================================================== --- head/www/dillo2/Makefile Fri Jun 7 23:30:13 2019 (r503676) +++ head/www/dillo2/Makefile Fri Jun 7 23:52:19 2019 (r503677) @@ -3,65 +3,79 @@ PORTNAME= dillo PORTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= www ipv6 -MASTER_SITES= http://www.dillo.org/download/ LOCAL/bf/dillo/ \ +MASTER_SITES= http://www.dillo.org/download/ \ + LOCAL/bf/dillo/ \ TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= phascolarctos@protonmail.ch COMMENT= Fast, small graphical Web browser built upon fltk LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfltk.so:x11-toolkits/fltk +LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ + libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= wget:ftp/wget USES= gmake iconv 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]* \ - dillo-0* +CONFIGURE_ARGS= --disable-efence \ + --disable-insure \ + --libdir=${PREFIX}/libexec +LDFLAGS+= -lthr + PORTDOCS= * -OPTIONS_DEFINE= COOKIES HYPHENATION IPV6 SSL THREADS DOCS -OPTIONS_DEFAULT= COOKIES HYPHENATION SSL THREADS +OPTIONS_DEFINE= COOKIES DEBUG DOCS HYPHENATION IPV6 JPEG PNG SSL \ + THREADS +OPTIONS_DEFAULT= COOKIES HYPHENATION IPV6 JPEG PNG SSL THREADS COOKIES_DESC= Cookie support HYPHENATION_DESC= Hyphenation file(s) for HYPHENATION_LANGS SSL_DESC= Experimental HTTPS support -SSL_USES= ssl +DEBUG_CONFIGURE_ENABLE= gprof rtfl + COOKIES_CONFIGURE_ENABLE= cookies -IPV6_CONFIGURE_ENABLE= ipv6 -SSL_CONFIGURE_ENABLE= ssl + +IPV6_CONFIGURE_ENABLE= ipv6 + +JPEG_CONFIGURE_ENABLE= jpeg +JPEG_USES= jpeg + +PNG_CONFIGURE_ENABLE= png +PNG_LIB_DEPENDS= libpng16.so:graphics/png + +SSL_USES= ssl +SSL_CONFIGURE_ENABLE= ssl +SSL_EXTRA_PATCHES= ${PATCHDIR}/extra-patches-openssl + THREADS_CONFIGURE_ENABLE= threaded-dns .include <bsd.port.pre.mk> -.ifdef(WITH_DEBUG) -CONFIGURE_ARGS+= --enable-gprof --enable-rtfl -.else -CONFIGURE_ARGS+= --disable-gprof --disable-rtfl -.endif - .if ${PORT_OPTIONS:MHYPHENATION} -ALL_HYPHENATION_LANGS= af as bg bn ca cop cs cy da de-1901 de-1996 \ -de-ch-1901 el-monoton el-polyton en-gb en-us eo es et eu fi fr fur ga \ -gl grc gu hi hr hsb hu hy ia id is it ka kmr kn la la-x-classic lt lv ml mn-cyrl mr \ -mul-ethi nb nl nn or pa pl pms pt rm ro ru sa sh-cyrl sh-latn sk sl \ -sr-cyrl sv ta te th tk tr uk zh-latn-pinyin +ALL_HYPHENATION_LANGS= af as bg bn ca cop cs cy da de-1901 de-1996 de-ch-1901 \ + el-monoton el-polyton en-gb en-us eo es et eu fi fr fur \ + ga gl grc gu hi hr hsb hu hy ia id is it ka kmr kn la \ + la-x-classic lt lv ml mn-cyrl mr mul-ethi nb nl nn or \ + pa pl pms pt rm ro ru sa sh-cyrl sh-latn sk sl sr-cyrl \ + sv ta te th tk tr uk zh-latn-pinyin .if defined(MAINTAINER_MODE) || make(makesum) HYPHENATION_LANGS?= ${ALL_HYPHENATION_LANGS} .else -HYPHENATION_LANGS?= \ - ${ALL_HYPHENATION_LANGS:N*-1901:N*-classic:N*-latn:N*-gb:N*-monoton} +HYPHENATION_LANGS?= ${ALL_HYPHENATION_LANGS:N*-1901:N*-classic:N*-latn:N*-gb:N*-monoton} .endif .for _l in ${HYPHENATION_LANGS} .if !${ALL_HYPHENATION_LANGS:M${_l}} -IGNORE= remove the invalid hyphenation language "${_l}" from HYPHENATION_LANGS +IGNORE= remove the invalid hyphenation language "${_l}" from HYPHENATION_LANGS .else DISTFILES+= hyph-${_l}.pat.txt:hyphen PLIST_FILES+= libexec/dillo/hyphenation/${_l:C/-.*\$//}.pat Modified: head/www/dillo2/distinfo ============================================================================== --- head/www/dillo2/distinfo Fri Jun 7 23:30:13 2019 (r503676) +++ head/www/dillo2/distinfo Fri Jun 7 23:52:19 2019 (r503677) @@ -1,11 +1,12 @@ +TIMESTAMP = 1559812757 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 SIZE (dillo/hyph-af.pat.txt) = 76602 SHA256 (dillo/hyph-as.pat.txt) = 7e919515a24ff650b14cb21458498aadf5267b5cdc761058e72f274544a4ecb6 SIZE (dillo/hyph-as.pat.txt) = 368 -SHA256 (dillo/hyph-bg.pat.txt) = 8039123b4e00e44be1b6de62829116a8567a43ac22521c2080cbe17ffd666115 -SIZE (dillo/hyph-bg.pat.txt) = 12831 +SHA256 (dillo/hyph-bg.pat.txt) = ca3a154c7b5303050bb78e6ac1d4090b2130795db0e6d9665156b1126a4ad402 +SIZE (dillo/hyph-bg.pat.txt) = 61487 SHA256 (dillo/hyph-bn.pat.txt) = 7e919515a24ff650b14cb21458498aadf5267b5cdc761058e72f274544a4ecb6 SIZE (dillo/hyph-bn.pat.txt) = 368 SHA256 (dillo/hyph-ca.pat.txt) = 2dc1bdf12b59ade48a70a3af4692c79bbc1be4e786ad625164cdf90f0e5e7753 @@ -18,12 +19,12 @@ SHA256 (dillo/hyph-cy.pat.txt) = ba1025eecf4464bd1709d 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-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-1901.pat.txt) = 756c3ae6768c815eb6c3048ec10608db693fbe8d2d52e8a182bf4bd868002779 +SIZE (dillo/hyph-de-1901.pat.txt) = 183207 +SHA256 (dillo/hyph-de-1996.pat.txt) = cddf781107d016a9139e62189729fb1e314d3683ac0dbed605306ce956fb78eb +SIZE (dillo/hyph-de-1996.pat.txt) = 181827 +SHA256 (dillo/hyph-de-ch-1901.pat.txt) = 9cd5b02c2f9313dbcc2cfb8bdd38d4805a53c2121e6efb3f8a635265578d7bfa +SIZE (dillo/hyph-de-ch-1901.pat.txt) = 179702 SHA256 (dillo/hyph-el-monoton.pat.txt) = ae58ac05e9c88dcfa6a2ebecb2fd6aebb08c3f36c4bf3c4e96984c0a2a71ad2e SIZE (dillo/hyph-el-monoton.pat.txt) = 3905 SHA256 (dillo/hyph-el-polyton.pat.txt) = ee93362de2e568ec0254dad0595aa79804d1c26815976cace38522f5afac3ff6 @@ -34,24 +35,24 @@ SHA256 (dillo/hyph-en-us.pat.txt) = 0f57318b878b132547 SIZE (dillo/hyph-en-us.pat.txt) = 31489 SHA256 (dillo/hyph-eo.pat.txt) = aecb4cf4ac1676c31f90a1329afca7f194f73ae418ec4740b7bb418c1c5375da SIZE (dillo/hyph-eo.pat.txt) = 18239 -SHA256 (dillo/hyph-es.pat.txt) = fd64125cc873122175fea4d14391607132691ef74b94ceba17cbf56d5f718dad -SIZE (dillo/hyph-es.pat.txt) = 27711 +SHA256 (dillo/hyph-es.pat.txt) = b084bacb1d866b72486c5288e2e0f838c9c82f233a5aa1ac5531b3993e11176c +SIZE (dillo/hyph-es.pat.txt) = 29623 SHA256 (dillo/hyph-et.pat.txt) = e04675ba1851dca1cdaab9fe5cb8dea2f7b04dfc9bf89820fc6bc9ef7eb7fd16 SIZE (dillo/hyph-et.pat.txt) = 23266 SHA256 (dillo/hyph-eu.pat.txt) = bbb0b2619153956a8e15c9e6941e20d7f6d736499c4161f016172a6d2985cc4d SIZE (dillo/hyph-eu.pat.txt) = 949 SHA256 (dillo/hyph-fi.pat.txt) = ccabb0b3f403eca9999c0cd73b75d16b0220f2052d8f6aad2f98b5f1854dc027 SIZE (dillo/hyph-fi.pat.txt) = 1547 -SHA256 (dillo/hyph-fr.pat.txt) = 8c1879d5ccba078694881ae5bb3fef0c4eedb0743327c88faf2a355202867086 -SIZE (dillo/hyph-fr.pat.txt) = 9582 +SHA256 (dillo/hyph-fr.pat.txt) = fd40a89e9e8eb0784a0919e50378814843e44afa41c5beaf0a85f6562820f6c2 +SIZE (dillo/hyph-fr.pat.txt) = 9674 SHA256 (dillo/hyph-fur.pat.txt) = e51b6e51c29233b79b2ecc0493fe2b99177ef98e99b925d9603841fb30942478 SIZE (dillo/hyph-fur.pat.txt) = 2186 SHA256 (dillo/hyph-ga.pat.txt) = 207d76d5666607cf1ec73b736cc821f8502fc0eeae822e5c460ed5615cb7202b SIZE (dillo/hyph-ga.pat.txt) = 43243 SHA256 (dillo/hyph-gl.pat.txt) = 78185ecaff922fc2fb7c8acc164ed5a303119eb280d4af48745fd7513a628522 SIZE (dillo/hyph-gl.pat.txt) = 20714 -SHA256 (dillo/hyph-grc.pat.txt) = d61ff400b2492ccb217202dea00cd9e1a29bba8e17b39a4da475abf4438f1418 -SIZE (dillo/hyph-grc.pat.txt) = 63006 +SHA256 (dillo/hyph-grc.pat.txt) = 04b0e89603df4e8efdf5097a8f3f14a5f52c629abe8846db8c7e7b5558c9f62f +SIZE (dillo/hyph-grc.pat.txt) = 64407 SHA256 (dillo/hyph-gu.pat.txt) = 717fbb82d36d78025c0ab660658d9f07dba8da8508e529acee5186820b81807c SIZE (dillo/hyph-gu.pat.txt) = 337 SHA256 (dillo/hyph-hi.pat.txt) = a070afade79f4ba1701db681cd91be25922cbdff975bc8ec1884214fcb6f4971 @@ -78,8 +79,8 @@ SHA256 (dillo/hyph-kmr.pat.txt) = 80bdb7635999aad90106 SIZE (dillo/hyph-kmr.pat.txt) = 1351 SHA256 (dillo/hyph-kn.pat.txt) = d7939c1e1c8fef58585cd0af4c852d665440cf16c3c5cdf2f956bc4ce1201292 SIZE (dillo/hyph-kn.pat.txt) = 373 -SHA256 (dillo/hyph-la.pat.txt) = c333bf3b72a0775c3cd499618c3af4fbd6b1c1f890f2d5b58360dd5b3a9c810b -SIZE (dillo/hyph-la.pat.txt) = 1757 +SHA256 (dillo/hyph-la.pat.txt) = a16fd3a431fd5698391e71c35f1d159c0618061f7bac02278210fae87a4fc44b +SIZE (dillo/hyph-la.pat.txt) = 1761 SHA256 (dillo/hyph-la-x-classic.pat.txt) = 9f3204897d80ed9a6ec49f4fe2be6f07c15b05a29d4df35b5e5e41aa99d63e35 SIZE (dillo/hyph-la-x-classic.pat.txt) = 5323 SHA256 (dillo/hyph-lt.pat.txt) = 38e3ac46376bc32db4197facffedff4ee442c3871f0244e08cd520d62665d56d @@ -92,8 +93,8 @@ SHA256 (dillo/hyph-mn-cyrl.pat.txt) = 476463ab5b28ad58 SIZE (dillo/hyph-mn-cyrl.pat.txt) = 12894 SHA256 (dillo/hyph-mr.pat.txt) = a070afade79f4ba1701db681cd91be25922cbdff975bc8ec1884214fcb6f4971 SIZE (dillo/hyph-mr.pat.txt) = 359 -SHA256 (dillo/hyph-mul-ethi.pat.txt) = ad11ee346eef21fe4d821caf895ddfc6bc22d0b7fa6d33b2ddfdd2c78fbab008 -SIZE (dillo/hyph-mul-ethi.pat.txt) = 2538 +SHA256 (dillo/hyph-mul-ethi.pat.txt) = 7f68ce48ae723a1ca679916fb831b1dbc01818f92d25a9bf1d7da9accf0ba014 +SIZE (dillo/hyph-mul-ethi.pat.txt) = 2730 SHA256 (dillo/hyph-nb.pat.txt) = e080c77da3d0f8de7e464f69082f5e2485e43ed349a2a7018b84e0adef785806 SIZE (dillo/hyph-nb.pat.txt) = 192730 SHA256 (dillo/hyph-nl.pat.txt) = ac5795c1d6cd7027e6ec3a9e58e173789f999669e40ffd81755a4db7d3214165 @@ -134,13 +135,13 @@ SHA256 (dillo/hyph-ta.pat.txt) = 6ccd02f3254fd7f4a2d1d SIZE (dillo/hyph-ta.pat.txt) = 457 SHA256 (dillo/hyph-te.pat.txt) = 43676d49d447ccfe6e4cf8280a879a08ddbc1f50cf86145f7bf7564119b57d35 SIZE (dillo/hyph-te.pat.txt) = 368 -SHA256 (dillo/hyph-th.pat.txt) = cfdf0166c9a13b5c54dc3804422cea95425fedbea03e5dd474fd6f5503ee06ab -SIZE (dillo/hyph-th.pat.txt) = 53240 +SHA256 (dillo/hyph-th.pat.txt) = 7da72796303444e0fe524b20fb7896dd95c70daa94b354433a7104350304d3fc +SIZE (dillo/hyph-th.pat.txt) = 53940 SHA256 (dillo/hyph-tk.pat.txt) = a016ebc51d23accd92d958f58b4c10583432f56ea4e70ab2987bbf517ca8ec50 SIZE (dillo/hyph-tk.pat.txt) = 13246 SHA256 (dillo/hyph-tr.pat.txt) = 0e7dda13d183f667e3eca0f7ea426dbe51458ca6072b878eb35102966ec22f03 SIZE (dillo/hyph-tr.pat.txt) = 2787 SHA256 (dillo/hyph-uk.pat.txt) = 48c8640eb073bee879fb3d57cd91068bf70129b0bb8f7f5db6ecf9e056b57d1e SIZE (dillo/hyph-uk.pat.txt) = 43682 -SHA256 (dillo/hyph-zh-latn-pinyin.pat.txt) = b3f48edbae8ab8100a290c6fa9d5242d92b4850565f34bd7b14516a1b68ca80e -SIZE (dillo/hyph-zh-latn-pinyin.pat.txt) = 803 +SHA256 (dillo/hyph-zh-latn-pinyin.pat.txt) = 33cb4ef6f14ae339f1454a5e8a34ab751517862e98c52e9a4f0adeecda0f3fc7 +SIZE (dillo/hyph-zh-latn-pinyin.pat.txt) = 3277 Added: head/www/dillo2/files/extra-patches-openssl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dillo2/files/extra-patches-openssl Fri Jun 7 23:52:19 2019 (r503677) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906072352.x57NqJ0S070778>