From 0e9a5e313ea53043da9c6f169d8da8bc59ff81aa Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Thu, 10 Feb 2005 19:26:38 +0000 Subject: use new scheme of USE_RC_SUBR. --- mail/cyrus-imapd2/Makefile | 8 +------ mail/cyrus-imapd2/files/imapd.sh | 42 ---------------------------------- mail/cyrus-imapd2/files/imapd.sh.in | 42 ++++++++++++++++++++++++++++++++++ mail/cyrus-imapd2/pkg-plist | 1 - mail/cyrus-imapd22/Makefile | 8 +------ mail/cyrus-imapd22/files/imapd.sh | 42 ---------------------------------- mail/cyrus-imapd22/files/imapd.sh.in | 42 ++++++++++++++++++++++++++++++++++ mail/cyrus-imapd22/pkg-plist | 1 - mail/cyrus-imapd23/Makefile | 8 +------ mail/cyrus-imapd23/files/imapd.sh | 42 ---------------------------------- mail/cyrus-imapd23/files/imapd.sh.in | 42 ++++++++++++++++++++++++++++++++++ mail/cyrus-imapd23/pkg-plist | 1 - mail/cyrus-imapd24/Makefile | 8 +------ mail/cyrus-imapd24/files/imapd.sh | 42 ---------------------------------- mail/cyrus-imapd24/files/imapd.sh.in | 42 ++++++++++++++++++++++++++++++++++ mail/cyrus-imapd24/pkg-plist | 1 - sysutils/gkrellm2/Makefile | 8 +------ sysutils/gkrellm2/files/gkrellmd.sh | 36 ----------------------------- sysutils/gkrellm2/files/gkrellmd.sh.in | 36 +++++++++++++++++++++++++++++ sysutils/gkrellm2/pkg-plist | 1 - 20 files changed, 209 insertions(+), 244 deletions(-) delete mode 100644 mail/cyrus-imapd2/files/imapd.sh create mode 100644 mail/cyrus-imapd2/files/imapd.sh.in delete mode 100644 mail/cyrus-imapd22/files/imapd.sh create mode 100644 mail/cyrus-imapd22/files/imapd.sh.in delete mode 100644 mail/cyrus-imapd23/files/imapd.sh create mode 100644 mail/cyrus-imapd23/files/imapd.sh.in delete mode 100644 mail/cyrus-imapd24/files/imapd.sh create mode 100644 mail/cyrus-imapd24/files/imapd.sh.in delete mode 100644 sysutils/gkrellm2/files/gkrellmd.sh create mode 100644 sysutils/gkrellm2/files/gkrellmd.sh.in diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile index 1f0bd4be423e..c920f3ba8f49 100644 --- a/mail/cyrus-imapd2/Makefile +++ b/mail/cyrus-imapd2/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend LATEST_LINK= ${PORTNAME}2 -USE_RC_SUBR= YES +USE_RC_SUBR= imapd.sh USE_OPENSSL= yes USE_PERL5= yes @@ -122,9 +122,6 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ @@ -189,9 +186,6 @@ post-install: @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh - @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh @${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist @${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ diff --git a/mail/cyrus-imapd2/files/imapd.sh b/mail/cyrus-imapd2/files/imapd.sh deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd2/files/imapd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.sh.in new file mode 100644 index 000000000000..5fcc612bb31c --- /dev/null +++ b/mail/cyrus-imapd2/files/imapd.sh.in @@ -0,0 +1,42 @@ +#!/bin/sh + +# Start or stop cyrus-imapd +# $FreeBSD$ + +# PROVIDE: cyrus_imapd +# REQUIRE: DAEMON +# BEFORE: mail +# KEYWORD: FreeBSD shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move imapd.sh to /etc/rc.d/cyrus_imapd + +prefix=%%PREFIX%% + +# Define these cyrus_imapd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/cyrus_imapd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd +#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program + +. %%RC_SUBR%% + +name="cyrus_imapd" +rcvar=`set_rcvar` +command="${prefix}/cyrus/bin/master" +pidfile="/var/run/cyrus-master.pid" +required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +stop_postcmd="cyrus_imapd_poststop" + +cyrus_imapd_poststop() { + /bin/rm -f ${pidfile} +} + +load_rc_config $name +run_rc_command "$1" diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist index 9c22545b9f1c..e24099d804a8 100644 --- a/mail/cyrus-imapd2/pkg-plist +++ b/mail/cyrus-imapd2/pkg-plist @@ -41,7 +41,6 @@ etc/cyrus.conf.dist @unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi etc/imapd.conf.dist @exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf -etc/rc.d/imapd.sh include/cyrus/acap.h include/cyrus/acl.h include/cyrus/assert.h diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index e5ab4303e832..bb6088092918 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -23,7 +23,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LATEST_LINK= ${PORTNAME}22 -USE_RC_SUBR= yes +USE_RC_SUBR= imapd.sh USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= yes @@ -240,9 +240,6 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ @@ -307,9 +304,6 @@ post-install: @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh - @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR} .for f in ${CONFS} diff --git a/mail/cyrus-imapd22/files/imapd.sh b/mail/cyrus-imapd22/files/imapd.sh deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd22/files/imapd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.sh.in new file mode 100644 index 000000000000..5fcc612bb31c --- /dev/null +++ b/mail/cyrus-imapd22/files/imapd.sh.in @@ -0,0 +1,42 @@ +#!/bin/sh + +# Start or stop cyrus-imapd +# $FreeBSD$ + +# PROVIDE: cyrus_imapd +# REQUIRE: DAEMON +# BEFORE: mail +# KEYWORD: FreeBSD shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move imapd.sh to /etc/rc.d/cyrus_imapd + +prefix=%%PREFIX%% + +# Define these cyrus_imapd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/cyrus_imapd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd +#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program + +. %%RC_SUBR%% + +name="cyrus_imapd" +rcvar=`set_rcvar` +command="${prefix}/cyrus/bin/master" +pidfile="/var/run/cyrus-master.pid" +required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +stop_postcmd="cyrus_imapd_poststop" + +cyrus_imapd_poststop() { + /bin/rm -f ${pidfile} +} + +load_rc_config $name +run_rc_command "$1" diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist index 7c0e1b92d420..f62a19ad16e6 100644 --- a/mail/cyrus-imapd22/pkg-plist +++ b/mail/cyrus-imapd22/pkg-plist @@ -45,7 +45,6 @@ cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune -etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index e5ab4303e832..bb6088092918 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -23,7 +23,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LATEST_LINK= ${PORTNAME}22 -USE_RC_SUBR= yes +USE_RC_SUBR= imapd.sh USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= yes @@ -240,9 +240,6 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ @@ -307,9 +304,6 @@ post-install: @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh - @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR} .for f in ${CONFS} diff --git a/mail/cyrus-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd23/files/imapd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in new file mode 100644 index 000000000000..5fcc612bb31c --- /dev/null +++ b/mail/cyrus-imapd23/files/imapd.sh.in @@ -0,0 +1,42 @@ +#!/bin/sh + +# Start or stop cyrus-imapd +# $FreeBSD$ + +# PROVIDE: cyrus_imapd +# REQUIRE: DAEMON +# BEFORE: mail +# KEYWORD: FreeBSD shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move imapd.sh to /etc/rc.d/cyrus_imapd + +prefix=%%PREFIX%% + +# Define these cyrus_imapd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/cyrus_imapd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd +#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program + +. %%RC_SUBR%% + +name="cyrus_imapd" +rcvar=`set_rcvar` +command="${prefix}/cyrus/bin/master" +pidfile="/var/run/cyrus-master.pid" +required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +stop_postcmd="cyrus_imapd_poststop" + +cyrus_imapd_poststop() { + /bin/rm -f ${pidfile} +} + +load_rc_config $name +run_rc_command "$1" diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist index 7c0e1b92d420..f62a19ad16e6 100644 --- a/mail/cyrus-imapd23/pkg-plist +++ b/mail/cyrus-imapd23/pkg-plist @@ -45,7 +45,6 @@ cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune -etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index e5ab4303e832..bb6088092918 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -23,7 +23,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* LATEST_LINK= ${PORTNAME}22 -USE_RC_SUBR= yes +USE_RC_SUBR= imapd.sh USE_OPENSSL= yes USE_PERL5= yes USE_REINPLACE= yes @@ -240,9 +240,6 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp RUN_DEPENDS+= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser .endif -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - post-patch: @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ @@ -307,9 +304,6 @@ post-install: @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh - @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR} .for f in ${CONFS} diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd24/files/imapd.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in new file mode 100644 index 000000000000..5fcc612bb31c --- /dev/null +++ b/mail/cyrus-imapd24/files/imapd.sh.in @@ -0,0 +1,42 @@ +#!/bin/sh + +# Start or stop cyrus-imapd +# $FreeBSD$ + +# PROVIDE: cyrus_imapd +# REQUIRE: DAEMON +# BEFORE: mail +# KEYWORD: FreeBSD shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move imapd.sh to /etc/rc.d/cyrus_imapd + +prefix=%%PREFIX%% + +# Define these cyrus_imapd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/cyrus_imapd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd +#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program + +. %%RC_SUBR%% + +name="cyrus_imapd" +rcvar=`set_rcvar` +command="${prefix}/cyrus/bin/master" +pidfile="/var/run/cyrus-master.pid" +required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +stop_postcmd="cyrus_imapd_poststop" + +cyrus_imapd_poststop() { + /bin/rm -f ${pidfile} +} + +load_rc_config $name +run_rc_command "$1" diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist index 7c0e1b92d420..f62a19ad16e6 100644 --- a/mail/cyrus-imapd24/pkg-plist +++ b/mail/cyrus-imapd24/pkg-plist @@ -45,7 +45,6 @@ cyrus/bin/smmapd cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune -etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 54dbb51e5e39..6605fecdf4eb 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -23,7 +23,7 @@ CONFLICTS= gkrellm-1.* LATEST_LINK= ${PORTNAME}2 -USE_RC_SUBR= YES +USE_RC_SUBR= gkrellmd.sh WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//} @@ -77,9 +77,6 @@ CFLAGS+= -DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \ -DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \ -DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"' -RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ - RC_SUBR=${RC_SUBR} - pre-everything:: .if !defined(GKRELLM_SERVER_ONLY) @${ECHO_MSG} "" @@ -96,9 +93,6 @@ post-install: .endif @${CHMOD} 2511 ${PREFIX}/sbin/gkrellmd @${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins-gkrellmd - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh - @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/gkrellmd.sh @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \ ${EXAMPLESDIR}/gkrellmd.conf diff --git a/sysutils/gkrellm2/files/gkrellmd.sh b/sysutils/gkrellm2/files/gkrellmd.sh deleted file mode 100644 index 1a826b5b4e8d..000000000000 --- a/sysutils/gkrellm2/files/gkrellmd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# Start or stop gkrellmd -# $FreeBSD$ - -# PROVIDE: gkrellmd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move gkrellmd.sh to /etc/rc.d/gkrellmd - -prefix=%%PREFIX%% - -# Define these gkrellmd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/gkrellmd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -gkrellmd_enable=${gkrellmd_enable:-"NO"} # Enable gkrellmd -#gkrellmd_program="${prefix}/sbin/gkrellmd" # Location of gkrellmd -gkrellmd_flags=${gkrellmd_flags:-"-d"} # Flags to gkrellmd - -. %%RC_SUBR%% - -name="gkrellmd" -rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" -required_files="${prefix}/etc/${name}.conf" - -load_rc_config $name -run_rc_command "$1" diff --git a/sysutils/gkrellm2/files/gkrellmd.sh.in b/sysutils/gkrellm2/files/gkrellmd.sh.in new file mode 100644 index 000000000000..1a826b5b4e8d --- /dev/null +++ b/sysutils/gkrellm2/files/gkrellmd.sh.in @@ -0,0 +1,36 @@ +#!/bin/sh + +# Start or stop gkrellmd +# $FreeBSD$ + +# PROVIDE: gkrellmd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move gkrellmd.sh to /etc/rc.d/gkrellmd + +prefix=%%PREFIX%% + +# Define these gkrellmd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# /etc/rc.conf.d/gkrellmd +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +gkrellmd_enable=${gkrellmd_enable:-"NO"} # Enable gkrellmd +#gkrellmd_program="${prefix}/sbin/gkrellmd" # Location of gkrellmd +gkrellmd_flags=${gkrellmd_flags:-"-d"} # Flags to gkrellmd + +. %%RC_SUBR%% + +name="gkrellmd" +rcvar=`set_rcvar` +command="${prefix}/sbin/${name}" +required_files="${prefix}/etc/${name}.conf" + +load_rc_config $name +run_rc_command "$1" diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index ee1d4afcaf89..ebb2786dedf7 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -6,7 +6,6 @@ sbin/gkrellmd %%EXAMPLESDIR%%/gkrellmd.conf @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf @dirrm %%EXAMPLESDIR%% -etc/rc.d/gkrellmd.sh @cwd %%X11BASE%% %%CLIENT%%include/gkrellm2/gkrellm.h %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h -- cgit v1.2.3