Download raw body.
update www/dillo
this updates dillo to its latest version
Changelog: https://github.com/dillo-browser/dillo/releases/tag/v3.1.0
make port-lib-depends-check is happy, portcheck too
built fine in a clean proot using dpb
I had to pull in gtk4 because of the following error, is it possible
to get ride of it?
===> Installing dillo-3.1.0 from /usr/ports/packages/amd64/all/
Error in dillo-3.1.0: @tag gtk-update-icon-cache definition not found
Direct dependencies for dillo-3.1.0 resolve to jpeg-3.0.2v0 fltk-1.3.3p3 png-1.6.43 wget-1.21.4p0 libiconv-1.17 desktop-file-utils-0.27
Full dependency tree is desktop-file-utils-0.27 libunistring-0.9.7 xz-5.4.5 python-3.10.14p0 wget-1.21.4p0 png-1.6.43 libidn2-2.3.0p0 libpsl-0.21.1 fltk-1.3.3p3 jpeg-3.0.2v0 sqlite3-3.44.2 bzip2-1.0.8p0 libffi-3.4.4p1 glib2-2.80.0 gettext-runtime-0.22.5 libiconv-1.17 py3-packaging-23.2 pcre2-10.37p2
Couldn't install dillo-3.1.0
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index eabf3e0371c..f0136494302 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,10 +1,10 @@
COMMENT = fast and light graphical web browser
-DISTNAME = dillo-3.0.5
CATEGORIES = www
-REVISION = 5
-HOMEPAGE = https://www.dillo.org/
+DIST_TUPLE += github dillo-browser dillo v3.1.0 .
+
+HOMEPAGE = https://dillo-browser.github.io/
# GPLv3+
PERMIT_PACKAGE = Yes
@@ -14,7 +14,6 @@ WANTLIB += fltk fontconfig iconv jpeg m png pthread ssl ${COMPILER_LIBCXX} z
COMPILER = base-clang ports-gcc base-gcc
-SITES = https://www.dillo.org/download/
EXTRACT_SUFX = .tar.bz2
@@ -25,12 +24,15 @@ LIB_DEPENDS = converters/libiconv \
# XXX dillo should be patched to use ftp(1)
RUN_DEPENDS = devel/desktop-file-utils \
- net/wget
+ net/wget \
+ x11/gtk+4,-guic
USE_GMAKE = Yes
-CONFIGURE_STYLE = gnu
+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
+CONFIGURE_STYLE= autoreconf
CONFIGURE_ARGS = --enable-ipv6 \
- --enable-ssl
+ --enable-tls
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -fcommon" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index bc2dcb51643..82b303dc9f1 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dillo-3.0.5.tar.bz2) = 2xvhbBxYQuvge0Gap8bvEaRWA6dd8od/mWNfT4NFFIs=
-SIZE (dillo-3.0.5.tar.bz2) = 734472
+SHA256 (dillo-browser-dillo-v3.1.0.tar.gz) = OqKmhmSLODQXoMH1dcPVQx1qLVPzXC4Rv1ecslsrRec=
+SIZE (dillo-browser-dillo-v3.1.0.tar.gz) = 1514218
diff --git a/www/dillo/patches/patch-dillorc b/www/dillo/patches/patch-dillorc
deleted file mode 100644
index 5c042af4ffe..00000000000
--- a/www/dillo/patches/patch-dillorc
+++ /dev/null
@@ -1,11 +0,0 @@
---- dillorc.orig Wed Apr 9 13:39:59 2014
-+++ dillorc Thu Apr 10 09:34:20 2014
-@@ -51,7 +51,7 @@
- # "fc-list : family | cut -d ',' -f 2 | sort").
- #font_serif="DejaVu Serif"
- #font_sans_serif="DejaVu Sans"
--#font_cursive="URW Chancery L"
-+font_cursive="DejaVu Serif"
- #font_fantasy="DejaVu Sans"
- #font_monospace="DejaVu Sans Mono"
- #
diff --git a/www/dillo/patches/patch-dpi_https_c b/www/dillo/patches/patch-dpi_https_c
deleted file mode 100644
index 3f0c20e9363..00000000000
--- a/www/dillo/patches/patch-dpi_https_c
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: dpi/https.c
---- dpi/https.c.orig
-+++ dpi/https.c
-@@ -169,7 +169,7 @@ static void yes_ssl_support(void)
- /*FIXME - provide for sysconfdir variables and such*/
- if (exit_error == 0){
- if (SSL_CTX_load_verify_locations(
-- ssl_context, NULL, "/etc/ssl/certs/" ) == 0){
-+ ssl_context, "/etc/ssl/cert.pem", "/etc/ssl/certs/" ) == 0){
- MSG("Error opening system x509 certificate location\n");
- exit_error = 1;
- }
-@@ -476,7 +476,7 @@ static int handle_certificate_problem(SSL * ssl_connec
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- /*Either self signed and untrusted*/
- /*Extract CN from certificate name information*/
-- if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
-+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
- strcpy(buf, "(no CN given)");
- } else {
- char *cn_end;
diff --git a/www/dillo/pkg/PLIST b/www/dillo/pkg/PLIST
index 404c6186c9b..cfb06451210 100644
--- a/www/dillo/pkg/PLIST
+++ b/www/dillo/pkg/PLIST
@@ -18,25 +18,12 @@ lib/dillo/dpi/ftp/
@bin lib/dillo/dpi/ftp/ftp.filter.dpi
lib/dillo/dpi/hello/
@bin lib/dillo/dpi/hello/hello.filter.dpi
-lib/dillo/dpi/https/
-@bin lib/dillo/dpi/https/https.filter.dpi
lib/dillo/dpi/vsource/
@bin lib/dillo/dpi/vsource/vsource.filter.dpi
@man man/man1/dillo.1
share/applications/dillo.desktop
share/doc/dillo/
-share/doc/dillo/CCCwork.txt
-share/doc/dillo/Cache.txt
share/doc/dillo/Cookies.txt
-share/doc/dillo/Dillo.txt
-share/doc/dillo/Dpid.txt
-share/doc/dillo/Dw.txt
-share/doc/dillo/HtmlParser.txt
-share/doc/dillo/IO.txt
-share/doc/dillo/Images.txt
-share/doc/dillo/Imgbuf.txt
-share/doc/dillo/NC_design.txt
-share/doc/dillo/Selection.txt
share/doc/dillo/user_help.html
share/examples/dillo/
@sample ${SYSCONFDIR}/dillo/
@@ -46,8 +33,12 @@ share/examples/dillo/domainrc
@sample ${SYSCONFDIR}/dillo/domainrc
share/examples/dillo/dpidrc
@sample ${SYSCONFDIR}/dillo/dpidrc
+share/examples/dillo/hsts_preload
share/examples/dillo/keysrc
@sample ${SYSCONFDIR}/dillo/keysrc
+share/icons/hicolor/128x128/apps/dillo.png
+share/icons/hicolor/48x48/apps/dillo.png
share/pixmaps/
share/pixmaps/dillo.xpm
@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
update www/dillo