diff options
author | Marcus Alves Grando <mnag@FreeBSD.org> | 2010-04-13 13:19:42 +0000 |
---|---|---|
committer | Marcus Alves Grando <mnag@FreeBSD.org> | 2010-04-13 13:19:42 +0000 |
commit | 6bd38971c63efb33f3e0d3954e4cd0cde4b24f31 (patch) | |
tree | 2068b07b7d9ddaa4bdd676735837b2f725e15c8c /mail/postfix-current/Makefile | |
parent | 800c5471d1d9787c94f7ef9533fe5caf20272744 (diff) | |
download | ports-6bd38971c63efb33f3e0d3954e4cd0cde4b24f31.tar.gz ports-6bd38971c63efb33f3e0d3954e4cd0cde4b24f31.zip |
- Update to 2.8-20100323
- Fix CONFLICTS because the port shouldn't conflict with itself
- Fix build on 8.0 & 9.0 when WITH_SASLKRB5 is set
PR: 145393
Submitted by: Sahil Tandon <sahil___tandon.net>
Notes
Notes:
svn path=/head/; revision=252637
Diffstat (limited to 'mail/postfix-current/Makefile')
-rw-r--r-- | mail/postfix-current/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index e5184cf24107..d157fe062af7 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -DISTVERSION= 2.8-20100213 +DISTVERSION= 2.8-20100323 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ @@ -21,7 +21,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= mnag@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-current-2.[0-68-9]* \ +CONFLICTS= courier-0.* postfix-1.* postfix-2.* postfix-current-2.[0-79]* \ sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* MAKE_JOBS_SAFE= yes @@ -113,7 +113,10 @@ POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT) BROKEN= Select only one SASL Kerberos option .endif -POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken +.if ${OSVERSION} >= 800037 +KRB5_EXTR= -lhx509 +.endif +POSTFIX_AUXLIBS+= -lkrb5 ${KRB5_EXTR} -lcrypto -lcrypt -lcom_err -lasn1 -lroken .endif .if defined(WITH_SASLKMIT) |