CVS commit: pkgsrc/www/hiawatha

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Apr 23 09:13:34 UTC 2025

Modified Files:
        pkgsrc/www/hiawatha: Makefile distinfo options.mk

Log Message:
Update www/hiawatha to v11.7

Since upstream updated the enclosed mbedtls, we switch back to
building with that.

>From upstream's changelog:

mbed TLS updated to 3.6.3.

All references to http://www.hiawatha-webserver.org/ changed to
https://hiawatha.leisink.net/.

Bugfix: building without TLS support failed.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/hiawatha/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/hiawatha/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/hiawatha/Makefile
diff -u pkgsrc/www/hiawatha/Makefile:1.47 pkgsrc/www/hiawatha/Makefile:1.48
--- pkgsrc/www/hiawatha/Makefile:1.47   Thu Apr 17 21:52:47 2025
+++ pkgsrc/www/hiawatha/Makefile        Wed Apr 23 09:13:34 2025
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2025/04/17 21:52:47 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/04/23 09:13:34 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
-PKGVER=                11.6
-PKGREVISION=   10
+PKGVER=                11.7
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
 EXTRACT_SUFX=  .tar.gz
@@ -81,20 +80,6 @@ SUBST_MESSAGE.uid=   Configuring Hiawatha 
 SUBST_FILES.uid=       config/hiawatha.conf.in
 SUBST_VARS.uid=                HIAWATHA_USER HIAWATHA_GROUP
 
-SUBST_CLASSES+=                url
-SUBST_STAGE.url=       pre-configure
-SUBST_MESSAGE.url=     Updating upstream web URL.
-SUBST_FILES.url=       config/index.xslt
-SUBST_FILES.url+=      extra/index.html
-SUBST_FILES.url+=      man/cgi-wrapper.1.in
-SUBST_FILES.url+=      man/hiawatha.1.in
-SUBST_FILES.url+=      man/lefh.1
-SUBST_FILES.url+=      man/newroot.1
-SUBST_FILES.url+=      man/ssi-cgi.1
-SUBST_FILES.url+=      man/wigwam.1
-SUBST_SED.url=         -e 's/www.hiawatha-webserver.org/hiawatha.leisink.net/g'
-SUBST_SED.url+=                -e 's/@hiawatha-webserver.org/@leisink.net/g'
-
 .if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
 SUBST_CLASSES+=                mbopt
 SUBST_STAGE.mbopt=     pre-configure

Index: pkgsrc/www/hiawatha/distinfo
diff -u pkgsrc/www/hiawatha/distinfo:1.14 pkgsrc/www/hiawatha/distinfo:1.15
--- pkgsrc/www/hiawatha/distinfo:1.14   Tue Apr  1 22:08:48 2025
+++ pkgsrc/www/hiawatha/distinfo        Wed Apr 23 09:13:34 2025
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.14 2025/04/01 22:08:48 hauke Exp $
+$NetBSD: distinfo,v 1.15 2025/04/23 09:13:34 hauke Exp $
 
-BLAKE2s (hiawatha-v11.6.tar.gz) = cb18a61b34c9ae64a1c21bdff6c57562aecddeaa15f6d4da6ab2e278dd81ffa0
-SHA512 (hiawatha-v11.6.tar.gz) = e0b23dd0626ea9850469feefd3f4c69119230e327c63ab4b68442abe695a232c5b4ea4250791cd00fe730c1c6ff3a0a66fafccde38c029d43b4506b1c817dd53
-Size (hiawatha-v11.6.tar.gz) = 1844062 bytes
-BLAKE2s (mbedtls-3.6.3.tar.bz2) = 3832be62732ff5bc620812706e01a9913dd137920e0dada64201a32b972ca356
-SHA512 (mbedtls-3.6.3.tar.bz2) = 2bde64f2581347ac01d3d0c50dc8fc7ff09ceb11d44ba24e54f137a05316a326c97c792286a4d81b6335c10b1fa4c21962a6b75f8bb7c29ca514e7fc545da7da
-Size (mbedtls-3.6.3.tar.bz2) = 5138248 bytes
+BLAKE2s (hiawatha-v11.7.tar.gz) = 3a7109a9a06854861287803f074eea5298820000dca2fa36f6bcf2ea6ed64bce
+SHA512 (hiawatha-v11.7.tar.gz) = a163098eba02446423ff847cfa0a83d653d4021585945b2daa3b46c6a2fe3c58cb2731cb9db8e223fe82fca910f9bf96f61d5924e49fd6d6963f867144f97f3e
+Size (hiawatha-v11.7.tar.gz) = 1869623 bytes
 SHA1 (patch-CMakeLists.txt) = a96e51545ab31e5ceb4a520bb4757787088c8174
 SHA1 (patch-config_hiawatha.conf.in) = 8a58402b0201ec6cd661f5d949e127edfe4b693a
 SHA1 (patch-extra_letsencrypt_letsencrypt.conf.in) = 718d44e883f8206fd88480c5503d962198992347

Index: pkgsrc/www/hiawatha/options.mk
diff -u pkgsrc/www/hiawatha/options.mk:1.5 pkgsrc/www/hiawatha/options.mk:1.6
--- pkgsrc/www/hiawatha/options.mk:1.5  Tue Apr  1 22:08:48 2025
+++ pkgsrc/www/hiawatha/options.mk      Wed Apr 23 09:13:34 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2025/04/01 22:08:48 hauke Exp $
+# $NetBSD: options.mk,v 1.6 2025/04/23 09:13:34 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.hiawatha
 PKG_SUPPORTED_OPTIONS=         cache letsencrypt monitor rproxy tomahawk
@@ -24,7 +24,7 @@ PKG_OPTIONS_REQUIRED_GROUPS=  tls
 PLIST.letsencrypt=             yes
 REPLACE_PHP+=                  extra/letsencrypt/lefh.in
 
-DEPENDS+=      php-[0-9]*:${PHPPKGSRCDIR}
+DEPENDS+=      ${PHP_PKG_PREFIX}-[0-9]*:${PHPPKGSRCDIR}
 .include "../../lang/php/phpversion.mk"
 .endif
 
@@ -56,7 +56,7 @@ CONF_FILES+=  ${EGDIR}/letsencrypt.conf $
 .endif
 .if !empty(PKG_OPTIONS:Mmbedtls-private)
 # Should the enclosed mbedtls be replaced by an update?
-HIAWATHA_REPLACE_MBEDTLS=      yes
+HIAWATHA_REPLACE_MBEDTLS=      no
 .if !empty(HIAWATHA_REPLACE_MBEDTLS:Myes)
 MTVER=         3.6.3
 DISTFILES+=    mbedtls-${MTVER}.tar.bz2