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 (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,98 +1,98 @@ @@ -1,98 +1,98 @@
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
15# 15#
16# WBM_DEPEND_MODULES Depending webmin modules. 16# WBM_DEPEND_MODULES Depending webmin modules.
17# 17#
18 18
19.include "version.mk" 19.include "version.mk"
20 20
21WBM_STD_MODULE?=YES 21WBM_STD_MODULE?=YES
22 22
23.if defined(WBM_MOD_REV) && !empty(WBM_MOD_REV) || !empty(WBM_STD_MODULE:M[Nn][Oo]) 23.if defined(WBM_MOD_REV) && !empty(WBM_MOD_REV) || !empty(WBM_STD_MODULE:M[Nn][Oo])
24PKGNAME?= wbm-${WBM_NAME}-${WBM_VERSION:S/0$/${WBM_MOD_REV}/} 24PKGNAME?= wbm-${WBM_NAME}-${WBM_VERSION:S/0$/${WBM_MOD_REV}/}
25DISTNAME?= ${WBM_NAME}-${WBM_VERSION}-${WBM_MOD_REV} 25DISTNAME?= ${WBM_NAME}-${WBM_VERSION}-${WBM_MOD_REV}
26MASTER_SITES?= http://www.webmin.com/updates/ 26MASTER_SITES?= http://www.webmin.com/updates/
27EXTRACT_SUFX?= .wbm.gz 27EXTRACT_SUFX?= .wbm.gz
28EXTRACT_OPTS+= -f tar 28EXTRACT_OPTS+= -f tar
29WRKSRC?= ${WRKDIR} 29WRKSRC?= ${WRKDIR}
30WBMSRC= ${WRKDIR}/${WBM_NAME} 30WBMSRC= ${WRKDIR}/${WBM_NAME}
31.else 31.else
32PKGNAME= wbm-${WBM_NAME}-${WBM_VERSION} 32PKGNAME= wbm-${WBM_NAME}-${WBM_VERSION}
33DISTNAME= webmin-${WBM_VERSION} 33DISTNAME= webmin-${WBM_VERSION}
34MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} 34MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
35WBMSRC= ${WRKSRC}/${WBM_NAME} 35WBMSRC= ${WRKSRC}/${WBM_NAME}
36EXTRACT_ELEMENTS=${DISTNAME}/${WBM_NAME} 36EXTRACT_ELEMENTS=${DISTNAME}/${WBM_NAME}
37.endif 37.endif
38CATEGORIES+= sysutils www 38CATEGORIES+= sysutils www
39 39
40MAINTAINER?= pkgsrc-users@NetBSD.org 40MAINTAINER?= pkgsrc-users@NetBSD.org
41HOMEPAGE?= http://www.webmin.com/standard.html 41HOMEPAGE?= http://www.webmin.com/standard.html
42 42
43USE_TOOLS+= perl:run 43USE_TOOLS+= perl:run
44DEPENDS+= webmin>=${WBM_VERSION}:../../sysutils/webmin 44DEPENDS+= webmin>=${WBM_VERSION}:../../sysutils/webmin
45 45
46.for m in ${WBM_DEPEND_MODULES} 46.for m in ${WBM_DEPEND_MODULES}
47DEPENDS+= wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m} 47DEPENDS+= wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m}
48.endfor 48.endfor
49 49
50EVAL_PREFIX+= PREFIX.webmin=webmin 50EVAL_PREFIX+= PREFIX.webmin=webmin
51WEBMIN_DIR= ${PREFIX.webmin}/share/webmin 51WEBMIN_DIR= ${PREFIX.webmin}/share/webmin
52WEBMIN_EGDIR= ${PREFIX.webmin}/share/examples/webmin 52WEBMIN_EGDIR= ${PREFIX.webmin}/share/examples/webmin
53WEBMIN_VARDIR= ${VARBASE}/webmin 53WEBMIN_VARDIR= ${VARBASE}/webmin
54WBM_DIR= ${PREFIX}/share/webmin 54WBM_DIR= ${PREFIX}/share/webmin
55WBM_EGDIR= ${PREFIX}/share/examples/webmin 55WBM_EGDIR= ${PREFIX}/share/examples/webmin
56 56
57 57
58PKG_SYSCONFSUBDIR= webmin 58PKG_SYSCONFSUBDIR= webmin
59OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBM_NAME} \ 59OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBM_NAME} \
60 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 60 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
61CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBM_NAME}/config \ 61CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBM_NAME}/config \
62 ${PKG_SYSCONFDIR}/${WBM_NAME}/config \ 62 ${PKG_SYSCONFDIR}/${WBM_NAME}/config \
63 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600 63 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
64FILES_SUBST+= WBM_NAME=${WBM_NAME:Q} 64FILES_SUBST+= WBM_NAME=${WBM_NAME:Q}
65FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} 65FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
66FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q} 66FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
67BUILD_DEFS+= VARBASE 67BUILD_DEFS+= VARBASE
68 68
69INSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-install.tmpl 69INSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-install.tmpl
70DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl 70DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl
71 71
72# WBM_NAME is the name of the module directory 72# WBM_NAME is the name of the module directory
73WBM_NAME?= ${DISTNAME} 73WBM_NAME?= ${DISTNAME}
74WEBMIN_OSTYPE_cmd= ${AWK} '/^os_type=/ {sub("os_type=",""); print}' \ 74WEBMIN_OSTYPE_cmd= ${AWK} '/^os_type=/ {sub("os_type=",""); print}' \
75 ${WEBMIN_EGDIR}/config 75 ${WEBMIN_EGDIR}/config
76WEBMIN_OSVERSION_cmd= ${AWK} '/^os_version=/ {sub("os_version=",""); print}' \ 76WEBMIN_OSVERSION_cmd= ${AWK} '/^os_version=/ {sub("os_version=",""); print}' \
77 ${WEBMIN_EGDIR}/config 77 ${WEBMIN_EGDIR}/config
78 78
79.PHONY: wbm-configure wbm-build wbm-install 79.PHONY: wbm-configure wbm-build wbm-install
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