diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2002-11-14 12:46:45 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2002-11-14 12:46:45 +0000 |
| commit | 5981e38f4ce3953d3766f99b40e72139b7e80edf (patch) | |
| tree | 2854cc10b992a0371d292b69ad83e8850730da3a /sysutils | |
| parent | Update modules: dhcpd-1.030-2, fsdump-1.030-1, sendmail-1.030-1, (diff) | |
Do not start service automatically: install webmin.sh-dist in rc.d
and let users enable it, like other services (bump portrevision).
Submitted by: adamw
Notes
Notes:
svn path=/head/; revision=70114
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/webmin/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/webmin/pkg-plist | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index beffe454ddc3..ba5b916340ed 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= webmin PORTVERSION= 1.030 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/updates/ \ ${MASTER_SITE_SOURCEFORGE} @@ -73,8 +73,8 @@ do-install: | ${XARGS} ${RMDIR} @cd ${PREFIX}/lib/webmin && find . -type d -empty -print \ | ${XARGS} ${RMDIR} - @${CP} ${WRKDIR}/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh - @${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh + @${CP} ${WRKDIR}/webmin.sh ${PREFIX}/etc/rc.d/webmin.sh-dist + @${CHMOD} 554 ${PREFIX}/etc/rc.d/webmin.sh-dist post-install: @cd ${PREFIX} ; find lib/webmin -type f -o -type l | sort \ @@ -96,8 +96,6 @@ post-install: @[ ! -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) -# 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/pkg-plist b/sysutils/webmin/pkg-plist index f30802a3b409..d0b63976f64c 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -1,6 +1,6 @@ @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 ) -etc/rc.d/webmin.sh +etc/rc.d/webmin.sh-dist @comment Insert PLIST.lib-webmin here @comment -=[ begin PLIST.lib-webmin ]=- @comment -=[ end PLIST.lib-webmin ]=- @@ -8,5 +8,3 @@ 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 ) |