Update to 0.7.1

PR:		34989
Submitted by:	maintainer

12 files changed, 278 insertions, 28 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 3e74a1dd7c54..b63ed7d3d8a5 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -22,7 +22,8 @@ USE_GTK=	yes
 CONFIGURE_ARGS=	--program-suffix="-claws" --with-included-gettext \
 		--enable-ipv6
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 .if defined(WITH_PIXBUF) || defined(WITH_ALL)
 LIB_DEPENDS+=		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
@@ -50,6 +51,16 @@ CONFIGURE_ARGS+=	--disable-jconv
 LIB_DEPENDS+=		pspell.4:${PORTSDIR}/textproc/pspell
 CONFIGURE_ARGS+=	--enable-pspell
 .endif
+.if defined(WITH_JPILOT) || defined(WITH_ALL)
+LIB_DEPENDS+=		pisock.4:${PORTSDIR}/palm/pilot-link
+RUN_DEPENDS+=		${LOCALBASE}/pilot/bin/jpilot:${PORTSDIR}/palm/jpilot
+CONFIGURE_ARGS+=	--enable-jpilot
+.endif
+.if defined(WITH_LDAP) || defined(WITH_ALL)
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap2
+CONFIGURE_ARGS+=	--enable-ldap
+CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
+.endif
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl
@@ -60,11 +71,14 @@ pre-everything::
 	@${ECHO} "You may define the following build options:"
 	@${ECHO} ""
 	@${ECHO} "      WITH_ALL       Enable all options below"
+	@${ECHO} ""
 	@${ECHO} "      WITH_PIXBUF    Enable GDK Pixbuf support"
 	@${ECHO} "      WITH_GPGME     Enable GnuPG support using GPGME"
 	@${ECHO} "      WITH_COMPFACE  Enable compface (X-Face) support"
 	@${ECHO} "      WITH_JCONV     Enable enhanced charset conversion"
 	@${ECHO} "      WITH_PSPELL    Enable spell-checking support"
+	@${ECHO} "      WITH_JPILOT    Enable JPilot support"
+	@${ECHO} "      WITH_LDAP      Enable LDAP access support"
 	@${ECHO} ""
 	@${ECHO} "      WITHOUT_SSL    Disable OpenSSL support"
 	@${ECHO} ""
@@ -90,6 +104,10 @@ post-install:
 .for i in eud2gc.py filter_conv.pl gif2xface.pl ldif-to-xml.py newscache_clean.pl
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${i} ${DATADIR}
 .endfor
