update to 2.2.0

most Makefile changes and patch-libsylph-defs.h where taken from sylpheed2-devel

8 files changed, 84 insertions, 42 deletions

diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 33161b070196..5013011a8de5 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.0/
+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
@@ -40,7 +40,8 @@ OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
 		COMPFACE	"Enable X-Face support." off \
 		JPILOT		"Enable JPilot support." off \
 		LDAP		"Enable LDAP support." off \
-		SSL		"Enable OpenSSL support." on
+		SSL		"Enable OpenSSL support." on \
+		GTKSPELL	"Enable Spell checking support" on
 
 .include <bsd.port.pre.mk>
 
@@ -48,6 +49,8 @@ OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=--enable-ssl
+.else
+CONFIGURE_ARGS+=--disable-ssl
 .endif
 
 .if defined(WITH_GPGME)
@@ -57,12 +60,14 @@ CONFIGURE_ARGS+=--enable-gpgme
 .else
 CONFIGURE_ARGS+=--disable-gpgme
 .endif
+
 .if defined(WITH_COMPFACE)
 LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
 CONFIGURE_ARGS+=--enable-compface
 .else
 CONFIGURE_ARGS+=--disable-compface
 .endif
+
 .if defined(WITH_JPILOT)
 LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
 RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
@@ -70,31 +75,40 @@ CONFIGURE_ARGS+=--enable-jpilot
 .else
 CONFIGURE_ARGS+=--disable-jpilot
 .endif
