summaryrefslogtreecommitdiff
path: root/mail/exim
diff options
context:
space:
mode:
authorwiz <wiz>2002-10-25 12:13:18 +0000
committerwiz <wiz>2002-10-25 12:13:18 +0000
commit7dd8fcc4d1da1958d8759808b515b988a6a7596f (patch)
treea3382298ae6f349f0dacd25864b98d3afea02af3 /mail/exim
parentb1cf8cdf97fdb5ab7dbc66fe7cc092bc335a09d6 (diff)
downloadpkgsrc-7dd8fcc4d1da1958d8759808b515b988a6a7596f.tar.gz
buildlink1 -> buildlink2.
Diffstat (limited to 'mail/exim')
-rw-r--r--mail/exim/Makefile6
-rw-r--r--mail/exim/distinfo4
-rw-r--r--mail/exim/patches/patch-ab30
3 files changed, 21 insertions, 19 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 2352a315d69..1d92441c38b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/07/02 14:41:20 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2002/10/25 12:18:15 wiz Exp $
DISTNAME= exim-4.05
CATEGORIES= mail net
@@ -12,8 +12,10 @@ HOMEPAGE= http://www.exim.org/
COMMENT= The Exim mail transfer agent, a replacement for sendmail
USE_PERL5= yes
+USE_BUILDLINK2= yes
INTERACTIVE_STAGE= build # actually, needs "mail" user
# before configure step, see below
+MAKE_ENV+= SSLBASE=${SSLBASE:Q}
pre-patch:
${MKDIR} ${WRKSRC}/Local
@@ -57,5 +59,5 @@ post-install:
${FILESDIR}/mailer.conf.exim \
> ${PREFIX}/etc/exim/mailer.conf.exim
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 7b1c63e6052..72a5da67b17 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2002/06/19 16:02:26 ad Exp $
+$NetBSD: distinfo,v 1.8 2002/10/25 12:18:15 wiz Exp $
SHA1 (exim-4.05.tar.bz2) = 118c89ab4a79151f66c788581bdd9ab877624a42
Size (exim-4.05.tar.bz2) = 1048495 bytes
SHA1 (patch-aa) = c892a73a1850a9ce53828e88ca9d646407aa0ff2
-SHA1 (patch-ab) = f97ce4bf5a5eeed664118f5bec4b86c67ac57596
+SHA1 (patch-ab) = e5d6365e9a05a87a6e16fef69b6e6cc8ebac32ae
SHA1 (patch-ac) = 6bb782eb07c724da82be3aefcdf9a4bf90906687
SHA1 (patch-ae) = 6fe1508019093e409dd936d934913bc9f23c3125
diff --git a/mail/exim/patches/patch-ab b/mail/exim/patches/patch-ab
index 5bbbcefff9c..5da71fd7fbe 100644
--- a/mail/exim/patches/patch-ab
+++ b/mail/exim/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
+$NetBSD: patch-ab,v 1.6 2002/10/25 12:18:16 wiz Exp $
---- Local/Makefile.netbsd.orig Thu Jun 13 12:43:22 2002
-+++ Local/Makefile.netbsd Thu Jun 13 12:43:52 2002
+--- Local/Makefile.netbsd.orig Fri Oct 25 14:04:25 2002
++++ Local/Makefile.netbsd
@@ -98,7 +98,9 @@
# /usr/local/sbin. The installation script will try to create this directory,
# and any superior directories, if they do not exist.
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -113,7 +115,7 @@
+@@ -113,7 +115,7 @@ BIN_DIRECTORY=/usr/exim/bin
# directories if they don't exist. It will also install a default run time
# configuration if this file does not exist.
@@ -22,7 +22,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -126,7 +128,7 @@
+@@ -126,7 +128,7 @@ CONFIGURE_FILE=/usr/exim/configure
# owner of a local mailbox.) Specifying these values as root is very strongly
# discouraged. These values are compiled into the binary.
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must
# also be a setting of EXIM_GROUP. If, on the other hand, you use a name
-@@ -207,7 +209,7 @@
+@@ -207,7 +209,7 @@ TRANSPORT_SMTP=yes
# This one is special-purpose, and commonly not required, so it is not
# included by default.
@@ -40,7 +40,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -216,9 +218,9 @@
+@@ -216,9 +218,9 @@ TRANSPORT_SMTP=yes
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.
@@ -53,7 +53,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -281,7 +283,7 @@
+@@ -281,7 +283,7 @@ LOOKUP_LSEARCH=yes
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.
@@ -62,7 +62,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
-@@ -302,9 +304,9 @@
+@@ -302,9 +304,9 @@ EXIM_MONITOR=eximon.bin
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.
@@ -75,18 +75,18 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -315,8 +317,8 @@
+@@ -315,8 +317,8 @@ EXIM_MONITOR=eximon.bin
# with TLS support. If you don't know what this is all about, leave these
# settings commented out.
-# SUPPORT_TLS=yes
-# TLS_LIBS=-lssl -lcrypto
+SUPPORT_TLS=yes
-+TLS_LIBS=-lssl -lcrypto
++TLS_LIBS=-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib -lssl -lcrypto
# 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 @@
+@@ -371,7 +373,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 +95,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad 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 @@
+@@ -467,14 +469,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 +112,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well.
-@@ -511,11 +513,11 @@
+@@ -511,11 +513,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 +129,7 @@ $NetBSD: patch-ab,v 1.5 2002/06/19 16:02:27 ad Exp $
#------------------------------------------------------------------------------
-@@ -695,7 +697,7 @@
+@@ -695,7 +697,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: