aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2012-08-06 07:19:36 +0800
committerdougb <dougb@FreeBSD.org>2012-08-06 07:19:36 +0800
commitf0d9f58b7f1825fb95236f427a6400ad54ad4b5e (patch)
tree1ed78841e1757014ccc09581c61c3683992d3f77 /mail
parent37b2a027341f57b44383efc005905ca41779dce6 (diff)
downloadfreebsd-ports-gnome-f0d9f58b7f1825fb95236f427a6400ad54ad4b5e.tar.gz
freebsd-ports-gnome-f0d9f58b7f1825fb95236f427a6400ad54ad4b5e.tar.zst
freebsd-ports-gnome-f0d9f58b7f1825fb95236f427a6400ad54ad4b5e.zip
Move the rc.d scripts of the form *.sh.in to *.in
Where necessary add $FreeBSD$ to the file No PORTREVISION bump necessary because this is a no-op
Diffstat (limited to 'mail')
-rw-r--r--mail/antivirus-milter/Makefile2
-rw-r--r--mail/antivirus-milter/files/antivirus-milter.in (renamed from mail/antivirus-milter/files/antivirus-milter.sh.in)0
-rw-r--r--mail/batv-milter/Makefile2
-rw-r--r--mail/batv-milter/files/milter-batv.in (renamed from mail/batv-milter/files/milter-batv.sh.in)0
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/courier/files/courier.in (renamed from mail/courier/files/courier.sh.in)0
-rw-r--r--mail/couriergraph/Makefile2
-rw-r--r--mail/couriergraph/files/couriergraph.in (renamed from mail/couriergraph/files/couriergraph.sh.in)0
-rw-r--r--mail/cyrus-imapd2/Makefile2
-rw-r--r--mail/cyrus-imapd2/files/imapd.in (renamed from mail/cyrus-imapd2/files/imapd.sh.in)0
-rw-r--r--mail/cyrus-imapd22/Makefile2
-rw-r--r--mail/cyrus-imapd22/files/imapd.in (renamed from mail/cyrus-imapd22/files/imapd.sh.in)0
-rw-r--r--mail/cyrus-imapd23/Makefile2
-rw-r--r--mail/cyrus-imapd23/files/imapd.in (renamed from mail/cyrus-imapd23/files/imapd.sh.in)0
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/cyrus-imapd24/files/imapd.in (renamed from mail/cyrus-imapd24/files/imapd.sh.in)0
-rw-r--r--mail/dbmail22/Makefile2
-rw-r--r--mail/dbmail22/files/dbmail-imapd.in (renamed from mail/dbmail22/files/dbmail-imapd.sh.in)0
-rw-r--r--mail/dbmail22/files/dbmail-lmtpd.in (renamed from mail/dbmail22/files/dbmail-lmtpd.sh.in)0
-rw-r--r--mail/dbmail22/files/dbmail-pop3d.in (renamed from mail/dbmail22/files/dbmail-pop3d.sh.in)0
-rw-r--r--mail/dbmail22/files/dbmail-timsieved.in (renamed from mail/dbmail22/files/dbmail-timsieved.sh.in)0
-rw-r--r--mail/dcc-dccd/Makefile8
-rw-r--r--mail/dcc-dccd/files/dccd.in (renamed from mail/dcc-dccd/files/dccd.sh.in)4
-rw-r--r--mail/dcc-dccd/files/dccgrey.in (renamed from mail/dcc-dccd/files/dccgrey.sh.in)3
-rw-r--r--mail/dcc-dccd/files/dccifd.in (renamed from mail/dcc-dccd/files/dccifd.sh.in)3
-rw-r--r--mail/dcc-dccd/files/dccm.in (renamed from mail/dcc-dccd/files/dccm.sh.in)3
-rw-r--r--mail/dk-milter/Makefile4
-rw-r--r--mail/dk-milter/files/milter-dk.in (renamed from mail/dk-milter/files/milter-dk.sh.in)0
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot/files/dovecot.in (renamed from mail/dovecot/files/dovecot.sh.in)0
-rw-r--r--mail/dovecot2/Makefile2
-rw-r--r--mail/dovecot2/files/dovecot.in (renamed from mail/dovecot2/files/dovecot.sh.in)0
-rw-r--r--mail/drac/Makefile2
-rw-r--r--mail/drac/files/dracd.in (renamed from mail/drac/files/dracd.sh.in)0
-rw-r--r--mail/exilog/Makefile2
-rw-r--r--mail/exilog/files/exilog.in (renamed from mail/exilog/files/exilog.sh.in)0
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/exim/files/exim.in (renamed from mail/exim/files/exim.sh.in)0
-rw-r--r--mail/james/Makefile2
-rw-r--r--mail/james/files/james.in (renamed from mail/james/files/james.sh.in)0
-rw-r--r--mail/milter-bogom/Makefile2
-rw-r--r--mail/milter-bogom/files/milter-bogom.in (renamed from mail/milter-bogom/files/milter-bogom.sh.in)2
-rw-r--r--mail/milter-regex/Makefile2
-rw-r--r--mail/milter-regex/files/milterregex.in (renamed from mail/milter-regex/files/milterregex.sh.in)0
-rw-r--r--mail/missey/Makefile2
-rw-r--r--mail/missey/files/mps.in (renamed from mail/missey/files/mps.sh.in)0
-rw-r--r--mail/noattach/Makefile2
-rw-r--r--mail/noattach/files/noattach.in (renamed from mail/noattach/files/noattach.sh.in)0
-rw-r--r--mail/ovs/Makefile2
-rw-r--r--mail/ovs/files/ovs.in (renamed from mail/ovs/files/ovs.sh.in)0
-rw-r--r--mail/p5-Mail-SpamAssassin/Makefile2
-rw-r--r--mail/p5-Mail-SpamAssassin/files/sa-spamd.in (renamed from mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in)0
-rw-r--r--mail/policyd2/Makefile2
-rw-r--r--mail/policyd2/files/policyd2.in (renamed from mail/policyd2/files/policyd2.sh.in)0
-rw-r--r--mail/pop-before-smtp/Makefile2
-rw-r--r--mail/pop-before-smtp/files/pop-before-smtp.in (renamed from mail/pop-before-smtp/files/pop-before-smtp.sh.in)0
-rw-r--r--mail/popular/Makefile2
-rw-r--r--mail/popular/files/0ringd.in (renamed from mail/popular/files/0ringd.sh.in)0
-rw-r--r--mail/popular/files/pcheckd.in (renamed from mail/popular/files/pcheckd.sh.in)0
-rw-r--r--mail/popular/files/pproxy.in (renamed from mail/popular/files/pproxy.sh.in)0
-rw-r--r--mail/popular/files/pserv.in (renamed from mail/popular/files/pserv.sh.in)0
-rw-r--r--mail/postfix-current/Makefile4
-rw-r--r--mail/postfix-current/files/postfix.in (renamed from mail/postfix-current/files/postfix.sh.in)0
-rw-r--r--mail/postfix-policyd-sf/Makefile2
-rw-r--r--mail/postfix-policyd-sf/files/policyd.in (renamed from mail/postfix-policyd-sf/files/policyd.sh.in)0
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/postfix/files/postfix.in (renamed from mail/postfix/files/postfix.sh.in)0
-rw-r--r--mail/postfix26/Makefile2
-rw-r--r--mail/postfix26/files/postfix.in (renamed from mail/postfix26/files/postfix.sh.in)0
-rw-r--r--mail/postfix27/Makefile4
-rw-r--r--mail/postfix27/files/postfix.in (renamed from mail/postfix27/files/postfix.sh.in)0
-rw-r--r--mail/postfix28/Makefile4
-rw-r--r--mail/postfix28/files/postfix.in (renamed from mail/postfix28/files/postfix.sh.in)0
-rw-r--r--mail/proxsmtp/Makefile2
-rw-r--r--mail/proxsmtp/files/proxsmtpd.in (renamed from mail/proxsmtp/files/proxsmtpd.sh.in)0
-rw-r--r--mail/py-ppolicy/Makefile2
-rw-r--r--mail/py-ppolicy/files/ppolicyd.in (renamed from mail/py-ppolicy/files/ppolicyd.sh.in)0
-rw-r--r--mail/rabl_server/Makefile2
-rw-r--r--mail/rabl_server/files/rabl_server.in (renamed from mail/rabl_server/files/rabl_server.sh.in)0
-rw-r--r--mail/rbl-milter/Makefile2
-rw-r--r--mail/rbl-milter/files/rblmilter.in (renamed from mail/rbl-milter/files/rblmilter.sh.in)0
-rw-r--r--mail/sid-milter/Makefile2
-rw-r--r--mail/sid-milter/files/milter-sid.in (renamed from mail/sid-milter/files/milter-sid.sh.in)0
-rw-r--r--mail/smtptrapd/Makefile2
-rw-r--r--mail/smtptrapd/files/smtptrapd.in (renamed from mail/smtptrapd/files/smtptrapd.sh.in)0
-rw-r--r--mail/spamilter/Makefile2
-rw-r--r--mail/spamilter/files/spamilter.in (renamed from mail/spamilter/files/spamilter.sh.in)0
-rw-r--r--mail/synonym/Makefile2
-rw-r--r--mail/synonym/files/synonym.in (renamed from mail/synonym/files/synonym.sh.in)0
-rw-r--r--mail/tpop3d/Makefile2
-rw-r--r--mail/tpop3d/files/tpop3d.in (renamed from mail/tpop3d/files/tpop3d.sh.in)5
-rw-r--r--mail/up-imapproxy/Makefile2
-rw-r--r--mail/up-imapproxy/files/imapproxyd.in (renamed from mail/up-imapproxy/files/imapproxyd.sh.in)0
-rw-r--r--mail/vbsfilter/Makefile2
-rw-r--r--mail/vbsfilter/files/vbsfilter.in (renamed from mail/vbsfilter/files/vbsfilter.sh.in)0
-rw-r--r--mail/whoson/Makefile2
-rw-r--r--mail/whoson/files/whoson.in (renamed from mail/whoson/files/whoson.sh.in)0
-rw-r--r--mail/zmailer/Makefile2
-rw-r--r--mail/zmailer/files/zmailer.in (renamed from mail/zmailer/files/zmailer.sh.in)0
99 files changed, 65 insertions, 61 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile
index b9f048554977..76f7753dbf8a 100644
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@@ -17,7 +17,7 @@ COMMENT= Sendmail milter wich uses McAfee Virus Scan or clamav
LICENSE= BSD
-USE_RC_SUBR= antivirus-milter.sh
+USE_RC_SUBR= antivirus-milter
CFLAGS+= -Wall ${PTHREAD_CFLAGS:S=""==}
LIBS+= -lmilter ${PTHREAD_LIBS}
diff --git a/mail/antivirus-milter/files/antivirus-milter.sh.in b/mail/antivirus-milter/files/antivirus-milter.in
index 57ace61e9835..57ace61e9835 100644
--- a/mail/antivirus-milter/files/antivirus-milter.sh.in
+++ b/mail/antivirus-milter/files/antivirus-milter.in
diff --git a/mail/batv-milter/Makefile b/mail/batv-milter/Makefile
index 038c53e88dfe..ef675a06cf97 100644
--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= umq@ueo.co.jp
COMMENT= A milter for BATV (Bounce Address Tag Validation)
-USE_RC_SUBR= milter-batv.sh
+USE_RC_SUBR= milter-batv
USE_OPENSSL= TRUE
SUB_FILES= milter-batv.sh
diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.in
index f9f901763bce..f9f901763bce 100644
--- a/mail/batv-milter/files/milter-batv.sh.in
+++ b/mail/batv-milter/files/milter-batv.in
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 56092eda226c..cc364da8e74e 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -69,7 +69,7 @@ USE_OPENSSL= yes
USE_PERL5= yes
USE_SUBMAKE= yes
-USE_RC_SUBR= courier.sh
+USE_RC_SUBR= courier
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.in
index c45bcf9438ae..c45bcf9438ae 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.in
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 29ca0126e29b..2c3bcb98913e 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -26,7 +26,7 @@ DATADIR?= /var/db/couriergraph
COURIERGRAPH_USER?= ${WWWOWN}
COURIERGRAPH_GROUP?= ${WWWGRP}
-USE_RC_SUBR= ${PORTNAME}.sh
+USE_RC_SUBR= ${PORTNAME}
SUB_LIST+= COURIERGRAPH_USER=${COURIERGRAPH_USER} COURIERGRAPH_GROUP=${COURIERGRAPH_GROUP}
STARTUP_FILE= ${PREFIX}/etc/rc.d/couriergraph.sh
diff --git a/mail/couriergraph/files/couriergraph.sh.in b/mail/couriergraph/files/couriergraph.in
index c39859255592..c39859255592 100644
--- a/mail/couriergraph/files/couriergraph.sh.in
+++ b/mail/couriergraph/files/couriergraph.in
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 62dd5bfe7468..c888d7b59d2f 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -27,7 +27,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^1].*
LATEST_LINK= ${PORTNAME}2
-USE_RC_SUBR= imapd.sh
+USE_RC_SUBR= imapd
USE_OPENSSL= yes
USE_PERL5= yes
diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd2/files/imapd.sh.in
+++ b/mail/cyrus-imapd2/files/imapd.in
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 0c75c6331550..a68c83997d8c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -22,7 +22,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].*
LATEST_LINK= ${PORTNAME}22
-USE_RC_SUBR= imapd.sh
+USE_RC_SUBR= imapd
USE_OPENSSL= yes
USE_PERL5= yes
USE_BDB= yes
diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd22/files/imapd.sh.in
+++ b/mail/cyrus-imapd22/files/imapd.in
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 94927a18cbca..28f51c0a81de 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].*
LATEST_LINK= ${PORTNAME}23
-USE_RC_SUBR= imapd.sh
+USE_RC_SUBR= imapd
USE_OPENSSL= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd23/files/imapd.sh.in
+++ b/mail/cyrus-imapd23/files/imapd.in
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index de21eeb585b6..8455ffd5500e 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].*
LATEST_LINK= ${PORTNAME}24
-USE_RC_SUBR= imapd.sh
+USE_RC_SUBR= imapd
USE_OPENSSL= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.in
index 1af0b40f32df..1af0b40f32df 100644
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ b/mail/cyrus-imapd24/files/imapd.in
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 86f10ed8792e..251cb868f619 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -29,7 +29,7 @@ LATEST_LINK= dbmail22
USE_AUTOTOOLS= libtool
USE_GMAKE= yes
USE_LDCONFIG= ${PREFIX}/lib/dbmail
-USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
+USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
USE_GNOME= glib20 pkgconfig
USE_OPENSSL= yes
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.in
index 7d1ca96ea7d0..7d1ca96ea7d0 100644
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ b/mail/dbmail22/files/dbmail-imapd.in
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.in
index f1805db488b1..f1805db488b1 100644
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail22/files/dbmail-lmtpd.in
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.in
index 71a567fbd393..71a567fbd393 100644
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail22/files/dbmail-pop3d.in
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.in
index 27eb49540333..27eb49540333 100644
--- a/mail/dbmail22/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail22/files/dbmail-timsieved.in
diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile
index 8128f6524b71..47e78b0e640b 100644
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@@ -122,7 +122,7 @@ CONFIGURE_ARGS+= --with-sendmail=yes
PLIST_SUB+= WITH_DCCM=""
-USE_RC_SUBR+= dccm.sh
+USE_RC_SUBR+= dccm
.else
CONFIGURE_ARGS+= --disable-dccm
@@ -136,7 +136,7 @@ CONFIGURE_ARGS+= --disable-dccifd
PLIST_SUB+= WITH_DCCIFD="@comment "
.else
PLIST_SUB+= WITH_DCCIFD=""
-USE_RC_SUBR+= dccifd.sh
+USE_RC_SUBR+= dccifd
.endif
## dccd server support
@@ -163,11 +163,11 @@ PLIST_SUB+= WITH_IFD_MILT=""
.endif
.if defined(WITH_DCCD)
-USE_RC_SUBR+= dccd.sh
+USE_RC_SUBR+= dccd
.endif
.if defined(WITH_DCCGREY)
-USE_RC_SUBR+= dccgrey.sh
+USE_RC_SUBR+= dccgrey
PLIST_SUB+= WITH_DCCGREY=""
.else
PLIST_SUB+= WITH_DCCGREY="@comment "
diff --git a/mail/dcc-dccd/files/dccd.sh.in b/mail/dcc-dccd/files/dccd.in
index 5618e428bf27..40bd326d732a 100644
--- a/mail/dcc-dccd/files/dccd.sh.in
+++ b/mail/dcc-dccd/files/dccd.in
@@ -1,10 +1,11 @@
#!/bin/sh
+
+# $FreeBSD$
#
# PROVIDE: dccd
# REQUIRE: LOGIN
# BEFORE: mail
# KEYWORD: shutdown
-
#
# Add the following lines to /etc/rc.conf:
#
@@ -20,7 +21,6 @@
#
#
# See %%DCCHOME%%/dcc_conf to configure startup options
-#
. /etc/rc.subr
diff --git a/mail/dcc-dccd/files/dccgrey.sh.in b/mail/dcc-dccd/files/dccgrey.in
index 87267ba69ad1..6eae2ae20d08 100644
--- a/mail/dcc-dccd/files/dccgrey.sh.in
+++ b/mail/dcc-dccd/files/dccgrey.in
@@ -1,4 +1,6 @@
#!/bin/sh
+
+# $FreeBSD$
#
# PROVIDE: dccgrey
# REQUIRE: LOGIN
@@ -20,7 +22,6 @@
#
#
# See %%DCCHOME%%/dcc_conf to configure startup options
-#
. /etc/rc.subr
diff --git a/mail/dcc-dccd/files/dccifd.sh.in b/mail/dcc-dccd/files/dccifd.in
index 95fa8cd54fcd..ecea2d85bab8 100644
--- a/mail/dcc-dccd/files/dccifd.sh.in
+++ b/mail/dcc-dccd/files/dccifd.in
@@ -1,4 +1,6 @@
#!/bin/sh
+
+# $FreeBSD$
#
# PROVIDE: dccifd
# REQUIRE: LOGIN
@@ -20,7 +22,6 @@
#
#
# See %%DCCHOME%%/dcc_conf to configure startup options
-#
. /etc/rc.subr
diff --git a/mail/dcc-dccd/files/dccm.sh.in b/mail/dcc-dccd/files/dccm.in
index 4ef5ea578ef0..47f6dbe0733c 100644
--- a/mail/dcc-dccd/files/dccm.sh.in
+++ b/mail/dcc-dccd/files/dccm.in
@@ -1,4 +1,6 @@
#!/bin/sh
+
+# $FreeBSD$
#
# PROVIDE: dccm
# REQUIRE: LOGIN
@@ -20,7 +22,6 @@
#
#
# See %%DCCHOME%%/dcc_conf to configure startup options
-#
. /etc/rc.subr
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 40ff67453939..9ba55aec26f6 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Domainkeys milter for Sendmail
-USE_RC_SUBR= milter-dk.sh
+USE_RC_SUBR= milter-dk
USE_OPENSSL= yes
.if !defined(BUILDING_INDEX)
@@ -59,7 +59,7 @@ SITE_SUB+= -e '\|-static|s|%%STATIC%%||g'
SITE_SUB+= -e '\|-static|s|%%STATIC%%|dnl |g'
.endif
-SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}"
+SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}"
.if defined(WITH_DEBUG)
SITE_SUB+= -e '\|confOPTIMIZE.*-g|s/^dnl //g'
diff --git a/mail/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.in
index d5b00f98358b..d5b00f98358b 100644
--- a/mail/dk-milter/files/milter-dk.sh.in
+++ b/mail/dk-milter/files/milter-dk.in
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index cdc4c54a61af..f42a7d1d79ac 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -31,7 +31,7 @@ DOVECOTVERSION= 1.2
######################################################################
USE_ICONV= yes
-USE_RC_SUBR= dovecot.sh
+USE_RC_SUBR= dovecot
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.in
index cadfadc7c8de..cadfadc7c8de 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.in
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 23e30564adb2..087fd4cdcbb0 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -28,7 +28,7 @@ CONFLICTS= dovecot-1.[0-9]*
######################################################################
USE_ICONV= yes
-USE_RC_SUBR= dovecot.sh
+USE_RC_SUBR= dovecot
MAKE_JOBS_SAFE= yes
GNU_CONFIGURE= yes
diff --git a/mail/dovecot2/files/dovecot.sh.in b/mail/dovecot2/files/dovecot.in
index 8c7a91dbe14a..8c7a91dbe14a 100644
--- a/mail/dovecot2/files/dovecot.sh.in
+++ b/mail/dovecot2/files/dovecot.in
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index a73b1235468f..6dd04b2baf19 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
.endif
NO_WRKSUBDIR= yes
-USE_RC_SUBR= dracd.sh
+USE_RC_SUBR= dracd
.if !defined(NOPORTDOCS)
MAN3= dracauth.3
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.in
index 83054f707369..83054f707369 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.in
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index 88d7bddf5879..34422b05c8b8 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -46,7 +46,7 @@ EXILOGDIR?= ${PREFIX}/exilog
.if defined(WITHOUT_AGENT)
PLIST_SUB+= AGENT="@comment "
.else
-USE_RC_SUBR= exilog.sh
+USE_RC_SUBR= exilog
PLIST_SUB+= AGENT=""
.endif
diff --git a/mail/exilog/files/exilog.sh.in b/mail/exilog/files/exilog.in
index 887be6cbdce8..887be6cbdce8 100644
--- a/mail/exilog/files/exilog.sh.in
+++ b/mail/exilog/files/exilog.in
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0a5af4a71e4a..f03494325a83 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -470,7 +470,7 @@ SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\1,'
.endif
.if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
-USE_RC_SUBR= exim.sh
+USE_RC_SUBR= exim
PLIST_SUB+= DAEMON=""
SUB_LIST+= LOGDIR="${LOGDIR}"
.else
diff --git a/mail/exim/files/exim.sh.in b/mail/exim/files/exim.in
index 119be1e21e9b..119be1e21e9b 100644
--- a/mail/exim/files/exim.sh.in
+++ b/mail/exim/files/exim.in
diff --git a/mail/james/Makefile b/mail/james/Makefile
index 228cf8f96945..2c5a8fff6069 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -20,7 +20,7 @@ USE_JAVA= yes
JAVA_VERSION= 1.5+
NO_BUILD= YES
-USE_RC_SUBR= james.sh
+USE_RC_SUBR= james
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION}
diff --git a/mail/james/files/james.sh.in b/mail/james/files/james.in
index 838ae5f61443..838ae5f61443 100644
--- a/mail/james/files/james.sh.in
+++ b/mail/james/files/james.in
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile
index 71e1014163a4..6153c7679697 100644
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@@ -23,7 +23,7 @@ MAN8= bogom.8
MAKE_ARGS= CPPFLAGS="-DDEF_CONF=\\\"${PREFIX}/etc/bogom.conf\\\" ${PTHREAD_CFLAGS}" \
LIBS="-lmilter ${PTHREAD_LIBS}"
-USE_RC_SUBR= milter-bogom.sh
+USE_RC_SUBR= milter-bogom
SUB_FILES= pkg-message
PLIST_FILES= sbin/bogom \
diff --git a/mail/milter-bogom/files/milter-bogom.sh.in b/mail/milter-bogom/files/milter-bogom.in
index 778dccdc9321..233fe78cb9df 100644
--- a/mail/milter-bogom/files/milter-bogom.sh.in
+++ b/mail/milter-bogom/files/milter-bogom.in
@@ -1,5 +1,7 @@
#!/bin/sh
+# $FreeBSD$
+#
# PROVIDE: milterbogom
# REQUIRE: LOGIN
# BEFORE: sendmail
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index 63acc8ec5f64..7f1b3ef76992 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE= ${FILESDIR}/COPYRIGHT
MAILUSER?= mailnull
MAN8= milter-regex.8
PLIST_FILES= libexec/milter-regex
-USE_RC_SUBR= milterregex.sh
+USE_RC_SUBR= milterregex
SPOOLDIR?= /var/run/milter-regex
SUB_LIST= SPOOLDIR=${SPOOLDIR}
diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.in
index de4ef12fa921..de4ef12fa921 100644
--- a/mail/milter-regex/files/milterregex.sh.in
+++ b/mail/milter-regex/files/milterregex.in
diff --git a/mail/missey/Makefile b/mail/missey/Makefile
index 3cfddf3a91d0..dedae3501928 100644
--- a/mail/missey/Makefile
+++ b/mail/missey/Makefile
@@ -27,7 +27,7 @@ MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
PLIST_FILES= sbin/bent sbin/mps etc/mps/pop3d.conf-dist
PLIST_DIRS= etc/mps
-USE_RC_SUBR= mps.sh
+USE_RC_SUBR= mps
post-patch:
@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
diff --git a/mail/missey/files/mps.sh.in b/mail/missey/files/mps.in
index fce084360b03..fce084360b03 100644
--- a/mail/missey/files/mps.sh.in
+++ b/mail/missey/files/mps.in
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index 669a7e31a4f5..1b8bb15cbfef 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= An attachment filter for Sendmail Milter
GNU_CONFIGURE= yes
-USE_RC_SUBR= noattach.sh
+USE_RC_SUBR= noattach
CFLAGS+= ${PTHREAD_CFLAGS:S=""==}
MAN8= noattach.8
diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.in
index ac167c52feca..ac167c52feca 100644
--- a/mail/noattach/files/noattach.sh.in
+++ b/mail/noattach/files/noattach.in
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index 049c9b17feb3..c1df10954448 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -26,7 +26,7 @@ WWWROOT?= ${PREFIX}/www/data
OVS_USER?= ${WWWOWN}
OVS_GROUP?= ${WWWGRP}
-USE_RC_SUBR= ${PORTNAME}.sh
+USE_RC_SUBR= ${PORTNAME}
SUB_LIST+= OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
PLIST_SUB= CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,}
diff --git a/mail/ovs/files/ovs.sh.in b/mail/ovs/files/ovs.in
index 1c8e16be08ad..1c8e16be08ad 100644
--- a/mail/ovs/files/ovs.sh.in
+++ b/mail/ovs/files/ovs.in
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 861ef5869348..d710f3583366 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -146,7 +146,7 @@ DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql
DOCSLDAP= README README.testing sa_test.ldif
PORTDOCS= ${DOCS} sql ldap
-USE_RC_SUBR= sa-spamd.sh
+USE_RC_SUBR= sa-spamd
.if defined(WITH_MYSQL) || defined(WITH_PGSQL)
SUB_LIST+= SQL_FLAG="-Q"
diff --git a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in b/mail/p5-Mail-SpamAssassin/files/sa-spamd.in
index 5398ea6fa7e7..5398ea6fa7e7 100644
--- a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
+++ b/mail/p5-Mail-SpamAssassin/files/sa-spamd.in
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index d0cca75656e0..8d8645d85fdf 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS= p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
USE_PERL5= yes
USE_PHP= yes
NO_BUILD= yes
-USE_RC_SUBR= policyd2.sh
+USE_RC_SUBR= policyd2
BINMODE= 0755
WEBUIDIR= ${PREFIX}/www/policyd
diff --git a/mail/policyd2/files/policyd2.sh.in b/mail/policyd2/files/policyd2.in
index a5443c618452..a5443c618452 100644
--- a/mail/policyd2/files/policyd2.sh.in
+++ b/mail/policyd2/files/policyd2.in
diff --git a/mail/pop-before-smtp/Makefile b/mail/pop-before-smtp/Makefile
index 2b77df270f0e..dd7b68433861 100644
--- a/mail/pop-before-smtp/Makefile
+++ b/mail/pop-before-smtp/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask \
NO_BUILD= yes
USE_PERL5_RUN= yes
-USE_RC_SUBR= pop-before-smtp.sh
+USE_RC_SUBR= pop-before-smtp
SUB_FILES= pkg-message
SUB_LIST= PERL=${PERL}
diff --git a/mail/pop-before-smtp/files/pop-before-smtp.sh.in b/mail/pop-before-smtp/files/pop-before-smtp.in
index 10f262c65dd5..10f262c65dd5 100644
--- a/mail/pop-before-smtp/files/pop-before-smtp.sh.in
+++ b/mail/pop-before-smtp/files/pop-before-smtp.in
diff --git a/mail/popular/Makefile b/mail/popular/Makefile
index 7efacd7769ad..f12a9e558142 100644
--- a/mail/popular/Makefile
+++ b/mail/popular/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS= --without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/pop
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
-USE_RC_SUBR= pcheckd.sh pproxy.sh pserv.sh 0ringd.sh
+USE_RC_SUBR= pcheckd pproxy pserv 0ringd
MAN1= pcheck.1 pcontrol.1 pdeliver.1 pstatus.1 ptestpdm.1
MAN7= popular-log.7
diff --git a/mail/popular/files/0ringd.sh.in b/mail/popular/files/0ringd.in
index 9ee445bd60b3..9ee445bd60b3 100644
--- a/mail/popular/files/0ringd.sh.in
+++ b/mail/popular/files/0ringd.in
diff --git a/mail/popular/files/pcheckd.sh.in b/mail/popular/files/pcheckd.in
index ab860cc4d5a2..ab860cc4d5a2 100644
--- a/mail/popular/files/pcheckd.sh.in
+++ b/mail/popular/files/pcheckd.in
diff --git a/mail/popular/files/pproxy.sh.in b/mail/popular/files/pproxy.in
index b401625a85e7..b401625a85e7 100644
--- a/mail/popular/files/pproxy.sh.in
+++ b/mail/popular/files/pproxy.in
diff --git a/mail/popular/files/pserv.sh.in b/mail/popular/files/pserv.in
index e5ef1c117cd7..e5ef1c117cd7 100644
--- a/mail/popular/files/pserv.sh.in
+++ b/mail/popular/files/pserv.in
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 54e970463233..d0c4fae526bb 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -249,10 +249,10 @@ PLIST_SUB+= TEST="@comment "
PKGNAMESUFFIX= -current-base
PREFIX= /usr
ETCDIR= /etc/postfix
-USE_RCORDER= postfix.sh
+USE_RCORDER= postfix
PLIST_SUB+= BASE=""
.else
-USE_RC_SUBR= postfix.sh
+USE_RC_SUBR= postfix
PLIST_SUB+= BASE="@comment "
.endif
diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix-current/files/postfix.sh.in
+++ b/mail/postfix-current/files/postfix.in
diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index 32f1dcdc564b..7d12cfeea9c6 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -21,7 +21,7 @@ COMMENT= Anti-spam plugin for Postfix (written in C)
USE_MYSQL= yes
USE_GMAKE= yes
-USE_RC_SUBR= policyd.sh
+USE_RC_SUBR= policyd
REALNAME= ${PKGNAME:C/-${PORTVERSION}.*//}
diff --git a/mail/postfix-policyd-sf/files/policyd.sh.in b/mail/postfix-policyd-sf/files/policyd.in
index 2a2648ef2335..2a2648ef2335 100644
--- a/mail/postfix-policyd-sf/files/policyd.sh.in
+++ b/mail/postfix-policyd-sf/files/policyd.in
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 144ffd7812ac..d626d4fc84fb 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -256,10 +256,10 @@ PLIST_SUB+= TEST="@comment "
PKGNAMESUFFIX= -base
PREFIX= /usr
ETCDIR= /etc/postfix
-USE_RCORDER= postfix.sh
+USE_RCORDER= postfix
PLIST_SUB+= BASE=""
.else
-USE_RC_SUBR= postfix.sh
+USE_RC_SUBR= postfix
PLIST_SUB+= BASE="@comment "
.endif
diff --git a/mail/postfix/files/postfix.sh.in b/mail/postfix/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix/files/postfix.sh.in
+++ b/mail/postfix/files/postfix.in
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 8d1601e1e299..78cc586edc8f 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -29,7 +29,7 @@ GROUPS= mail maildrop postfix
NO_LATEST_LINK= yes
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
-USE_RC_SUBR= postfix.sh
+USE_RC_SUBR= postfix
SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix26/files/postfix.sh.in
+++ b/mail/postfix26/files/postfix.in
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 27a3c7e8287b..4d7b106f1376 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -238,10 +238,10 @@ PLIST_SUB+= TEST="@comment "
PKGNAMESUFFIX= -base
PREFIX= /usr
ETCDIR= /etc/postfix
-USE_RCORDER= postfix.sh
+USE_RCORDER= postfix
PLIST_SUB+= BASE=""
.else
-USE_RC_SUBR= postfix.sh
+USE_RC_SUBR= postfix
PLIST_SUB+= BASE="@comment "
.endif
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix27/files/postfix.sh.in
+++ b/mail/postfix27/files/postfix.in
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 75be6eeee329..b3825161477e 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -258,10 +258,10 @@ PLIST_SUB+= TEST="@comment "
PKGNAMESUFFIX= -base
PREFIX= /usr
ETCDIR= /etc/postfix
-USE_RCORDER= postfix.sh
+USE_RCORDER= postfix
PLIST_SUB+= BASE=""
.else
-USE_RC_SUBR= postfix.sh
+USE_RC_SUBR= postfix
PLIST_SUB+= BASE="@comment "
.endif
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.in
index 216a3a5b21f0..216a3a5b21f0 100644
--- a/mail/postfix28/files/postfix.sh.in
+++ b/mail/postfix28/files/postfix.in
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index c336d8e81ffa..5807cccb449f 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -17,7 +17,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-USE_RC_SUBR= proxsmtpd.sh
+USE_RC_SUBR= proxsmtpd
SUB_FILES= pkg-message
MAN5= proxsmtpd.conf.5
diff --git a/mail/proxsmtp/files/proxsmtpd.sh.in b/mail/proxsmtp/files/proxsmtpd.in
index b2f97d3770f1..b2f97d3770f1 100644
--- a/mail/proxsmtp/files/proxsmtpd.sh.in
+++ b/mail/proxsmtp/files/proxsmtpd.in
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 6d9fd6f3b9d4..94aa3827e680 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON= 2.5+
USE_PYDISTUTILS=yes
USE_TWISTED= yes
NO_BUILD= yes
-USE_RC_SUBR= ppolicyd.sh
+USE_RC_SUBR= ppolicyd
DOCSDIR?= ${PREFIX}/share/doc/py-${PORTNAME}
SUB_LIST= PYTHON_CMD=${PYTHON_CMD}
diff --git a/mail/py-ppolicy/files/ppolicyd.sh.in b/mail/py-ppolicy/files/ppolicyd.in
index f4846ad02958..f4846ad02958 100644
--- a/mail/py-ppolicy/files/ppolicyd.sh.in
+++ b/mail/py-ppolicy/files/ppolicyd.in
diff --git a/mail/rabl_server/Makefile b/mail/rabl_server/Makefile
index c4ccd4f01aff..3f30f1bc8da5 100644
--- a/mail/rabl_server/Makefile
+++ b/mail/rabl_server/Makefile
@@ -24,7 +24,7 @@ PORTDOCS= CHANGE README RELEASE.NOTES
OPTIONS= DEBUG "Enable DEBUG messages" off
-USE_RC_SUBR= ${PORTNAME}.sh
+USE_RC_SUBR= ${PORTNAME}
RABL_GROUP?= bind
diff --git a/mail/rabl_server/files/rabl_server.sh.in b/mail/rabl_server/files/rabl_server.in
index 19efce4e5f21..19efce4e5f21 100644
--- a/mail/rabl_server/files/rabl_server.sh.in
+++ b/mail/rabl_server/files/rabl_server.in
diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile
index 04386efbb9da..0b239c31c321 100644
--- a/mail/rbl-milter/Makefile
+++ b/mail/rbl-milter/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://opensource.confusticate.com/rbl-milter/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= A milter that adds mail header warnings on mail from open-relays
-USE_RC_SUBR= rblmilter.sh
+USE_RC_SUBR= rblmilter
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/mail/rbl-milter/files/rblmilter.sh.in b/mail/rbl-milter/files/rblmilter.in
index 89d1b1141aca..89d1b1141aca 100644
--- a/mail/rbl-milter/files/rblmilter.sh.in
+++ b/mail/rbl-milter/files/rblmilter.in
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index c4d68f5d7499..b2ca60d94905 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -35,7 +35,7 @@ SITE+= ${FILESDIR}/site.config.m4
MAN3= ar.3
PLIST_FILES+= include/libar.h lib/libar.a
.endif
-USE_RC_SUBR= milter-sid.sh
+USE_RC_SUBR= milter-sid
.include <bsd.port.pre.mk>
diff --git a/mail/sid-milter/files/milter-sid.sh.in b/mail/sid-milter/files/milter-sid.in
index a923e2b8f0b7..a923e2b8f0b7 100644
--- a/mail/sid-milter/files/milter-sid.sh.in
+++ b/mail/sid-milter/files/milter-sid.in
diff --git a/mail/smtptrapd/Makefile b/mail/smtptrapd/Makefile
index 4615c8a68b9d..6ac9327d2559 100644
--- a/mail/smtptrapd/Makefile
+++ b/mail/smtptrapd/Makefile
@@ -15,7 +15,7 @@ COMMENT= RFC 2821 compliant SMTP service that always returns a 4xx soft error
CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
-USE_RC_SUBR= smtptrapd.sh
+USE_RC_SUBR= smtptrapd
PLIST_FILES= bin/smtptrapd
diff --git a/mail/smtptrapd/files/smtptrapd.sh.in b/mail/smtptrapd/files/smtptrapd.in
index fc22353cdc80..fc22353cdc80 100644
--- a/mail/smtptrapd/files/smtptrapd.sh.in
+++ b/mail/smtptrapd/files/smtptrapd.in
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 89c17f2acf2b..25153ba6d592 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --have-resn
-USE_RC_SUBR= spamilter.sh
+USE_RC_SUBR= spamilter
WRKSRC= ${WRKDIR}/${PORTNAME}
CFLAGS+= ${PTHREAD_CFLAGS:S=""==}
diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.in
index 645b044d61c2..645b044d61c2 100644
--- a/mail/spamilter/files/spamilter.sh.in
+++ b/mail/spamilter/files/spamilter.in
diff --git a/mail/synonym/Makefile b/mail/synonym/Makefile
index bdcf8c988542..ca7b2ecba20a 100644
--- a/mail/synonym/Makefile
+++ b/mail/synonym/Makefile
@@ -19,7 +19,7 @@ USE_GNOME= libxml2
WRKSRC= ${WRKDIR}/${PORTNAME}-0.4
PORTDOCS= README license.txt
-USE_RC_SUBR= synonym.sh
+USE_RC_SUBR= synonym
MAKE_ENV+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
PTHREAD_LIBS=${PTHREAD_LIBS} \
diff --git a/mail/synonym/files/synonym.sh.in b/mail/synonym/files/synonym.in
index 298b7eea3b47..298b7eea3b47 100644
--- a/mail/synonym/files/synonym.sh.in
+++ b/mail/synonym/files/synonym.in
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index f78da75d2512..d7e7708deaec 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -97,7 +97,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
EXTRA_PATCHES+=${PATCHDIR}/extra-patch-auth_perl.c
.endif
-USE_RC_SUBR= tpop3d.sh
+USE_RC_SUBR= tpop3d
DEFAULT_CONFIG= ${PREFIX}/etc/tpop3d.conf.dist
MAN5= tpop3d.conf.5
diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.in
index 090d50549457..c827ac561efb 100644
--- a/mail/tpop3d/files/tpop3d.sh.in
+++ b/mail/tpop3d/files/tpop3d.in
@@ -1,16 +1,15 @@
#!/bin/sh
-#
+# $FreeBSD$
+#
# PROVIDE: tpop3d
# REQUIRE: postgresql mysql LOGIN
-
#
# Add the following line to /etc/rc.conf to enable tpop3d:
#tpop3d_enable="YES"
#
# You may also wish to use the following variables to fine-tune startup:
#tpop3d_flags="..."
-#
. /etc/rc.subr
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 21aba0a3767d..fe7dbd494d19 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -18,7 +18,7 @@ COMMENT= A caching IMAP proxy server
USE_AUTOTOOLS= autoheader
-USE_RC_SUBR= imapproxyd.sh
+USE_RC_SUBR= imapproxyd
DOCS= COPYING ChangeLog README README.debian \
README.known_issues README.ssl
SBINS= in.imapproxyd pimpstat
diff --git a/mail/up-imapproxy/files/imapproxyd.sh.in b/mail/up-imapproxy/files/imapproxyd.in
index ffbeb7e6d032..ffbeb7e6d032 100644
--- a/mail/up-imapproxy/files/imapproxyd.sh.in
+++ b/mail/up-imapproxy/files/imapproxyd.in
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index f1855953ea93..e868656a9669 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -18,7 +18,7 @@ COMMENT= A vbs-attachment filter for Sendmail Milter
LICENSE= GPLv2
-USE_RC_SUBR= vbsfilter.sh
+USE_RC_SUBR= vbsfilter
PLIST_FILES= libexec/vbsfilter
CTARGETS+= vbsfilter-${PORTVERSION}
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.in
index 608d173965c1..608d173965c1 100644
--- a/mail/vbsfilter/files/vbsfilter.sh.in
+++ b/mail/vbsfilter/files/vbsfilter.in
diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile
index fd1c0262162b..80a1aedfd854 100644
--- a/mail/whoson/Makefile
+++ b/mail/whoson/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-config=${PREFIX}/etc/whoson.conf
USE_LDCONFIG= yes
-USE_RC_SUBR= whoson.sh
+USE_RC_SUBR= whoson
MAN3= whoson.3 wso_login.3 wso_logout.3 wso_query.3 wso_version.3
MAN5= whoson.conf.5
diff --git a/mail/whoson/files/whoson.sh.in b/mail/whoson/files/whoson.in
index 8f28b3d692a0..8f28b3d692a0 100644
--- a/mail/whoson/files/whoson.sh.in
+++ b/mail/whoson/files/whoson.in
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 5647daf525ff..a3f58d98a9f6 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -62,7 +62,7 @@ MAN8= hold.8zm router.8zm scheduler.8zm sendmail.8zm sm.8zm smtp.8zm \
SUB_FILES= pkg-install
PKGINSTALL= ${WRKDIR}/pkg-install
-USE_RC_SUBR= zmailer.sh
+USE_RC_SUBR= zmailer
# local variable (we can't use ${SED} here)
DOMAIN!= /bin/hostname | ${SED} -e "s:^"`/bin/hostname -s`"\.*::g"
diff --git a/mail/zmailer/files/zmailer.sh.in b/mail/zmailer/files/zmailer.in
index eb3968a4ba0a..eb3968a4ba0a 100644
--- a/mail/zmailer/files/zmailer.sh.in
+++ b/mail/zmailer/files/zmailer.in