4 files changed, 8 insertions, 10 deletions

diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index c0098f299199..b94140929afc 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -5,12 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mailscanner
-PORTVERSION=	4.25.14
-PORTREVISION=	1
+PORTNAME=	MailScanner
+PORTVERSION=	4.26.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
-DISTNAME=	MailScanner-4.25-14
+PKGNAMESUFFIX=	-devel
+DISTNAME=	MailScanner-${PORTVERSION:C/\.([0-9]+)$/-\1/}
 
 MAINTAINER=	j.koopmann@seceidos.de
 COMMENT=	Powerful virus/spam scanning framework for Sendmail/Exim
@@ -29,12 +29,10 @@ BUILD_DEPENDS=	\
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2
 
-CONFLICTS=	MailScanner-devel-*
+CONFLICTS=	MailScanner-[0-9]*
 
 USE_PERL5=	yes
 
-DATADIR=	${PREFIX}/share/MailScanner
-DOCSDIR=	${PREFIX}/share/doc/MailScanner
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 MAN8=		MailScanner.8
diff --git a/mail/mailscanner-devel/distinfo b/mail/mailscanner-devel/distinfo
index f5ff512fdc67..0b0b0d310bdf 100644
--- a/mail/mailscanner-devel/distinfo
+++ b/mail/mailscanner-devel/distinfo
@@ -1 +1 @@
-MD5 (MailScanner-4.25-14.tar.gz) = a730889387355d5e215a655a3fc5bc55
+MD5 (MailScanner-4.26-1.tar.gz) = 96efae6f60d1cff764151a6c10298088
diff --git a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
index c5fc4c808a6e..4eab5bbb1e9b 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.8
@@ -2,7 +2,7 @@
 +++ 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.25-14" "Julian Field" "Mail"
++.TH "MailScanner" "8" "4.26-1" "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.conf.5 b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
index bc29188bfa9e..4c10c32bb3d7 100644
--- a/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
+++ b/mail/mailscanner-devel/files/patch-docs:man:MailScanner.conf.5
@@ -2,7 +2,7 @@
 +++ 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.25-14" "Julian Field" "Mail"
++.TH "MailScanner.conf" "5" "4.26-1" "Julian Field" "Mail"
  .SH "NAME"
  .LP 
  MailScanner.conf \- Main configuration for MailScanner