aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-07-13 04:32:52 +0800
committerpav <pav@FreeBSD.org>2004-07-13 04:32:52 +0800
commit3d9a5affee63c522b3ed322b44447e4d1f1ae656 (patch)
tree51dc4443436e6c547c13173390f4dce9e5faa37b /mail
parentce5737c9767ccb7626fdd4f7f870192a571ae739 (diff)
downloadfreebsd-ports-gnome-3d9a5affee63c522b3ed322b44447e4d1f1ae656.tar.gz
freebsd-ports-gnome-3d9a5affee63c522b3ed322b44447e4d1f1ae656.tar.zst
freebsd-ports-gnome-3d9a5affee63c522b3ed322b44447e4d1f1ae656.zip
- Revert part of my previous change: p5-Time-HiRes is prefered even on
perl 5.8.4, because it can be newer than the bundled copy Requested by: local camel clan (lth)
Diffstat (limited to 'mail')
-rw-r--r--mail/qmail-scanner/Makefile11
-rw-r--r--mail/qmail-scanner1/Makefile11
2 files changed, 6 insertions, 16 deletions
diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile
index 7ad954488368..bb9d02e37137 100644
--- a/mail/qmail-scanner/Makefile
+++ b/mail/qmail-scanner/Makefile
@@ -18,7 +18,8 @@ MAINTAINER= freebsd@simplerezo.com
COMMENT= Content/Anti-virus Scanner for qmail
BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
- reformime:${PORTSDIR}/mail/maildrop
+ reformime:${PORTSDIR}/mail/maildrop \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
# A normal qmail installation puts everything into /var/qmail/.
@@ -145,10 +146,4 @@ post-deinstall:
test:
@${WRKSRC}/contrib/test_installation.sh -doit
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile
index 7ad954488368..bb9d02e37137 100644
--- a/mail/qmail-scanner1/Makefile
+++ b/mail/qmail-scanner1/Makefile
@@ -18,7 +18,8 @@ MAINTAINER= freebsd@simplerezo.com
COMMENT= Content/Anti-virus Scanner for qmail
BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
- reformime:${PORTSDIR}/mail/maildrop
+ reformime:${PORTSDIR}/mail/maildrop \
+ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
# A normal qmail installation puts everything into /var/qmail/.
@@ -145,10 +146,4 @@ post-deinstall:
test:
@${WRKSRC}/contrib/test_installation.sh -doit
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>