+	@for d in `${FIND} ${WRKSRC}/themes`; do \
+		if ${TEST} -d $${d}; then ${MKDIR} ${DATADIR}/$${d#${WRKSRC}/}; else \
+		${INSTALL_DATA} $${d} ${DATADIR}/$${d#${WRKSRC}}; fi; \
+	done
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index c228936f27fb..da2f46882828 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1 +1 @@
-MD5 (sylpheed-0.7.0claws.tar.gz) = ff76b9e3f0f43bdacf05f3a25addcd40
+MD5 (sylpheed-0.7.1claws.tar.gz) = 7d1c4c53f4ac12dbbc1116dd4407f1a8
diff --git a/mail/claws-mail/files/patch-configure b/mail/claws-mail/files/patch-configure
index 98fada214116..96f66cf6d41e 100644
--- a/mail/claws-mail/files/patch-configure
+++ b/mail/claws-mail/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Jan 14 16:15:33 2002
-+++ configure	Tue Jan 15 15:53:11 2002
+--- configure.orig	Thu Feb 14 10:08:51 2002
++++ configure	Sat Feb 16 02:43:04 2002
 @@ -756,7 +756,7 @@
  fi
  
@@ -9,7 +9,7 @@
  
  MAJOR_VERSION=0
  MINOR_VERSION=7
-@@ -1056,7 +1056,7 @@
+@@ -1146,7 +1146,7 @@
  fi
  
  
@@ -18,7 +18,7 @@
    SYLPHEED_GNOME_TRUE=
    SYLPHEED_GNOME_FALSE='#'
  else
-@@ -7419,7 +7419,7 @@
+@@ -7470,7 +7470,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  
@@ -26,4 +26,13 @@
 +manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual'
  
  
- # Check whether --with-glib-prefix or --without-glib-prefix was given.
+ if test "x${datadir}" = 'x${prefix}/share'; then
+@@ -9041,7 +9041,7 @@
+ 
+ 	if test "$ac_cv_enable_ldap" = yes; then
+ 		CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
+-		LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
++		LIBS="$LIBS -lldap -llber ${PTHREAD_LIBS} `$GLIB_CONFIG --libs gthread`"
+ 	fi
+ else
+ 	echo "$ac_t""no" 1>&6
diff --git a/mail/claws-mail/files/patch-src-defs.h b/mail/claws-mail/files/patch-src-defs.h
index f7451153cacd..034e5f62e347 100644
--- a/mail/claws-mail/files/patch-src-defs.h
+++ b/mail/claws-mail/files/patch-src-defs.h
@@ -1,6 +1,6 @@
---- ./src/defs.h.orig	Fri Nov 16 09:47:26 2001
-+++ ./src/defs.h	Fri Dec 21 01:02:01 2001
-@@ -65,8 +65,8 @@
+--- src/defs.h.orig	Thu Feb 14 10:18:52 2002
++++ src/defs.h	Sat Feb 16 04:12:54 2002
+@@ -67,8 +67,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -11,7 +11,7 @@
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
  #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
  #ifdef _PATH_MAILDIR
  #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
  #else
diff --git a/mail/claws-mail/pkg-descr b/mail/claws-mail/pkg-descr
index a77dfe2ecc44..e89e487a0422 100644
--- a/mail/claws-mail/pkg-descr
+++ b/mail/claws-mail/pkg-descr
@@ -5,7 +5,6 @@ multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
 AUTH, SSL, IPv6, GnuPG, internalization, and more.
 
 In addition to the above, Sylpheed-claws has the following extra features:
-* A revision of the filtering system
 * allow colour labeling of emails based on filtering rules
 * automatic mailing list reply, allow ignoring of mail threads
 * selectable fonts, compface support, spell checking, SMTP AUTH
@@ -13,7 +12,7 @@ In addition to the above, Sylpheed-claws has the following extra features:
 * folder properties: associate certain options per folder,
 	'Request Return Receipt', 'Default To', and 'Default account'
 * subject simplification for changing the display of subject lines via RegExp
-* Undo/Redo
+* pixmap themes
 and more...
 
 WWW: http://sylpheed-claws.sourceforge.net/
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 7927074465ed..99cbdba5c8d9 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -69,9 +69,108 @@ share/sylpheed-claws/filter_conv.pl
 share/sylpheed-claws/gif2xface.pl
 share/sylpheed-claws/ldif-to-xml.py
 share/sylpheed-claws/newscache_clean.pl
+share/sylpheed-claws/themes/Kovico-sylpheed/address.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/address_book.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/down_arrow.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/edit_extern.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/exec.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/forwarded.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/ignorethread.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/insert_file.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_attach.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_compose.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_forward.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive_all.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_all.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_author.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_send.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_send_queue.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_sign.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/new.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/news_compose.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/paste.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/replied.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/unread.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/up_arrow.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/vcard.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/address.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/address_book.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/down_arrow.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/edit_extern.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/exec.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/forwarded.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/ignorethread.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/insert_file.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_attach.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_compose.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_forward.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_receive.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_receive_all.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply_to_all.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply_to_author.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_send.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_send_queue.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_sign.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/new.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/news_compose.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/paste.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/replied.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/unread.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/up_arrow.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/vcard.xpm
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/ja
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/en
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws
+@dirrm share/sylpheed-claws/themes/Plain_and_Blueish
+@dirrm share/sylpheed-claws/themes/Kovico-sylpheed
+@dirrm share/sylpheed-claws/themes
 @unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @dirrm share/sylpheed-claws
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 3e74a1dd7c54..b63ed7d3d8a5 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -22,7 +22,8 @@ USE_GTK=	yes
 CONFIGURE_ARGS=	--program-suffix="-claws" --with-included-gettext \
 		--enable-ipv6
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
 .if defined(WITH_PIXBUF) || defined(WITH_ALL)
 LIB_DEPENDS+=		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
@@ -50,6 +51,16 @@ CONFIGURE_ARGS+=	--disable-jconv
 LIB_DEPENDS+=		pspell.4:${PORTSDIR}/textproc/pspell
 CONFIGURE_ARGS+=	--enable-pspell
 .endif
+.if defined(WITH_JPILOT) || defined(WITH_ALL)
+LIB_DEPENDS+=		pisock.4:${PORTSDIR}/palm/pilot-link
+RUN_DEPENDS+=		${LOCALBASE}/pilot/bin/jpilot:${PORTSDIR}/palm/jpilot
+CONFIGURE_ARGS+=	--enable-jpilot
+.endif
+.if defined(WITH_LDAP) || defined(WITH_ALL)
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap2
+CONFIGURE_ARGS+=	--enable-ldap
+CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
+.endif
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-ssl
@@ -60,11 +71,14 @@ pre-everything::
 	@${ECHO} "You may define the following build options:"
 	@${ECHO} ""
 	@${ECHO} "      WITH_ALL       Enable all options below"
+	@${ECHO} ""
 	@${ECHO} "      WITH_PIXBUF    Enable GDK Pixbuf support"
 	@${ECHO} "      WITH_GPGME     Enable GnuPG support using GPGME"
 	@${ECHO} "      WITH_COMPFACE  Enable compface (X-Face) support"
 	@${ECHO} "      WITH_JCONV     Enable enhanced charset conversion"
 	@${ECHO} "      WITH_PSPELL    Enable spell-checking support"
+	@${ECHO} "      WITH_JPILOT    Enable JPilot support"
+	@${ECHO} "      WITH_LDAP      Enable LDAP access support"
 	@${ECHO} ""
 	@${ECHO} "      WITHOUT_SSL    Disable OpenSSL support"
 	@${ECHO} ""
@@ -90,6 +104,10 @@ post-install:
 .for i in eud2gc.py filter_conv.pl gif2xface.pl ldif-to-xml.py newscache_clean.pl
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${i} ${DATADIR}
 .endfor
+	@for d in `${FIND} ${WRKSRC}/themes`; do \
+		if ${TEST} -d $${d}; then ${MKDIR} ${DATADIR}/$${d#${WRKSRC}/}; else \
+		${INSTALL_DATA} $${d} ${DATADIR}/$${d#${WRKSRC}}; fi; \
+	done
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index c228936f27fb..da2f46882828 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1 +1 @@
-MD5 (sylpheed-0.7.0claws.tar.gz) = ff76b9e3f0f43bdacf05f3a25addcd40
+MD5 (sylpheed-0.7.1claws.tar.gz) = 7d1c4c53f4ac12dbbc1116dd4407f1a8
diff --git a/mail/sylpheed-claws/files/patch-configure b/mail/sylpheed-claws/files/patch-configure
index 98fada214116..96f66cf6d41e 100644
--- a/mail/sylpheed-claws/files/patch-configure
+++ b/mail/sylpheed-claws/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Jan 14 16:15:33 2002
-+++ configure	Tue Jan 15 15:53:11 2002
+--- configure.orig	Thu Feb 14 10:08:51 2002
++++ configure	Sat Feb 16 02:43:04 2002
 @@ -756,7 +756,7 @@
  fi
  
@@ -9,7 +9,7 @@
  
  MAJOR_VERSION=0
  MINOR_VERSION=7
-@@ -1056,7 +1056,7 @@
+@@ -1146,7 +1146,7 @@
  fi
  
  
@@ -18,7 +18,7 @@
    SYLPHEED_GNOME_TRUE=
    SYLPHEED_GNOME_FALSE='#'
  else
-@@ -7419,7 +7419,7 @@
+@@ -7470,7 +7470,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  
@@ -26,4 +26,13 @@
 +manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual'
  
  
- # Check whether --with-glib-prefix or --without-glib-prefix was given.
+ if test "x${datadir}" = 'x${prefix}/share'; then
+@@ -9041,7 +9041,7 @@
+ 
+ 	if test "$ac_cv_enable_ldap" = yes; then
+ 		CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
+-		LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
++		LIBS="$LIBS -lldap -llber ${PTHREAD_LIBS} `$GLIB_CONFIG --libs gthread`"
+ 	fi
+ else
+ 	echo "$ac_t""no" 1>&6
diff --git a/mail/sylpheed-claws/files/patch-src-defs.h b/mail/sylpheed-claws/files/patch-src-defs.h
index f7451153cacd..034e5f62e347 100644
--- a/mail/sylpheed-claws/files/patch-src-defs.h
+++ b/mail/sylpheed-claws/files/patch-src-defs.h
@@ -1,6 +1,6 @@
---- ./src/defs.h.orig	Fri Nov 16 09:47:26 2001
-+++ ./src/defs.h	Fri Dec 21 01:02:01 2001
-@@ -65,8 +65,8 @@
+--- src/defs.h.orig	Thu Feb 14 10:18:52 2002
++++ src/defs.h	Sat Feb 16 04:12:54 2002
+@@ -67,8 +67,8 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
@@ -11,7 +11,7 @@
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
  #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
  #ifdef _PATH_MAILDIR
  #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
  #else
diff --git a/mail/sylpheed-claws/pkg-descr b/mail/sylpheed-claws/pkg-descr
index a77dfe2ecc44..e89e487a0422 100644
--- a/mail/sylpheed-claws/pkg-descr
+++ b/mail/sylpheed-claws/pkg-descr
@@ -5,7 +5,6 @@ multiple accounts, threading, filtering, MIME attachments, APOP, SMTP
 AUTH, SSL, IPv6, GnuPG, internalization, and more.
 
 In addition to the above, Sylpheed-claws has the following extra features:
-* A revision of the filtering system
 * allow colour labeling of emails based on filtering rules
 * automatic mailing list reply, allow ignoring of mail threads
 * selectable fonts, compface support, spell checking, SMTP AUTH
@@ -13,7 +12,7 @@ In addition to the above, Sylpheed-claws has the following extra features:
 * folder properties: associate certain options per folder,
 	'Request Return Receipt', 'Default To', and 'Default account'
 * subject simplification for changing the display of subject lines via RegExp
-* Undo/Redo
+* pixmap themes
 and more...
 
 WWW: http://sylpheed-claws.sourceforge.net/
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 7927074465ed..99cbdba5c8d9 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -69,9 +69,108 @@ share/sylpheed-claws/filter_conv.pl
 share/sylpheed-claws/gif2xface.pl
 share/sylpheed-claws/ldif-to-xml.py
 share/sylpheed-claws/newscache_clean.pl
+share/sylpheed-claws/themes/Kovico-sylpheed/address.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/address_book.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/dir_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/down_arrow.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/edit_extern.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/exec.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/forwarded.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/ignorethread.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/inbox_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/insert_file.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_attach.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_compose.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_forward.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_receive_all.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_all.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_reply_to_author.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_send.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_send_queue.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/mail_sign.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/new.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/news_compose.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/outbox_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/paste.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/queue_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/replied.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_close.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_close_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_open.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/trash_open_hrm.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/unread.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/up_arrow.xpm
+share/sylpheed-claws/themes/Kovico-sylpheed/vcard.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/address.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/address_book.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/dir_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/down_arrow.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/edit_extern.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/exec.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/forwarded.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/ignorethread.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/inbox_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/insert_file.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_attach.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_compose.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_forward.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_receive.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_receive_all.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply_to_all.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_reply_to_author.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_send.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_send_queue.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/mail_sign.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/new.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/news_compose.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/outbox_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/paste.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/queue_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/replied.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_close.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_close_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_open.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/trash_open_hrm.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/unread.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/up_arrow.xpm
+share/sylpheed-claws/themes/Plain_and_Blueish/vcard.xpm
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/ja
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual/en
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/manual
 %%PORTDOCS%%@dirrm share/doc/sylpheed-claws
+@dirrm share/sylpheed-claws/themes/Plain_and_Blueish
+@dirrm share/sylpheed-claws/themes/Kovico-sylpheed
+@dirrm share/sylpheed-claws/themes
 @unexec rmdir %D/share/pixmaps 2>/dev/null || true
 @dirrm share/sylpheed-claws