aboutsummaryrefslogtreecommitdiffstats
path: root/security/amavisd-new
diff options
context:
space:
mode:
authorgabor <gabor@FreeBSD.org>2010-07-12 01:42:37 +0800
committergabor <gabor@FreeBSD.org>2010-07-12 01:42:37 +0800
commit2f729cf2e579ea9fd486367aa065e72e75b7c76e (patch)
tree37a0fcf6a68d20180531e6805c99915fe136cf59 /security/amavisd-new
parent67324218473f6d06040d777fe3b4ea668e2c17fb (diff)
downloadfreebsd-ports-gnome-2f729cf2e579ea9fd486367aa065e72e75b7c76e.tar.gz
freebsd-ports-gnome-2f729cf2e579ea9fd486367aa065e72e75b7c76e.tar.zst
freebsd-ports-gnome-2f729cf2e579ea9fd486367aa065e72e75b7c76e.zip
- Remove BDB version requirement. This doesn't fix the problem because
amavisd-new uses BDB through databases/p5-BerkeleyDB and if that port is already present on the system when we install amavisd-new, this knob won't guarantee that we get the proper version. The underlying port should be changed to use a more modern version of BDB, so instead of adding quirks here, a PR has been submitted for that port (ports/148494). [1] [2] - Proper handling of the WITH_RAR case [3] - Remove -M option from mdmfs when using ramdisk. This reportedly stop crashes. [4] - Bump PORTREVISION PR: ports/147794 [1], ports/147856 [2] Submitted by: delphij [1], Joe Horn <joehorn@gmail.com> [2], Scot Hetzel <swhetzel@gmail.com> [3], Andy Dills <andy@xecu.net> (via private mail) [4]
Diffstat (limited to 'security/amavisd-new')
-rw-r--r--security/amavisd-new/Makefile9
-rw-r--r--security/amavisd-new/files/amavisd.sh.in2
-rw-r--r--security/amavisd-new/files/pkg-message.in2
3 files changed, 8 insertions, 5 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 8460459c56c4..bb4bd82a4693 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -8,7 +8,7 @@
PORTNAME= amavisd-new
PORTVERSION= 2.6.4
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
@@ -106,7 +106,6 @@ AMAVIS_NOMILTER="@comment "
.endif
.if defined(WITH_BDB)
-USE_BDB= 42
RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/BerkeleyDB.pm:${PORTSDIR}/databases/p5-BerkeleyDB
.endif
@@ -155,8 +154,12 @@ RUN_DEPENDS+= file>=4.21:${PORTSDIR}/sysutils/file
# not suit rar.
.if defined(WITH_RAR)
-IA32_BINARY_PORT= yes
+# support for archivers/rar is broken on ia64
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
RUN_DEPENDS+= ${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
+.else
+IGNORE= archviers/rar is a 32-bit binary port and is not compatible with ${ARCH}
+.endif
.endif
.if defined(WITH_UNRAR)
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index 613f7f490a47..c885608169d3 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -37,7 +37,7 @@ if [ ${amavisd_ram} ];then
echo "========================================================"
df %%AMAVISDIR%%/tmp | grep '^/dev/md' > /dev/null
if [ $? -eq 1 ];then
- mdmfs -M -s ${amavisd_ram} -p 750 -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true
+ mdmfs -s ${amavisd_ram} -p 750 -w %%AMAVISUSER%%:%%AMAVISGROUP%% md %%AMAVISDIR%%/tmp || true
fi
fi
}
diff --git a/security/amavisd-new/files/pkg-message.in b/security/amavisd-new/files/pkg-message.in
index 4340dec4f1d6..ea45433c5df9 100644
--- a/security/amavisd-new/files/pkg-message.in
+++ b/security/amavisd-new/files/pkg-message.in
@@ -17,7 +17,7 @@
amavisd_pidfile="/var/amavis/amavisd.pid"
- Optionally enable amavisd tmp ram disk with: (DISCOURAGED!)
+ Optionally enable amavisd tmp ram disk with:
amavisd_ram="512m"