diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 4c131bb4ad5..13f61808c8f 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2008/12/16 00:51:06 todd Exp $
+# $OpenBSD: Makefile,v 1.12 2009/01/28 15:16:17 sthen Exp $
 
 COMMENT=	virus/spam scanning framework
 
-V=		4.73
-Vs=		4
-Vss=		${Vs}-2
+V=		4.74
+Vs=		16
+Vss=		${Vs}-1
 CATEGORIES=	mail
 MASTER_SITES=	http://mailscanner.info/files/4/tar/
 DISTNAME=	mailscanner-${V}.${Vss}
@@ -50,6 +50,7 @@ do-install:	install_libexec install_etc install_share install_lib install_bin
 
 BINS=	MailScanner df2mbox d2mbox update_bad_phishing_sites update_phishing_sites
 BINS+=	check_mailscanner clean.quarantine clean.SA.cache analyse_SpamAssassin_cache
+BINS+=	mailscanner_create_locks
 
 _MS_sed_frag= _subst() { sed 's,%PREFIX%,${LOCALBASE},g;s,%SYSCONFDIR%,${SYSCONFDIR},g' \
 		"$$2" > ${WRKDIST}/file; \
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index da366374af7..e83193dd046 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,5 +1,5 @@
-MD5 (MailScanner-install-4.73.4-2.tar.gz) = x1kKhuQISJH/IQdEH5tf3A==
-RMD160 (MailScanner-install-4.73.4-2.tar.gz) = V/gaLZ22zfux1FoKV8LXsW+rz88=
-SHA1 (MailScanner-install-4.73.4-2.tar.gz) = gYdK4hFnYY8O9C5mNJKegGhWlwE=
-SHA256 (MailScanner-install-4.73.4-2.tar.gz) = EjSVxfFktF2BzNnIa1RxAp3Q9QHvq8/PkV0YXQIvWY4=
-SIZE (MailScanner-install-4.73.4-2.tar.gz) = 8399013
+MD5 (MailScanner-install-4.74.16-1.tar.gz) = hXDU8adjCoqIRpAv6+jrDg==
+RMD160 (MailScanner-install-4.74.16-1.tar.gz) = TXkod37JX6e9bGQi5TnwbtCodqA=
+SHA1 (MailScanner-install-4.74.16-1.tar.gz) = 821FXOd8MUuFRS1zlyjGFczbGCk=
+SHA256 (MailScanner-install-4.74.16-1.tar.gz) = pXVUZTbm8sqfJsNv6Pgkts7PGuy7CFHV6XUL24yM4Jo=
+SIZE (MailScanner-install-4.74.16-1.tar.gz) = 8405637
diff --git a/mail/mailscanner/patches/patch-bin_MailScanner b/mail/mailscanner/patches/patch-bin_MailScanner
index 980dcd5dbe2..c97c5b75cb5 100644
--- a/mail/mailscanner/patches/patch-bin_MailScanner
+++ b/mail/mailscanner/patches/patch-bin_MailScanner
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bin_MailScanner,v 1.5 2008/11/07 02:33:58 brad Exp $
---- bin/MailScanner.orig	Sat Nov  1 15:03:52 2008
-+++ bin/MailScanner	Thu Nov  6 20:24:55 2008
+$OpenBSD: patch-bin_MailScanner,v 1.6 2009/01/28 15:16:17 sthen Exp $
+--- bin/MailScanner.orig	Thu Jan  8 14:11:44 2009
++++ bin/MailScanner	Sun Jan 11 13:34:41 2009
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -I/opt/MailScanner/lib
 +#!/usr/bin/perl -I%PREFIX%/lib/MailScanner
@@ -55,3 +55,21 @@ $OpenBSD: patch-bin_MailScanner,v 1.5 2008/11/07 02:33:58 brad Exp $
      Virus Scanners = clamav
  Then download
      http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/install-Clam-SA.tar.gz
+@@ -382,7 +381,7 @@ if ($WantLintOnly || $WantLintLiteOnly) {
+   }
+   my $cluid = MailScanner::Config::QuickPeek($ConfFile, 'runasuser');
+   my $clgid = MailScanner::Config::QuickPeek($ConfFile, 'runasgroup');
+-  my $clr = system("/opt/MailScanner/bin/mailscanner_create_locks \"$lockdir\" \"$cluid\" \"$clgid\"");
++  my $clr = system("%PREFIX%/bin/mailscanner_create_locks \"$lockdir\" \"$cluid\" \"$clgid\"");
+   print STDERR "Error: Attempt to create locks in $lockdir failed!\n"
+     if ($clr>>8) != 0;
+ 
+@@ -675,7 +674,7 @@ if ($locksdir eq "" || $locksdir =~ /tmp$/i) {
+   print STDERR "Please move your \"Lockfile Dir\" setting in MailScanner.conf.\n";
+   print STDERR "It should point outside /tmp, preferably /var/spool/MailScanner/incoming/Locks\n";
+ }
+-my $cl = system("/opt/MailScanner/bin/mailscanner_create_locks \"$locksdir\" \"$uname\" \"$gname\"");
++my $cl = system("%PREFIX%/bin/mailscanner_create_locks \"$locksdir\" \"$uname\" \"$gname\"");
+ print STDERR "Error: Attempt to create locks in $locksdir failed!\n"
+  if ($cl>>8) != 0;
+ 
diff --git a/mail/mailscanner/patches/patch-bin_mailscanner_create_locks b/mail/mailscanner/patches/patch-bin_mailscanner_create_locks
new file mode 100644
index 00000000000..d7c4f17d5da
--- /dev/null
+++ b/mail/mailscanner/patches/patch-bin_mailscanner_create_locks
@@ -0,0 +1,14 @@
+$OpenBSD: patch-bin_mailscanner_create_locks,v 1.1 2009/01/28 15:16:17 sthen Exp $
+--- bin/mailscanner_create_locks.orig	Sun Jan 11 13:38:38 2009
++++ bin/mailscanner_create_locks	Sun Jan 11 13:38:58 2009
+@@ -26,8 +26,8 @@ unless (-d _) {
+ 
+ # Now work through all the virus scanner autoupdate names, building Lock files.
+ my($dh, $fh, $updatename, $lockname, @updatenames, @locknames);
+-$dh = new DirHandle "/opt/MailScanner/lib";
+-die "Can't read dir /opt/MailScanner/lib to build list of -autoupdate scripts, $!" unless $dh;
++$dh = new DirHandle "%PREFIX%/libexec/MailScanner";
++die "Can't read dir %PREFIX%/libexec/MailScanner to build list of -autoupdate scripts, $!" unless $dh;
+ while (defined($updatename = $dh->read)) {
+   next unless $updatename =~ s/-autoupdate$//;
+   next unless $updatename =~ /^[a-z0-9_-]+$/i; # No nasty chars thanks!
diff --git a/mail/mailscanner/patches/patch-bin_update_virus_scanners b/mail/mailscanner/patches/patch-bin_update_virus_scanners
index a87bfb7a52d..45b3d6c89fd 100644
--- a/mail/mailscanner/patches/patch-bin_update_virus_scanners
+++ b/mail/mailscanner/patches/patch-bin_update_virus_scanners
@@ -1,11 +1,17 @@
-$OpenBSD: patch-bin_update_virus_scanners,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
---- bin/update_virus_scanners.orig	Fri Jun 22 08:57:23 2007
-+++ bin/update_virus_scanners	Sun Aug  5 04:03:25 2007
-@@ -1,6 +1,6 @@
+$OpenBSD: patch-bin_update_virus_scanners,v 1.2 2009/01/28 15:16:17 sthen Exp $
+--- bin/update_virus_scanners.orig	Mon Jan 12 16:32:30 2009
++++ bin/update_virus_scanners	Sat Jan 17 09:27:40 2009
+@@ -1,9 +1,9 @@
  #!/bin/sh
  
 -SCANNERSCONF=/opt/MailScanner/etc/virus.scanners.conf
+-LOCKDIR=`perl -n -e 'print "$_" if chomp && s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
+-RUNASU=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
+-RUNASG=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i' /opt/MailScanner/etc/MailScanner.conf`
 +SCANNERSCONF=%SYSCONFDIR%/MailScanner/virus.scanners.conf
++LOCKDIR=`perl -n -e 'print "$_" if chomp && s/^\s*Lock\s*file\s*Dir\s*=\s*([^\s#]+).*$/$1/i' %SYSCONFDIR%/MailScanner/MailScanner.conf`
++RUNASU=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*User\s*=\s*([^\s#]+).*$/$1/i' %SYSCONFDIR%/MailScanner/MailScanner.conf`
++RUNASG=`perl -n -e 'print "$_" if chomp && s/^\s*Run\s*As\s*Group\s*=\s*([^\s#]+).*$/$1/i' %SYSCONFDIR%/MailScanner/MailScanner.conf`
  
  Disabled=no
  if [ "x$Disabled" = "xyes" ]; then
diff --git a/mail/mailscanner/patches/patch-etc_MailScanner_conf b/mail/mailscanner/patches/patch-etc_MailScanner_conf
index 2ae60c4533f..198950e518c 100644
--- a/mail/mailscanner/patches/patch-etc_MailScanner_conf
+++ b/mail/mailscanner/patches/patch-etc_MailScanner_conf
@@ -1,6 +1,6 @@
-$OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
---- etc/MailScanner.conf.orig	Sat Nov  1 15:03:52 2008
-+++ etc/MailScanner.conf	Thu Nov  6 20:24:55 2008
+$OpenBSD: patch-etc_MailScanner_conf,v 1.6 2009/01/28 15:16:17 sthen Exp $
+--- etc/MailScanner.conf.orig	Thu Jan  8 09:11:44 2009
++++ etc/MailScanner.conf	Sat Jan 10 21:16:03 2009
 @@ -72,17 +72,17 @@
  %web-site% = www.your-organisation.com
  
@@ -141,7 +141,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # ClamAVModule only: set limits when scanning for viruses.
  #
-@@ -1363,7 +1365,7 @@ Sign Messages Already Processed = no
+@@ -1366,7 +1368,7 @@ Sign Messages Already Processed = no
  # Add the "Inline HTML Signature" or "Inline Text Signature" to the end
  # of uninfected messages?
  # This can also be the filename of a ruleset.
@@ -150,7 +150,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # If you are using HTML signatures, you can embed an image in the signature.
  # For the filename(s) of the image, see the settings "Signature Image
-@@ -1483,7 +1485,7 @@ Deliver Cleaned Messages = yes
+@@ -1486,7 +1488,7 @@ Deliver Cleaned Messages = yes
  # Do you want to notify the people who sent you messages containing
  # viruses or badly-named filenames?
  # This can also be the filename of a ruleset.
@@ -159,7 +159,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # *If* "Notify Senders" is set to yes, do you want to notify people
  # who sent you messages containing viruses?
-@@ -1545,7 +1547,7 @@ Scanned Subject Text = {Scanned}
+@@ -1548,7 +1550,7 @@ Scanned Subject Text = {Scanned}
  #      end   = Add text to the end of the subject line.
  # This makes filtering in Outlook very easy.
  # This can also be the filename of a ruleset.
@@ -168,7 +168,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Virus Modify Subject" option is set.
-@@ -1561,7 +1563,7 @@ Virus Subject Text = {Virus?}
+@@ -1564,7 +1566,7 @@ Virus Subject Text = {Virus?}
  #      end   = Add text to the end of the subject line.
  # This makes filtering in Outlook very easy.
  # This can also be the filename of a ruleset.
@@ -177,7 +177,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Filename Modify Subject" option is set.
-@@ -1579,7 +1581,7 @@ Filename Subject Text = {Filename?}
+@@ -1582,7 +1584,7 @@ Filename Subject Text = {Filename?}
  #      end   = Add text to the end of the subject line.
  # This makes filtering in Outlook very easy.
  # This can also be the filename of a ruleset.
@@ -186,7 +186,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Content Modify Subject" option is set.
-@@ -1598,7 +1600,7 @@ Content Subject Text = {Dangerous Content?}
+@@ -1601,7 +1603,7 @@ Content Subject Text = {Dangerous Content?}
  #      end   = Add text to the end of the subject line.
  # This makes filtering in Outlook very easy.
  # This can also be the filename of a ruleset.
@@ -195,7 +195,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Size Modify Subject" option is set.
-@@ -1617,7 +1619,7 @@ Size Subject Text = {Size}
+@@ -1620,7 +1622,7 @@ Size Subject Text = {Size}
  #      yes   = Add text to the start of the subject line, or
  #      end   = Add text to the end of the subject line.
  # This can also be the filename of a ruleset.
@@ -204,7 +204,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Disarmed Modify Subject" option is set.
-@@ -1647,7 +1649,7 @@ Phishing Subject Text = {Fraud?}
+@@ -1650,7 +1652,7 @@ Phishing Subject Text = {Fraud?}
  #      end   = Add text to the end of the subject line.
  # This makes filtering in Outlook very easy.
  # This can also be the filename of a ruleset.
@@ -213,7 +213,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the text to add to the start of the subject if the
  # "Spam Modify Subject" option is set.
-@@ -1667,7 +1669,7 @@ Spam Subject Text = {Spam?}
+@@ -1670,7 +1672,7 @@ Spam Subject Text = {Spam?}
  #      yes   = Add text to the start of the subject line, or
  #      end   = Add text to the end of the subject line.
  # This can also be the filename of a ruleset.
@@ -222,7 +222,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is just like the "Spam Subject Text" option above, except that
  # it applies when the score from SpamAssassin is higher than the
-@@ -1757,7 +1759,7 @@ Missing Mail Archive Is = directory
+@@ -1760,7 +1762,7 @@ Missing Mail Archive Is = directory
  # Notify the local system administrators ("Notices To") when any infections
  # are found?
  # This can also be the filename of a ruleset.
@@ -231,7 +231,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # Include the full headers of each message in the notices sent to the local
  # system administrators?
-@@ -1812,7 +1814,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
+@@ -1815,7 +1817,7 @@ Virus Scanner Definitions = %etc-dir%/virus.scanners.c
  #       If you want to just disable the "Spam List" feature then set
  #       "Spam List =" (i.e. an empty list) in the setting below.
  # This can also be the filename of a ruleset.
@@ -240,7 +240,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # This is the list of spam blacklists (RBLs) which you are using.
  # See the "Spam List Definitions" file for more information about what
-@@ -1991,7 +1993,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
+@@ -1994,7 +1996,7 @@ Watermark Header = X-%org-name%-MailScanner-Watermark:
  
  # Do you want to find spam using the "SpamAssassin" package?
  # This can also be the filename of a ruleset.
@@ -249,7 +249,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # SpamAssassin is not very fast when scanning huge messages, so messages
  # bigger than this value will be truncated to this length for SpamAssassin
-@@ -2088,7 +2090,7 @@ Include Binary Attachments In SpamAssassin = no
+@@ -2091,7 +2093,7 @@ Include Binary Attachments In SpamAssassin = no
  # whatever SpamAssassin threshold they want. For example, they just look
  # for "sssss" for every message whose score is > 5, for example.
  # This can also be the filename of a ruleset.
@@ -258,7 +258,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  
  # Many naive spammers send out the same message to lots of people.
  # These messages are very likely to have roughly the same SpamAssassin score.
-@@ -2512,14 +2514,14 @@ SpamAssassin Install Prefix =
+@@ -2536,14 +2538,14 @@ SpamAssassin Install Prefix =
  SpamAssassin Site Rules Dir = /etc/mail/spamassassin
  
  # The site-local rules are searched for here, and in prefix/etc/spamassassin,
@@ -275,7 +275,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  SpamAssassin Local Rules Dir =
  
  # The rules created by the "sa-update" tool are searched for here.
-@@ -2533,10 +2535,10 @@ SpamAssassin Local Rules Dir =
+@@ -2557,10 +2559,10 @@ SpamAssassin Local Rules Dir =
  SpamAssassin Local State Dir = # /var/lib/spamassassin
  
  # The default rules are searched for here, and in prefix/share/spamassassin,
@@ -288,7 +288,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  SpamAssassin Default Rules Dir =
  
  #
-@@ -2569,9 +2571,9 @@ MCP Actions = deliver
+@@ -2593,9 +2595,9 @@ MCP Actions = deliver
  High Scoring MCP Actions = deliver
  Bounce MCP As Attachment = no
  
@@ -300,7 +300,7 @@ $OpenBSD: patch-etc_MailScanner_conf,v 1.5 2008/11/07 02:33:58 brad Exp $
  High Scoring MCP Subject Text = {MCP?}
  
  Is Definitely MCP = no
-@@ -2734,7 +2736,7 @@ Lockfile Dir = /tmp
+@@ -2758,7 +2760,7 @@ Lockfile Dir = /var/spool/MailScanner/incoming/Locks
  # directory should be over-written by the installation or upgrade process.
  # All files starting with "." or ending with ".rpmnew" will be ignored,
  # all other files will be compiled and may be used with Custom Functions.
diff --git a/mail/mailscanner/patches/patch-lib_bitdefender-autoupdate b/mail/mailscanner/patches/patch-lib_bitdefender-autoupdate
index 93d06ae5925..9b68a6af81e 100644
--- a/mail/mailscanner/patches/patch-lib_bitdefender-autoupdate
+++ b/mail/mailscanner/patches/patch-lib_bitdefender-autoupdate
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_bitdefender-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
---- lib/bitdefender-autoupdate.orig	Mon Mar 20 17:48:20 2006
-+++ lib/bitdefender-autoupdate	Mon Mar 20 17:48:20 2006
+$OpenBSD: patch-lib_bitdefender-autoupdate,v 1.2 2009/01/28 15:16:17 sthen Exp $
+--- lib/bitdefender-autoupdate.orig	Thu Dec 11 06:57:04 2008
++++ lib/bitdefender-autoupdate	Sat Jan 10 21:16:03 2009
 @@ -107,7 +107,7 @@ use IO::File;
  use Archive::Zip qw(:ERROR_CODES);
  use Sys::Syslog;
@@ -8,5 +8,5 @@ $OpenBSD: patch-lib_bitdefender-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Ex
 -my $PackageDir = shift || "/opt/bdc";
 +my $PackageDir = shift || "%PREFIX%/bdc";
  
- # This is the maximum time allowed for the bdc --update command to run.
- my $MaximumTime = 60*20; # 20 minutes
+ $LockFile = shift || "/var/spool/MailScanner/incoming/Locks/bitdefenderBusy.lock";
+ 
diff --git a/mail/mailscanner/patches/patch-lib_css-autoupdate b/mail/mailscanner/patches/patch-lib_css-autoupdate
index a919e138c4e..f2e6b4eb243 100644
--- a/mail/mailscanner/patches/patch-lib_css-autoupdate
+++ b/mail/mailscanner/patches/patch-lib_css-autoupdate
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_css-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
---- lib/css-autoupdate.orig	Mon Mar 20 17:48:20 2006
-+++ lib/css-autoupdate	Mon Mar 20 17:48:20 2006
+$OpenBSD: patch-lib_css-autoupdate,v 1.2 2009/01/28 15:16:17 sthen Exp $
+--- lib/css-autoupdate.orig	Thu Dec 11 06:57:18 2008
++++ lib/css-autoupdate	Sat Jan 10 21:16:03 2009
 @@ -2,7 +2,7 @@
  
  use Sys::Syslog;
@@ -9,4 +9,4 @@ $OpenBSD: patch-lib_css-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
 +$CSSDir = shift || "%PREFIX%/SYMCScan";
  $CSSUpdateCommand="$CSSDir/bin/liveupdate.sh";
  
- $LockFile = "/tmp/SYMCScan.lock";
+ $LockFile = shift || "/var/spool/MailScanner/incoming/Locks/cssBusy.lock";
diff --git a/mail/mailscanner/patches/patch-lib_etrust-autoupdate b/mail/mailscanner/patches/patch-lib_etrust-autoupdate
index cc867e7d94b..52e4a3fdd70 100644
--- a/mail/mailscanner/patches/patch-lib_etrust-autoupdate
+++ b/mail/mailscanner/patches/patch-lib_etrust-autoupdate
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_etrust-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
---- lib/etrust-autoupdate.orig	Sat Dec 29 16:04:03 2007
-+++ lib/etrust-autoupdate	Sun Feb 17 20:43:01 2008
+$OpenBSD: patch-lib_etrust-autoupdate,v 1.2 2009/01/28 15:16:17 sthen Exp $
+--- lib/etrust-autoupdate.orig	Thu Dec 11 06:57:26 2008
++++ lib/etrust-autoupdate	Sat Jan 10 21:16:03 2009
 @@ -7,7 +7,7 @@
  
  use Sys::Syslog;
@@ -8,5 +8,5 @@ $OpenBSD: patch-lib_etrust-autoupdate,v 1.1.1.1 2008/02/20 03:47:18 todd Exp $
 -$PackageDir = shift || "/opt/CA/eTrustITM";
 +$PackageDir = shift || "%PREFIX%/CA/eTrustITM";
  
- $LockFile = "/tmp/eTrustBusy.lock";
+ $LockFile = shift || "/var/spool/MailScanner/incoming/Locks/etrustBusy.lock";
  
diff --git a/mail/mailscanner/patches/patch-lib_symscanengine-autoupdate b/mail/mailscanner/patches/patch-lib_symscanengine-autoupdate
index 484ef18728a..248b2d2efc2 100644
--- a/mail/mailscanner/patches/patch-lib_symscanengine-autoupdate
+++ b/mail/mailscanner/patches/patch-lib_symscanengine-autoupdate
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_symscanengine-autoupdate,v 1.2 2008/04/24 21:31:00 todd Exp $
---- lib/symscanengine-autoupdate.orig	Sat Mar  1 20:36:16 2008
-+++ lib/symscanengine-autoupdate	Tue Mar 18 14:16:39 2008
+$OpenBSD: patch-lib_symscanengine-autoupdate,v 1.3 2009/01/28 15:16:17 sthen Exp $
+--- lib/symscanengine-autoupdate.orig	Thu Dec 11 06:59:17 2008
++++ lib/symscanengine-autoupdate	Sat Jan 10 21:16:04 2009
 @@ -2,7 +2,7 @@
   
  use Sys::Syslog;
@@ -8,7 +8,7 @@ $OpenBSD: patch-lib_symscanengine-autoupdate,v 1.2 2008/04/24 21:31:00 todd Exp
 -$PackageDir = shift || "/opt/SYMCScan";
 +$PackageDir = shift || "%PREFIX%/SYMCScan";
   
- $LockFile = "/tmp/SymScanEngineBusy.lock";
+ $LockFile = shift || "/var/spool/MailScanner/incoming/Locks/symscanengineBusy.lock";
   
 @@ -30,7 +30,7 @@ BailOut("Installation dir \"$PackageDir\" does not exi
   
diff --git a/mail/mailscanner/pkg/PLIST b/mail/mailscanner/pkg/PLIST
index 90185f41655..37b22ae9b4b 100644
--- a/mail/mailscanner/pkg/PLIST
+++ b/mail/mailscanner/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/11/07 02:33:58 brad Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/01/28 15:16:17 sthen Exp $
 @conflict clamav-<0.94
 bin/MailScanner
 bin/analyse_SpamAssassin_cache
@@ -7,12 +7,14 @@ bin/clean.SA.cache
 bin/clean.quarantine
 bin/d2mbox
 bin/df2mbox
+bin/mailscanner_create_locks
 bin/update_bad_phishing_sites
 bin/update_phishing_sites
 lib/MailScanner/
 @sample /var/spool/MailScanner/
 @sample /var/spool/MailScanner/quarantine/
 @sample /var/spool/MailScanner/incoming/
+@sample /var/spool/MailScanner/incoming/Locks/
 @sample /var/spool/MailScanner/outgoing/
 lib/MailScanner/MailScanner/
 lib/MailScanner/MailScanner.pm