4 files changed, 14 insertions, 23 deletions

diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 23ac45b4c9e5..582a153ce3c2 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	1.0.1
+PORTVERSION=	1.9.1
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_LOCAL:S/$/:mime/} \
-		http://sylpheed.good-day.net/sylpheed/:source \
+		http://sylpheed.good-day.net/sylpheed/v1.9/:source \
 		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
 MASTER_SITE_SUBDIR=	sylpheed-claws/:source oliver/:mime
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r.1/rc/}
@@ -26,9 +26,10 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
+NO_LATEST_LINK=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -37,23 +38,14 @@ CONFIGURE_ARGS=	--enable-ipv6 \
 		--with-libintl-prefix=${LOCALBASE} \
 		--program-transform-name=''
 
+CONFLICTS=	sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]*
+
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
 .endif
 
-.if defined(WITH_PIXBUF)
-USE_GNOME+=	gdkpixbuf
-.else
-USE_GNOME+=	imlib
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PIXBUF)
-CONFIGURE_ARGS+=--disable-imlib
-.else
-CONFIGURE_ARGS+=--disable-gdk-pixbuf
-.endif
 .if defined(WITH_GPGME)
 LIB_DEPENDS+=	gpgme.14:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
@@ -95,7 +87,6 @@ pre-everything::
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "      WITH_PIXBUF=yes   Enable GDK Pixbuf support"
 	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
 	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
 	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
@@ -129,7 +120,7 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 .for i in ChangeLog INSTALL README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.jp ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
 .endfor
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mime.types ${PREFIX}/etc/sylpheed-mime.types
 .endif
diff --git a/mail/sylpheed2/distinfo b/mail/sylpheed2/distinfo
index e8d1ac0d0f9b..754a8cadd84b 100644
--- a/mail/sylpheed2/distinfo
+++ b/mail/sylpheed2/distinfo
@@ -1,4 +1,4 @@
-MD5 (sylpheed/sylpheed-1.0.1.tar.bz2) = 0f7c6d12debfbd0e1e41a4f1db4e4e70
-SIZE(sylpheed/sylpheed-1.0.1.tar.bz2) = 2374127
+MD5 (sylpheed/sylpheed-1.9.1.tar.bz2) = 3164a9db5a7a50902083fb3b05c486ae
+SIZE(sylpheed/sylpheed-1.9.1.tar.bz2) = 2303268
 MD5 (sylpheed/mime.types) = 7c0563d85e2e830c0266d54517ad62e8
 SIZE(sylpheed/mime.types) = 14979
diff --git a/mail/sylpheed2/pkg-descr b/mail/sylpheed2/pkg-descr
index 82e317b6d4fd..3107ae5ca582 100644
--- a/mail/sylpheed2/pkg-descr
+++ b/mail/sylpheed2/pkg-descr
@@ -1,4 +1,4 @@
-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
+Sylpheed is an e-mail client (and news reader) based on GTK+ 2, running on
 X Window System, and aiming for:
   * Quick response
   * Graceful, and sophisticated interface
diff --git a/mail/sylpheed2/pkg-plist b/mail/sylpheed2/pkg-plist
index 41571a5b3dcb..4d852453bf51 100644
--- a/mail/sylpheed2/pkg-plist
+++ b/mail/sylpheed2/pkg-plist
@@ -1,13 +1,13 @@
 bin/sylpheed
 etc/sylpheed-mime.types
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.jp
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.jp
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.jp
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.jp
+%%PORTDOCS%%%%DOCSDIR%%/TODO.ja
 share/locale/cs/LC_MESSAGES/sylpheed.mo
 share/locale/bg/LC_MESSAGES/sylpheed.mo
 share/locale/da/LC_MESSAGES/sylpheed.mo