+
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
 .endif
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--enable-ssl
+
+.if defined(WITH_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
 .else
-CONFIGURE_ARGS+=--disable-ssl
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
+.if defined(WITH_GNOME)
+PLIST_FILES=	share/gnome/applications/sylpheed.desktop \
+		share/gnome/pixmaps/sylpheed.png
 .endif
 
 MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
 		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
 		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in
+		manual/ja/Makefile.in src/Makefile.in libsylph/Makefile.in \
+		src/icons/Makefile.in
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
 		s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
-		${WRKSRC}/src/procmime.c
+		${WRKSRC}/libsylph/procmime.c
 
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src po manual faq$$|SUBDIRS = ac libsylph src po|g' \
 		${WRKSRC}/Makefile.in
 .else
 .for i in ${MAKEFILES}
@@ -112,5 +126,9 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
 .endfor
 .endif
+.if defined(WITH_GNOME)
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/gnome/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/applications/
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sylpheed2/distinfo b/mail/sylpheed2/distinfo
index 20d1c6f5c7e1..2b6787e9e8ef 100644
--- a/mail/sylpheed2/distinfo
+++ b/mail/sylpheed2/distinfo
@@ -1,3 +1,3 @@
-MD5 (sylpheed-2.0.4.tar.bz2) = c9f1c4cf2b3933ebbb58519ba3b77887
-SHA256 (sylpheed-2.0.4.tar.bz2) = c6822eec057f765e8fc9ee7999b33f0d98149d829ab07059986c7b2f6776696f
-SIZE (sylpheed-2.0.4.tar.bz2) = 2335882
+MD5 (sylpheed-2.2.0.tar.bz2) = da23e5c6ef869c4fe847ea9207f40ddf
+SHA256 (sylpheed-2.2.0.tar.bz2) = 72724821199dd92d9bb0068fc88054fc0144144889af7dc6dfea9ea4ae607a6c
+SIZE (sylpheed-2.2.0.tar.bz2) = 2492789
diff --git a/mail/sylpheed2/files/patch-ac b/mail/sylpheed2/files/patch-libsylph-defs.h
index 86cde54e6a53..7881004694d3 100644
--- a/mail/sylpheed2/files/patch-ac
+++ b/mail/sylpheed2/files/patch-libsylph-defs.h
@@ -1,17 +1,17 @@
---- src/defs.h.orig	Mon Sep  3 01:07:32 2001
-+++ src/defs.h	Mon Sep  3 04:50:35 2001
-@@ -58,8 +58,8 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
+--- libsylph/defs.h.orig	Tue Sep 13 16:55:49 2005
++++ libsylph/defs.h	Mon Sep 19 03:23:15 2005
+@@ -81,8 +81,8 @@
+ #else
+ #  define DEFAULT_SIGNATURE	".signature"
+ #endif
 -#define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
 -#define DEFAULT_INC_PROGRAM	"inc"
 +#define DEFAULT_INC_PATH	""
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -67,7 +67,7 @@
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
+@@ -91,7 +91,7 @@
  #ifdef _PATH_MAILDIR
  #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
  #else
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
index 7045f6254f37..e373d69521aa 100644
--- a/mail/sylpheed2/pkg-plist
+++ b/mail/sylpheed2/pkg-plist
@@ -33,8 +33,9 @@ share/locale/sr/LC_MESSAGES/sylpheed.mo
 share/locale/sv/LC_MESSAGES/sylpheed.mo
 share/locale/tr/LC_MESSAGES/sylpheed.mo
 share/locale/uk/LC_MESSAGES/sylpheed.mo
+share/locale/vi/LC_MESSAGES/sylpheed.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
+share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
@@ -89,6 +90,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-21.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-22.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 33161b070196..5013011a8de5 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	2.0.4
+PORTVERSION=	2.2.0
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.0/
+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
@@ -40,7 +40,8 @@ OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
 		COMPFACE	"Enable X-Face support." off \
 		JPILOT		"Enable JPilot support." off \
 		LDAP		"Enable LDAP support." off \
-		SSL		"Enable OpenSSL support." on
+		SSL		"Enable OpenSSL support." on \
+		GTKSPELL	"Enable Spell checking support" on
 
 .include <bsd.port.pre.mk>
 
@@ -48,6 +49,8 @@ OPTIONS=	GPGME		"Enable GnuPG support using GPGME." off \
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=--enable-ssl
+.else
+CONFIGURE_ARGS+=--disable-ssl
 .endif
 
 .if defined(WITH_GPGME)
@@ -57,12 +60,14 @@ CONFIGURE_ARGS+=--enable-gpgme
 .else
 CONFIGURE_ARGS+=--disable-gpgme
 .endif
+
 .if defined(WITH_COMPFACE)
 LIB_DEPENDS+=	compface.1:${PORTSDIR}/mail/faces
 CONFIGURE_ARGS+=--enable-compface
 .else
 CONFIGURE_ARGS+=--disable-compface
 .endif
+
 .if defined(WITH_JPILOT)
 LIB_DEPENDS+=	pisock.8:${PORTSDIR}/palm/pilot-link
 RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
@@ -70,31 +75,40 @@ CONFIGURE_ARGS+=--enable-jpilot
 .else
 CONFIGURE_ARGS+=--disable-jpilot
 .endif
+
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
 .endif
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--enable-ssl
+
+.if defined(WITH_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
 .else
-CONFIGURE_ARGS+=--disable-ssl
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
+.if defined(WITH_GNOME)
+PLIST_FILES=	share/gnome/applications/sylpheed.desktop \
+		share/gnome/pixmaps/sylpheed.png
 .endif
 
 MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
 		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
 		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
-		manual/ja/Makefile.in src/Makefile.in
+		manual/ja/Makefile.in src/Makefile.in libsylph/Makefile.in \
+		src/icons/Makefile.in
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
 		s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \
-		${WRKSRC}/src/procmime.c
+		${WRKSRC}/libsylph/procmime.c
 
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src po manual faq$$|SUBDIRS = ac libsylph src po|g' \
 		${WRKSRC}/Makefile.in
 .else
 .for i in ${MAKEFILES}
@@ -112,5 +126,9 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
 .endfor
 .endif
+.if defined(WITH_GNOME)
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/gnome/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/applications/
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo
index 20d1c6f5c7e1..2b6787e9e8ef 100644
--- a/mail/sylpheed3/distinfo
+++ b/mail/sylpheed3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sylpheed-2.0.4.tar.bz2) = c9f1c4cf2b3933ebbb58519ba3b77887
-SHA256 (sylpheed-2.0.4.tar.bz2) = c6822eec057f765e8fc9ee7999b33f0d98149d829ab07059986c7b2f6776696f
-SIZE (sylpheed-2.0.4.tar.bz2) = 2335882
+MD5 (sylpheed-2.2.0.tar.bz2) = da23e5c6ef869c4fe847ea9207f40ddf
+SHA256 (sylpheed-2.2.0.tar.bz2) = 72724821199dd92d9bb0068fc88054fc0144144889af7dc6dfea9ea4ae607a6c
+SIZE (sylpheed-2.2.0.tar.bz2) = 2492789
diff --git a/mail/sylpheed3/files/patch-ac b/mail/sylpheed3/files/patch-libsylph-defs.h
index 86cde54e6a53..7881004694d3 100644
--- a/mail/sylpheed3/files/patch-ac
+++ b/mail/sylpheed3/files/patch-libsylph-defs.h
@@ -1,17 +1,17 @@
---- src/defs.h.orig	Mon Sep  3 01:07:32 2001
-+++ src/defs.h	Mon Sep  3 04:50:35 2001
-@@ -58,8 +58,8 @@
- #define MARK_VERSION		2
- 
- #define DEFAULT_SIGNATURE	".signature"
+--- libsylph/defs.h.orig	Tue Sep 13 16:55:49 2005
++++ libsylph/defs.h	Mon Sep 19 03:23:15 2005
+@@ -81,8 +81,8 @@
+ #else
+ #  define DEFAULT_SIGNATURE	".signature"
+ #endif
 -#define DEFAULT_INC_PATH	"/usr/bin/mh/inc"
 -#define DEFAULT_INC_PROGRAM	"inc"
 +#define DEFAULT_INC_PATH	""
 +#define DEFAULT_INC_PROGRAM	""
  /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
  /* #define DEFAULT_INC_PROGRAM	"imget" */
- #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
-@@ -67,7 +67,7 @@
+ #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t -i"
+@@ -91,7 +91,7 @@
  #ifdef _PATH_MAILDIR
  #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
  #else
diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist
index 7045f6254f37..e373d69521aa 100644
--- a/mail/sylpheed3/pkg-plist
+++ b/mail/sylpheed3/pkg-plist
@@ -33,8 +33,9 @@ share/locale/sr/LC_MESSAGES/sylpheed.mo
 share/locale/sv/LC_MESSAGES/sylpheed.mo
 share/locale/tr/LC_MESSAGES/sylpheed.mo
 share/locale/uk/LC_MESSAGES/sylpheed.mo
+share/locale/vi/LC_MESSAGES/sylpheed.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
+share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html
@@ -89,6 +90,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-21.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-22.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html