diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2007-03-23 10:38:58 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2007-03-23 10:38:58 +0000 |
| commit | e805bc5e485c3671f56fb5453e28bd5400d925ab (patch) | |
| tree | b1139c187f93032f4d9b50574151e5fdb074d6dd /mail/exim | |
| parent | 7bb18580e1ab42e6649ff3ca0156bafb10b594ac (diff) | |
| download | ports-e805bc5e485c3671f56fb5453e28bd5400d925ab.tar.gz ports-e805bc5e485c3671f56fb5453e28bd5400d925ab.zip | |
Notes
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 7 | ||||
| -rw-r--r-- | mail/exim/distinfo | 2 | ||||
| -rw-r--r-- | mail/exim/files/patch-src_tls-openssl.c | 15 | ||||
| -rw-r--r-- | mail/exim/pkg-plist | 1 |
4 files changed, 17 insertions, 8 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 4bf57f2d3d10..9e80d9559a69 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -12,7 +12,7 @@ CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim DISTNAME= ${PORTNAME}-${EXIM_VERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim FAQ.txt.bz2:exim +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim DIST_SUBDIR= exim EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -31,8 +31,6 @@ DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim EXIM_VERSION= 4.66 SA_EXIM_VERSION=4.2 -IGNOREFILES= FAQ.txt.bz2 - .if !defined(EXIMON_ONLY) .if defined(PKGNAMESUFFIX) CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-4.* @@ -61,7 +59,7 @@ MAN8= exim.8 NO_INSTALL_MANPAGES= yes .endif -PORTDOC_BASE= ACKNOWLEDGMENTS FAQ NOTICE README.UPDATING +PORTDOC_BASE= ACKNOWLEDGMENTS NOTICE README.UPDATING PORTDOC_FILES= ChangeLog Exim3.upgrade Exim4.upgrade NewStuff \ OptionLists.txt README README.SIEVE dbm.discuss.txt \ experimental-spec.txt filter.txt pcrepattern.txt \ @@ -593,7 +591,6 @@ pre-everything:: .endif post-extract: - @${BZCAT} ${_DISTDIR}/FAQ.txt.bz2 > ${WRKSRC}/FAQ .if defined(WITH_SA_EXIM) @cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS} .endif diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 685129aa1288..0f283de00488 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -4,5 +4,3 @@ SIZE (exim/exim-4.66.tar.bz2) = 1584704 MD5 (exim/sa-exim-4.2.tar.gz) = ad76f73c6b3d01caa88078e3e622745a SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a SIZE (exim/sa-exim-4.2.tar.gz) = 66575 -MD5 (exim/FAQ.txt.bz2) = IGNORE -SHA256 (exim/FAQ.txt.bz2) = IGNORE diff --git a/mail/exim/files/patch-src_tls-openssl.c b/mail/exim/files/patch-src_tls-openssl.c new file mode 100644 index 000000000000..5a4ae9556328 --- /dev/null +++ b/mail/exim/files/patch-src_tls-openssl.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- src/tls-openssl.c.orig ++++ src/tls-openssl.c +@@ -343,8 +343,7 @@ + /* Set up the information callback, which outputs if debugging is at a suitable + level. */ + +-if (!(SSL_CTX_set_info_callback(ctx, (void (*)())info_callback))) +- return tls_error(US"SSL_CTX_set_info_callback", host); ++SSL_CTX_set_info_callback(ctx, (void (*)())info_callback); + + /* The following patch was supplied by Robert Roselius */ + diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index 1d4bf3dd3fdd..c6e430ccf855 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -19,7 +19,6 @@ sbin/exiwhat %%EXIMON%%sbin/eximon %%EXIMON%%sbin/eximon.bin %%PORTDOCS%%%%DOCSDIR%%/ACKNOWLEDGMENTS -%%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/NOTICE %%PORTDOCS%%%%DOCSDIR%%/README.UPDATING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog |