CVS commit: pkgsrc/security/zoneminder

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar 26 13:23:12 UTC 2025

Modified Files:
        pkgsrc/security/zoneminder: Makefile

Log Message:
security/zoneminder: Work around phpversion.mk setting PKG_SYSCONFSUBDIR

phpversion.mk sets PKG_SYSCONFSUBDIR if not set, and that results in
zoneminder's PKG_SYSCONFDIR being e.g. /usr/pkg/etc/php/8.2, leading
to not reading the conf file and mysterious authentication failures.

Work around this by setting PKG_SYSCONFSUBDIR before including
lang/php/phpversion.mk, and then using PKG_SYSCONFDIR instead of
PKG_SYSCONFDIR/zm.  (That's arguably better anyway, separately from it
working around the problem in phpversion.mk.)


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/security/zoneminder/Makefile

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

Modified files:

Index: pkgsrc/security/zoneminder/Makefile
diff -u pkgsrc/security/zoneminder/Makefile:1.78 pkgsrc/security/zoneminder/Makefile:1.79
--- pkgsrc/security/zoneminder/Makefile:1.78    Sat Feb  8 03:53:26 2025
+++ pkgsrc/security/zoneminder/Makefile Wed Mar 26 13:23:12 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2025/02/08 03:53:26 taca Exp $
+# $NetBSD: Makefile,v 1.79 2025/03/26 13:23:12 gdt Exp $
 
 VERSION=       1.36.33
-PKGREVISION=   1
+PKGREVISION=   2
 # Distfile is ZoneMinder but package and tarball contents are zoneminder.
 NAME_DIST=     ZoneMinder
 NAME_LOWER=    zoneminder
@@ -52,6 +52,12 @@ PKG_SUGGESTED_OPTIONS=               apache
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake perl pkg-config
 
+# Previously, we open-coded zm as a subdir of PKG_SYSCONFSUBDIR.  But
+# lang/php/phpversion.mk (arguably wrongly) sets PKG_SYSCONFSUBDIR to
+# a php location, leading to zoneminder looking for config in the
+# wrong place.
+PKG_SYSCONFSUBDIR=     zm
+
 # Place man pages following pkgsrc norms, rather than share/man.
 CMAKE_CONFIGURE_ARGS+= -DZM_MANPAGE_DEST_PREFIX=${PREFIX}/${PKGMANDIR}
 
@@ -67,9 +73,9 @@ CMAKE_CONFIGURE_ARGS+=        -DCMAKE_BUILD_TYP
 # ZoneMinder prefers a subdirectory of etc. Further, it demands a
 # conf.d subdirectory within its config directory, which would be
 # irregular at top level.
-CMAKE_CONFIGURE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}/zm
-OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
-OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/zm/conf.d ${REAL_ROOT_USER} ${APACHE_GROUP} 775
+CMAKE_CONFIGURE_ARGS+= -DZM_CONFIG_DIR=${PKG_SYSCONFDIR}
+OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR} ${REAL_ROOT_USER} ${APACHE_GROUP} 775
+OWN_DIRS_PERMS+=       ${PKG_SYSCONFDIR}/conf.d ${REAL_ROOT_USER} ${APACHE_GROUP} 775
 
 # \todo We prepare a webroot, even without the apache option.
 ZM_HTTPD_ROOT=         share/zoneminder/htdocs
@@ -312,7 +318,7 @@ pre-configure:
 EGDIR=                 share/examples/${PKGBASE}
 DOCDIR=                        share/doc/${PKGBASE}
 INSTALLATION_DIRS+=    ${EGDIR} ${EGDIR}/config ${EGDIR}/apache
-CONF_FILES+=           ${PREFIX}/${EGDIR}/config/zm.conf ${PKG_SYSCONFDIR}/zm/zm.conf
+CONF_FILES+=           ${PREFIX}/${EGDIR}/config/zm.conf ${PKG_SYSCONFDIR}/zm.conf
 INSTALLATION_DIRS+=    bin share/examples/rc.d share/zoneminder/db
 INSTALLATION_DIRS+=    ${DOCDIR}
 post-install: