summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-03-22 12:37:24 +0000
committerjmmv <jmmv>2003-03-22 12:37:24 +0000
commitf0c12fca13a4b46b9b3f55f1df169fb588250caf (patch)
tree7e87f53e3be3e9b2afc80bb4757d4259c0efa858 /mail
parent8afef0390bb221f10c834af58ca67a07c4e55b62 (diff)
downloadpkgsrc-f0c12fca13a4b46b9b3f55f1df169fb588250caf.tar.gz
Explicitly set TLS_INCLUDE to where OpenSSL headers are found.
Fixes PR pkg/20609 by Mirko Thiesen.
Diffstat (limited to 'mail')
-rw-r--r--mail/exim/distinfo4
-rw-r--r--mail/exim/patches/patch-ab15
2 files changed, 10 insertions, 9 deletions
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 417ff390321..86fffd37772 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2002/12/09 11:38:04 ad Exp $
+$NetBSD: distinfo,v 1.10 2003/03/22 12:37:24 jmmv Exp $
SHA1 (exim-4.10.tar.bz2) = cd374dde11a24fd12aa1c0ff72270d876d9c180d
Size (exim-4.10.tar.bz2) = 1037997 bytes
SHA1 (patch-aa) = c892a73a1850a9ce53828e88ca9d646407aa0ff2
-SHA1 (patch-ab) = e5d6365e9a05a87a6e16fef69b6e6cc8ebac32ae
+SHA1 (patch-ab) = 1180e73bff8f7cee712fb64d8c2a647057a56184
SHA1 (patch-ac) = 6bb782eb07c724da82be3aefcdf9a4bf90906687
SHA1 (patch-ad) = 2e4fe6eec1772946c6ed615df56459abc0f2d06d
SHA1 (patch-ae) = 18c0ad924a709abc5c2a7e334ce53cb3413d4d3b
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 5da71fd7fbe..0b40dc6284d 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2003/03/22 12:37:25 jmmv Exp $
---- Local/Makefile.netbsd.orig Fri Oct 25 14:04:25 2002
+--- Local/Makefile.netbsd.orig 2003-03-22 13:37:47.000000000 +0100
+++ Local/Makefile.netbsd
@@ -98,7 +98,9 @@
# /usr/local/sbin. The installation script will try to create this directory,
@@ -75,7 +75,7 @@ $NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
#------------------------------------------------------------------------------
-@@ -315,8 +317,8 @@ EXIM_MONITOR=eximon.bin
+@@ -315,8 +317,9 @@ EXIM_MONITOR=eximon.bin
# with TLS support. If you don't know what this is all about, leave these
# settings commented out.
@@ -83,10 +83,11 @@ $NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
-# TLS_LIBS=-lssl -lcrypto
+SUPPORT_TLS=yes
+TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
++TLS_INCLUDE=-I${SSLBASE}/include
# If you are running Exim as a server, note that just building it with TLS
# support is not all you need to do. You also need to set up a suitable
-@@ -371,7 +373,7 @@ EXIM_MONITOR=eximon.bin
+@@ -371,7 +374,7 @@ EXIM_MONITOR=eximon.bin
# %s. This will be replaced by one of the strings "main", "panic", or "reject"
# to form the final file names. Some installations may want something like this:
@@ -95,7 +96,7 @@ $NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
# which results in files with names /var/log/exim_mainlog, etc. The directory
# in which the log files are placed must exist; Exim does not try to create
-@@ -467,14 +469,14 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -467,14 +470,14 @@ ZCAT_COMMAND=/usr/bin/zcat
# this setting. See the manual section entitled "Use of tcpwrappers" in the
# chapter on building and installing Exim.
@@ -112,7 +113,7 @@ $NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well.
-@@ -511,11 +513,11 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -511,11 +514,11 @@ ZCAT_COMMAND=/usr/bin/zcat
# haven't got Perl, Exim will still build and run; you just won't be able to
# use those utilities.
@@ -129,7 +130,7 @@ $NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
#------------------------------------------------------------------------------
-@@ -695,7 +697,7 @@ ZCAT_COMMAND=/usr/bin/zcat
+@@ -695,7 +698,7 @@ ZCAT_COMMAND=/usr/bin/zcat
# (process id) to a file so that it can easily be identified. The path of the
# file can be specified here. Some installations may want something like this: