4 files changed, 36 insertions, 24 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 7f7843318db6..f8b37a0c369f 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -502,8 +502,9 @@
     SUBDIR += svnmailer
     SUBDIR += swaks
     SUBDIR += sylpheed
-    SUBDIR += sylpheed2
     SUBDIR += sylpheed-claws
+    SUBDIR += sylpheed2
+    SUBDIR += sylpheed2-devel
     SUBDIR += sympa
     SUBDIR += sympa-elixus
     SUBDIR += sympa5
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 3ce0ec43a5cf..25dfc180b00e 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -1,23 +1,24 @@
-# New ports collection makefile for:	sylpheed
-# Date created:                 15 June 2000
-# Whom:                         shigeri <shigeri@m10.alpha-net.ne.jp>
+# New ports collection makefile for:	sylpheed2-devel
+# Date created:				2005-09-10
+# Whom:					nork@FreeBSD.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.3
 PORTREVISION=	0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.0/ \
+MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.1/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws/
 
-MAINTAINER=	oliver@FreeBSD.org
+MAINTAINER=	nork@FreeBSD.org
 COMMENT=	A lightweight, featureful, and fast GTK+ based e-mail client
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
+LATEST_LINK=	${PORTNAME}2-devel
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -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,33 @@ 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
-.else
-CONFIGURE_ARGS+=--disable-ssl
+
+.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 +119,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-devel/distinfo b/mail/sylpheed2-devel/distinfo
index 6e42cf5d6868..c0f0f968a4b0 100644
--- a/mail/sylpheed2-devel/distinfo
+++ b/mail/sylpheed2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (sylpheed-2.0.1.tar.bz2) = 7e8c8fdd427935349c4a57cf33fdf68a
-SIZE (sylpheed-2.0.1.tar.bz2) = 2323171
+MD5 (sylpheed-2.1.3.tar.bz2) = 57f874501c5b0e52b8ec1959fe0359be
+SIZE (sylpheed-2.1.3.tar.bz2) = 2366669
diff --git a/mail/sylpheed2-devel/files/patch-ac b/mail/sylpheed2-devel/files/patch-libsylph-defs.h
index 86cde54e6a53..7881004694d3 100644
--- a/mail/sylpheed2-devel/files/patch-ac
+++ b/mail/sylpheed2-devel/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