aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mail/MailScanner-devel/Makefile63
-rw-r--r--mail/MailScanner-devel/pkg-plist173
-rw-r--r--mail/mailscanner-devel/Makefile63
-rw-r--r--mail/mailscanner-devel/pkg-plist173
4 files changed, 232 insertions, 240 deletions
diff --git a/mail/MailScanner-devel/Makefile b/mail/MailScanner-devel/Makefile
index b94140929afc..954c1d56ad6d 100644
--- a/mail/MailScanner-devel/Makefile
+++ b/mail/MailScanner-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= MailScanner
PORTVERSION= 4.26.1
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
PKGNAMESUFFIX= -devel
@@ -27,7 +28,8 @@ BUILD_DEPENDS= \
${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
RUN_DEPENDS= ${BUILD_DEPENDS} \
- ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
+ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
+ ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
CONFLICTS= MailScanner-[0-9]*
@@ -54,52 +56,47 @@ ETC_FILES= MailScanner.conf filename.rules.conf \
do-build:
${PERL} -pi -e \
- 's,/opt/MailScanner/lib,'${PREFIX}'/lib/MailScanner,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ 's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/bin/MailScanner
${PERL} -pi -e \
's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
- s,/opt/MailScanner/bin,'${PREFIX}'bin,g; \
- s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
+ s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/etc/MailScanner.conf
${PERL} -pi -e \
- 's,/opt/MailScanner/lib,'${PREFIX}'/libexec/MailScanner,g; \
+ 's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
${PERL} -pi -e \
- 's,/bin/bash,'${LOCALBASE}'/bin/bash,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/bin/update_virus_scanners
${PERL} -pi -e \
's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
- s,/opt/MailScanner/bin,'${PREFIX}'/bin,g; \
- s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
+ s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/lib/MailScanner/ConfigDefs.pl
${PERL} -pi \
-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
do-install:
- #
- # Step 1: Install binaries
- #
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/tnef.linux ${PREFIX}/bin/tnef
- #
- # Step 2: Install libexec files
+ # Step 1: Install libexec files
#
${MKDIR} ${PREFIX}/libexec/MailScanner
${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
- cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec ${INSTALL_SCRIPT} \
- '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+ cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
+ ${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
- ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+ ${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
${PREFIX}/libexec/MailScanner/update_virus_scanners
#
- # Step 3: Install etc files
+ # Step 2: Install etc files
#
${MKDIR} ${PREFIX}/etc/MailScanner
${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
@@ -114,43 +111,43 @@ do-install:
${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
#
- # Step 4: Install files in share
+ # Step 3: Install files in share
#
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
- mkdir ${DATADIR}'/{}' \;
+ mkdir ${DATADIR}/{} \;
cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
- ${INSTALL_DATA} '{}' ${DATADIR}'/{}'.sample \;
+ ${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
${CHMOD} -R ${BINMODE} ${DATADIR}/reports
#
- # Step 5: Install lib
+ # Step 4: Install lib
#
${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
${PREFIX}/lib/MailScanner/MailScanner.pm
cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
- ${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \;
+ ${INSTALL_SCRIPT} {} ${PREFIX}/lib/MailScanner/MailScanner/{} \;
#
- # Step 6: Install Start/Stop scripts
+ # Step 5: Install Start/Stop scripts
#
${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
${PREFIX}/etc/rc.d/mailscanner.sh.sample
${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
#
- # Step 7: Docs & Manpages
+ # Step 6: Docs & Manpages
#
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
cd ${WRKSRC}/docs && \
- ${FIND} * -type d -exec mkdir ${DOCSDIR}'/{}' \; && \
+ ${FIND} * -type d -exec mkdir ${DOCSDIR}/{} \; && \
${FIND} * -type f ! -name "*.orig" -exec \
- ${INSTALL_DATA} '{}' ${DOCSDIR}'/{}' \;
+ ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+.endif
cd ${WRKSRC}/docs/man && \
${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
-.endif
.if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
# Upgrading MailScanner.conf file... Please wait
@${WRKSRC}/bin/upgrade_MailScanner_conf \
@@ -182,7 +179,7 @@ renew-autoupdate: install
renew-reports: install
# Renew reports
cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
- -exec ${INSTALL_DATA} '{}' ${DATADIR}'/reports/en/{}' \;
+ -exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{} \;
initial-config: renew-wrapper renew-autoupdate renew-reports
cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
diff --git a/mail/MailScanner-devel/pkg-plist b/mail/MailScanner-devel/pkg-plist
index 12f22c5c23fa..cc28dd827e3f 100644
--- a/mail/MailScanner-devel/pkg-plist
+++ b/mail/MailScanner-devel/pkg-plist
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-bin/tnef
etc/MailScanner/MailScanner.conf.sample
etc/MailScanner/filename.rules.conf.sample
etc/MailScanner/filetype.rules.conf.sample
@@ -372,92 +371,92 @@ libexec/MailScanner/update_virus_scanners
%%DATADIR%%/reports/sk/stored.content.message.txt.sample
%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/INSTALL.FreeBSD
-%%DOCSDIR%%/INSTALL.OpenBSD
-%%DOCSDIR%%/QuickInstall.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.FreeBSD.port
-%%DOCSDIR%%/README.sql-logging
-%%DOCSDIR%%/building.txt
-%%DOCSDIR%%/donations.shtml
-%%DOCSDIR%%/downloadgraphs.shtml
-%%DOCSDIR%%/downloads.shtml
-%%DOCSDIR%%/ecs.css
-%%DOCSDIR%%/faq.shtml
-%%DOCSDIR%%/images/JulianField1_small.jpg
-%%DOCSDIR%%/images/bigmailscannerlogo.gif
-%%DOCSDIR%%/images/smallmailscannerlogo.gif
-%%DOCSDIR%%/images/thumb_JulianField2.jpg
-%%DOCSDIR%%/images/thumb_JulianField3.jpg
-%%DOCSDIR%%/images/thumb_JulianField4.jpg
-%%DOCSDIR%%/images/thumb_JulianField5.jpg
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/install/ClamAVModule.shtml
-%%DOCSDIR%%/install/OS-virus-scan-web.htm
-%%DOCSDIR%%/install/README.trend
-%%DOCSDIR%%/install/SAVI.shtml
-%%DOCSDIR%%/install/codestatus.shtml
-%%DOCSDIR%%/install/conf.shtml
-%%DOCSDIR%%/install/exim-old.shtml
-%%DOCSDIR%%/install/exim.shtml
-%%DOCSDIR%%/install/filesnscripts.shtml
-%%DOCSDIR%%/install/gcc.shtml
-%%DOCSDIR%%/install/index.shtml
-%%DOCSDIR%%/install/linux.shtml
-%%DOCSDIR%%/install/mailscanner.shtml
-%%DOCSDIR%%/install/mcafee.shtml
-%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
-%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
-%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
-%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
-%%DOCSDIR%%/install/mcp/index.html
-%%DOCSDIR%%/install/mime-tools-patch.txt
-%%DOCSDIR%%/install/mime-tools-patch2.txt
-%%DOCSDIR%%/install/mime-tools-patch3.txt
-%%DOCSDIR%%/install/mime-tools-patch4.txt
-%%DOCSDIR%%/install/osborne.txt
-%%DOCSDIR%%/install/other.shtml
-%%DOCSDIR%%/install/perl.shtml
-%%DOCSDIR%%/install/postfix.shtml
-%%DOCSDIR%%/install/sendmail.shtml
-%%DOCSDIR%%/install/solaris9.txt
-%%DOCSDIR%%/install/sophos.shtml
-%%DOCSDIR%%/install/spamassassin.shtml
-%%DOCSDIR%%/install/tnef.shtml
-%%DOCSDIR%%/install/zmailer.shtml
-%%DOCSDIR%%/introduction.shtml
-%%DOCSDIR%%/jobs
-%%DOCSDIR%%/mailscanner_trans.gif
-%%DOCSDIR%%/man/MailScanner.8
-%%DOCSDIR%%/man/MailScanner.8.html
-%%DOCSDIR%%/man/MailScanner.conf.5
-%%DOCSDIR%%/man/MailScanner.conf.5.html
-%%DOCSDIR%%/mrtg.shtml
-%%DOCSDIR%%/newinv4.shtml
-%%DOCSDIR%%/nextversion.shtml
-%%DOCSDIR%%/oldnews.shtml
-%%DOCSDIR%%/osdir.png
-%%DOCSDIR%%/performance.shtml
-%%DOCSDIR%%/poetry.shtml
-%%DOCSDIR%%/poweredby.google.gif
-%%DOCSDIR%%/poweredby.transtec.gif
-%%DOCSDIR%%/presentations.html
-%%DOCSDIR%%/press.html
-%%DOCSDIR%%/readme.shtml
-%%DOCSDIR%%/reject.html
-%%DOCSDIR%%/sobig.html
-%%DOCSDIR%%/support.html
-%%DOCSDIR%%/transtec.logo.gif
-%%DOCSDIR%%/users.shtml
-@dirrm %%DOCSDIR%%/man
-@dirrm %%DOCSDIR%%/install/mcp
-@dirrm %%DOCSDIR%%/install/tcp
-@dirrm %%DOCSDIR%%/install
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
+%%PORTDOCS%%%%DOCSDIR%%/QuickInstall.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
+%%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
+%%PORTDOCS%%%%DOCSDIR%%/building.txt
+%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
+%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
+%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
+%%PORTDOCS%%%%DOCSDIR%%/ecs.css
+%%PORTDOCS%%%%DOCSDIR%%/faq.shtml
+%%PORTDOCS%%%%DOCSDIR%%/images/JulianField1_small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/bigmailscannerlogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/smallmailscannerlogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install/ClamAVModule.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/OS-virus-scan-web.htm
+%%PORTDOCS%%%%DOCSDIR%%/install/README.trend
+%%PORTDOCS%%%%DOCSDIR%%/install/SAVI.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/codestatus.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/conf.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/exim-old.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/exim.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/filesnscripts.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/gcc.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/index.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/linux.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mailscanner.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mcafee.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch3.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch4.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/osborne.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/other.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/perl.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/postfix.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/sendmail.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/solaris9.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/sophos.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/spamassassin.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/tnef.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/zmailer.shtml
+%%PORTDOCS%%%%DOCSDIR%%/introduction.shtml
+%%PORTDOCS%%%%DOCSDIR%%/jobs
+%%PORTDOCS%%%%DOCSDIR%%/mailscanner_trans.gif
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
+%%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
+%%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
+%%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
+%%PORTDOCS%%%%DOCSDIR%%/oldnews.shtml
+%%PORTDOCS%%%%DOCSDIR%%/osdir.png
+%%PORTDOCS%%%%DOCSDIR%%/performance.shtml
+%%PORTDOCS%%%%DOCSDIR%%/poetry.shtml
+%%PORTDOCS%%%%DOCSDIR%%/poweredby.google.gif
+%%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
+%%PORTDOCS%%%%DOCSDIR%%/presentations.html
+%%PORTDOCS%%%%DOCSDIR%%/press.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.shtml
+%%PORTDOCS%%%%DOCSDIR%%/reject.html
+%%PORTDOCS%%%%DOCSDIR%%/sobig.html
+%%PORTDOCS%%%%DOCSDIR%%/support.html
+%%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/users.shtml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/tcp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/mcp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/reports/sk
@dirrm %%DATADIR%%/reports/se
@dirrm %%DATADIR%%/reports/ro
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index b94140929afc..954c1d56ad6d 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= MailScanner
PORTVERSION= 4.26.1
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
PKGNAMESUFFIX= -devel
@@ -27,7 +28,8 @@ BUILD_DEPENDS= \
${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
RUN_DEPENDS= ${BUILD_DEPENDS} \
- ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
+ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
+ ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
CONFLICTS= MailScanner-[0-9]*
@@ -54,52 +56,47 @@ ETC_FILES= MailScanner.conf filename.rules.conf \
do-build:
${PERL} -pi -e \
- 's,/opt/MailScanner/lib,'${PREFIX}'/lib/MailScanner,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ 's,/opt/MailScanner/lib,${PREFIX}/lib/MailScanner,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/bin/MailScanner
${PERL} -pi -e \
's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
- s,/opt/MailScanner/bin,'${PREFIX}'bin,g; \
- s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
+ s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/etc/MailScanner.conf
${PERL} -pi -e \
- 's,/opt/MailScanner/lib,'${PREFIX}'/libexec/MailScanner,g; \
+ 's,/opt/MailScanner/lib,${PREFIX}/libexec/MailScanner,g; \
s,/bin/false,/usr/bin/false,;' ${WRKSRC}/etc/virus.scanners.conf
${PERL} -pi -e \
- 's,/bin/bash,'${LOCALBASE}'/bin/bash,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ 's,/bin/bash,${LOCALBASE}/bin/bash,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/bin/update_virus_scanners
${PERL} -pi -e \
's,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g; \
s,/usr/lib/sendmail,/usr/sbin/sendmail,g; \
- s,/opt/MailScanner/bin,'${PREFIX}'/bin,g; \
- s,/opt/MailScanner/etc/reports,'${DATADIR}'/reports,g; \
- s,/opt/MailScanner/etc,'${PREFIX}'/etc/MailScanner,g;' \
+ s,/opt/MailScanner/bin,${PREFIX}/bin,g; \
+ s,/opt/MailScanner/etc/reports,${DATADIR}/reports,g; \
+ s,/opt/MailScanner/etc,${PREFIX}/etc/MailScanner,g;' \
${WRKSRC}/lib/MailScanner/ConfigDefs.pl
${PERL} -pi \
-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
do-install:
- #
- # Step 1: Install binaries
- #
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/tnef.linux ${PREFIX}/bin/tnef
- #
- # Step 2: Install libexec files
+ # Step 1: Install libexec files
#
${MKDIR} ${PREFIX}/libexec/MailScanner
${CHMOD} -R ${BINMODE} ${PREFIX}/libexec/MailScanner
${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${PREFIX}/libexec/MailScanner
- cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec ${INSTALL_SCRIPT} \
- '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+ cd ${WRKSRC}/lib && ${FIND} * -name "*-wrapper" -exec \
+ ${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
cd ${WRKSRC}/lib && ${FIND} * -name "*-autoupdate" -exec \
- ${INSTALL_SCRIPT} '{}' ${PREFIX}'/libexec/MailScanner/{}'.sample \;
+ ${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
${PREFIX}/libexec/MailScanner/update_virus_scanners
#
- # Step 3: Install etc files
+ # Step 2: Install etc files
#
${MKDIR} ${PREFIX}/etc/MailScanner
${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
@@ -114,43 +111,43 @@ do-install:
${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
#
- # Step 4: Install files in share
+ # Step 3: Install files in share
#
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
- mkdir ${DATADIR}'/{}' \;
+ mkdir ${DATADIR}/{} \;
cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
- ${INSTALL_DATA} '{}' ${DATADIR}'/{}'.sample \;
+ ${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
${CHMOD} -R ${BINMODE} ${DATADIR}/reports
#
- # Step 5: Install lib
+ # Step 4: Install lib
#
${MKDIR} ${PREFIX}/lib/MailScanner/MailScanner
${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm \
${PREFIX}/lib/MailScanner/MailScanner.pm
cd ${WRKSRC}/lib/MailScanner && ${FIND} * -type f ! -name "*.orig" -exec \
- ${INSTALL_SCRIPT} '{}' ${PREFIX}'/lib/MailScanner/MailScanner/{}' \;
+ ${INSTALL_SCRIPT} {} ${PREFIX}/lib/MailScanner/MailScanner/{} \;
#
- # Step 6: Install Start/Stop scripts
+ # Step 5: Install Start/Stop scripts
#
${INSTALL_SCRIPT} ${FILESDIR}/mailscanner.sh \
${PREFIX}/etc/rc.d/mailscanner.sh.sample
${INSTALL_SCRIPT} ${FILESDIR}/mta.sh ${PREFIX}/etc/rc.d/mta.sh.sample
#
- # Step 7: Docs & Manpages
+ # Step 6: Docs & Manpages
#
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${FILESDIR}/README.FreeBSD.port ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
cd ${WRKSRC}/docs && \
- ${FIND} * -type d -exec mkdir ${DOCSDIR}'/{}' \; && \
+ ${FIND} * -type d -exec mkdir ${DOCSDIR}/{} \; && \
${FIND} * -type f ! -name "*.orig" -exec \
- ${INSTALL_DATA} '{}' ${DOCSDIR}'/{}' \;
+ ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+.endif
cd ${WRKSRC}/docs/man && \
${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
-.endif
.if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
# Upgrading MailScanner.conf file... Please wait
@${WRKSRC}/bin/upgrade_MailScanner_conf \
@@ -182,7 +179,7 @@ renew-autoupdate: install
renew-reports: install
# Renew reports
cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
- -exec ${INSTALL_DATA} '{}' ${DATADIR}'/reports/en/{}' \;
+ -exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{} \;
initial-config: renew-wrapper renew-autoupdate renew-reports
cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
diff --git a/mail/mailscanner-devel/pkg-plist b/mail/mailscanner-devel/pkg-plist
index 12f22c5c23fa..cc28dd827e3f 100644
--- a/mail/mailscanner-devel/pkg-plist
+++ b/mail/mailscanner-devel/pkg-plist
@@ -1,5 +1,4 @@
@comment $FreeBSD$
-bin/tnef
etc/MailScanner/MailScanner.conf.sample
etc/MailScanner/filename.rules.conf.sample
etc/MailScanner/filetype.rules.conf.sample
@@ -372,92 +371,92 @@ libexec/MailScanner/update_virus_scanners
%%DATADIR%%/reports/sk/stored.content.message.txt.sample
%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/INSTALL.FreeBSD
-%%DOCSDIR%%/INSTALL.OpenBSD
-%%DOCSDIR%%/QuickInstall.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.FreeBSD.port
-%%DOCSDIR%%/README.sql-logging
-%%DOCSDIR%%/building.txt
-%%DOCSDIR%%/donations.shtml
-%%DOCSDIR%%/downloadgraphs.shtml
-%%DOCSDIR%%/downloads.shtml
-%%DOCSDIR%%/ecs.css
-%%DOCSDIR%%/faq.shtml
-%%DOCSDIR%%/images/JulianField1_small.jpg
-%%DOCSDIR%%/images/bigmailscannerlogo.gif
-%%DOCSDIR%%/images/smallmailscannerlogo.gif
-%%DOCSDIR%%/images/thumb_JulianField2.jpg
-%%DOCSDIR%%/images/thumb_JulianField3.jpg
-%%DOCSDIR%%/images/thumb_JulianField4.jpg
-%%DOCSDIR%%/images/thumb_JulianField5.jpg
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/install/ClamAVModule.shtml
-%%DOCSDIR%%/install/OS-virus-scan-web.htm
-%%DOCSDIR%%/install/README.trend
-%%DOCSDIR%%/install/SAVI.shtml
-%%DOCSDIR%%/install/codestatus.shtml
-%%DOCSDIR%%/install/conf.shtml
-%%DOCSDIR%%/install/exim-old.shtml
-%%DOCSDIR%%/install/exim.shtml
-%%DOCSDIR%%/install/filesnscripts.shtml
-%%DOCSDIR%%/install/gcc.shtml
-%%DOCSDIR%%/install/index.shtml
-%%DOCSDIR%%/install/linux.shtml
-%%DOCSDIR%%/install/mailscanner.shtml
-%%DOCSDIR%%/install/mcafee.shtml
-%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
-%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
-%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
-%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
-%%DOCSDIR%%/install/mcp/index.html
-%%DOCSDIR%%/install/mime-tools-patch.txt
-%%DOCSDIR%%/install/mime-tools-patch2.txt
-%%DOCSDIR%%/install/mime-tools-patch3.txt
-%%DOCSDIR%%/install/mime-tools-patch4.txt
-%%DOCSDIR%%/install/osborne.txt
-%%DOCSDIR%%/install/other.shtml
-%%DOCSDIR%%/install/perl.shtml
-%%DOCSDIR%%/install/postfix.shtml
-%%DOCSDIR%%/install/sendmail.shtml
-%%DOCSDIR%%/install/solaris9.txt
-%%DOCSDIR%%/install/sophos.shtml
-%%DOCSDIR%%/install/spamassassin.shtml
-%%DOCSDIR%%/install/tnef.shtml
-%%DOCSDIR%%/install/zmailer.shtml
-%%DOCSDIR%%/introduction.shtml
-%%DOCSDIR%%/jobs
-%%DOCSDIR%%/mailscanner_trans.gif
-%%DOCSDIR%%/man/MailScanner.8
-%%DOCSDIR%%/man/MailScanner.8.html
-%%DOCSDIR%%/man/MailScanner.conf.5
-%%DOCSDIR%%/man/MailScanner.conf.5.html
-%%DOCSDIR%%/mrtg.shtml
-%%DOCSDIR%%/newinv4.shtml
-%%DOCSDIR%%/nextversion.shtml
-%%DOCSDIR%%/oldnews.shtml
-%%DOCSDIR%%/osdir.png
-%%DOCSDIR%%/performance.shtml
-%%DOCSDIR%%/poetry.shtml
-%%DOCSDIR%%/poweredby.google.gif
-%%DOCSDIR%%/poweredby.transtec.gif
-%%DOCSDIR%%/presentations.html
-%%DOCSDIR%%/press.html
-%%DOCSDIR%%/readme.shtml
-%%DOCSDIR%%/reject.html
-%%DOCSDIR%%/sobig.html
-%%DOCSDIR%%/support.html
-%%DOCSDIR%%/transtec.logo.gif
-%%DOCSDIR%%/users.shtml
-@dirrm %%DOCSDIR%%/man
-@dirrm %%DOCSDIR%%/install/mcp
-@dirrm %%DOCSDIR%%/install/tcp
-@dirrm %%DOCSDIR%%/install
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.FreeBSD
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.OpenBSD
+%%PORTDOCS%%%%DOCSDIR%%/QuickInstall.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD.port
+%%PORTDOCS%%%%DOCSDIR%%/README.sql-logging
+%%PORTDOCS%%%%DOCSDIR%%/building.txt
+%%PORTDOCS%%%%DOCSDIR%%/donations.shtml
+%%PORTDOCS%%%%DOCSDIR%%/downloadgraphs.shtml
+%%PORTDOCS%%%%DOCSDIR%%/downloads.shtml
+%%PORTDOCS%%%%DOCSDIR%%/ecs.css
+%%PORTDOCS%%%%DOCSDIR%%/faq.shtml
+%%PORTDOCS%%%%DOCSDIR%%/images/JulianField1_small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/bigmailscannerlogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/smallmailscannerlogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField3.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField4.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_JulianField5.jpg
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install/ClamAVModule.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/OS-virus-scan-web.htm
+%%PORTDOCS%%%%DOCSDIR%%/install/README.trend
+%%PORTDOCS%%%%DOCSDIR%%/install/SAVI.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/codestatus.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/conf.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/exim-old.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/exim.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/filesnscripts.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/gcc.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/index.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/linux.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mailscanner.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mcafee.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.55
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/Conf.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
+%%PORTDOCS%%%%DOCSDIR%%/install/mcp/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch2.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch3.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/mime-tools-patch4.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/osborne.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/other.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/perl.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/postfix.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/sendmail.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/solaris9.txt
+%%PORTDOCS%%%%DOCSDIR%%/install/sophos.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/spamassassin.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/tnef.shtml
+%%PORTDOCS%%%%DOCSDIR%%/install/zmailer.shtml
+%%PORTDOCS%%%%DOCSDIR%%/introduction.shtml
+%%PORTDOCS%%%%DOCSDIR%%/jobs
+%%PORTDOCS%%%%DOCSDIR%%/mailscanner_trans.gif
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.8.html
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5
+%%PORTDOCS%%%%DOCSDIR%%/man/MailScanner.conf.5.html
+%%PORTDOCS%%%%DOCSDIR%%/mrtg.shtml
+%%PORTDOCS%%%%DOCSDIR%%/newinv4.shtml
+%%PORTDOCS%%%%DOCSDIR%%/nextversion.shtml
+%%PORTDOCS%%%%DOCSDIR%%/oldnews.shtml
+%%PORTDOCS%%%%DOCSDIR%%/osdir.png
+%%PORTDOCS%%%%DOCSDIR%%/performance.shtml
+%%PORTDOCS%%%%DOCSDIR%%/poetry.shtml
+%%PORTDOCS%%%%DOCSDIR%%/poweredby.google.gif
+%%PORTDOCS%%%%DOCSDIR%%/poweredby.transtec.gif
+%%PORTDOCS%%%%DOCSDIR%%/presentations.html
+%%PORTDOCS%%%%DOCSDIR%%/press.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.shtml
+%%PORTDOCS%%%%DOCSDIR%%/reject.html
+%%PORTDOCS%%%%DOCSDIR%%/sobig.html
+%%PORTDOCS%%%%DOCSDIR%%/support.html
+%%PORTDOCS%%%%DOCSDIR%%/transtec.logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/users.shtml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/tcp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install/mcp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/install
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/reports/sk
@dirrm %%DATADIR%%/reports/se
@dirrm %%DATADIR%%/reports/ro