From af0d856e8ca6a0935a1795c7b80c0c155dd5e841 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 19 May 2006 17:14:53 +0000 Subject: * Pull in some changes discussed on the Webmin mailing list to allow running an individual module's uninstall action * Add an DEINSTALL_TEMPLATE file that is pulled in by all wbm-* modules that will run the module's uninstall action at DEINSTALL time. * Fix the "time" module to ignore "sched_mode" -- verified by Jamie Cameron on the Webmin mailing list as a bug. * Fix the "postfix" module to remove its temp files at DEINSTALL time so that we cleanly pkg_delete. Bump the PKGREVISION of sysutils/webmin as well as all sysutils/wbm-* packages that have uninstall.pl scripts. --- sysutils/webmin/wbm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sysutils/webmin/wbm.mk') diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index 9523738acbe..87414ef7e15 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.3 2006/05/16 16:38:06 jlam Exp $ +# $NetBSD: wbm.mk,v 1.4 2006/05/19 17:14:53 jlam Exp $ # # Makefile fragment for Webmin modules @@ -16,6 +16,7 @@ DEPENDS+= webmin>=1.270:../../sysutils/webmin EVAL_PREFIX+= PREFIX.webmin=webmin WEBMIN_DIR= ${PREFIX.webmin}/share/webmin WEBMIN_EGDIR= ${PREFIX.webmin}/share/examples/webmin +WEBMIN_VARDIR= ${VARBASE}/webmin WBM_DIR= ${PREFIX}/share/webmin WBM_EGDIR= ${PREFIX}/share/examples/webmin @@ -27,6 +28,11 @@ OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBMNAME} \ CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBMNAME}/config \ ${PKG_SYSCONFDIR}/${WBMNAME}/config \ ${ROOT_USER} ${ROOT_GROUP} 0600 +FILES_SUBST+= WBMNAME=${WBMNAME:Q} +FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} +FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q} + +DEINSTALL_TEMPLATE+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl # WBMNAME is the name of the module directory WBMNAME?= ${DISTNAME} -- cgit v1.2.3