Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/sylpheed/Makefile,v
retrieving revision 1.88
diff -w -u -p -r1.88 Makefile
--- Makefile	11 Oct 2010 08:15:27 -0000	1.88
+++ Makefile	16 Oct 2010 09:14:24 -0000
@@ -1,15 +1,11 @@
 # $OpenBSD: Makefile,v 1.88 2010/10/11 08:15:27 jasper Exp $
 
-COMMENT=	mail/news client in gtk+
+COMMENT =		lightweight and user-friendly e-mail client
 
-MAJOR=		2.7
-VERSION=	${MAJOR}.1
-DISTNAME=	sylpheed-${VERSION}
+DISTNAME =		sylpheed-3.0.3
 
-REVISION=	1
-
-SHARED_LIBS +=  sylph-0              0.0      # .0.1
-SHARED_LIBS +=  sylpheed-plugin-0    0.0      # .0.1
+SHARED_LIBS += 	 	sylph-0                   1.0 # 1.3
+SHARED_LIBS += 		sylpheed-plugin-0         1.0 # 1.3
 
 CATEGORIES=	mail news x11
 HOMEPAGE=	http://sylpheed.sraoss.jp/en
@@ -21,17 +17,19 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	gtk-x11-2.0.>=0.9,gdk-x11-2.0.>=0.9::x11/gtk+2 \
-		gtkspell.>=1::textproc/gtkspell
-
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto enchant
-WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0
-WANTLIB += pcre pixman-1 png pthread pthread-stubs ssl stdc++ xcb z
+LIB_DEPENDS +=		gtk-x11-2.0.>=0.9,gdk-x11-2.0.>=0.9::x11/gtk+2 \
+			gtkspell.>=1::textproc/gtkspell \
+			::security/gpgme 
+
+WANTLIB += GL X11 X11-xcb Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender Xxf86vm c crypto atk-1.0 cairo gdk_pixbuf-2.0
+WANTLIB += pango-1.0 pangocairo-1.0 dbus-1 dbus-glib-1 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 drm expat fontconfig freetype m pixman-1
+WANTLIB += pthread pthread-stubs gthread-2.0 iconv intl pcre enchant pangoft2-1.0
+WANTLIB += png gpgme gpg-error gtkspell ssl stdc++ xcb xcb-render xcb-shm z
 
 RUN_DEPENDS=	::devel/desktop-file-utils
-MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${MAJOR}/
+MASTER_SITES =		http://sylpheed.sraoss.jp/sylpheed/v3.0/
 
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
@@ -42,27 +40,21 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--enable-gtkspell \
 			--disable-jpilot \
 			--disable-ldap \
-			--disable-oniguruma
+			--disable-oniguruma \
+			--enable-gpgme
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
-FLAVORS=	compface gpgme
+FLAVORS= 		compface
 FLAVOR?=
 
 .if ${FLAVOR:L:Mcompface}
-PERMIT_PACKAGE_CDROM=	No Fee
-PERMIT_DISTFILES_CDROM=	No Fee
 LIB_DEPENDS+=		compface.>=1::mail/faces
+CONFIGURE_ARGS +=	--enable-compface
+PERMIT_PACKAGE_CDROM =  No fee
+PERMIT_DISTFILES_CDROM =No fee
 .else
 CONFIGURE_ARGS+=	--disable-compface
-.endif
-
-.if ${FLAVOR:L:Mgpgme}
-LIB_DEPENDS+=		gpgme.>=4::security/gpgme
-CONFIGURE_ARGS+=	--enable-gpgme
-WANTLIB+=		gpg-error
-.else
-CONFIGURE_ARGS+=	--disable-gpgme
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/sylpheed/distinfo,v
retrieving revision 1.45
diff -w -u -p -r1.45 distinfo
--- distinfo	10 Jan 2010 10:21:05 -0000	1.45
+++ distinfo	16 Oct 2010 09:14:24 -0000
@@ -1,5 +1,5 @@
-MD5 (sylpheed-2.7.1.tar.gz) = QF+8lSmNzs9Ut0LncjbO3Q==
-RMD160 (sylpheed-2.7.1.tar.gz) = Po6DN2wf35evn0Ruk6kdBiRP9ng=
-SHA1 (sylpheed-2.7.1.tar.gz) = 9JYyZPWwFGE85unLttlNVqZj3M4=
-SHA256 (sylpheed-2.7.1.tar.gz) = 65RBUfVdBvQExEChFvGZfRuGbyK1bUzdc21iNJH2Yyo=
-SIZE (sylpheed-2.7.1.tar.gz) = 4340355
+MD5 (sylpheed-3.0.3.tar.gz) = IH4zKjJVATawBEMTpXyCKQ==
+RMD160 (sylpheed-3.0.3.tar.gz) = u30SUpwuIFiMJI3MFB5Nrn+LuAE=
+SHA1 (sylpheed-3.0.3.tar.gz) = XlBvUQ+ZXda5+XMuLsjB44cPmBI=
+SHA256 (sylpheed-3.0.3.tar.gz) = MxBQiQhpbWxqT7ofhppgi1xieyC9exALjWfMIzaBb5k=
+SIZE (sylpheed-3.0.3.tar.gz) = 4517372
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/mail/sylpheed/pkg/DESCR,v
retrieving revision 1.7
diff -w -u -p -r1.7 DESCR
--- pkg/DESCR	3 Oct 2005 20:20:29 -0000	1.7
+++ pkg/DESCR	16 Oct 2010 09:14:24 -0000
@@ -11,4 +11,3 @@ enabled by default).
 
 FLAVORS:
 	* compface: support X-Face header
-	* gpgme: compile with gnupg made easy support
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/sylpheed/pkg/PLIST,v
retrieving revision 1.32
diff -w -u -p -r1.32 PLIST
--- pkg/PLIST	10 Jan 2010 10:21:05 -0000	1.32
+++ pkg/PLIST	16 Oct 2010 09:14:24 -0000
@@ -92,6 +92,7 @@ share/sylpheed/faq/en/
 share/sylpheed/faq/en/sylpheed-faq-1.html
 share/sylpheed/faq/en/sylpheed-faq-2.html
 share/sylpheed/faq/en/sylpheed-faq-3.html
+share/sylpheed/faq/en/sylpheed-faq-4.html
 share/sylpheed/faq/en/sylpheed-faq.html
 share/sylpheed/faq/es/
 share/sylpheed/faq/es/sylpheed-faq-1.html
@@ -150,6 +151,7 @@ share/sylpheed/manual/ja/sylpheed-22.htm
 share/sylpheed/manual/ja/sylpheed-23.html
 share/sylpheed/manual/ja/sylpheed-24.html
 share/sylpheed/manual/ja/sylpheed-25.html
+share/sylpheed/manual/ja/sylpheed-26.html
 share/sylpheed/manual/ja/sylpheed-3.html
 share/sylpheed/manual/ja/sylpheed-4.html
 share/sylpheed/manual/ja/sylpheed-5.html