Sat May 16 17:57:45 2020 UTC ()
security/zoneminder: fix build in SUBST_NOOP_OK=no mode


(rillig)
diff -r1.49 -r1.50 pkgsrc/security/zoneminder/Makefile
cvs diff -r1.49 -r1.50 pkgsrc/security/zoneminder/Makefile (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/Makefile 2020/04/22 23:17:05 1.49
+++ pkgsrc/security/zoneminder/Makefile 2020/05/16 17:57:45 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.49 2020/04/22 23:17:05 dsainty Exp $ 1# $NetBSD: Makefile,v 1.50 2020/05/16 17:57:45 rillig Exp $
2 2
3# See wip/zoneminder for a draft update to 1.29.0. 3# See wip/zoneminder for a draft update to 1.29.0.
4PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} 4PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/}
5DISTNAME= ZoneMinder-1.28.1 5DISTNAME= ZoneMinder-1.28.1
6PKGREVISION= 22 6PKGREVISION= 22
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/}
9GITHUB_PROJECT= ZoneMinder 9GITHUB_PROJECT= ZoneMinder
10GITHUB_TYPE= tag 10GITHUB_TYPE= tag
11GITHUB_TAG= v${PKGVERSION_NOREV} 11GITHUB_TAG= v${PKGVERSION_NOREV}
12 12
13MAINTAINER= dsainty@NetBSD.org 13MAINTAINER= dsainty@NetBSD.org
14#MAINTAINER+= gdt@NetBSD.org 14#MAINTAINER+= gdt@NetBSD.org
@@ -187,27 +187,27 @@ SUBST_MESSAGE.dbpaths-path= Adjusting de @@ -187,27 +187,27 @@ SUBST_MESSAGE.dbpaths-path= Adjusting de
187SUBST_STAGE.dbpaths-path= pre-configure 187SUBST_STAGE.dbpaths-path= pre-configure
188SUBST_FILES.dbpaths-path= db/zm_create.sql.in 188SUBST_FILES.dbpaths-path= db/zm_create.sql.in
189SUBST_SED.dbpaths-path= -e 's|/usr/local/bin/|${PREFIX}/bin/|g' 189SUBST_SED.dbpaths-path= -e 's|/usr/local/bin/|${PREFIX}/bin/|g'
190SUBST_SED.dbpaths-path+= -e 's|/usr/bin|${PREFIX}/bin|g' 190SUBST_SED.dbpaths-path+= -e 's|/usr/bin|${PREFIX}/bin|g'
191SUBST_SED.dbpaths-path+= -e 's|/cgi-bin/nph-zms|/zm/cgi-bin/nph-zms|g' 191SUBST_SED.dbpaths-path+= -e 's|/cgi-bin/nph-zms|/zm/cgi-bin/nph-zms|g'
192 192
193# 193#
194# Required to find the 'mysql' client executable, and may also use 'sudo' if 194# Required to find the 'mysql' client executable, and may also use 'sudo' if
195# installed. 195# installed.
196# 196#
197SUBST_CLASSES+= script-path 197SUBST_CLASSES+= script-path
198SUBST_MESSAGE.script-path= Adjusting paths in scripts. 198SUBST_MESSAGE.script-path= Adjusting paths in scripts.
199SUBST_STAGE.script-path= pre-configure 199SUBST_STAGE.script-path= pre-configure
200SUBST_FILES.script-path= ${REPLACE_PERL} ${EXTRA_PERL} 200SUBST_FILES.script-path= ${REPLACE_PERL} ${EXTRA_PERL:Nscripts/zmsystemctl.pl.in}
201SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g" 201SUBST_SED.script-path= -e "s|^\\([\$$]ENV{PATH} *= *'\\).*';\$$|\\1${PREFIX}/bin:/bin:/usr/bin';|g"
202 202
203SUBST_CLASSES+= files 203SUBST_CLASSES+= files
204SUBST_STAGE.files= pre-configure 204SUBST_STAGE.files= pre-configure
205SUBST_FILES.files= zoneminder.conf 205SUBST_FILES.files= zoneminder.conf
206SUBST_SED.files= -e "s|@ZM_HTTPD_ROOT@|${PREFIX}/${ZM_HTTPD_ROOT}|g" 206SUBST_SED.files= -e "s|@ZM_HTTPD_ROOT@|${PREFIX}/${ZM_HTTPD_ROOT}|g"
207SUBST_SED.files+= -e "s|@ZM_HTTPD_CGIBIN@|${PREFIX}/${ZM_HTTPD_CGIBIN}|g" 207SUBST_SED.files+= -e "s|@ZM_HTTPD_CGIBIN@|${PREFIX}/${ZM_HTTPD_CGIBIN}|g"
208SUBST_MESSAGE.files= Fixing ZoneMinder configuration file for Apache. 208SUBST_MESSAGE.files= Fixing ZoneMinder configuration file for Apache.
209 209
210PLIST_VARS+= rcd 210PLIST_VARS+= rcd
211 211
212.if ${INIT_SYSTEM} == "rc.d" 212.if ${INIT_SYSTEM} == "rc.d"
213PLIST.rcd= yes 213PLIST.rcd= yes