Repocopy the MailScanner-devel port to mailscanner-devel, so as to retain

the status quo of low case directory names.

14 files changed, 1 insertions, 1093 deletions

diff --git a/mail/MailScanner-devel/Makefile b/mail/MailScanner-devel/Makefile
deleted file mode 100644
index 9d22d9bf3eb1..000000000000
--- a/mail/MailScanner-devel/Makefile
+++ /dev/null
@@ -1,202 +0,0 @@
-# New ports collection makefile for:	MailScanner
-# Date created:				17 March 2003
-# Whom:					Jan-Peter Koopmann <j.koopmann@seceidos.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	MailScanner
-PORTVERSION=	4.26.4
-CATEGORIES=	mail
-MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
-
-MAINTAINER=	j.koopmann@seceidos.de
-COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
-
-BUILD_DEPENDS=	\
-	${SITE_PERL}/IO/Stringy.pm:${PORTSDIR}/devel/p5-IO-stringy \
-	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
-	${SITE_PERL}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset \
-	${SITE_PERL}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-	${SITE_PERL}/MIME/Parser.pm:${PORTSDIR}/mail/p5-MIME-Tools \
-	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp \
-	${SITE_PERL}/Convert/TNEF.pm:${PORTSDIR}/converters/p5-Convert-TNEF \
-	${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
-
-RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
-		${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef \
-		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
-		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
-
-CONFLICTS=	MailScanner-[0-9]*
-
-USE_PERL5=	yes
-
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-MAN8=		MailScanner.8
-MAN5=		MailScanner.conf.5
-MLINKS=		MailScanner.8 mailscanner.8 \
-		MailScanner.conf.5 mailscanner.conf.5
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif
-
-DOC_FILES=	INSTALL INSTALL.FreeBSD INSTALL.OpenBSD README
-ETC_FILES=	MailScanner.conf filename.rules.conf \
-		filetype.rules.conf spam.assassin.prefs.conf \
-		spam.lists.conf virus.scanners.conf
-
-do-build:
-	${PERL} -pi -e \
-		'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;' \
-		${WRKSRC}/etc/MailScanner.conf
-	${PERL} -pi -e \
-		'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;' \
-		${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;' \
-		${WRKSRC}/lib/MailScanner/ConfigDefs.pl
-	${PERL} -pi \
-		-e 's,/bin/sed,/usr/bin/sed,g;' ${WRKSRC}/lib/MailScanner/SystemDefs.pm
-	${PERL} -pi -e \
-		's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g;' \
-		${WRKSRC}/lib/clamav-wrapper
-	${PERL} -pi -e \
-		's,/usr/bin/wget,${LOCALBASE}/bin/wget,g;' \
-		${WRKSRC}/lib/sophos-autoupdate
-	${PERL} -pi -e \
-		's,/usr/bin/unzip,${LOCALBASE}/bin/unzip,g;' \
-		${WRKSRC}/lib/sophos-autoupdate
-
-do-install:
-	# 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 "*-autoupdate" -exec \
-		${INSTALL_SCRIPT} {} ${PREFIX}/libexec/MailScanner/{}.sample \;
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners \
-		${PREFIX}/libexec/MailScanner/update_virus_scanners
-	#
-	# Step 2: Install etc files
-	#
-	${MKDIR} ${PREFIX}/etc/MailScanner
-	${CHMOD} ${BINMODE} ${PREFIX}/etc/MailScanner
-.for FILE in ${ETC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} \
-		${PREFIX}/etc/MailScanner/${FILE}.sample
-.endfor
-	${MKDIR} ${PREFIX}/etc/MailScanner/rules
-	cd ${WRKSRC}/etc/rules && \
-		${INSTALL_DATA} EXAMPLES README ${PREFIX}/etc/MailScanner/rules
-	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
-		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules.sample
-
-	#
-	# Step 3: Install files in share
-	#
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/etc && ${FIND} reports -type d -exec \
-		mkdir ${DATADIR}/{} \;
-	cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec \
-		${INSTALL_DATA} {} ${DATADIR}/{}.sample \;
-	${CHMOD} -R ${BINMODE} ${DATADIR}/reports
-	#
-	# 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/{} \;
-	#
-	# 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 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 f ! -name "*.orig" -exec \
-			${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-.endif
-	cd ${WRKSRC}/docs/man && \
-		${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5 && \
-		${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
-	# Sophos install script
-	${INSTALL_SCRIPT} ${FILESDIR}/Sophos.install.freebsd ${DOCSDIR}
-.if exists(${PREFIX}/etc/MailScanner/MailScanner.conf)
-	# Upgrading MailScanner.conf file... Please wait
-	@${WRKSRC}/bin/upgrade_MailScanner_conf \
-		${PREFIX}/etc/MailScanner/MailScanner.conf \
-		${PREFIX}/etc/MailScanner/MailScanner.conf.sample > \
-		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} \
-		2> /dev/null
-	# Diff the files. If the files do not differ, delete the new file
-	@if diff -b -B -q ${PREFIX}/etc/MailScanner/MailScanner.conf \
-		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
-	   then ${ECHO} "No changes in MailScanner.conf options found" ; \
-		${RM} ${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION} ; \
-	else \
-	   ${ECHO} "Changes in MailScanner.conf found. Please look at \
-		${PREFIX}/etc/MailScanner/MailScanner.conf.new.${PORTVERSION}" ; \
-	fi
-.endif
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},' pkg-message > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-
-renew-wrapper: install
-	# Renew virus wrapper scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-wrapper ${PREFIX}/libexec/MailScanner
-
-renew-autoupdate: install
-	# Renew autoupdate scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/*-autoupdate ${PREFIX}/libexec/MailScanner
-
-renew-reports: install
-	# Renew reports
-	cd ${WRKSRC}/etc/reports/en && ${FIND} * -type f ! -name "*.orig" \
-		-exec ${INSTALL_DATA} {} ${DATADIR}/reports/en/{}  \;
-
-initial-config: renew-wrapper renew-autoupdate renew-reports
-	cd ${WRKSRC}/etc && ${INSTALL_DATA} ${ETC_FILES} \
-		${PREFIX}/etc/MailScanner
-	${INSTALL_DATA} ${WRKSRC}/etc/rules/spam.whitelist.rules \
-		${PREFIX}/etc/MailScanner/rules/spam.whitelist.rules
-
-.include <bsd.port.post.mk>
diff --git a/mail/MailScanner-devel/distinfo b/mail/MailScanner-devel/distinfo
deleted file mode 100644
index 54429feb7913..000000000000
--- a/mail/MailScanner-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (MailScanner-4.26-4.tar.gz) = 6c7ef8fe632f9f490bc63ef5a8972c43
diff --git a/mail/MailScanner-devel/files/README.FreeBSD.port b/mail/MailScanner-devel/files/README.FreeBSD.port
deleted file mode 100644
index 55b28caaf497..000000000000
--- a/mail/MailScanner-devel/files/README.FreeBSD.port
+++ /dev/null
@@ -1,48 +0,0 @@
-The MailScanner port is using the original MailScanner tarball from 
-www.mailscanner.info. This tarball puts all the MailScanner files in 
-subdirectories
-
-bin	MailScanner binary / MailScanner start script etc.
-etc	MailScanner config files / rules / report templates
-lib	Virus wrapper and autoupdate scripts / MailScanner Perl libraries
-docs	Documentation
-var	pid file
-
-In order to make this FreeBSD compliant the port installs those files
-in the following directories:
-
-/usr/local/libexec/MailScanner	MailScanner binary, virus wrapper/autoupdate
-/usr/local/lib/MailScanner	MailScanner Perl libraries
-/usr/local/share/MailScanner	MailScanner report templates
-/usr/local/share/doc/MailScanner	Documentation
-/usr/local/etc/MailScanner	MailScanner config files / rules
-/usr/local/etc/rc.d		start/stop scripts
-
-The port installs two start/stop scripts in /usr/local/etc/rc.d:
-
-mailscanner.sh.sample
-mta.sh.sample
-
-My suggestion is to use these scripts instead of the usual FreeBSD MTA startup
-process. This of course means that you will have to disable MTA startup 
-in rc.conf completely. Put this in your rc.conf:
-
-sendmail_enable="NO"
-
-Then adjust sendmail.sh or exim.sh to your configuration. Have a look at the
-MailScanner manpage for MTA setup hints.
-
-When upgrading the port it will try to look for new options/variables in
-MailScanner.conf using Julians upgrade_MailScanner_conf script. If it finds
-changes it will create a newly merged MailScanner.conf and copy it to
-/usr/local/etc/MailScanner/MailScanner.conf.new.PORTVERSION.
-
-
-If you have suggestions for this port please let me know and drop me an e-mail at
-
-j.koopmann@seceidos.de
-
-
-Thanks,
-  Jan-Peter Koopmann
-
diff --git a/mail/MailScanner-devel/files/Sophos.install.freebsd b/mail/MailScanner-devel/files/Sophos.install.freebsd
deleted file mode 100644
index f1df49606e82..000000000000
--- a/mail/MailScanner-devel/files/Sophos.install.freebsd
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/local/bin/bash
-#
-# $Id: Sophos.install,v 1.13.2.3 2003/06/07 17:20:39 jkf Exp $
-#
-# Run this script to install Sophos in the right place, with the right
-# options for the MailScanner.
-# Run this script from inside the directory in which you have copied
-# and unpacked the Sophos distribution.
-# Tweaked for FreeBSD.
-
-SOPHOS=/usr/local/Sophos
-SCRIPTS=/usr/local/libexec/MailScanner
-COMPD=freebsd.elf.tar.Z
-DISTRIB=freebsd.elf.tar
-
-mkdir -p ${SOPHOS}
-chown -R root ${SOPHOS}
-chmod -R go+rX ${SOPHOS}
-
-# Clear out any old libs from /usr/local/lib which is where
-# a default SAVI installation will have left them
-echo Clearing out old default Sophos installation libraries
-rm -f /usr/local/lib/libsavi.so*
-
-# Have we got to uncompress the distribution for them?
-if [ -f $COMPD ]; then
-  echo Uncompressing Sophos distribution
-  uncompress $COMPD
-fi
-
-# Have we got to unpack the distribution for them?
-if [ -f $DISTRIB ]; then
-  # Is there an old unpacked distribution here too??
-  if [ -d sav-install ]; then
-    echo Clearing out unpacked distribution
-    rm -rf sav-install
-  fi
-  # Unpack the distribution
-  echo Unpacking distribution
-  tar xBf $DISTRIB
-fi
-
-# JKF 31/08/2001 Remove any existing vdl.dat files
-if [ -f ${SOPHOS}/lib/vdl.dat ]; then
-  rm -f ${SOPHOS}/lib/vdl*
-fi
-if [ -f ${SOPHOS}/lib/vdln.dat ]; then
-  rm -f ${SOPHOS}/lib/vdl*
-fi
-if [ -f ${SOPHOS}/lib/vdl01.vdb ]; then
-  rm -f ${SOPHOS}/lib/vdl*
-fi
-
-# Are we in the right directory, or one above it?
-if [ -d sav-install ]; then
-  cd sav-install
-fi
-
-# Check we have found the install.sh script
-if [ \! -f install.sh ]; then
-  echo Please cd into the directory containing the Sophos install.sh
-  echo script and run this command again.
-  exit 1
-fi
-
-echo Installing Sophos for MailScanner
-./install.sh -v -d ${SOPHOS} -s lib -ni
-
-if [ -f /etc/sav.conf ]; then
-  echo Removing troublesome and useless configuration file /etc/sav.conf
-  rm -f /etc/sav.conf
-fi
-
-echo Creating links so Perl-SAVI module compiles
-[ -e ${SOPHOS}/lib/libsavi.so.2 ] && ln -sf libsavi.so.2 ${SOPHOS}/lib/libsavi.so
-[ -e ${SOPHOS}/lib/libsavi.so.3 ] && ln -sf libsavi.so.3 ${SOPHOS}/lib/libsavi.so
-
-echo
-echo Fetching latest IDE virus identities from www.sophos.com
-${SCRIPTS}/sophos-autoupdate
-
-if [ -f ${SCRIPTS}/sophos-wrapper ]; then
-  chmod a=rx ${SCRIPTS}/sophos-wrapper
-  echo Done.
-else
-  echo Something has gone wrong. There should be a copy of the
-  echo script sophos-wrapper in the directory ${SCRIPTS}.
-  echo Please re-install the MailScanner or fetch another copy of
-  echo sophoswrapper from the distribution web site.
-fi
-
-exit 0
diff --git a/mail/MailScanner-devel/files/mailscanner.sh b/mail/MailScanner-devel/files/mailscanner.sh
deleted file mode 100644
index 67b7bbcbe50e..000000000000
--- a/mail/MailScanner-devel/files/mailscanner.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-msbindir=/usr/local/libexec/MailScanner
-process=MailScanner
-config=/usr/local/etc/MailScanner/MailScanner.conf
-PIDFILE=/var/run/MailScanner.pid
-
-start_ms()
-{
-    pid=`ps -axww |
-         grep '[ ]'$msbindir/$process |
-         awk '{print $1}'`
-
-    if [ "x$pid" = "x" ]; then
-	# Quietly try to raise the open_files limit
-	ulimit -n 2000 >/dev/null 2>&1
-	# Restart it
-	PATH=${msbindir}:$PATH
-	echo Starting MailScanner...
-	cd $msbindir
-	$process $config
-    else
-	echo MailScanner running with pid $pid  
-    fi
-}
-
-stop_ms()
-{
-    echo Stopping MailScanner...
-    kill -TERM -- -`cat $PIDFILE` 2>/dev/null
-    sleep 5
-}
-
-_action=${1:-start}
-
-case ${_action} in
-start)
-	start_ms
-	;;
-
-stop)
-	stop_ms
-	;;
-
-restart)
-	stop_ms
-	start_ms
-	;;
-
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	exit 64
-	;;
-esac
-exit 0
diff --git a/mail/MailScanner-devel/files/mta.sh b/mail/MailScanner-devel/files/mta.sh
deleted file mode 100644
index 7bce65f9d8d8..000000000000
--- a/mail/MailScanner-devel/files/mta.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/sh
-
-outgoing_queue_time=15m
-mta=exim
-
-case "$mta" in
-	exim)
-		program=/usr/local/sbin/exim
-
-		if [ -f /usr/local/etc/exim/configure.in ]; then
-			incoming_config=/usr/local/etc/exim/configure.in
-		else
-			incoming_config=/usr/local/etc/exim/configure
-		fi
-
-		outgoing_config=/usr/local/etc/exim/configure.out
-
-		inpidfile=/var/run/exim_in.pid
-		outpidfile=/var/run/exim_out.pid
-		subpidfile=
-
-		incoming_args="-C ${incoming_config} -oP ${inpidfile} -bd"
-		outgoing_args="-C ${outgoing_config} -oP ${outpidfile} -q${outgoing_queue_time}"
-		submitqueue_args=
-		;;
-
-	sendmail)
-		program=/usr/sbin/sendmail
-
-		incoming_queue=/var/spool/mqueue.in
-
-		submit_queue_time=${outgoing_queue_time}
-
-		inpidfile=/var/run/sendmail_in.pid
-		outpidfile=/var/run/sendmail_out.pid
-		subpidfile=/var/spool/clientmqueue/sm-client.pid
-
-		incoming_args="-L sm-mta-in -bd \
-				-OPrivacyOptions=noetrn \
-				-OQueueDirectory=${incoming_queue} \
-				-ODeliveryMode=queueonly \
-				-OPidFile=${inpidfile}"
-		outgoing_args="-L sm-mta-out -q${outgoing_queue_time} \
-				-OPidFile=${outpidfile}"
-		submitqueue_args="-L sm-msp-queue -Ac -q${submit_queue_time} \
-				-OPidFile=${subpidfile}"
-		;;
-
-	*)
-		echo "ERROR: I don't know the MTA '$mta'. Check your settings." >&2
-		exit 2
-		;;
-esac
-
-start_mta()
-{
-	echo -n " `basename ${program}`(incoming)"
-	${program} ${incoming_args}
-
-	echo -n " `basename ${program}`(outgoing)"
-	${program} ${outgoing_args}
-}
-
-start_mspq ()
-{
-	if [ "${submitqueue_args}" ]; then
-		echo -n " `basename ${program}`(submitqueue)"
-		${program} ${submitqueue_args}
-	fi
-}
-
-stop_mta()
-{
-	echo "Stopping `basename ${program}` (incoming)"
-	kill -TERM `head -1 ${inpidfile}` 2>/dev/null
-
-	echo "Stopping `basename ${program}` (outgoing)"
-	kill -TERM `head -1 ${outpidfile}` 2>/dev/null
-}
-
-stop_mspq ()
-{
-	if [ "${submitqueue_args}" ]; then
-		echo "Stopping `basename ${program}` (submitqueue)"
-		kill -TERM `head -1 ${subpidfile}` 2>/dev/null
-	fi
-}
-
-
-_action=${1:-start}
-
-case ${_action} in
-start)
-        start_mta
-	start_mspq
-        ;;
-
-stop)
-        stop_mta
-	stop_mspq
-        ;;
-
-restart)
-	stop_mta
-	stop_mspq
-	sleep 5
-	start_mta
-	start_mspq
-	;;
-
-*)
-	echo "Usage: `basename $0` {start|stop|restart}" >&2
-	exit 64
-	;;
-esac
-exit 0
-
diff --git a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8 b/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8
deleted file mode 100644
index 676b7c4a1b72..000000000000
--- a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8
+++ /dev/null
@@ -1,8 +0,0 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.8	Tue Dec  2 22:23:08 2003
-@@ -1,4 +1,4 @@
--.TH "MailScanner" "8" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner" "8" "4.26-3" "Julian Field" "Mail"
- .SH "NAME"
- .LP 
- MailScanner \- Virus/Spam Scanner for Sendmail and Exim
diff --git a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8.html b/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8.html
deleted file mode 100644
index fbd69895098f..000000000000
--- a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.8.html
+++ /dev/null
@@ -1,9 +0,0 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.8.html	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.8.html	Tue Dec  2 22:23:08 2003
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Wed Nov 19 17:14:30 2003 -->
-+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
- <html>
diff --git a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5 b/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5
deleted file mode 100644
index 8e03c558f9c1..000000000000
--- a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5
+++ /dev/null
@@ -1,8 +0,0 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.conf.5	Tue Dec  2 22:23:08 2003
-@@ -1,4 +1,4 @@
--.TH "MailScanner.conf" "5" "4.25-10" "Julian Field" "Mail"
-+.TH "MailScanner.conf" "5" "4.26-3" "Julian Field" "Mail"
- .SH "NAME"
- .LP 
- MailScanner.conf \- Main configuration for MailScanner
diff --git a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5.html b/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5.html
deleted file mode 100644
index d78f9334e05b..000000000000
--- a/mail/MailScanner-devel/files/patch-docs:man:MailScanner.conf.5.html
+++ /dev/null
@@ -1,9 +0,0 @@
---- ../MailScanner-4.25-14.orig/docs/man/MailScanner.conf.5.html	Tue Dec  2 22:22:27 2003
-+++ docs/man/MailScanner.conf.5.html	Tue Dec  2 22:23:08 2003
-@@ -1,5 +1,5 @@
- <!-- Creator     : groff version 1.19 -->
--<!-- CreationDate: Wed Nov 26 20:07:41 2003 -->
-+<!-- CreationDate: Tue Dec  2 22:22:45 2003 -->
- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
- <html>
diff --git a/mail/MailScanner-devel/pkg-descr b/mail/MailScanner-devel/pkg-descr
deleted file mode 100644
index 3a143b093420..000000000000
--- a/mail/MailScanner-devel/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-MailScanner is a complete e-mail security system designed for use on 
-e-mail gateways. It protects against viruses, and detects attacks against 
-e-mail client packages (such as Outlook, Outlook Express, Eudora). It can 
-also detect almost all unsolicited commercial e-mail (spam) passing through 
-it and respond to all incidents in a wide variety of ways. 
-
-Not only can it scan for known viruses, but it can also protect against unknown 
-viruses hidden inside e-mail attachments by refusing entry to attachments whose 
-filenames match any given pattern. This can include generic patterns that trap 
-filenames attempting to hide the true filename extension (e.g. ".txt.vbs"). 
-
-It is superior to many commercial packages in its ability to handle attacks 
-against itself, such as Denial Of Service attacks caused by messages containing
-the "Zip of Death". It is easy to install into an existing e-mail gateway, 
-requiring very little knowledge of sendmail and no change to an existing 
-sendmail configuration. 
-
-MailScanner itself is entirely open source, but it uses widely known commercial
-virus scanning packages at its core. The other software it uses is all high 
-quality open source software, leading to a system that can be trusted for 
-performance and reliability. 
-
-WWW:	http://www.mailscanner.info
diff --git a/mail/MailScanner-devel/pkg-message b/mail/MailScanner-devel/pkg-message
deleted file mode 100644
index 125ed173ca23..000000000000
--- a/mail/MailScanner-devel/pkg-message
+++ /dev/null
@@ -1,37 +0,0 @@
-*************************************************************************
-	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 	
-	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |
-	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |
-	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |
-	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|
-							
-	See %%PREFIX%%/share/doc/MailScanner/README.FreeBSD.port,
-	http://www.mailscanner.info, the man pages MailScanner and
-	MailScanner.conf for further instructions.
-
-	You will need to make several modifications to config files
-	before MailScanner will work correctly.
-                                              
-	If this is the first time you are installing this port you
-	should create an initial set of configuration files with 
-                                                               
-	make initial-config 
-
-	within this directory. Without this step you will only have
-	.sample files instead of real .conf files and report
-	templates.
-
-	If you are upgrading your port you might consider 
-	running
-
-	make renew-wrapper
-	make renew-autoupdate
-	make renew-reports
-
-	to update your virus-wrappers, autoupdates, reports and
-	languages.conf
-
-	Sophos users: Please take a look at the Sophos install
-	script %%PREFIX%%/share/doc/MailScanner/Sophos.install.freebsd
-
-*************************************************************************
diff --git a/mail/MailScanner-devel/pkg-plist b/mail/MailScanner-devel/pkg-plist
deleted file mode 100644
index 2fd7f3b670f4..000000000000
--- a/mail/MailScanner-devel/pkg-plist
+++ /dev/null
@@ -1,483 +0,0 @@
-@comment $FreeBSD$
-etc/MailScanner/MailScanner.conf.sample
-etc/MailScanner/filename.rules.conf.sample
-etc/MailScanner/filetype.rules.conf.sample
-etc/MailScanner/rules/EXAMPLES
-etc/MailScanner/rules/README
-etc/MailScanner/rules/spam.whitelist.rules.sample
-etc/MailScanner/spam.assassin.prefs.conf.sample
-etc/MailScanner/spam.lists.conf.sample
-etc/MailScanner/virus.scanners.conf.sample
-etc/rc.d/mailscanner.sh.sample
-etc/rc.d/mta.sh.sample
-lib/MailScanner/MailScanner.pm
-lib/MailScanner/MailScanner/Config.pm
-lib/MailScanner/MailScanner/ConfigDefs.pl
-lib/MailScanner/MailScanner/CustomConfig.pm
-lib/MailScanner/MailScanner/Exim.pm
-lib/MailScanner/MailScanner/EximDiskStore.pm
-lib/MailScanner/MailScanner/Lock.pm
-lib/MailScanner/MailScanner/Log.pm
-lib/MailScanner/MailScanner/MCP.pm
-lib/MailScanner/MailScanner/MCPMessage.pm
-lib/MailScanner/MailScanner/Mail.pm
-lib/MailScanner/MailScanner/Message.pm
-lib/MailScanner/MailScanner/MessageBatch.pm
-lib/MailScanner/MailScanner/PFDiskStore.pm
-lib/MailScanner/MailScanner/Postfix.pm
-lib/MailScanner/MailScanner/Quarantine.pm
-lib/MailScanner/MailScanner/Queue.pm
-lib/MailScanner/MailScanner/RBLs.pm
-lib/MailScanner/MailScanner/SA.pm
-lib/MailScanner/MailScanner/SMDiskStore.pm
-lib/MailScanner/MailScanner/Sendmail.pm
-lib/MailScanner/MailScanner/SweepContent.pm
-lib/MailScanner/MailScanner/SweepOther.pm
-lib/MailScanner/MailScanner/SweepViruses.pm
-lib/MailScanner/MailScanner/SystemDefs.pm
-lib/MailScanner/MailScanner/TNEF.pm
-lib/MailScanner/MailScanner/WorkArea.pm
-lib/MailScanner/MailScanner/ZMDiskStore.pm
-lib/MailScanner/MailScanner/ZMailer.pm
-lib/MailScanner/MailScanner/notes.txt
-libexec/MailScanner/MailScanner
-libexec/MailScanner/antivir-autoupdate.sample
-libexec/MailScanner/antivir-wrapper.sample
-libexec/MailScanner/bitdefender-autoupdate.sample
-libexec/MailScanner/bitdefender-wrapper.sample
-libexec/MailScanner/clamav-autoupdate.sample
-libexec/MailScanner/clamav-wrapper.sample
-libexec/MailScanner/command-wrapper.sample
-libexec/MailScanner/drweb-wrapper.sample
-libexec/MailScanner/etrust-autoupdate.sample
-libexec/MailScanner/etrust-wrapper.sample
-libexec/MailScanner/f-prot-autoupdate.sample
-libexec/MailScanner/f-prot-wrapper.sample
-libexec/MailScanner/f-secure-autoupdate.sample
-libexec/MailScanner/f-secure-wrapper.sample
-libexec/MailScanner/inoculan-autoupdate.sample
-libexec/MailScanner/inoculan-wrapper.sample
-libexec/MailScanner/inoculate-wrapper.sample
-libexec/MailScanner/kaspersky-autoupdate.sample
-libexec/MailScanner/kaspersky-wrapper.sample
-libexec/MailScanner/kavdaemonclient-wrapper.sample
-libexec/MailScanner/mcafee-autoupdate.sample
-libexec/MailScanner/mcafee-wrapper.sample
-libexec/MailScanner/nod32-autoupdate.sample
-libexec/MailScanner/nod32-wrapper.sample
-libexec/MailScanner/norman-autoupdate.sample
-libexec/MailScanner/norman-wrapper.sample
-libexec/MailScanner/panda-wrapper.sample
-libexec/MailScanner/rav-autoupdate.sample
-libexec/MailScanner/rav-wrapper.sample
-libexec/MailScanner/sophos-autoupdate.sample
-libexec/MailScanner/sophos-wrapper.sample
-libexec/MailScanner/trend-autoupdate.sample
-libexec/MailScanner/trend-wrapper.sample
-libexec/MailScanner/update_virus_scanners
-%%DATADIR%%/reports/cy+en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cy+en/disinfected.report.txt.sample
-%%DATADIR%%/reports/cy+en/inline.sig.html.sample
-%%DATADIR%%/reports/cy+en/inline.sig.txt.sample
-%%DATADIR%%/reports/cy+en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cy+en/inline.warning.html.sample
-%%DATADIR%%/reports/cy+en/inline.warning.txt.sample
-%%DATADIR%%/reports/cy+en/languages.conf.sample
-%%DATADIR%%/reports/cy+en/sender.content.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.error.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cy+en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cy+en/stored.content.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cy+en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.content.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/cz/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/cz/disinfected.report.txt.sample
-%%DATADIR%%/reports/cz/inline.sig.html.sample
-%%DATADIR%%/reports/cz/inline.sig.txt.sample
-%%DATADIR%%/reports/cz/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/cz/inline.warning.html.sample
-%%DATADIR%%/reports/cz/inline.warning.txt.sample
-%%DATADIR%%/reports/cz/languages.conf.sample
-%%DATADIR%%/reports/cz/sender.content.report.txt.sample
-%%DATADIR%%/reports/cz/sender.error.report.txt.sample
-%%DATADIR%%/reports/cz/sender.filename.report.txt.sample
-%%DATADIR%%/reports/cz/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.report.txt.sample
-%%DATADIR%%/reports/cz/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/cz/sender.virus.report.txt.sample
-%%DATADIR%%/reports/cz/stored.content.message.txt.sample
-%%DATADIR%%/reports/cz/stored.filename.message.txt.sample
-%%DATADIR%%/reports/cz/stored.virus.message.txt.sample
-%%DATADIR%%/reports/de/README.1ST.sample
-%%DATADIR%%/reports/de/deleted.content.message.txt.sample
-%%DATADIR%%/reports/de/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/de/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/de/disinfected.report.txt.sample
-%%DATADIR%%/reports/de/inline.sig.html.sample
-%%DATADIR%%/reports/de/inline.sig.txt.sample
-%%DATADIR%%/reports/de/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/de/inline.warning.html.sample
-%%DATADIR%%/reports/de/inline.warning.txt.sample
-%%DATADIR%%/reports/de/languages.conf.sample
-%%DATADIR%%/reports/de/sender.content.report.txt.sample
-%%DATADIR%%/reports/de/sender.error.report.txt.sample
-%%DATADIR%%/reports/de/sender.filename.report.txt.sample
-%%DATADIR%%/reports/de/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.report.txt.sample
-%%DATADIR%%/reports/de/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/de/sender.virus.report.txt.sample
-%%DATADIR%%/reports/de/stored.content.message.txt.sample
-%%DATADIR%%/reports/de/stored.filename.message.txt.sample
-%%DATADIR%%/reports/de/stored.virus.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/dk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/dk/disinfected.report.txt.sample
-%%DATADIR%%/reports/dk/inline.sig.html.sample
-%%DATADIR%%/reports/dk/inline.sig.txt.sample
-%%DATADIR%%/reports/dk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/dk/inline.warning.html.sample
-%%DATADIR%%/reports/dk/inline.warning.txt.sample
-%%DATADIR%%/reports/dk/languages.conf.sample
-%%DATADIR%%/reports/dk/sender.content.report.txt.sample
-%%DATADIR%%/reports/dk/sender.error.report.txt.sample
-%%DATADIR%%/reports/dk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/dk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/dk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/dk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/dk/stored.content.message.txt.sample
-%%DATADIR%%/reports/dk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/dk/stored.virus.message.txt.sample
-%%DATADIR%%/reports/en/deleted.content.message.txt.sample
-%%DATADIR%%/reports/en/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/en/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/en/disinfected.report.txt.sample
-%%DATADIR%%/reports/en/inline.sig.html.sample
-%%DATADIR%%/reports/en/inline.sig.txt.sample
-%%DATADIR%%/reports/en/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/en/inline.warning.html.sample
-%%DATADIR%%/reports/en/inline.warning.txt.sample
-%%DATADIR%%/reports/en/languages.conf.sample
-%%DATADIR%%/reports/en/sender.content.report.txt.sample
-%%DATADIR%%/reports/en/sender.error.report.txt.sample
-%%DATADIR%%/reports/en/sender.filename.report.txt.sample
-%%DATADIR%%/reports/en/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.report.txt.sample
-%%DATADIR%%/reports/en/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/en/sender.virus.report.txt.sample
-%%DATADIR%%/reports/en/stored.content.message.txt.sample
-%%DATADIR%%/reports/en/stored.filename.message.txt.sample
-%%DATADIR%%/reports/en/stored.virus.message.txt.sample
-%%DATADIR%%/reports/es/deleted.content.message.txt.sample
-%%DATADIR%%/reports/es/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/es/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/es/disinfected.report.txt.sample
-%%DATADIR%%/reports/es/inline.sig.html.sample
-%%DATADIR%%/reports/es/inline.sig.txt.sample
-%%DATADIR%%/reports/es/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/es/inline.warning.html.sample
-%%DATADIR%%/reports/es/inline.warning.txt.sample
-%%DATADIR%%/reports/es/languages.conf.sample
-%%DATADIR%%/reports/es/sender.content.report.txt.sample
-%%DATADIR%%/reports/es/sender.error.report.txt.sample
-%%DATADIR%%/reports/es/sender.filename.report.txt.sample
-%%DATADIR%%/reports/es/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.report.txt.sample
-%%DATADIR%%/reports/es/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/es/sender.virus.report.txt.sample
-%%DATADIR%%/reports/es/stored.content.message.txt.sample
-%%DATADIR%%/reports/es/stored.filename.message.txt.sample
-%%DATADIR%%/reports/es/stored.virus.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.content.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/fr/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/fr/disinfected.report.txt.sample
-%%DATADIR%%/reports/fr/inline.sig.html.sample
-%%DATADIR%%/reports/fr/inline.sig.txt.sample
-%%DATADIR%%/reports/fr/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/fr/inline.warning.html.sample
-%%DATADIR%%/reports/fr/inline.warning.txt.sample
-%%DATADIR%%/reports/fr/languages.conf.sample
-%%DATADIR%%/reports/fr/sender.content.report.txt.sample
-%%DATADIR%%/reports/fr/sender.error.report.txt.sample
-%%DATADIR%%/reports/fr/sender.filename.report.txt.sample
-%%DATADIR%%/reports/fr/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.report.txt.sample
-%%DATADIR%%/reports/fr/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/fr/sender.virus.report.txt.sample
-%%DATADIR%%/reports/fr/stored.content.message.txt.sample
-%%DATADIR%%/reports/fr/stored.filename.message.txt.sample
-%%DATADIR%%/reports/fr/stored.virus.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.content.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/hu/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/hu/disinfected.report.txt.sample
-%%DATADIR%%/reports/hu/inline.sig.html.sample
-%%DATADIR%%/reports/hu/inline.sig.txt.sample
-%%DATADIR%%/reports/hu/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/hu/inline.warning.html.sample
-%%DATADIR%%/reports/hu/inline.warning.txt.sample
-%%DATADIR%%/reports/hu/languages.conf.sample
-%%DATADIR%%/reports/hu/sender.content.report.txt.sample
-%%DATADIR%%/reports/hu/sender.error.report.txt.sample
-%%DATADIR%%/reports/hu/sender.filename.report.txt.sample
-%%DATADIR%%/reports/hu/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.report.txt.sample
-%%DATADIR%%/reports/hu/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/hu/sender.virus.report.txt.sample
-%%DATADIR%%/reports/hu/stored.content.message.txt.sample
-%%DATADIR%%/reports/hu/stored.filename.message.txt.sample
-%%DATADIR%%/reports/hu/stored.virus.message.txt.sample
-%%DATADIR%%/reports/it/deleted.content.message.txt.sample
-%%DATADIR%%/reports/it/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/it/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/it/disinfected.report.txt.sample
-%%DATADIR%%/reports/it/inline.sig.html.sample
-%%DATADIR%%/reports/it/inline.sig.txt.sample
-%%DATADIR%%/reports/it/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/it/inline.warning.html.sample
-%%DATADIR%%/reports/it/inline.warning.txt.sample
-%%DATADIR%%/reports/it/languages.conf.sample
-%%DATADIR%%/reports/it/sender.content.report.txt.sample
-%%DATADIR%%/reports/it/sender.error.report.txt.sample
-%%DATADIR%%/reports/it/sender.filename.report.txt.sample
-%%DATADIR%%/reports/it/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.report.txt.sample
-%%DATADIR%%/reports/it/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/it/sender.virus.report.txt.sample
-%%DATADIR%%/reports/it/stored.content.message.txt.sample
-%%DATADIR%%/reports/it/stored.filename.message.txt.sample
-%%DATADIR%%/reports/it/stored.virus.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.content.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/nl/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/nl/disinfected.report.txt.sample
-%%DATADIR%%/reports/nl/inline.sig.html.sample
-%%DATADIR%%/reports/nl/inline.sig.txt.sample
-%%DATADIR%%/reports/nl/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/nl/inline.warning.html.sample
-%%DATADIR%%/reports/nl/inline.warning.txt.sample
-%%DATADIR%%/reports/nl/languages.conf.sample
-%%DATADIR%%/reports/nl/sender.content.report.txt.sample
-%%DATADIR%%/reports/nl/sender.error.report.txt.sample
-%%DATADIR%%/reports/nl/sender.filename.report.txt.sample
-%%DATADIR%%/reports/nl/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.report.txt.sample
-%%DATADIR%%/reports/nl/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/nl/sender.virus.report.txt.sample
-%%DATADIR%%/reports/nl/stored.content.message.txt.sample
-%%DATADIR%%/reports/nl/stored.filename.message.txt.sample
-%%DATADIR%%/reports/nl/stored.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/pt_br/disinfected.report.txt.sample
-%%DATADIR%%/reports/pt_br/inline.sig.html.sample
-%%DATADIR%%/reports/pt_br/inline.sig.txt.sample
-%%DATADIR%%/reports/pt_br/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/pt_br/inline.warning.html.sample
-%%DATADIR%%/reports/pt_br/inline.warning.txt.sample
-%%DATADIR%%/reports/pt_br/languages.conf.sample
-%%DATADIR%%/reports/pt_br/sender.content.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.error.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.filename.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/pt_br/sender.virus.report.txt.sample
-%%DATADIR%%/reports/pt_br/stored.content.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.filename.message.txt.sample
-%%DATADIR%%/reports/pt_br/stored.virus.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.content.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/ro/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/ro/disinfected.report.txt.sample
-%%DATADIR%%/reports/ro/inline.sig.html.sample
-%%DATADIR%%/reports/ro/inline.sig.txt.sample
-%%DATADIR%%/reports/ro/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/ro/inline.warning.html.sample
-%%DATADIR%%/reports/ro/inline.warning.txt.sample
-%%DATADIR%%/reports/ro/languages.conf.sample
-%%DATADIR%%/reports/ro/sender.content.report.txt.sample
-%%DATADIR%%/reports/ro/sender.error.report.txt.sample
-%%DATADIR%%/reports/ro/sender.filename.report.txt.sample
-%%DATADIR%%/reports/ro/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.report.txt.sample
-%%DATADIR%%/reports/ro/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/ro/sender.virus.report.txt.sample
-%%DATADIR%%/reports/ro/stored.content.message.txt.sample
-%%DATADIR%%/reports/ro/stored.filename.message.txt.sample
-%%DATADIR%%/reports/ro/stored.virus.message.txt.sample
-%%DATADIR%%/reports/se/README.sample
-%%DATADIR%%/reports/se/deleted.content.message.txt.sample
-%%DATADIR%%/reports/se/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/se/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/se/disinfected.report.txt.sample
-%%DATADIR%%/reports/se/inline.sig.html.sample
-%%DATADIR%%/reports/se/inline.sig.txt.sample
-%%DATADIR%%/reports/se/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/se/inline.warning.html.sample
-%%DATADIR%%/reports/se/inline.warning.txt.sample
-%%DATADIR%%/reports/se/languages.conf.sample
-%%DATADIR%%/reports/se/sender.content.report.txt.sample
-%%DATADIR%%/reports/se/sender.error.report.txt.sample
-%%DATADIR%%/reports/se/sender.filename.report.txt.sample
-%%DATADIR%%/reports/se/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.report.txt.sample
-%%DATADIR%%/reports/se/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/se/sender.virus.report.txt.sample
-%%DATADIR%%/reports/se/stored.content.message.txt.sample
-%%DATADIR%%/reports/se/stored.filename.message.txt.sample
-%%DATADIR%%/reports/se/stored.virus.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.content.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.filename.message.txt.sample
-%%DATADIR%%/reports/sk/deleted.virus.message.txt.sample
-%%DATADIR%%/reports/sk/disinfected.report.txt.sample
-%%DATADIR%%/reports/sk/inline.sig.html.sample
-%%DATADIR%%/reports/sk/inline.sig.txt.sample
-%%DATADIR%%/reports/sk/inline.spam.warning.txt.sample
-%%DATADIR%%/reports/sk/inline.warning.html.sample
-%%DATADIR%%/reports/sk/inline.warning.txt.sample
-%%DATADIR%%/reports/sk/languages.conf.sample
-%%DATADIR%%/reports/sk/sender.content.report.txt.sample
-%%DATADIR%%/reports/sk/sender.error.report.txt.sample
-%%DATADIR%%/reports/sk/sender.filename.report.txt.sample
-%%DATADIR%%/reports/sk/sender.mcp.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.rbl.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.report.txt.sample
-%%DATADIR%%/reports/sk/sender.spam.sa.report.txt.sample
-%%DATADIR%%/reports/sk/sender.virus.report.txt.sample
-%%DATADIR%%/reports/sk/stored.content.message.txt.sample
-%%DATADIR%%/reports/sk/stored.filename.message.txt.sample
-%%DATADIR%%/reports/sk/stored.virus.message.txt.sample
-%%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%%/Sophos.install.freebsd
-%%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/Conf.pm.patch.2.61
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.55
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.60
-%%PORTDOCS%%%%DOCSDIR%%/install/mcp/PerMsgStatus.pm.patch.2.61
-%%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
-@dirrm %%DATADIR%%/reports/pt_br
-@dirrm %%DATADIR%%/reports/nl
-@dirrm %%DATADIR%%/reports/it
-@dirrm %%DATADIR%%/reports/hu
-@dirrm %%DATADIR%%/reports/fr
-@dirrm %%DATADIR%%/reports/es
-@dirrm %%DATADIR%%/reports/en
-@dirrm %%DATADIR%%/reports/dk
-@dirrm %%DATADIR%%/reports/de
-@dirrm %%DATADIR%%/reports/cz
-@dirrm %%DATADIR%%/reports/cy+en
-@dirrm %%DATADIR%%/reports
-@dirrm %%DATADIR%%
-@dirrm libexec/MailScanner
-@dirrm lib/MailScanner/MailScanner
-@dirrm lib/MailScanner
-@dirrm etc/MailScanner/rules
-@dirrm etc/MailScanner
diff --git a/mail/Makefile b/mail/Makefile
index 9aaf1d1f71cd..73c551d19f07 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
 
-    SUBDIR += MailScanner-devel
     SUBDIR += abook
     SUBDIR += adcomplain
     SUBDIR += aileron
@@ -142,6 +141,7 @@
     SUBDIR += mailmgr
 #   SUBDIR += mailman-devel
     SUBDIR += mailscanner
+    SUBDIR += mailscanner-devel
     SUBDIR += mailsync
     SUBDIR += mailx
     SUBDIR += mairix