Hi!
Attached an update for mail/claws-mail to version 2.10.0
For an overview about the changes see
<http://www.claws-mail.org/news.php>
Note: The proposed patch from Brad <[EMAIL PROTECTED]> (see
<http://marc.info/?l=openbsd-ports&m=118334350501304&w=2>) is merged in
I don't know if the external plugins are affected and also needed to be
updated, please test
Ulrich
diff -x CVS -urN mail/claws-mail.orig/Makefile mail/claws-mail/Makefile
--- mail/claws-mail.orig/Makefile Tue May 15 00:24:26 2007
+++ mail/claws-mail/Makefile Mon Jul 2 16:07:44 2007
@@ -7,7 +7,7 @@
COMMENT-dillo= "dillo plugin"
COMMENT-spamassassin= "spamassassin plugin"
-V= 2.9.2
+V= 2.10.0
DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}p0
FULLPKGNAME-docs= claws-mail-docs-${V}p0
@@ -35,7 +35,7 @@
MULTI_PACKAGES= -main -docs -bogofilter -clamav -dillo \
-spamassassin
-FLAVORS= jpilot gnomeprint compface ldap
+FLAVORS= jpilot gnomeprint compface ldap debug
FLAVOR?=
FLAVOR_STRING= ${FLAVOR_EXT:S/-/,/g}
@@ -87,22 +87,13 @@
USE_GMAKE= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-aspell \
- --enable-bogofilter-plugin \
- --enable-clamav-plugin \
- --enable-dillo-viewer-plugin \
- --enable-pgpcore-plugin \
- --enable-pgpmime-plugin \
- --enable-pgpinline-plugin \
- --enable-spamassassin-plugin
-
+CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.61
CONFIGURE_ENV+= OPENSSL_CFLAGS="-I/usr/include/openssl" \
OPENSSL_LIBS="-lssl -lcrypto" \
CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
.if ${FLAVOR:L:Mjpilot}
-CONFIGURE_ARGS+= --enable-jpilot
LIB_DEPENDS-main+= pisock::comms/pilot-link
RUN_DEPENDS-main+= ::comms/jpilot
.else
@@ -110,7 +101,6 @@
.endif
.if ${FLAVOR:L:Mgnomeprint}
-CONFIGURE_ARGS+= --enable-gnomeprint
WANTLIB-main+= art_lgpl_2 xml2
LIB_DEPENDS-main+= gnomecanvas-2::x11/gnome/libgnomecanvas \
gnomeprint-2-2::x11/gnome/libgnomeprint \
@@ -122,18 +112,21 @@
.if ${FLAVOR:L:Mcompface}
PERMIT_PACKAGE_CDROM= "No Fee"
PERMIT_DISTFILES_CDROM= "No Fee"
-CONFIGURE_ARGS+= --enable-compface
LIB_DEPENDS-main+= compface.>=1::mail/faces
.else
CONFIGURE_ARGS+= --disable-compface
.endif
.if ${FLAVOR:L:Mldap}
-CONFIGURE_ARGS+= --enable-ldap
WANTLIB-main+= asn1 com_err gssapi krb5
LIB_DEPENDS-main+= lber,ldap:openldap-client-*:databases/openldap
.else
CONFIGURE_ARGS+= --disable-ldap
+.endif
+
+.if ${FLAVOR:L:Mdebug}
+CFLAGS+= -O0 -g
+INSTALL_STRIP=
.endif
TOOLS= OOo2claws-mail.pl \
diff -x CVS -urN mail/claws-mail.orig/distinfo mail/claws-mail/distinfo
--- mail/claws-mail.orig/distinfo Thu May 10 09:43:39 2007
+++ mail/claws-mail/distinfo Mon Jul 2 16:08:19 2007
@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-2.9.2.tar.bz2) = UFQUnGwOzi+CVJTx46iUCQ==
-RMD160 (claws/claws-mail-2.9.2.tar.bz2) = 9zMFRXdmA9F1rN6YCxXKSMF7h7I=
-SHA1 (claws/claws-mail-2.9.2.tar.bz2) = OxVzAGXKHgwxhZKzmwLC0El+brw=
-SHA256 (claws/claws-mail-2.9.2.tar.bz2) =
V7qPmKa2llU57h0Dg3chbyduMZsaFOQPKwM+FWGQqKQ=
-SIZE (claws/claws-mail-2.9.2.tar.bz2) = 5448901
+MD5 (claws/claws-mail-2.10.0.tar.bz2) = 7UCQArXmtgtoKuPuf4eobQ==
+RMD160 (claws/claws-mail-2.10.0.tar.bz2) = 4Q7tLDRhqMhdYxPwxXWBo7DqZU8=
+SHA1 (claws/claws-mail-2.10.0.tar.bz2) = DuOOwt0MN5QbC8xK96tEHsQyxjw=
+SHA256 (claws/claws-mail-2.10.0.tar.bz2) =
WQNPro7R5zc/Q2mxLulriEJBz1+Grv435PSSbr9xLM8=
+SIZE (claws/claws-mail-2.10.0.tar.bz2) = 5520512
diff -x CVS -urN mail/claws-mail.orig/patches/patch-configure
mail/claws-mail/patches/patch-configure
--- mail/claws-mail.orig/patches/patch-configure Fri May 4 14:13:14 2007
+++ mail/claws-mail/patches/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2007/05/04 12:13:14 steven Exp $
---- configure.orig Thu Apr 19 03:11:30 2007
-+++ configure Thu Apr 19 19:48:15 2007
-@@ -27930,7 +27930,7 @@ echo $ECHO_N "checking for GNU/aspell - version >= $mi
- use_aspell=no ac_cv_enable_aspell=no
- else
- ASPELL_CFLAGS="-I$aspell_includes"
-- ASPELL_LIBS="-L$aspell_libs -laspell"
-+ ASPELL_LIBS="-L$aspell_libs -laspell -lstdc++ -lm"
- aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell
Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
- rm -f conf.aspelltest
- if test "$cross_compiling" = yes; then
-@@ -29651,7 +29651,7 @@ if test "${ac_cv_lib_pisock_unpack_Address+set}" = set
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpisock $LIBS"
-+LIBS="-lpisock -pthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -29707,7 +29707,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pisock_unpack_Address" >&5
- echo "${ECHO_T}$ac_cv_lib_pisock_unpack_Address" >&6; }
- if test $ac_cv_lib_pisock_unpack_Address = yes; then
-- JPILOT_LIBS="-lpisock"
-+ JPILOT_LIBS="-lpisock -pthread"
- else
- JPILOT_LIBS="" ac_cv_enable_jpilot="no"
- fi
diff -x CVS -urN mail/claws-mail.orig/patches/patch-configure_ac
mail/claws-mail/patches/patch-configure_ac
--- mail/claws-mail.orig/patches/patch-configure_ac Thu Jan 1 01:00:00 1970
+++ mail/claws-mail/patches/patch-configure_ac Mon Jul 2 16:03:54 2007
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- configure.ac.orig Tue May 8 04:03:10 2007
++++ configure.ac Sun Jul 1 19:04:48 2007
+@@ -548,6 +548,7 @@ else
+ AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
+ AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
+ AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
++ AC_CHECK_LIB(sasl2, sasl_version, LDAP_LIBS="$LDAP_LIBS -lsasl2")
+ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
+ $LDAP_LIBS)
+
+@@ -563,7 +564,8 @@ else
+
+ AC_CHECK_LIB(ldap, ldap_start_tls_s,
+ [ ac_cv_have_tls=yes ],
+- [ ac_cv_have_tls=no ])
++ [ ac_cv_have_tls=no ],
++ $LDAP_LIBS)
+
+ fi
+
+@@ -600,7 +602,7 @@ if test "$ac_cv_enable_jpilot" = yes; then
+ AC_DEFINE(USE_JPILOT, 1, Define if you want
JPilot support in addressbook.) ])
+ fi
+
+- AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"],
[JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
++ AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock -pthread"],
[JPILOT_LIBS="" ac_cv_enable_jpilot="no"], -pthread)
+ if test x"$ac_cv_enable_jpilot" = xyes; then
+ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in
addressbook.)
+ else
diff -x CVS -urN mail/claws-mail.orig/patches/patch-m4_aspell_m4
mail/claws-mail/patches/patch-m4_aspell_m4
--- mail/claws-mail.orig/patches/patch-m4_aspell_m4 Thu Jan 1 01:00:00 1970
+++ mail/claws-mail/patches/patch-m4_aspell_m4 Mon Jul 2 16:03:54 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/aspell.m4.orig Sun Jul 1 18:36:54 2007
++++ m4/aspell.m4 Sun Jul 1 18:38:05 2007
+@@ -70,7 +70,7 @@ dnl
+ ifelse([$3], , :, [$3])
+ else
+ ASPELL_CFLAGS="-I$aspell_includes"
+- ASPELL_LIBS="-L$aspell_libs -laspell"
++ ASPELL_LIBS="-L$aspell_libs -laspell -lstdc++ -lm"
+ aspell_version=`$ASPELL version|sed -e "s/\(@(#) International Ispell
Version 3.1.20 (but really Aspell \)\(.*\))/\2/"`
+ rm -f conf.aspelltest
+ AC_TRY_RUN([
