CVS commit: pkgsrc/www/hiawatha

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Aug 22 17:54:52 UTC 2024

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

Log Message:
www/hiawatha: Cmake changes

Switch from USE_CMAKE (mk/configure/cmake.mk) to including
devel/cmake/build.mk.

Stumbling stones were a custom CMAKE_BUILD_DIR for the sake of config
file generation (the paths could probably be patched), and the
CMAKE_ARGS -> CMAKE_CONFIGURE_ARGS conversion in options.mk, to make
sure we keep statically linking to mbedtls, instead of installing
private shared libs.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/www/hiawatha/Makefile
cvs rdiff -u -r1.1 -r1.2 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.36 pkgsrc/www/hiawatha/Makefile:1.37
--- pkgsrc/www/hiawatha/Makefile:1.36   Thu Aug 22 15:59:21 2024
+++ pkgsrc/www/hiawatha/Makefile        Thu Aug 22 17:54:51 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2024/08/22 15:59:21 hauke Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/22 17:54:51 hauke Exp $
 
 PKGNAME=       hiawatha-${PKGVER}
 DISTNAME=      hiawatha-v${PKGVER}
 PKGVER=                11.6
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITLAB:=hsleisink/hiawatha/-/archive/v${PKGVER}/}
 EXTRACT_SUFX=  .tar.gz
@@ -22,17 +23,18 @@ HIAWATHA_WEBROOT=   ${VARBASE}/hiawatha
 
 BUILD_DEFS+=           VARBASE
 
-USE_CMAKE=             yes
+# Config file processing
+CMAKE_BUILD_DIR=       .
 
-CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR=${PREFIX}/${HIAWATHA_CGIDIR}
-CMAKE_ARGS+=           -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
-CMAKE_ARGS+=           -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
-CMAKE_ARGS+=           -DWORK_DIR=${VARBASE}/db/${PKGBASE}
-CMAKE_ARGS+=           -DLOG_DIR=${HIAWATHA_LOGDIR}
-CMAKE_ARGS+=           -DPID_DIR=${HIAWATHA_PIDDIR}
-CMAKE_ARGS+=           -DWEBROOT_DIR=${HIAWATHA_WEBROOT}
-CMAKE_ARGS+=           -DWORK_DIR=${HIAWATHA_DATADIR}
-CMAKE_ARGS+=           -DCONFIG_DIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_BINDIR=${PREFIX}/${HIAWATHA_CGIDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALSTATEDIR=${VARBASE}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
+CMAKE_CONFIGURE_ARGS+= -DWORK_DIR=${VARBASE}/db/${PKGBASE}
+CMAKE_CONFIGURE_ARGS+= -DLOG_DIR=${HIAWATHA_LOGDIR}
+CMAKE_CONFIGURE_ARGS+= -DPID_DIR=${HIAWATHA_PIDDIR}
+CMAKE_CONFIGURE_ARGS+= -DWEBROOT_DIR=${HIAWATHA_WEBROOT}
+CMAKE_CONFIGURE_ARGS+= -DWORK_DIR=${HIAWATHA_DATADIR}
+CMAKE_CONFIGURE_ARGS+= -DCONFIG_DIR=${PKG_SYSCONFDIR}
 
 .include "options.mk"
 
@@ -131,5 +133,6 @@ post-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/hiawatha/options.mk
diff -u pkgsrc/www/hiawatha/options.mk:1.1 pkgsrc/www/hiawatha/options.mk:1.2
--- pkgsrc/www/hiawatha/options.mk:1.1  Mon Apr 15 14:52:33 2024
+++ pkgsrc/www/hiawatha/options.mk      Thu Aug 22 17:54:51 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/04/15 14:52:33 hauke Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/22 17:54:51 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.hiawatha
 PKG_SUPPORTED_OPTIONS=         cache letsencrypt monitor rproxy tomahawk
@@ -14,9 +14,9 @@ PLIST_VARS+=                  letsencrypt urltoolkit xs
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcache)
-CMAKE_ARGS+=   -DENABLE_CACHE=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CACHE=on
 .else
