update to 2.10.0 from Ulrich Kahl (maintainer) and Brad.

tested by me on i386 and amd64.

mail/claws-mail/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/05/14 22:24:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2007/07/10 06:14:43 pyr Exp $
 
 COMMENT-main=		"mail and news client"
 COMMENT-docs=		"documentation"
@@ -7,14 +7,14 @@ COMMENT-clamav=		"clamav plugin"
 COMMENT-dillo=		"dillo plugin"
 COMMENT-spamassassin=	"spamassassin plugin"
 
-V=			2.9.2
+V=			2.10.0
 DISTNAME=		claws-mail-${V}
-PKGNAME-main=			${DISTNAME}p0
+PKGNAME-main=			${DISTNAME}
-FULLPKGNAME-docs=		claws-mail-docs-${V}p0
+FULLPKGNAME-docs=		claws-mail-docs-${V}
-FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}p0
+FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}
-FULLPKGNAME-clamav=		claws-mail-clamav-${V}p0
+FULLPKGNAME-clamav=		claws-mail-clamav-${V}
-FULLPKGNAME-dillo=		claws-mail-dillo-${V}p0
+FULLPKGNAME-dillo=		claws-mail-dillo-${V}
-FULLPKGNAME-spamassassin=	claws-mail-spamassassin-${V}p0
+FULLPKGNAME-spamassassin=	claws-mail-spamassassin-${V}
 
 CATEGORIES=		mail news
 
@@ -35,7 +35,7 @@ DIST_SUBDIR=		claws
 
 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_X11=		Yes
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 LIBTOOL_FLAGS=		--tag=disable-static
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
-CONFIGURE_ARGS+=	--enable-aspell \
+AUTOCONF_VERSION=	2.61
-			--enable-bogofilter-plugin \
-			--enable-clamav-plugin \
-			--enable-dillo-viewer-plugin \
-			--enable-pgpcore-plugin \
-			--enable-pgpmime-plugin \
-			--enable-pgpinline-plugin \
-			--enable-spamassassin-plugin
-
 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 @@ CONFIGURE_ARGS+=	--disable-jpilot
 .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,20 +112,23 @@ CONFIGURE_ARGS+=	--disable-gnomeprint
 .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 \
 		acroread2claws-mail.pl \
 		calypso_convert.pl \

mail/claws-mail/distinfo

@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-2.9.2.tar.bz2) = UFQUnGwOzi+CVJTx46iUCQ==
+MD5 (claws/claws-mail-2.10.0.tar.bz2) = 7UCQArXmtgtoKuPuf4eobQ==
-RMD160 (claws/claws-mail-2.9.2.tar.bz2) = 9zMFRXdmA9F1rN6YCxXKSMF7h7I=
+RMD160 (claws/claws-mail-2.10.0.tar.bz2) = 4Q7tLDRhqMhdYxPwxXWBo7DqZU8=
-SHA1 (claws/claws-mail-2.9.2.tar.bz2) = OxVzAGXKHgwxhZKzmwLC0El+brw=
+SHA1 (claws/claws-mail-2.10.0.tar.bz2) = DuOOwt0MN5QbC8xK96tEHsQyxjw=
-SHA256 (claws/claws-mail-2.9.2.tar.bz2) = V7qPmKa2llU57h0Dg3chbyduMZsaFOQPKwM+FWGQqKQ=
+SHA256 (claws/claws-mail-2.10.0.tar.bz2) = WQNPro7R5zc/Q2mxLulriEJBz1+Grv435PSSbr9xLM8=
-SIZE (claws/claws-mail-2.9.2.tar.bz2) = 5448901
+SIZE (claws/claws-mail-2.10.0.tar.bz2) = 5520512

mail/claws-mail/patches/patch-configure

@@ -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

mail/claws-mail/patches/patch-configure_ac

@@ -0,0 +1,30 @@
+$OpenBSD: patch-configure_ac,v 1.1 2007/07/10 06:14:43 pyr Exp $
+--- 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

mail/claws-mail/patches/patch-m4_aspell_m4

@@ -0,0 +1,12 @@
+$OpenBSD: patch-m4_aspell_m4,v 1.1 2007/07/10 06:14:43 pyr Exp $
+--- 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([

mail/claws-mail/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2007/05/04 12:13:14 steven Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2007/07/10 06:14:43 pyr Exp $
 @pkgpath mail/sylpheed-claws,-main${FLAVOR_STRING}
 @pkgpath mail/sylpheed-claws${FLAVOR_STRING}
 bin/claws-mail
@@ -101,6 +101,7 @@ include/claws-mail/gtk/gtkshruler.h
 include/claws-mail/gtk/gtksourceprintjob.h
 include/claws-mail/gtk/gtkutils.h
 include/claws-mail/gtk/gtkvscrollbutton.h
+include/claws-mail/gtk/headers.h
 include/claws-mail/gtk/icon_legend.h
 include/claws-mail/gtk/inputdialog.h
 include/claws-mail/gtk/logwindow.h
@@ -126,6 +127,7 @@ include/claws-mail/ldapctrl.h
 include/claws-mail/ldaplocate.h
 include/claws-mail/ldapquery.h
 include/claws-mail/ldapserver.h
+include/claws-mail/ldapupdate.h
 include/claws-mail/ldaputil.h
 include/claws-mail/ldif.h
 include/claws-mail/localfolder.h
@@ -186,6 +188,7 @@ include/claws-mail/prefs_send.h
 include/claws-mail/prefs_spelling.h
 include/claws-mail/prefs_summaries.h
 include/claws-mail/prefs_summary_column.h
+include/claws-mail/prefs_summary_open.h
 include/claws-mail/prefs_template.h
 include/claws-mail/prefs_themes.h
 include/claws-mail/prefs_toolbar.h