Update to 1.9.14.

5 files changed, 6 insertions, 44 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index e5dcdb30bccb..5a8cb56fc69d 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	1.9.13
-PORTREVISION=	1
+PORTVERSION=	1.9.14
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -37,7 +36,9 @@ WANT_GNOME=	yes
 MAN1=		sylpheed-claws.1
 
 CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6 \
-		--with-libiconv-prefix=${LOCALBASE}
+		--with-libiconv-prefix=${LOCALBASE} \
+		--with-manualdir=${DOCSDIR}/manual \
+		--with-faqdir=${DOCSDIR}/faq
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 5bc1b28dfcbb..15202c182eef 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed-claws-1.9.13.tar.bz2) = afd3b82ca210520f0ad241b77c5e673a
-SIZE (sylpheed-claws-1.9.13.tar.bz2) = 3432284
+MD5 (sylpheed-claws-1.9.14.tar.bz2) = f61666e1b829daf116996136e7728ac8
+SIZE (sylpheed-claws-1.9.14.tar.bz2) = 3458098
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/files/patch-configure.ac b/mail/claws-mail/files/patch-configure.ac
index c5aa15b3d2ba..d9f0665cf1ac 100644
--- a/mail/claws-mail/files/patch-configure.ac
+++ b/mail/claws-mail/files/patch-configure.ac
@@ -1,17 +1,5 @@
 --- configure.ac.orig	Sat Jul 30 10:54:42 2005
 +++ configure.ac	Sat Jul 30 11:10:47 2005
-@@ -153,9 +153,9 @@
- localedir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(localedir)
- 
--manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
-+manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual'
- AC_SUBST(manualdir)
--faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
-+faqdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/faq'
- AC_SUBST(faqdir)
- 
- dnl Set PACKAGE_DATA_DIR in config.h.
 @@ -303,7 +303,18 @@
  AC_MSG_CHECKING([whether to use OpenSSL])
  if test x"$ac_cv_enable_openssl" = xyes; then
diff --git a/mail/claws-mail/files/patch-src_etpan_etpan-thread-manager.c b/mail/claws-mail/files/patch-src_etpan_etpan-thread-manager.c
deleted file mode 100644
index a4f3ddc8d905..000000000000
--- a/mail/claws-mail/files/patch-src_etpan_etpan-thread-manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/etpan/etpan-thread-manager.c.orig	Thu Sep  1 12:57:20 2005
-+++ src/etpan/etpan-thread-manager.c	Thu Sep  1 12:57:57 2005
-@@ -4,10 +4,10 @@
- 
- #ifdef HAVE_LIBETPAN
- 
-+#include <pthread.h>
- #include "etpan-thread-manager.h"
- 
- #include <stdlib.h>
--#include <pthread.h>
- #include <libetpan/mailsem.h>
- #include <semaphore.h>
- #include <unistd.h>
diff --git a/mail/claws-mail/files/patch-src_etpan_imap-thread.c b/mail/claws-mail/files/patch-src_etpan_imap-thread.c
deleted file mode 100644
index 58dff9a7cb1d..000000000000
--- a/mail/claws-mail/files/patch-src_etpan_imap-thread.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/etpan/imap-thread.c.orig	Fri Jul 22 13:30:23 2005
-+++ src/etpan/imap-thread.c	Sat Sep  3 11:05:25 2005
-@@ -6,8 +6,10 @@
- 
- #include "imap-thread.h"
- #include <imap.h>
-+#include <pthread.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/socket.h>
- #include <fcntl.h>
- #include <sys/mman.h>
- #include <sys/wait.h>