aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/cyrus-imapd2/Makefile8
-rw-r--r--mail/cyrus-imapd2/files/imapd.sh.in (renamed from mail/cyrus-imapd2/files/imapd.sh)0
-rw-r--r--mail/cyrus-imapd2/pkg-plist1
-rw-r--r--mail/cyrus-imapd22/Makefile8
-rw-r--r--mail/cyrus-imapd22/files/imapd.sh.in (renamed from mail/cyrus-imapd22/files/imapd.sh)0
-rw-r--r--mail/cyrus-imapd22/pkg-plist1
-rw-r--r--mail/cyrus-imapd23/Makefile8
-rw-r--r--mail/cyrus-imapd23/files/imapd.sh.in (renamed from mail/cyrus-imapd23/files/imapd.sh)0
-rw-r--r--mail/cyrus-imapd23/pkg-plist1
-rw-r--r--mail/cyrus-imapd24/Makefile8
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh.in (renamed from mail/cyrus-imapd24/files/imapd.sh)0
-rw-r--r--mail/cyrus-imapd24/pkg-plist1
-rw-r--r--sysutils/gkrellm2/Makefile8
-rw-r--r--sysutils/gkrellm2/files/gkrellmd.sh.in (renamed from sysutils/gkrellm2/files/gkrellmd.sh)0
-rw-r--r--sysutils/gkrellm2/pkg-plist1
15 files changed, 5 insertions, 40 deletions
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.in
index 5fcc612bb31c..5fcc612bb31c 100644
--- a/mail/cyrus-imapd2/files/imapd.sh
+++ b/mail/cyrus-imapd2/files/imapd.sh.in
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.in
index 5fcc612bb31c..5fcc612bb31c 100644
--- a/mail/cyrus-imapd22/files/imapd.sh
+++ b/mail/cyrus-imapd22/files/imapd.sh.in
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.in
index 5fcc612bb31c..5fcc612bb31c 100644
--- a/mail/cyrus-imapd23/files/imapd.sh
+++ b/mail/cyrus-imapd23/files/imapd.sh.in
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.in
index 5fcc612bb31c..5fcc612bb31c 100644
--- a/mail/cyrus-imapd24/files/imapd.sh
+++ b/mail/cyrus-imapd24/files/imapd.sh.in
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.in
index 1a826b5b4e8d..1a826b5b4e8d 100644
--- a/sysutils/gkrellm2/files/gkrellmd.sh
+++ b/sysutils/gkrellm2/files/gkrellmd.sh.in
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