From f7348895e101b939eb1d911b5b7d47d4943d5e2a Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 29 Jun 2007 10:33:30 +0000
Subject: - Update to 2.5.2 [1] - Don't try to install if WITH_RAR is selected
 and IA32 compatibility is not   available [2]

PR:		ports/114084 [1], ports/113941 [2]
Submitted by:	garga [1], Michael Scheidell <scheidell@secnap.net> [2]
---
 security/amavisd-new/Makefile  | 7 ++++++-
 security/amavisd-new/distinfo  | 6 +++---
 security/amavisd-new/pkg-plist | 1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 66af41843d6e..5c5b5e32b9b6 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -7,7 +7,7 @@
 # Based on amavisd ports makefile.
 
 PORTNAME=	amavisd-new
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.ijs.si/software/amavisd/ \
@@ -144,7 +144,12 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/altermime:${PORTSDIR}/mail/altermime
 RUN_DEPENDS+=	file>=4.21:${PORTSDIR}/sysutils/file
 .endif
 
+# archviers/rar is a 32-bit binary port, we don't want the install to fail
+# at that port, therefore we will block instantly here if the platform does
+# not suit rar.
+
 .if defined(WITH_RAR)
+IA32_BINARY_PORT=	yes
 RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
 .endif
 
diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo
index 7783eb699bb5..81dff3374504 100644
--- a/security/amavisd-new/distinfo
+++ b/security/amavisd-new/distinfo
@@ -1,3 +1,3 @@
-MD5 (amavisd-new-2.5.1.tar.gz) = c0bed5db53dfce6e70047597989523e2
-SHA256 (amavisd-new-2.5.1.tar.gz) = 2ac5a933d62072b3ed9986252003fd3942179618c7ba76d3390570547fc981de
-SIZE (amavisd-new-2.5.1.tar.gz) = 786898
+MD5 (amavisd-new-2.5.2.tar.gz) = 52d227d442fac64916488b83d79806d7
+SHA256 (amavisd-new-2.5.2.tar.gz) = 5f590850c505017c2633f47ced483aae23ec857e2a782f763eb16f9f9f3fceef
+SIZE (amavisd-new-2.5.2.tar.gz) = 788546
diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist
index cfe2539fdf92..75f88a0eed48 100644
--- a/security/amavisd-new/pkg-plist
+++ b/security/amavisd-new/pkg-plist
@@ -22,7 +22,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.performance
 %%PORTDOCS%%%%DOCSDIR%%/README.policy-on-notifications
 %%PORTDOCS%%%%DOCSDIR%%/README.postfix
-%%PORTDOCS%%%%DOCSDIR%%/README.postfix.old
 %%PORTDOCS%%%%DOCSDIR%%/README.postfix.html
 %%PORTDOCS%%%%DOCSDIR%%/README.protocol
 %%PORTDOCS%%%%DOCSDIR%%/README.sendmail
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0