From 5143bf9ec1ba721c73c66ca16ae30923200ffd57 Mon Sep 17 00:00:00 2001 From: dougb Date: Sun, 28 Mar 2010 05:52:12 +0000 Subject: Cleanse more RC_SUBR and RC_SUBR_SUFFIX variables --- mail/mailscanner-devel/Makefile | 7 +++---- mail/mailscanner-devel/files/mta.in | 2 +- mail/mailscanner/Makefile | 9 ++++----- mail/mailscanner/files/mta.in | 2 +- mail/spamass-milter/Makefile | 1 - 5 files changed, 9 insertions(+), 12 deletions(-) (limited to 'mail') diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile index 4ae5d3c733ea..35ad050db8de 100644 --- a/mail/mailscanner-devel/Makefile +++ b/mail/mailscanner-devel/Makefile @@ -115,7 +115,6 @@ USRLOCAL_FILES_LIB= \ rav-wrapper sophos-autoupdate USE_RC_SUBR= mailscanner mta -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} post-extract: cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}/* . @@ -146,7 +145,7 @@ do-build: ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_virus_scanners.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ @@ -155,12 +154,12 @@ do-build: ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_phishing_sites.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/sa-update.cron ${PERL} -pi -e \ 's,/etc/MailScanner/MailScanner.conf,${PREFIX}/etc/MailScanner/MailScanner.conf,g;' \ diff --git a/mail/mailscanner-devel/files/mta.in b/mail/mailscanner-devel/files/mta.in index dcf2089dd818..03c3e0cba649 100644 --- a/mail/mailscanner-devel/files/mta.in +++ b/mail/mailscanner-devel/files/mta.in @@ -63,7 +63,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH name="mta" rcvar=`set_rcvar` -_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%" +_mta_rc_script="%%PREFIX%%/etc/rc.d/mta" load_rc_config $name diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile index 03f1295e8bbd..3ce594c610e1 100644 --- a/mail/mailscanner/Makefile +++ b/mail/mailscanner/Makefile @@ -115,7 +115,6 @@ USRLOCAL_FILES_LIB= \ rav-wrapper sophos-autoupdate USE_RC_SUBR= mailscanner mta -SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} post-extract: cd ${WRKSRC} && ${TAR} xvzf perl-tar/MailScanner-${PORTVERSION}-${PATCHLEVEL}.tar.gz > /dev/null && ${MV} MailScanner-${PORTVERSION}-${PATCHLEVEL}/* . @@ -157,7 +156,7 @@ do-build: ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_virus_scanners.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ @@ -174,17 +173,17 @@ do-build: ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_phishing_sites.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_bad_phishing_sites.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ s,/opt/MailScanner/bin,${PREFIX}/libexec/MailScanner,g; \ - s,%%RC_SUBR%%,${RC_SUBR},g;' \ + s,%%RC_SUBR%%,/etc/rc.subr,g;' \ ${WRKSRC}/bin/cron/update_spamassassin.cron ${PERL} -pi -e \ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \ diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in index dcf2089dd818..03c3e0cba649 100644 --- a/mail/mailscanner/files/mta.in +++ b/mail/mailscanner/files/mta.in @@ -63,7 +63,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH name="mta" rcvar=`set_rcvar` -_mta_rc_script="%%PREFIX%%/etc/rc.d/mta%%RC_SUBR_SUFFIX%%" +_mta_rc_script="%%PREFIX%%/etc/rc.d/mta" load_rc_config $name diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index dbbed7ebe198..1a777d4b99d9 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -86,7 +86,6 @@ LDFLAGS+= -L${MILTERLIB} USE_RC_SUBR= spamass-milter GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} SUB_FILES= pkg-message -- cgit