CVS commit: pkgsrc/www/dillo

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Sep 20 08:55:48 UTC 2020

Modified Files:
        pkgsrc/www/dillo: Makefile options.mk

Log Message:
dillo: use correct SSLCERTS dir

It turns out the HTTPS plugin hardcodes the SSL certificate dir as
/etc/ssl/certs, which is incorrect in NetBSD. SUBST it to the correct
location and bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/www/dillo/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/dillo/options.mk

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.82 pkgsrc/www/dillo/Makefile:1.83
--- pkgsrc/www/dillo/Makefile:1.82      Mon Aug 31 18:12:32 2020
+++ pkgsrc/www/dillo/Makefile   Sun Sep 20 08:55:48 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.82 2020/08/31 18:12:32 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2020/09/20 08:55:48 bsiegert Exp $
 
 DISTNAME=      dillo-3.0.5
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    www
 MASTER_SITES=  https://www.dillo.org/download/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/www/dillo/options.mk
diff -u pkgsrc/www/dillo/options.mk:1.5 pkgsrc/www/dillo/options.mk:1.6
--- pkgsrc/www/dillo/options.mk:1.5     Sat Mar 24 15:40:07 2018
+++ pkgsrc/www/dillo/options.mk Sun Sep 20 08:55:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2018/03/24 15:40:07 ryoon Exp $
+# $NetBSD: options.mk,v 1.6 2020/09/20 08:55:48 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dillo
 PKG_SUPPORTED_OPTIONS= inet6 ssl
@@ -14,6 +14,13 @@ CONFIGURE_ARGS+=     --enable-ipv6
 CONFIGURE_ARGS+=       --enable-ssl
 LIBS+=                 -lssl
 .include "../../security/openssl/buildlink3.mk"
+
+SUBST_CLASSES+=                sslcerts
+SUBST_MESSAGE.sslcerts=        Fixing SSL certificate directory.
+SUBST_FILES.sslcerts=  dpi/https.c
+SUBST_STAGE.sslcerts=  post-extract
+SUBST_SED.sslcerts=    -e 's,"/etc/ssl/certs,"${SSLCERTS},'
+
 .else
 CONFIGURE_ARGS+=       --disable-ssl
 .endif