6 files changed, 16 insertions, 47 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 69f3cbf380f1..22527263416f 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -16,7 +15,7 @@ DISTFILES=	${EXTRACT_ONLY} \
 		${THEMEFILE}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	corecode@corecode.ath.cx
+MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
 LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
@@ -33,7 +32,15 @@ USE_REINPLACE=	yes
 
 MAN1=		sylpheed-claws.1
 
-CONFIGURE_ARGS=	--program-suffix="-claws" --enable-ipv6
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=		yes
+CONFIGURE_ARGS=		--enable-openssl --with-openssl-includes=${OPENSSLINC} \
+			--with-openssl-libs=${OPENSSLLIB}
+.endif
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+=	--program-suffix="-claws" --enable-ipv6
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
@@ -81,10 +88,6 @@ PLIST_SUB+=		SA_PLUG=""
 .else
 PLIST_SUB+=		SA_PLUG="@comment "
 .endif
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--enable-openssl
-.endif
 .if defined(WITHOUT_THEMES)
 PLIST_SUB+=	THEMES="@comment "
 .else
@@ -129,6 +132,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|po intl src|po src|" ${WRKSRC}/Makefile.in
 	@for f in ${WRKSRC}/tools/*; do \
 		${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done
+	#@${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in
 .endif
@@ -160,4 +164,4 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/sylpheed-claws.png
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 2076bb2ca490..70caca870d95 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-MD5 (sylpheed-0.9.3claws.tar.bz2) = b44d9136604802c5d34f91f92514c989
+MD5 (sylpheed-0.9.6claws.tar.bz2) = a4a7e7c9a6c1b17f688a782e8c06ae4b
 MD5 (sylpheed-iconset-20030712.tar.gz) = 7da918c0ebe89cd6c9f8b65bc3e18377
diff --git a/mail/claws-mail/files/patch-src-common-Makefile.in b/mail/claws-mail/files/patch-src-common-Makefile.in
deleted file mode 100644
index 4b2e83567aab..000000000000
--- a/mail/claws-mail/files/patch-src-common-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/Makefile.in.orig	Fri Jan 24 13:41:49 2003
-+++ src/common/Makefile.in	Thu Jan 30 01:34:01 2003
-@@ -58,7 +58,7 @@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- 
--CPPFLAGS = \
-+CPPFLAGS = @CPPFLAGS@ \
- 	$(GLIB_CFLAGS) \
- 	$(OPENSSL_CFLAGS) \
- 	-DLOCALEDIR=\""$(localedir)"\"
diff --git a/mail/claws-mail/files/patch-src-matcher_parser_lex.c b/mail/claws-mail/files/patch-src-matcher_parser_lex.c
deleted file mode 100644
index 729a9bc884bc..000000000000
--- a/mail/claws-mail/files/patch-src-matcher_parser_lex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/matcher_parser_lex.c.orig	Mon Jul 28 15:43:46 2003
-+++ src/matcher_parser_lex.c	Mon Jul 28 15:44:11 2003
-@@ -21,7 +21,10 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 500028
- #include <stdint.h> /* May break IA64 test-noansi-r */
-+#endif
- 
- /* end standard C headers. */
- 
diff --git a/mail/claws-mail/files/patch-src-quote_fmt_lex.c b/mail/claws-mail/files/patch-src-quote_fmt_lex.c
deleted file mode 100644
index bf915d2cd2a7..000000000000
--- a/mail/claws-mail/files/patch-src-quote_fmt_lex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/quote_fmt_lex.c.orig	Mon Jul 28 15:40:54 2003
-+++ src/quote_fmt_lex.c	Mon Jul 28 15:42:07 2003
-@@ -21,7 +21,10 @@
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 500028
- #include <stdint.h> /* May break IA64 test-noansi-r */
-+#endif
- 
- /* end standard C headers. */
- 
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 949602753ddd..351b84823fa9 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -157,8 +157,10 @@ share/locale/nl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pl/LC_MESSAGES/sylpheed-claws.mo
 share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo
 share/locale/ru/LC_MESSAGES/sylpheed-claws.mo
+share/locale/sk/LC_MESSAGES/sylpheed-claws.mo
 share/locale/sr/LC_MESSAGES/sylpheed-claws.mo
 share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
+share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws.png
 share/sylpheed-claws/OOo2sylpheed.pl