From 97e41865c6e3a230894ad70e48dd7f05d6dbb008 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 1 Sep 2001 18:50:27 +0000
Subject: [PATCH] - update to 0.6.0 - enable SSL - enable IPv6 - add compface
 flavor - turn pixbuf flavor into unflavored default

submitted by maintainer Damien Couderc <couderc.damien@wanadoo.fr>
---
 mail/sylpheed/Makefile  | 37 +++++++++++++++++++++----------------
 mail/sylpheed/files/md5 |  6 +++---
 mail/sylpheed/pkg/DESCR |  8 ++++----
 mail/sylpheed/pkg/PLIST | 25 ++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 297bd12ad33..4169943e338 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2001/07/30 17:49:05 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2001/09/01 18:50:27 naddy Exp $
 
 COMMENT=	"mail/news client in gtk+"
 
-DISTNAME=	sylpheed-0.5.1
+DISTNAME=	sylpheed-0.6.0
 CATEGORIES=    	mail news x11
-NEED_VERSION=	1.427
+NEED_VERSION=	1.440
 HOMEPAGE=	http://sylpheed.good-day.net
 
 MAINTAINER=	Damien Couderc <couderc.damien@wanadoo.fr>
@@ -16,24 +16,21 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}/sylpheed/
 
-USE_X11=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --disable-glibtest
+CONFIGURE_ARGS= --enable-ssl \
+		--enable-ipv6
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
                 LDFLAGS="-L${LOCALBASE}/lib"
 
-FLAVORS=	imlib pixbuf gpgme
-FLAVOR?=	pixbuf
+FLAVORS=	compface gpgme imlib
+FLAVOR?=
 
-.if ${FLAVOR:L:Mimlib}
-LIB_DEPENDS=	gtk.1.2::x11/gtk+ \
-		gdk_imlib.19::graphics/imlib
-CONFIGURE_ARGS+=	--disable-gdk-pixbuf
-.endif
-.if ${FLAVOR:L:Mpixbuf}
-LIB_DEPENDS=	gtk.1.2::x11/gtk+ \
-		gdk_pixbuf::graphics/gdk-pixbuf
-CONFIGURE_ARGS+=	--disable-imlib
+.if ${FLAVOR:L:Mcompface}
+PERMIT_PACKAGE_CDROM=	"No Fee"
+PERMIT_DISTFILES_CDROM=	"No Fee"
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcompface.a::graphics/compface
+.else
+CONFIGURE_ARGS+= --disable-compface
 .endif
 
 .if ${FLAVOR:L:Mgpgme}
@@ -43,4 +40,12 @@ CONFIGURE_ARGS+= --enable-gpgme
 CONFIGURE_ARGS+= --disable-gpgme
 .endif
 
+.if ${FLAVOR:L:Mimlib}
+LIB_DEPENDS+=	gdk_imlib.19::graphics/imlib
+CONFIGURE_ARGS+= --disable-gdk-pixbuf
+.else
+LIB_DEPENDS+=	gdk_pixbuf.2::graphics/gdk-pixbuf
+CONFIGURE_ARGS+= --disable-imlib
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/sylpheed/files/md5 b/mail/sylpheed/files/md5
index 2f9b4136971..5d5d1289ea5 100644
--- a/mail/sylpheed/files/md5
+++ b/mail/sylpheed/files/md5
@@ -1,3 +1,3 @@
-MD5 (sylpheed-0.5.1.tar.gz) = 8a27031d6b17431ec7a7a90456ce07bf
-RMD160 (sylpheed-0.5.1.tar.gz) = fbdb00313896a50a20da07dbfd33a519aa15de76
-SHA1 (sylpheed-0.5.1.tar.gz) = 946c69cae60b98a1b1cfc44f41cf798ab777af0a
+MD5 (sylpheed-0.6.0.tar.gz) = aa3a3b77c061b0a274d915bc18e5aa2c
+RMD160 (sylpheed-0.6.0.tar.gz) = cc1706cb2ee119ec3558f4b912ebef234386b7ea
+SHA1 (sylpheed-0.6.0.tar.gz) = 2b22823867a2f740d80b99ca5e560f86914dce11
diff --git a/mail/sylpheed/pkg/DESCR b/mail/sylpheed/pkg/DESCR
index e7b00f2b5c9..3ff2ddbcb5b 100644
--- a/mail/sylpheed/pkg/DESCR
+++ b/mail/sylpheed/pkg/DESCR
@@ -8,7 +8,7 @@ on the X Window System, and aiming for:
 
 WWW: ${HOMEPAGE}
 
-FLAVORS :
-	* pixbuf : use gdk_pixbuf as graphic library (default)
-	* imlib	: use imlib as graphic library
-	* gpgme : compile with gnupg made easy support
+FLAVORS:
+	* compface: support X-Face header
+	* gpgme: compile with gnupg made easy support
+	* imlib: use imlib instead of gdk_pixbuf as graphic library
diff --git a/mail/sylpheed/pkg/PLIST b/mail/sylpheed/pkg/PLIST
index 4473feb4ae4..395ef81c085 100644
--- a/mail/sylpheed/pkg/PLIST
+++ b/mail/sylpheed/pkg/PLIST
@@ -1,5 +1,27 @@
-@comment $OpenBSD: PLIST,v 1.4 2001/07/29 18:34:34 shell Exp $
+@comment $OpenBSD: PLIST,v 1.5 2001/09/01 18:50:28 naddy Exp $
 bin/sylpheed
+share/sylpheed/manual/en/sylpheed-1.html
+share/sylpheed/manual/en/sylpheed-10.html
+share/sylpheed/manual/en/sylpheed-11.html
+share/sylpheed/manual/en/sylpheed-12.html
+share/sylpheed/manual/en/sylpheed-13.html
+share/sylpheed/manual/en/sylpheed-14.html
+share/sylpheed/manual/en/sylpheed-15.html
+share/sylpheed/manual/en/sylpheed-16.html
+share/sylpheed/manual/en/sylpheed-17.html
+share/sylpheed/manual/en/sylpheed-18.html
+share/sylpheed/manual/en/sylpheed-19.html
+share/sylpheed/manual/en/sylpheed-2.html
+share/sylpheed/manual/en/sylpheed-20.html
+share/sylpheed/manual/en/sylpheed-21.html
+share/sylpheed/manual/en/sylpheed-3.html
+share/sylpheed/manual/en/sylpheed-4.html
+share/sylpheed/manual/en/sylpheed-5.html
+share/sylpheed/manual/en/sylpheed-6.html
+share/sylpheed/manual/en/sylpheed-7.html
+share/sylpheed/manual/en/sylpheed-8.html
+share/sylpheed/manual/en/sylpheed-9.html
+share/sylpheed/manual/en/sylpheed.html
 share/sylpheed/manual/ja/sylpheed-1.html
 share/sylpheed/manual/ja/sylpheed-10.html
 share/sylpheed/manual/ja/sylpheed-11.html
@@ -20,5 +42,6 @@ share/sylpheed/manual/ja/sylpheed-9.html
 share/sylpheed/manual/ja/sylpheed.html
 share/sylpheed/manual/ja/sylpheed.sgml
 @dirrm share/sylpheed/manual/ja
+@dirrm share/sylpheed/manual/en
 @dirrm share/sylpheed/manual
 @dirrm share/sylpheed