Make sure to run all modules' postinstall script and standard module's

uninstall script.

Affected modules are standard modules (acl, cron) and apache module.
Bump PKGREVISION.

8 files changed, 53 insertions, 8 deletions

diff --git a/sysutils/wbm-apache/Makefile b/sysutils/wbm-apache/Makefile
index 1f7cca21283..a65a75b2980 100644
--- a/sysutils/wbm-apache/Makefile
+++ b/sysutils/wbm-apache/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/06/07 15:13:47 obache Exp $
+# $NetBSD: Makefile,v 1.6 2007/10/08 08:47:09 obache Exp $
 
 WBM_NAME=	apache
+PKGREVISION=	1
 
 COMMENT=	Webmin module for configuring Apache servers
 
diff --git a/sysutils/webmin/DEINSTALL b/sysutils/webmin/DEINSTALL
index c4b9171b1bd..c6f3cec27c0 100644
--- a/sysutils/webmin/DEINSTALL
+++ b/sysutils/webmin/DEINSTALL
@@ -1,7 +1,17 @@
-# $NetBSD: DEINSTALL,v 1.4 2006/05/16 04:01:28 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.5 2007/10/08 08:47:03 obache Exp $
 
 case ${STAGE} in
 DEINSTALL)
+	WEBMIN_DIR="@WEBMIN_DIR@"
+	WEBMIN_CONFIG="${PKG_SYSCONFDIR}"
+	WEBMIN_VAR="@WEBMIN_VARDIR@"
+	${TEST} ! -f "${WEBMIN_CONFIG}/var-path" ||
+		WEBMIN_VAR=`${CAT} ${WEBMIN_CONFIG}/var-path`
+	export WEBMIN_CONFIG WEBMIN_VAR
+	if ${TEST} -x "${WEBMIN_DIR}/run-uninstalls.pl"; then
+		( cd ${WEBMIN_DIR} &&
+		  ${WEBMIN_DIR}/run-uninstalls.pl @WEBMIN_MINIMAL_MODULES@ )
+	fi
 	${RM} -f @PKG_SYSCONFDIR@/module.infos.cache
 	;;
 esac
