Sun May 13 08:10:12 2012 UTC ()
If the WEBMIN_OSVERSION_cmd output is empty then a pair of quotes must be
used so that copyconfig.pl has the correct number of arguments.


(sbd)
diff -r1.9 -r1.10 pkgsrc/sysutils/webmin/wbm.mk
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/webmin/wbm.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/webmin/wbm.mk 2010/07/11 17:41:01 1.9
+++ pkgsrc/sysutils/webmin/wbm.mk 2012/05/13 08:10:12 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: wbm.mk,v 1.9 2010/07/11 17:41:01 joerg Exp $ 1# $NetBSD: wbm.mk,v 1.10 2012/05/13 08:10:12 sbd Exp $
2# 2#
3# Makefile fragment for Webmin modules 3# Makefile fragment for Webmin modules
4# 4#
5# Then following variables may be set prior to including this file: 5# Then following variables may be set prior to including this file:
6# 6#
7# WBM_NAME Module name. 7# WBM_NAME Module name.
8# 8#
9# WBM_STD_MODULE if "YES", then this package provided as standard 9# WBM_STD_MODULE if "YES", then this package provided as standard
10# module. defaults to "YES". 10# module. defaults to "YES".
11# 11#
12# WBM_MOD_REV Updated revision number since the each release. 12# WBM_MOD_REV Updated revision number since the each release.
13# Updated modules are taken from following URL: 13# Updated modules are taken from following URL:
14# http://www.webmin.com/updates.html 14# http://www.webmin.com/updates.html
@@ -80,19 +80,19 @@ WEBMIN_OSVERSION_cmd= ${AWK} '/^os_versi @@ -80,19 +80,19 @@ WEBMIN_OSVERSION_cmd= ${AWK} '/^os_versi
80 80
81wbm-configure: 81wbm-configure:
82 ${FIND} ${WBMSRC} -name "*.orig" -print | ${XARGS} ${RM} -f 82 ${FIND} ${WBMSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
83 83
84wbm-build: 84wbm-build:
85 ${FIND} ${WBMSRC} -name '*.cgi' -print -o -name '*.pl' -print | \ 85 ${FIND} ${WBMSRC} -name '*.cgi' -print -o -name '*.pl' -print | \
86 ${PERL5} ${WEBMIN_DIR}/perlpath.pl ${PERL5} - 86 ${PERL5} ${WEBMIN_DIR}/perlpath.pl ${PERL5} -
87 87
88INSTALLATION_DIRS+= ${WBM_DIR} ${WBM_EGDIR} 88INSTALLATION_DIRS+= ${WBM_DIR} ${WBM_EGDIR}
89 89
90wbm-install: 90wbm-install:
91 ${CP} -R ${WBMSRC} ${DESTDIR}${WBM_DIR}/. 91 ${CP} -R ${WBMSRC} ${DESTDIR}${WBM_DIR}/.
92 ${PERL5} ${WEBMIN_DIR}/copyconfig.pl \ 92 ${PERL5} ${WEBMIN_DIR}/copyconfig.pl \
93 ${WEBMIN_OSTYPE_cmd:sh:Q} ${WEBMIN_OSVERSION_cmd:sh:Q} \ 93 ${WEBMIN_OSTYPE_cmd:sh:Q} ${WEBMIN_OSVERSION_cmd:sh:Q:S/^$/''/}\
94 ${DESTDIR}${WBM_DIR} ${DESTDIR}${WBM_EGDIR} ${WBM_NAME} 94 ${DESTDIR}${WBM_DIR} ${DESTDIR}${WBM_EGDIR} ${WBM_NAME}
95 95
96do-configure: wbm-configure 96do-configure: wbm-configure
97do-build: wbm-build 97do-build: wbm-build
98do-install: wbm-install 98do-install: wbm-install