pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils Make sure to run all modules' postinstall scr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fa2fd993376
branches:  trunk
changeset: 533939:5fa2fd993376
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Oct 08 08:47:03 2007 +0000

description:
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.

diffstat:

 sysutils/wbm-apache/Makefile           |   3 ++-
 sysutils/webmin/DEINSTALL              |  12 +++++++++++-
 sysutils/webmin/INSTALL                |  16 ++++++++++++++++
 sysutils/webmin/Makefile               |   4 +++-
 sysutils/webmin/PLIST                  |   3 +--
 sysutils/webmin/files/setup-pre.sh     |   4 ++--
 sysutils/webmin/files/wbm-install.tmpl |  16 ++++++++++++++++
 sysutils/webmin/wbm.mk                 |   3 ++-
 8 files changed, 53 insertions(+), 8 deletions(-)

diffs (143 lines):

diff -r aae6dae27df0 -r 5fa2fd993376 sysutils/wbm-apache/Makefile
--- a/sysutils/wbm-apache/Makefile      Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/wbm-apache/Makefile      Mon Oct 08 08:47:03 2007 +0000
@@ -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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/DEINSTALL
--- a/sysutils/webmin/DEINSTALL Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/webmin/DEINSTALL Mon Oct 08 08:47:03 2007 +0000
@@ -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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/webmin/INSTALL   Mon Oct 08 08:47:03 2007 +0000
@@ -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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/webmin/Makefile  Mon Oct 08 08:47:03 2007 +0000
@@ -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 @@
 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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/PLIST
--- a/sysutils/webmin/PLIST     Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/webmin/PLIST     Mon Oct 08 08:47:03 2007 +0000
@@ -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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/files/setup-pre.sh
--- a/sysutils/webmin/files/setup-pre.sh        Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/webmin/files/setup-pre.sh        Mon Oct 08 08:47:03 2007 +0000
@@ -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 @@
 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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/files/wbm-install.tmpl
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/webmin/files/wbm-install.tmpl    Mon Oct 08 08:47:03 2007 +0000
@@ -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 -r aae6dae27df0 -r 5fa2fd993376 sysutils/webmin/wbm.mk
--- a/sysutils/webmin/wbm.mk    Mon Oct 08 07:05:14 2007 +0000
+++ b/sysutils/webmin/wbm.mk    Mon Oct 08 08:47:03 2007 +0000
@@ -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_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



Home | Main Index | Thread Index | Old Index