-CMAKE_ARGS+=   -DENABLE_CACHE=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_CACHE=off
 .endif
 
 .if !empty(PKG_OPTIONS:Mletsencrypt)
@@ -29,51 +29,51 @@ DEPENDS+=   php-[0-9]*:${PHPPKGSRCDIR}
 .endif
 
 .if !empty(PKG_OPTIONS:Mmonitor)
-CMAKE_ARGS+=   -DENABLE_MONITOR=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MONITOR=on
 .else
-CMAKE_ARGS+=   -DENABLE_MONITOR=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MONITOR=off
 .endif
 
 .if !empty(PKG_OPTIONS:Mrproxy)
-CMAKE_ARGS+=   -DENABLE_RPROXY=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RPROXY=on
 .else
-CMAKE_ARGS+=   -DENABLE_RPROXY=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_RPROXY=off
 .endif
 
 .if !empty(PKG_OPTIONS:Mtomahawk)
-CMAKE_ARGS+=   -DENABLE_TOMAHAWK=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOMAHAWK=on
 .else
-CMAKE_ARGS+=   -DENABLE_TOMAHAWK=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOMAHAWK=off
 .endif
 
 # TLS support options
 
 .if !empty(PKG_OPTIONS:Mmbedtls)
-CMAKE_ARGS+=   -DENABLE_TLS=on
-CMAKE_ARGS+=   -DUSE_SYSTEM_MBEDTLS=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TLS=on
+CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_MBEDTLS=on
 CONF_FILES+=   ${EGDIR}/letsencrypt.conf ${PKG_SYSCONFDIR}/letsencrypt.conf
 .include "../../security/mbedtls3/buildlink3.mk"
 .endif
 .if !empty(PKG_OPTIONS:Mmbedtls-private)
-CMAKE_ARGS+=           -DENABLE_TLS=on
-CMAKE_ARGS+=           -DUSE_SYSTEM_MBEDTLS=off
-CMAKE_ARGS+=           -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
-CMAKE_ARGS+=           -DUSE_STATIC_MBEDTLS_LIBRARY=ON
+CMAKE_CONFIGURE_ARGS+=         -DENABLE_TLS=on
+CMAKE_CONFIGURE_ARGS+=         -DUSE_SYSTEM_MBEDTLS=off
+CMAKE_CONFIGURE_ARGS+=         -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
+CMAKE_CONFIGURE_ARGS+=         -DUSE_STATIC_MBEDTLS_LIBRARY=ON
 ##LDFLAGS+=            ${COMPILER_RPATH_FLAG}${PREFIX}/lib/hiawatha
 ##CONFIGURE_ENV+=              LDFLAGS=${LDFLAGS:Q}
 ##INSTALLATION_DIRS+=  lib/hiawatha
 .endif
 .if empty(PKG_OPTIONS:Mmbedtls) && empty(PKG_OPTIONS:Mmbedtls-private)
-CMAKE_ARGS+=   -DENABLE_TLS=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TLS=off
 .endif
 
 .if !empty(PKG_OPTIONS:Murltoolkit)
 PLIST.urltoolkit=      yes
 CONF_FILES+=           ${EGDIR}/toolkit.conf ${PKG_SYSCONFDIR}/toolkit.conf
 
-CMAKE_ARGS+=   -DENABLE_TOOLKIT=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOOLKIT=on
 .else
-CMAKE_ARGS+=   -DENABLE_TOOLKIT=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TOOLKIT=off
 .endif
 
 .if !empty(PKG_OPTIONS:Mxslt)
@@ -81,8 +81,8 @@ PLIST.xslt=   yes
 CONF_FILES+=   ${EGDIR}/error.xslt ${PKG_SYSCONFDIR}/error.xslt
 CONF_FILES+=   ${EGDIR}/index.xslt ${PKG_SYSCONFDIR}/index.xslt
 
-CMAKE_ARGS+=   -DENABLE_XSLT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_XSLT=ON
 .include "../../textproc/libxslt/buildlink3.mk"
 .else
-CMAKE_ARGS+=   -DENABLE_XSLT=OFF
+CMAKE_CONFIGURE_ARGS+= -DENABLE_XSLT=OFF
 .endif