diff --git a/sysutils/webmin/INSTALL b/sysutils/webmin/INSTALL
new file mode 100644
index 00000000000..59f3c3d86f7
--- /dev/null
+++ b/sysutils/webmin/INSTALL
@@ -0,0 +1,16 @@
+# $NetBSD: INSTALL,v 1.1 2007/10/08 08:47:05 obache Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	WEBMIN_DIR="@WEBMIN_DIR@"
+	WEBMIN_CONFIG="${PKG_SYSCONFDIR}"
+	WEBMIN_VAR="@WEBMIN_VARDIR@"
+	${TEST} ! -f "${WEBMIN_CONFIG}/var-path" ||
+		WEBMIN_VAR=`${CAT} ${WEBMIN_CONFIG}/var-path`
+	export WEBMIN_CONFIG WEBMIN_VAR
+	if ${TEST} -x "${WEBMIN_DIR}/run-postinstalls.pl"; then
+		( cd ${WEBMIN_DIR} &&
+		  ${WEBMIN_DIR}/run-postinstalls.pl @WEBMIN_MINIMAL_MODULES@ )
+	fi
+	;;
+esac
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 94ba7a8c60c..1f11c9acbb2 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2007/04/21 05:22:57 obache Exp $
+# $NetBSD: Makefile,v 1.21 2007/10/08 08:47:07 obache Exp $
 
 .include "version.mk"
 
 DISTNAME=	webmin-${WBM_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
@@ -25,6 +26,7 @@ WEBMIN_VARDIR=		${VARBASE}/webmin
 FILES_SUBST+=		WEBMIN_DIR=${WEBMIN_DIR:Q}
 FILES_SUBST+=		WEBMIN_EGDIR=${WEBMIN_EGDIR:Q}
 FILES_SUBST+=		WEBMIN_ETCDIR=${WEBMIN_ETCDIR:Q}
+FILES_SUBST+=		WEBMIN_MINIMAL_MODULES=${WEBMIN_MINIMAL_MODULES:Q}
 FILES_SUBST+=		WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
 MESSAGE_SUBST+=		WEBMIN_DIR=${WEBMIN_DIR:Q}
 BUILD_DEFS+=		VARBASE
diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST
index 27f13c590ad..cf2a03c36e4 100644
--- a/sysutils/webmin/PLIST
+++ b/sysutils/webmin/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/06 07:31:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/10/08 08:47:08 obache Exp $
 share/examples/rc.d/webmin
 share/examples/webmin/acl/config
 share/examples/webmin/config
 share/examples/webmin/cron/config
-share/examples/webmin/cron/tempdelete.pl
 share/examples/webmin/init/config
 share/examples/webmin/inittab/config
 share/examples/webmin/install-dir
diff --git a/sysutils/webmin/files/setup-pre.sh b/sysutils/webmin/files/setup-pre.sh
index ac6a0de51b5..eb476e52692 100644
--- a/sysutils/webmin/files/setup-pre.sh
+++ b/sysutils/webmin/files/setup-pre.sh
@@ -1,4 +1,4 @@
-# $NetBSD: setup-pre.sh,v 1.1 2006/05/16 04:01:28 jlam Exp $
+# $NetBSD: setup-pre.sh,v 1.2 2007/10/08 08:47:09 obache Exp $
 #
 # This shell script is sourced by webmin's setup.sh to provide local
 # overrides and defaults for configuration settings.
@@ -24,5 +24,5 @@ ssl=1			# always use SSL
 atboot=0		# don't auto-configure to run at boot-time
 noperlpath=		# fix up path to perl in scripts
 nouninstall=1		# don't auto-create the uninstall script
-nopostinstalls=1	# don't auto-run the postinstall actions during setup
+nopostinstall=1		# don't auto-run the postinstall actions during setup
 nostart=1		# don't auto-start the webmin server after setup
diff --git a/sysutils/webmin/files/wbm-install.tmpl b/sysutils/webmin/files/wbm-install.tmpl
new file mode 100644
index 00000000000..dda35fe8e9c
--- /dev/null
+++ b/sysutils/webmin/files/wbm-install.tmpl
@@ -0,0 +1,16 @@
+# $NetBSD: wbm-install.tmpl,v 1.1 2007/10/08 08:47:09 obache Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+	WBMNAME="@WBMNAME@"
+	WEBMIN_DIR="@WEBMIN_DIR@"
+	WEBMIN_CONFIG="${PKG_SYSCONFDIR}"
+	WEBMIN_VAR="@WEBMIN_VARDIR@"
+	${TEST} ! -f "${WEBMIN_CONFIG}/var-path" ||
+		WEBMIN_VAR=`${CAT} ${WEBMIN_CONFIG}/var-path`
+	export WEBMIN_CONFIG WEBMIN_VAR
+	if ${TEST} -x "${WEBMIN_DIR}/run-postinstalls.pl"; then
+		( cd ${WEBMIN_DIR} && 
+		  ${WEBMIN_DIR}/run-postinstalls.pl ${WBMNAME} )
+	fi
+esac
diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk
index d8fbf0b22c0..eb3e81ec35b 100644
--- a/sysutils/webmin/wbm.mk
+++ b/sysutils/webmin/wbm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.7 2007/05/12 06:17:45 obache Exp $
+# $NetBSD: wbm.mk,v 1.8 2007/10/08 08:47:09 obache Exp $
 #
 # Makefile fragment for Webmin modules
 #
@@ -66,6 +66,7 @@ FILES_SUBST+=		WEBMIN_DIR=${WEBMIN_DIR:Q}
 FILES_SUBST+=		WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
 BUILD_DEFS+=		VARBASE
 
+INSTALL_TEMPLATES+=	${PKGSRCDIR}/sysutils/webmin/files/wbm-install.tmpl
 DEINSTALL_TEMPLATES+=	${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl
 
 # WBM_NAME is the name of the module directory