diff options
| -rw-r--r-- | sysutils/webmin/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/webmin/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/webmin/pkg-plist | 4 |
3 files changed, 18 insertions, 4 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 485525e2d593..c950acbc1f1a 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= webmin PORTVERSION= 0.92 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/webmin/updates/ \ http://www.webmin.com/webmin/download/ @@ -24,8 +24,10 @@ USE_PERL5= yes SCRIPTS_ENV+= WRKDIR="${WRKDIR}" WEBMIN_MODULES= useradmin-0.92-1.wbm.gz custom-0.92-1.wbm.gz \ - jabber-0.92-1.wbm.gz bind8-0.92-1.wbm.gz -WEBMIN_THEMES= + jabber-0.92-1.wbm.gz bind8-0.92-1.wbm.gz \ + postgresql-0.92-1.wbm.gz mysql-0.92-1.wbm.gz \ + proftpd-0.92-1.wbm.gz +WEBMIN_THEMES= mscstyle3-0.92-1.wbt.gz post-extract: @if [ "${WEBMIN_MODULES}" != "" ]; then \ @@ -87,10 +89,14 @@ post-install: @${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script @${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-lib-webmin @cd ${WRKDIR} ; ex < ex.script +# stop webmin if configured and enabled at startup + @[ -n "${BATCH}" ] || ([ ! -d ${PREFIX}/etc/webmin ] || [ ! -x ${PREFIX}/etc/rc.d/webmin.sh ] || ${PREFIX}/etc/rc.d/webmin.sh stop > /dev/null) # upgrade configuration if etc/webmin exists @[ ! -d ${PREFIX}/etc/webmin ] || echo | nostart=Y ${PREFIX}/lib/webmin/setup.sh # run interactive setup if not in BATCH mode and no configuration exists - @[ -n "$BATCH" ] || ([ -d ${PREFIX}/etc/webmin ] || nostart=Y ${PREFIX}/lib/webmin/setup.sh) + @[ -n "${BATCH}" ] || ([ -d ${PREFIX}/etc/webmin ] || nostart=Y ${PREFIX}/lib/webmin/setup.sh) +# start webmin again + @[ -n "${BATCH}" ] || ([ ! -d ${PREFIX}/etc/webmin ] || [ ! -x ${PREFIX}/etc/rc.d/webmin.sh ] || ${PREFIX}/etc/rc.d/webmin.sh start > /dev/null) @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 4c04f0aa4f20..32fae1ee571f 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -3,3 +3,7 @@ MD5 (useradmin-0.92-1.wbm.gz) = 1d6efe2f2d924dd2ca6c8afc37a5397e MD5 (custom-0.92-1.wbm.gz) = 8ca81ee87a8721f4dcb3a1f11aad9586 MD5 (jabber-0.92-1.wbm.gz) = ada42bd34a54e6118f82628008dc3c10 MD5 (bind8-0.92-1.wbm.gz) = 1ed65e13dbdd43a59213885c18797c2d +MD5 (postgresql-0.92-1.wbm.gz) = b0b3a0989e9d36af19a3fe30095144a0 +MD5 (mysql-0.92-1.wbm.gz) = 57d667f021a9992b32b99cc459e7b71e +MD5 (proftpd-0.92-1.wbm.gz) = 4a7867bd81e1cf0212ea6b0638c6f0a4 +MD5 (mscstyle3-0.92-1.wbt.gz) = a6b3947b2e87d0a80cbdbcb8129a8c22 diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index f46cba126412..bb9c986da3d2 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -6,3 +6,7 @@ etc/rc.d/webmin.sh @exec [ ! -d %D/etc/webmin ] || echo | nostart=Y %D/lib/webmin/setup.sh @comment run interactive setup if not in BATCH mode and no configuration exists @exec [ -n "$BATCH" ] || ([ -d %D/etc/webmin ] || nostart=Y %D/lib/webmin/setup.sh) +@comment restart service if package is being upgraded (the upgrade procedure stopped it) +@exec [ -n "$BATCH" ] || ([ ! -d %D/etc/webmin ] || [ ! -x %D/etc/rc.d/webmin.sh ] || %D/etc/rc.d/webmin.sh start >/dev/null ) +@comment stop service at deinstall time +@unexec [ -n "$BATCH" ] || ([ ! -d %D/etc/webmin ] || [ ! -x %D/etc/rc.d/webmin.sh ] || %D/etc/rc.d/webmin.sh stop >/dev/null ) |