- uptdate to 2.63
- fix pasto in files/rc.mimedefang, plus a tweak or two
- variable substitution
- removes pkg/UNMESSAGE
- other minor fixes and improvements
- take maintanier
many thanks to sthen@ for his suggestions and tweaks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 27 Sep 2007 07:42:09 -0000 1.6
+++ Makefile 4 Oct 2007 17:33:37 -0000
@@ -2,12 +2,13 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.62
-PKGNAME= ${DISTNAME}p1
-CATEGORIES= mail perl5
+DISTNAME= mimedefang-2.63
+CATEGORIES= mail
HOMEPAGE= http://www.mimedefang.org/
+MAINTAINER= Okan Demirmen <[EMAIL PROTECTED]>
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -28,13 +29,17 @@
NO_REGRESS= Yes
+post-build:
+ @sed -e 's,%LOCALBASE%,${LOCALBASE},g' < ${FILESDIR}/rc.mimedefang \
+ > ${WRKSRC}/rc.mimedefang
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mimedefang
${INSTALL_DATA}
${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients \
${PREFIX}/share/examples/mimedefang/mimedefang-filter
${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf \
${PREFIX}/share/examples/mimedefang/sa-mimedefang.cf
- ${INSTALL_SCRIPT} ${FILESDIR}/rc.mimedefang \
+ ${INSTALL_SCRIPT} ${WRKSRC}/rc.mimedefang \
${PREFIX}/share/examples/mimedefang/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 27 Jul 2007 21:57:29 -0000 1.3
+++ distinfo 4 Oct 2007 17:33:37 -0000
@@ -1,5 +1,5 @@
-MD5 (mimedefang-2.62.tar.gz) = KwQKd+k6uROoOqpFqUpUqQ==
-RMD160 (mimedefang-2.62.tar.gz) = omroGACb+ldPZ6uyFyzH9/tdViE=
-SHA1 (mimedefang-2.62.tar.gz) = Ow48Z9p+h2t1oxBL/bMbHGj5YC8=
-SHA256 (mimedefang-2.62.tar.gz) = lfzCtD9rbePgNJ6X3bSZQCTdUhV7KFwxOA8ameI0hhE=
-SIZE (mimedefang-2.62.tar.gz) = 329774
+MD5 (mimedefang-2.63.tar.gz) = spEa5x7BpiUWixOEMvkZuw==
+RMD160 (mimedefang-2.63.tar.gz) = BtnNCTrXcqgJ65SM0FNM841ZL8g=
+SHA1 (mimedefang-2.63.tar.gz) = 5upg+2NhP/UMRleKSVZBRhBbJCw=
+SHA256 (mimedefang-2.63.tar.gz) = NnS38YeGLSFXY00tV/Pua03TBfJubv6z3sxoTTSheiM=
+SIZE (mimedefang-2.63.tar.gz) = 328357
Index: files/rc.mimedefang
===================================================================
RCS file: /cvs/ports/mail/mimedefang/files/rc.mimedefang,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rc.mimedefang
--- files/rc.mimedefang 19 Oct 2006 01:06:22 -0000 1.1.1.1
+++ files/rc.mimedefang 4 Oct 2007 17:33:37 -0000
@@ -1,30 +1,31 @@
# $OpenBSD: rc.mimedefang,v 1.1.1.1 2006/10/19 01:06:22 alek Exp $
-mimedefang=/usr/local/bin/mimedefang
-multiplexor=/usr/local/bin/mimedefang-multiplexor
-
-if [ -x $mimedefang -a -x $multiplexor ]; then
- MAX_SLAVES=16
- MIN_SLAVES=2
- BUSY_TIMEOUT=720
- IDLE_TIMEOUT=300
- WAIT_START=10
- MX_QUEUE_SIZE=10
- MX_QUEUE_TIMEOUT=30
+mimedefang=%LOCALBASE%/bin/mimedefang
+multiplexor=%LOCALBASE%/bin/mimedefang-multiplexor
- echo -n " mimedefang-multiplexor"
+if [ -x $mimedefang -a -x $multiplexor ]; then
+ MAX_SLAVES=16
+ MIN_SLAVES=2
+ BUSY_TIMEOUT=720
+ IDLE_TIMEOUT=300
+ WAIT_START=10
+ MX_QUEUE_SIZE=10
+ MX_QUEUE_TIMEOUT=30
+ install -d -o _mdefang /var/run/mdefang
+
+ echo -n " mimedefang-multiplexor"
$multiplexor -U _mdefang -l \
- -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT -i $IDLE_TIMEOUT
\
- -w $WAIT_START -q $MX_QUEUE_SIZE -Q $MX_QUEUE_TIMEOUT \
+ -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT \
+ -i $IDLE_TIMEOUT -w $WAIT_START -q $MX_QUEUE_SIZE \
+ -Q $MX_QUEUE_TIMEOUT \
-p /var/run/mdefang/multiplexor.pid \
- -s /var/run/mdefang/multiplexor.socket
+ -s /var/run/mdefang/multiplexor.socket
echo -n " mimedefang"
-
$mimedefang -U _mdefang -r -s -t \
-p /var/run/mdefang/mimedefang.socket \
- -m /var/run/mdefang/multiplexor.socket
+ -m /var/run/mdefang/multiplexor.socket
- sleep 3 # for socket creation
+ sleep 3 # for socket creation
fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/mail/mimedefang/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 MESSAGE
--- pkg/MESSAGE 19 Oct 2006 01:06:22 -0000 1.1.1.1
+++ pkg/MESSAGE 4 Oct 2007 17:33:37 -0000
@@ -6,7 +6,7 @@
F=T, T=S:360s;R:360s;E:15m')dnl
If you wish to start up mimedefang automatically during system
-startup, add following lines to /etc/rc.local:
+startup, add the following lines to /etc/rc.local:
if [ -f ${SYSCONFDIR}/rc.mimedefang ]; then
. ${SYSCONFDIR}/rc.mimedefang
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/mimedefang/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 27 Sep 2007 07:42:09 -0000 1.4
+++ pkg/PLIST 4 Oct 2007 17:33:37 -0000
@@ -17,11 +17,10 @@
@man man/man8/watch-mimedefang.8
@man man/man8/watch-multiple-mimedefangs.8
share/examples/mimedefang/
[EMAIL PROTECTED] ${SYSCONFDIR}/mail/
share/examples/mimedefang/mimedefang-filter
@sample ${SYSCONFDIR}/mail/mimedefang-filter
share/examples/mimedefang/rc.mimedefang
[EMAIL PROTECTED] 755
[EMAIL PROTECTED] 0750
@sample ${SYSCONFDIR}/rc.mimedefang
@mode
share/examples/mimedefang/sa-mimedefang.cf
@@ -33,6 +32,6 @@
@sample /var/spool/MD-Quarantine/
@mode 0755
@sample /var/run/mdefang/
[EMAIL PROTECTED] rm -rf /var/run/mdefang/*
[EMAIL PROTECTED] rm -rf /var/run/mdefang/*
@extraunexec rm -rf /var/spool/MIMEDefang/*
@extraunexec rm -rf /var/spool/MD-Quarantine/*
Index: pkg/UNMESSAGE
===================================================================
RCS file: pkg/UNMESSAGE
diff -N pkg/UNMESSAGE
--- pkg/UNMESSAGE 19 Oct 2006 01:06:22 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Do not forget to revert changes made to /etc/rc.local..
