pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/dillo
Module Name: pkgsrc
Committed By: micha
Date: Fri Jan 31 14:33:17 UTC 2025
Modified Files:
pkgsrc/www/dillo: DESCR Makefile PLIST distinfo options.mk
Added Files:
pkgsrc/www/dillo/patches: patch-configure.ac
patch-dillo-install-hyphenation
Log Message:
www/dillo: Switch to FLTK 1.4
Part of FLTK 1.4 transition (Step 2).
- Add patch to detect FLTK 1.4
- Add patch for dillo-install-hyphenation
POSIX::tmpnam() is replaced with File::Temp
- Declare net/wget as dependency
dillo uses wget at runtime
- Declare usage of features "snprintf" and "vsnprintf"
- Use option "tls" to enable/disable TLS support
SSL is obsolete
- Use option "libwebp" to enable/disable WEBP image support
Option "webp" is not documented
- Add more information to DESCR
- Bump PKGREVISION
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/dillo/DESCR
cvs rdiff -u -r1.93 -r1.94 pkgsrc/www/dillo/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/dillo/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/dillo/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/dillo/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/dillo/patches/patch-configure.ac \
pkgsrc/www/dillo/patches/patch-dillo-install-hyphenation
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/DESCR
diff -u pkgsrc/www/dillo/DESCR:1.6 pkgsrc/www/dillo/DESCR:1.7
--- pkgsrc/www/dillo/DESCR:1.6 Sun Jan 22 09:12:03 2012
+++ pkgsrc/www/dillo/DESCR Fri Jan 31 14:33:17 2025
@@ -1 +1,10 @@
-A very small and fast graphical web browser using FLTK-1.3.
+Dillo is a web browser designed to be fast, use few resources and
+support slow and unreliable networks on resource-constrained machines.
+It can load local and remote files via HTTP, HTTPS and FTP.
+Other protocols like Gemini, Gopher, IPFS and others are available as
+plugins.
+
+Dillo supports a subset of HTML 4.01 and CSS 2.1 but it doesn't support
+JavaScript and only implements some elements of HTML 5 and CSS 3.
+It also renders plain text documents and images in PNG, JPG and GIF
+formats.
Index: pkgsrc/www/dillo/Makefile
diff -u pkgsrc/www/dillo/Makefile:1.93 pkgsrc/www/dillo/Makefile:1.94
--- pkgsrc/www/dillo/Makefile:1.93 Sun Jan 19 15:34:43 2025
+++ pkgsrc/www/dillo/Makefile Fri Jan 31 14:33:17 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2025/01/19 15:34:43 ktnb Exp $
+# $NetBSD: Makefile,v 1.94 2025/01/31 14:33:17 micha Exp $
DISTNAME= dillo-3.2.0
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=dillo-browser/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -13,9 +14,12 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
+USE_FEATURES+= snprintf vsnprintf
+USE_TOOLS+= aclocal autoconf automake autoreconf gmake perl:run
+
+DEPENDS+= wget-[0-9]*:../../net/wget
REPLACE_PERL+= dillo-install-hyphenation
-USE_TOOLS+= perl:run wget:run
PKG_SYSCONFSUBDIR= dillo
EGDIR= ${PREFIX}/share/examples/dillo
@@ -28,12 +32,10 @@ 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
+ cd ${WRKSRC} && autoreconf -fiv
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo
@@ -44,7 +46,6 @@ post-install:
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/fltk13/buildlink3.mk"
-
+.include "../../x11/fltk/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/dillo/PLIST
diff -u pkgsrc/www/dillo/PLIST:1.20 pkgsrc/www/dillo/PLIST:1.21
--- pkgsrc/www/dillo/PLIST:1.20 Tue May 7 18:06:35 2024
+++ pkgsrc/www/dillo/PLIST Fri Jan 31 14:33:17 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2024/05/07 18:06:35 abs Exp $
+@comment $NetBSD: PLIST,v 1.21 2025/01/31 14:33:17 micha Exp $
bin/dillo
bin/dillo-install-hyphenation
bin/dpid
Index: pkgsrc/www/dillo/distinfo
diff -u pkgsrc/www/dillo/distinfo:1.45 pkgsrc/www/dillo/distinfo:1.46
--- pkgsrc/www/dillo/distinfo:1.45 Sun Jan 19 15:34:43 2025
+++ pkgsrc/www/dillo/distinfo Fri Jan 31 14:33:17 2025
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.45 2025/01/19 15:34:43 ktnb Exp $
+$NetBSD: distinfo,v 1.46 2025/01/31 14:33:17 micha Exp $
BLAKE2s (dillo-3.2.0.tar.gz) = 5316ef138218567801d7ed9491f69c8f30393f91f976ee6980ca9f47e764a2e1
SHA512 (dillo-3.2.0.tar.gz) = ff6aa64c79a5dac3bd5152e7501a20c129924c20df712003fc2cd0f18ab55886b0959aea4765f3c893e450e9f95781c10d393108cae8240804d4740f8121f066
Size (dillo-3.2.0.tar.gz) = 1459110 bytes
+SHA1 (patch-configure.ac) = 9e3e7297b559dc70a3b1b61416bf1e97eeb23ca0
+SHA1 (patch-dillo-install-hyphenation) = 27f3a481da421a691c4c39093f010c01abee2515
Index: pkgsrc/www/dillo/options.mk
diff -u pkgsrc/www/dillo/options.mk:1.8 pkgsrc/www/dillo/options.mk:1.9
--- pkgsrc/www/dillo/options.mk:1.8 Sun Jan 19 15:34:43 2025
+++ pkgsrc/www/dillo/options.mk Fri Jan 31 14:33:17 2025
@@ -1,31 +1,35 @@
-# $NetBSD: options.mk,v 1.8 2025/01/19 15:34:43 ktnb Exp $
+# $NetBSD: options.mk,v 1.9 2025/01/31 14:33:17 micha Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dillo
-PKG_SUPPORTED_OPTIONS= inet6 ssl webp
-PKG_SUGGESTED_OPTIONS= inet6 ssl webp
+PKG_SUPPORTED_OPTIONS= inet6 tls libwebp
+PKG_SUGGESTED_OPTIONS= inet6 tls libwebp
.include "../../mk/bsd.options.mk"
+# Support for IPv6 protocol
.if !empty(PKG_OPTIONS:Minet6)
CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
.endif
-.if !empty(PKG_OPTIONS:Mssl)
+# Support for Transport Layer Security (TLS)
+.if !empty(PKG_OPTIONS:Mtls)
CONFIGURE_ARGS+= --enable-tls
+CONFIGURE_ARGS+= --disable-mbedtls
+CONFIGURE_ARGS+= --enable-openssl
+CONFIGURE_ARGS+= --with-ca-certs-dir=${SSLCERTS}
LIBS+= -lssl
.include "../../security/openssl/buildlink3.mk"
-
-SUBST_CLASSES+= sslcerts
-SUBST_MESSAGE.sslcerts= Fixing SSL certificate directory.
-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},'
-
.else
-CONFIGURE_ARGS+= --disable-ssl
+CONFIGURE_ARGS+= --disable-tls
+CONFIGURE_ARGS+= --disable-mbedtls
+CONFIGURE_ARGS+= --disable-openssl
.endif
-.if !empty(PKG_OPTIONS:Mwebp)
+.if !empty(PKG_OPTIONS:Mlibwebp)
CONFIGURE_ARGS+= --enable-webp
.include "../../graphics/libwebp/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-webp
.endif
Added files:
Index: pkgsrc/www/dillo/patches/patch-configure.ac
diff -u /dev/null pkgsrc/www/dillo/patches/patch-configure.ac:1.1
--- /dev/null Fri Jan 31 14:33:17 2025
+++ pkgsrc/www/dillo/patches/patch-configure.ac Fri Jan 31 14:33:17 2025
@@ -0,0 +1,38 @@
+$NetBSD: patch-configure.ac,v 1.1 2025/01/31 14:33:17 micha Exp $
+
+Use FLTK 1.4 for glyph substitution on X11 platform.
+
+--- configure.ac.orig 2025-01-18 10:51:30.000000000 +0000
++++ configure.ac
+@@ -211,24 +211,24 @@ fi
+
+
+ dnl -------------------------
+-dnl Test for FLTK 1.3 library
++dnl Test for FLTK 1.4 library
+ dnl -------------------------
+ dnl
+ dnl For debugging and to be user friendly
+ AC_PATH_PROG(FLTK_CONFIG,fltk-config)
+-AC_MSG_CHECKING([FLTK 1.3])
++AC_MSG_CHECKING([FLTK 1.4])
+ fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
+ case $fltk_version in
+- 1.3.*) AC_MSG_RESULT(yes)
++ 1.4.*) AC_MSG_RESULT(yes)
+ LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
+ LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
+ LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
+- 1.4.*) AC_MSG_RESULT(no)
+- AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.3]);;
++ 1.5.*) AC_MSG_RESULT(no)
++ AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.4]);;
+ ?*) AC_MSG_RESULT(no)
+- AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
++ AC_MSG_ERROR(FLTK 1.4 required; version found: $fltk_version);;
+ *) AC_MSG_RESULT(no)
+- AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found)
++ AC_MSG_ERROR(FLTK 1.4 required; fltk-config not found)
+ esac
+
+ dnl -----------------------------------
Index: pkgsrc/www/dillo/patches/patch-dillo-install-hyphenation
diff -u /dev/null pkgsrc/www/dillo/patches/patch-dillo-install-hyphenation:1.1
--- /dev/null Fri Jan 31 14:33:17 2025
+++ pkgsrc/www/dillo/patches/patch-dillo-install-hyphenation Fri Jan 31 14:33:17 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-dillo-install-hyphenation,v 1.1 2025/01/31 14:33:17 micha Exp $
+
+Unimplemented: POSIX::tmpnam():
+ use File::Temp instead at /usr/pkg/bin/dillo-install-hyphenation line 110.
+
+--- dillo-install-hyphenation.orig 2024-05-04 19:53:29.000000000 +0000
++++ dillo-install-hyphenation
+@@ -1,5 +1,6 @@
+ #!/usr/bin/env perl
+-use POSIX;
++#use POSIX;
++use File::Temp;
+ use File::Basename;
+ use Net::FTP;
+ use Getopt::Long;
Home |
Main Index |
Thread Index |
Old Index