Date: Sun, 12 May 2024 13:53:08 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8667edd241a9 - main - www/dillo2: Update to 3.1.0 Message-ID: <202405121353.44CDr8Ap004318@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8667edd241a952554b634e827ed763b543a2862d commit 8667edd241a952554b634e827ed763b543a2862d Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-05-12 13:49:52 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-05-12 13:52:49 +0000 www/dillo2: Update to 3.1.0 Also,change WWW and MASTER_SITES. Dillo2 is hosted at a new website. Reported by: danfe, Rodrigo Arias <rodarima@gmail.com> --- www/dillo2/Makefile | 16 +++++-------- www/dillo2/distinfo | 6 ++--- www/dillo2/files/extra-patches-openssl | 41 ---------------------------------- www/dillo2/pkg-plist | 5 ++++- 4 files changed, 13 insertions(+), 55 deletions(-) diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index 376bcbadd86f..8eded5223a80 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -1,8 +1,7 @@ PORTNAME= dillo -PORTVERSION= 3.0.5 -PORTREVISION= 5 +PORTVERSION= 3.1.0 CATEGORIES= www -MASTER_SITES= http://www.dillo.org/download/ \ +MASTER_SITES= https://github.com/dillo-browser/dillo/releases/download/v3.1.0/ \ LOCAL/bf/dillo/ \ TEX/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -11,7 +10,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org COMMENT= Fast, small graphical Web browser built upon fltk -WWW= https://www.dillo.org/ +WWW= https://dillo-browser.github.io/dillo.org.html LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING @@ -37,11 +36,10 @@ PORTDOCS= * OPTIONS_DEFINE= COOKIES DEBUG DOCS HYPHENATION IPV6 JPEG PNG SSL \ THREADS -OPTIONS_DEFAULT= COOKIES IPV6 JPEG PNG SSL THREADS +OPTIONS_DEFAULT= COOKIES IPV6 JPEG PNG THREADS COOKIES_DESC= Cookie support HYPHENATION_DESC= Hyphenation file(s) for HYPHENATION_LANGS -SSL_DESC= Experimental HTTPS support DEBUG_CONFIGURE_ENABLE= gprof rtfl @@ -55,10 +53,6 @@ JPEG_USES= jpeg PNG_CONFIGURE_ENABLE= png PNG_LIB_DEPENDS= libpng.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> @@ -90,11 +84,13 @@ post-patch: @${MV} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample @${MV} ${WRKSRC}/dpid/dpidrc.in ${WRKSRC}/dpid/dpidrc.sample.in @${MV} ${WRKSRC}/src/domainrc ${WRKSRC}/src/domainrc.sample + @${MV} ${WRKSRC}/src/hsts_preload ${WRKSRC}/src/hsts_preload.sample @${MV} ${WRKSRC}/src/keysrc ${WRKSRC}/src/keysrc.sample @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|dillorc|dillorc.sample|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|dpidrc|dpidrc.sample|g" ${WRKSRC}/dpid/Makefile.in @${REINPLACE_CMD} -E "s/(domain|keys)rc/&.sample/g" ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -E "s/hsts_preload/hsts_preload.sample/g" ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e "s|/lib/dillo|/libexec/dillo|" \ ${WRKSRC}/dillo-install-hyphenation \ ${WRKSRC}/doc/dillo.1.in \ diff --git a/www/dillo2/distinfo b/www/dillo2/distinfo index 650e7afdaec1..967d6dfe04be 100644 --- a/www/dillo2/distinfo +++ b/www/dillo2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1652973072 -SHA256 (dillo/dillo-3.0.5.tar.bz2) = db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b -SIZE (dillo/dillo-3.0.5.tar.bz2) = 734472 +TIMESTAMP = 1715503936 +SHA256 (dillo/dillo-3.1.0.tar.bz2) = f56766956d90dac0ccca31755917cba8a4014bcf43b3e36c7d86efe1d20f9d92 +SIZE (dillo/dillo-3.1.0.tar.bz2) = 994610 diff --git a/www/dillo2/files/extra-patches-openssl b/www/dillo2/files/extra-patches-openssl deleted file mode 100644 index 38134a30d2fe..000000000000 --- a/www/dillo2/files/extra-patches-openssl +++ /dev/null @@ -1,41 +0,0 @@ -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; diff --git a/www/dillo2/pkg-plist b/www/dillo2/pkg-plist index a02ea17856e1..2f4bf3e9c87a 100644 --- a/www/dillo2/pkg-plist +++ b/www/dillo2/pkg-plist @@ -5,6 +5,7 @@ bin/dpidc @sample etc/dillo/dillorc.sample @sample etc/dillo/domainrc.sample @sample etc/dillo/dpidrc.sample +@sample etc/dillo/hsts_preload.sample @sample etc/dillo/keysrc.sample libexec/dillo/dpi/bookmarks/bookmarks.dpi libexec/dillo/dpi/cookies/cookies.dpi @@ -13,7 +14,9 @@ libexec/dillo/dpi/downloads/downloads.dpi libexec/dillo/dpi/file/file.dpi libexec/dillo/dpi/ftp/ftp.filter.dpi libexec/dillo/dpi/hello/hello.filter.dpi -libexec/dillo/dpi/https/https.filter.dpi libexec/dillo/dpi/vsource/vsource.filter.dpi +share/applications/dillo.desktop +share/icons/hicolor/128x128/apps/dillo.png +share/icons/hicolor/48x48/apps/dillo.png share/man/man1/dillo.1.gz @dir libexec/dillo/hyphenation
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405121353.44CDr8Ap004318>