CVS commit: pkgsrc/www/dillo

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Tue May  7 18:06:35 UTC 2024

Modified Files:
        pkgsrc/www/dillo: Makefile PLIST distinfo options.mk
Removed Files:
        pkgsrc/www/dillo/patches: patch-configure patch-dpi_https.c

Log Message:
Updated www/dillo to 3.1.0

Since the last release 3.0.5 from 2015 a lot of things have happened
to the Dillo project. A plot of number of commits over time colored
by authors. There is a missing gap from mid 2002 to mid 2008. And
from 2017 to end of 2023 there is almost no commits. Here is a
short timeline to put things into perspective:

 - On 2016, the main developer of the layout engine, Sebastian
   Geerken, passed away
 - On 2017, the development stopped
 - On 2019, the last email from Jorge Arellano Cid, the lead
   developer of Dillo, was recorded by the mailing list
 - On 2022, the domain dillo.org was lost
 - On 2024, an attempt to resurrect the project began by Rodrigo
   Arias Mallo

This release contains a lot of changes accumulated from the 2015-2017
period, as well as fixes and small features introduced in 2024.
Here is a summary:

 - Add support for floating HTML elements, which involved a big
   redesign
 - Add support for OpenSSL, LibreSSL and mbed TLS for HTTPS, which
   is now enabled by default
 - Add a CI pipeline to build Dillo on Ubuntu, MacOS, FreeBSD and
   Windows (via cygwin)
 - Add automatic HTML rendering tests
 - Improve and extend the Dillo manual


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/www/dillo/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/dillo/PLIST
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/dillo/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/dillo/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/www/dillo/patches/patch-configure \
    pkgsrc/www/dillo/patches/patch-dpi_https.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/dillo/Makefile
diff -u pkgsrc/www/dillo/Makefile:1.89 pkgsrc/www/dillo/Makefile:1.90
--- pkgsrc/www/dillo/Makefile:1.89      Sun Nov 12 13:23:54 2023
+++ pkgsrc/www/dillo/Makefile   Tue May  7 18:06:35 2024
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.89 2023/11/12 13:23:54 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2024/05/07 18:06:35 abs Exp $
 
-DISTNAME=      dillo-3.0.5
-PKGREVISION=   14
+DISTNAME=      dillo-3.1.0
 CATEGORIES=    www
-MASTER_SITES=  https://www.dillo.org/download/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=dillo-browser/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.dillo.org/
+HOMEPAGE=      https://dillo-browser.github.io/
 COMMENT=       Very small and fast graphical web-browser
 LICENSE=       gnu-gpl-v3
 
@@ -29,16 +28,22 @@ INSTALLATION_DIRS=  share/doc/dillo ${EGD
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 
+USE_TOOLS+=            aclocal autoconf automake autoreconf gmake perl tar
+
 .include "options.mk"
 
+pre-configure:
+       cd ${WRKSRC} && autoreconf -fi
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo
        ${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/dillo
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
 

Index: pkgsrc/www/dillo/PLIST
diff -u pkgsrc/www/dillo/PLIST:1.19 pkgsrc/www/dillo/PLIST:1.20
--- pkgsrc/www/dillo/PLIST:1.19 Sat Apr 12 02:24:19 2014
+++ pkgsrc/www/dillo/PLIST      Tue May  7 18:06:35 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2014/04/12 02:24:19 obache Exp $
+@comment $NetBSD: PLIST,v 1.20 2024/05/07 18:06:35 abs Exp $
 bin/dillo
 bin/dillo-install-hyphenation
 bin/dpid
@@ -10,24 +10,16 @@ lib/dillo/dpi/downloads/downloads.dpi
 lib/dillo/dpi/file/file.dpi
 lib/dillo/dpi/ftp/ftp.filter.dpi
 lib/dillo/dpi/hello/hello.filter.dpi
-lib/dillo/dpi/https/https.filter.dpi
 lib/dillo/dpi/vsource/vsource.filter.dpi
 man/man1/dillo.1
-share/doc/dillo/CCCwork.txt
-share/doc/dillo/Cache.txt
+share/applications/dillo.desktop
 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/README
-share/doc/dillo/Selection.txt
 share/doc/dillo/user_help.html
 share/examples/dillo/dillorc
 share/examples/dillo/domainrc
 share/examples/dillo/dpidrc
+share/examples/dillo/hsts_preload
 share/examples/dillo/keysrc
+share/icons/hicolor/128x128/apps/dillo.png
+share/icons/hicolor/48x48/apps/dillo.png

Index: pkgsrc/www/dillo/distinfo
diff -u pkgsrc/www/dillo/distinfo:1.42 pkgsrc/www/dillo/distinfo:1.43
--- pkgsrc/www/dillo/distinfo:1.42      Tue Oct 26 11:29:24 2021
+++ pkgsrc/www/dillo/distinfo   Tue May  7 18:06:35 2024
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.42 2021/10/26 11:29:24 nia Exp $
+$NetBSD: distinfo,v 1.43 2024/05/07 18:06:35 abs Exp $
 
-BLAKE2s (dillo-3.0.5.tar.bz2) = 7644d03e1ebf63ad7abcb1a1b629a112b34e5d82026631ccca1e6e13c4a3ef25
-SHA512 (dillo-3.0.5.tar.bz2) = d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
-Size (dillo-3.0.5.tar.bz2) = 734472 bytes
-SHA1 (patch-configure) = 18dc67f0fe302ee030cb7be2a5fa5ef5976fcece
-SHA1 (patch-dpi_https.c) = 1f95a8dfdc44a9ad6aa666cb880198708c6a5f1d
+BLAKE2s (dillo-3.1.0.tar.gz) = e15d9a6dafa97a6140047df208647e46675a8fa93f3eb287ff81b77fb150064f
+SHA512 (dillo-3.1.0.tar.gz) = c34995a9b7911458f962b1f7424a06a4b95ad8a3f01a3e84ecbf19fa6e6fd10992c5536712e4942ab45b2137e543e1d383751ffc50b58f95d4da9f5891d05c61
+Size (dillo-3.1.0.tar.gz) = 1514218 bytes

Index: pkgsrc/www/dillo/options.mk
diff -u pkgsrc/www/dillo/options.mk:1.6 pkgsrc/www/dillo/options.mk:1.7
--- pkgsrc/www/dillo/options.mk:1.6     Sun Sep 20 08:55:48 2020
+++ pkgsrc/www/dillo/options.mk Tue May  7 18:06:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2020/09/20 08:55:48 bsiegert Exp $
+# $NetBSD: options.mk,v 1.7 2024/05/07 18:06:35 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dillo
 PKG_SUPPORTED_OPTIONS= inet6 ssl
@@ -11,13 +11,13 @@ CONFIGURE_ARGS+=    --enable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=       --enable-ssl
+CONFIGURE_ARGS+=       --enable-tls
 LIBS+=                 -lssl
 .include "../../security/openssl/buildlink3.mk"
 
 SUBST_CLASSES+=                sslcerts
 SUBST_MESSAGE.sslcerts=        Fixing SSL certificate directory.
-SUBST_FILES.sslcerts=  dpi/https.c
+SUBST_FILES.sslcerts=  src/IO/tls_openssl.c src/IO/tls_mbedtls.c
 SUBST_STAGE.sslcerts=  post-extract
 SUBST_SED.sslcerts=    -e 's,"/etc/ssl/certs,"${SSLCERTS},'