summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2006-01-16 21:20:09 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2006-01-16 21:20:09 +0000
commit94ce4ffc8c47fdff557835b91a0137793362d0d4 (patch)
tree5da785f85095ffd351a4e2d66bc8266c3c14f1aa /sysutils
parent- Update to 2.4.1 (diff)
Use SUB_FILES.
Notes
Notes: svn path=/head/; revision=153683
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/webmin/Makefile10
-rw-r--r--sysutils/webmin/files/webmin.sh.in2
-rw-r--r--sysutils/webmin/files/webmin.sh.sample26
-rw-r--r--sysutils/webmin/pkg-plist1
4 files changed, 5 insertions, 34 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index bca9ef52fd67..844eca9b087f 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= webmin
PORTVERSION= 1.250
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/updates/:up \
${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
@@ -23,8 +23,9 @@ RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net
NO_BUILD= yes
USE_PERL5= yes
-USE_RC_SUBR= yes
+USE_RC_SUBR= webmin.sh
USE_REINPLACE= yes
+SUB_LIST= PERL5=${PERL}
WEBMIN_MODULES= acl-1.250-2.wbm.gz
@@ -62,11 +63,6 @@ post-patch:
do-install:
@${MKDIR} ${PREFIX}/lib/webmin
@${CP} -r ${WRKSRC}/* ${PREFIX}/lib/webmin
- @${SED} -e "s=%%RC_SUBR%%=${RC_SUBR}=" \
- -e "s=%%PREFIX%%=${PREFIX}=" \
- -e "s=%%PERL5%%=${PERL}=" \
- < ${FILESDIR}/webmin.sh.sample > ${PREFIX}/etc/rc.d/webmin.sh
- @${CHMOD} 555 ${PREFIX}/etc/rc.d/webmin.sh
post-install:
@cd ${WRKSRC} ; ${FIND} * -type f -o -type l | ${SORT} | ${AWK} \
diff --git a/sysutils/webmin/files/webmin.sh.in b/sysutils/webmin/files/webmin.sh.in
index fc2e052f7de0..7f398fb34cd4 100644
--- a/sysutils/webmin/files/webmin.sh.in
+++ b/sysutils/webmin/files/webmin.sh.in
@@ -11,6 +11,8 @@
# webmin_enable="YES"
#
+webmin_enable=${webmin_enable:-"NO"}
+
. %%RC_SUBR%%
name=webmin
diff --git a/sysutils/webmin/files/webmin.sh.sample b/sysutils/webmin/files/webmin.sh.sample
deleted file mode 100644
index fc2e052f7de0..000000000000
--- a/sysutils/webmin/files/webmin.sh.sample
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: webmin
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD
-#
-# Add the following line to /etc/rc.conf to enable webmin:
-#
-# webmin_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=webmin
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-procname=%%PERL5%%
-pidfile=/var/log/webmin/miniserv.pid
-required_dirs=${prefix}/etc/webmin
-command=${prefix}/etc/webmin/start
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index a2be42f38dd6..3315792f42fb 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -1,4 +1,3 @@
-etc/rc.d/webmin.sh
@comment Insert PLIST.lib-webmin here
@comment -=[ begin PLIST.lib-webmin ]=-
@comment -=[ end PLIST.lib-webmin ]=-