Hey,
here's an update to exim-4.71. Please test and comment.
Thanks.
Regards,
Bernd
Makefile | 14 +++++++-------
distinfo | 10 +++++-----
patches/patch-OS_Makefile-Default | 15 ++++++++++++---
3 files changed, 24 insertions(+), 15 deletions(-)
Index: Makefile
===================================================================
RCS file: /d/OpenBSD/cvs/ports/mail/exim/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 10 Aug 2009 06:32:42 -0000 1.67
+++ Makefile 11 Dec 2009 10:33:56 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.67 2009/08/10 06:32:42 kili Exp $
COMMENT= Flexible mail transfer agent
-DISTNAME= exim-4.69
-PKGNAME= ${DISTNAME}p2
+DISTNAME= exim-4.71
CATEGORIES= mail
MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ \
@@ -19,6 +18,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto perl ssl util wrap m
+LIB_DEPENDS= pcre::devel/pcre
+
FLAVORS=no_exiscan no_x11 mysql postgresql sqlite3 ldap iconv sasl
FLAVOR?=
@@ -32,7 +33,7 @@ EXIM_MAKECAT+= "WITH_OLD_DEMIME=yes\n"
.if !${FLAVOR:L:Mno_x11}
USE_X11= Yes
EXIM_MAKECAT+= "EXIM_MONITOR=eximon.bin\n"
-WANTLIB+= X11 Xaw Xext Xmu Xt pthread-stubs xcb
+WANTLIB+= X11 Xaw Xext Xmu Xt
.endif
.if ${FLAVOR:L:Mmysql}
@@ -51,7 +52,6 @@ LIB_DEPENDS+= pq.>=2:postgresql-client-
.if ${FLAVOR:L:Msqlite3}
EXIM_MAKECAT+= "LOOKUP_SQLITE=yes\n"
-EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib/ -lsqlite3
LIB_DEPENDS+= sqlite3.>=8::databases/sqlite3
.endif
@@ -59,7 +59,6 @@ LIB_DEPENDS+= sqlite3.>=8::databases/sq
.if ${FLAVOR:L:Mldap}
EXIM_MAKECAT+= "LOOKUP_LDAP=yes\n"
EXIM_MAKECAT+= "LDAP_LIB_TYPE=OPENLDAP2\n"
-EXIM_LOOKUP_INCLUDE+= -I${LOCALBASE}/include
EXIM_LOOKUP_LIBS+= -L${LOCALBASE}/lib -lldap -llber
LIB_DEPENDS+= ldap.>=2,lber:openldap-client->=2,<3:databases/openldap
.endif
@@ -68,13 +67,11 @@ LIB_DEPENDS+= ldap.>=2,lber:openldap-cl
MODULES= converters/libiconv
EXIM_MAKECAT+= "HAVE_ICONV=yes\n"
EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -liconv
-EXIM_CFLAGS+= -I${LOCALBASE}/include
.endif
.if ${FLAVOR:L:Msasl}
EXIM_MAKECAT+= "AUTH_CYRUS_SASL=yes\n"
EXIM_EXTRA_LIBS+= -L${LOCALBASE}/lib -lsasl2
-EXIM_CFLAGS+= -I${LOCALBASE}/include
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
.endif
@@ -87,6 +84,9 @@ EXIM_MAKECAT+= "LOOKUP_INCLUDE=${EXIM_L
EXIM_MAKECAT+= "LOOKUP_LIBS=${EXIM_LOOKUP_LIBS}\n"
EXIM_MAKECAT+= "EXTRALIBS_EXIM=${EXIM_EXTRA_LIBS}\n"
EXIM_MAKECAT+= "CFLAGS=${CFLAGS} ${EXIM_CFLAGS}\n"
+EXIM_MAKECAT+= "INCLUDE=-I${LOCALBASE}/include\n"
+
+MAKE_FLAGS+= FULLECHO=
do-configure:
@mkdir -p ${WRKSRC}/Local
Index: distinfo
===================================================================
RCS file: /d/OpenBSD/cvs/ports/mail/exim/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 3 Feb 2008 20:39:11 -0000 1.16
+++ distinfo 11 Dec 2009 09:57:52 -0000
@@ -1,5 +1,5 @@
-MD5 (exim-4.69.tar.gz) = VujbHf4x4O5M74XolAzu3A==
-RMD160 (exim-4.69.tar.gz) = 0lnHZup58qJTknUwIRHJlk5xDf8=
-SHA1 (exim-4.69.tar.gz) = fq4faFvog2/G+1lwqtomVB4UqQ0=
-SHA256 (exim-4.69.tar.gz) = VvkLkngC4LVjaelTXYJs+1VHmq+6ZbaJ7NgP2LFCpgg=
-SIZE (exim-4.69.tar.gz) = 2131237
+MD5 (exim-4.71.tar.gz) = JVU4GNyjPfBvBoyvseDo6A==
+RMD160 (exim-4.71.tar.gz) = jBXMJ1syAD07Vi/L63B5BU8oKK0=
+SHA1 (exim-4.71.tar.gz) = gZjHCJK6jOGhxVCw0ZvHWQgUxTU=
+SHA256 (exim-4.71.tar.gz) = NvdpRKn4mPrSxk4mjVS9dl5hm+BgzbAyBVP8Kh9L8v4=
+SIZE (exim-4.71.tar.gz) = 2002790
Index: patches/patch-OS_Makefile-Default
===================================================================
RCS file: /d/OpenBSD/cvs/ports/mail/exim/patches/patch-OS_Makefile-Default,v
retrieving revision 1.6
diff -u -p -r1.6 patch-OS_Makefile-Default
--- patches/patch-OS_Makefile-Default 3 Feb 2008 20:39:12 -0000 1.6
+++ patches/patch-OS_Makefile-Default 11 Dec 2009 10:17:48 -0000
@@ -1,6 +1,6 @@
---- OS/Makefile-Default.orig Fri Feb 10 15:33:26 2006
-+++ OS/Makefile-Default Wed Jan 30 23:03:20 2008
-@@ -71,7 +71,7 @@ PERL_COMMAND=/usr/bin/perl
+--- OS/Makefile-Default.orig Fri Oct 16 09:30:54 2009
++++ OS/Makefile-Default Fri Dec 11 11:17:44 2009
+@@ -73,7 +73,7 @@ PERL_COMMAND=/usr/bin/perl
# CC contains the name of the C compiler to be used.
@@ -9,3 +9,12 @@
# CFLAGS contains flags to be passed to the compiler. Nothing is defaulted
+@@ -86,7 +86,7 @@ CC=gcc
+ # here; instead each OS-dependent Makefile contains a default setting if one
+ # is needed.
+
+-# LFLAGS=
++LFLAGS=-L$(LOCALBASE)/lib
+
+
+ # PCRE_LIBS contains the library to be linked for PCRE
