- Update to 0.9.8a.20040109

- use OPTIONS macro
While I'm here:
- Add CONFLICTS

PR:             61747
Submitted by:   Jean-Yves Lefort <jylefort@brutele.be> (maintainer)

4 files changed, 20 insertions, 46 deletions

diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 3a9abd394efa..362f6c173602 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -6,24 +6,35 @@
 #
 
 PORTNAME=		sylpheed-gtk2
-PORTVERSION=		0.9.5.20030906
+PORTVERSION=		0.9.8a.20040109
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		sylpheed-0.9.5-gtk2-20030906
+DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
 
 MAINTAINER=		jylefort@brutele.be
-COMMENT=		The GTK+ 2.0 port of a lightweight, featureful, and fast e-mail client
+COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
+
+LIB_DEPENDS=		intl.5:${PORTSDIR}/devel/gettext \
+			iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
+USE_OPENSSL=		yes
 USE_LIBTOOL=		yes
 USE_REINPLACE=		yes
 
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS=		--prefix=${PREFIX} --enable-ipv6
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=		--enable-ssl
+
+OPTIONS=		GPGME "GnuPG support (using GPGME)" no \
+			COMPFACE "X-Face support (using compface)" no \
+			JPILOT "JPilot support" no \
+			LDAP "LDAP support" no
+
+CONFLICTS=		sylpheed-0.*
 
 .include <bsd.port.pre.mk>
 
@@ -31,13 +42,10 @@ CONFIGURE_ARGS=		--prefix=${PREFIX} --enable-ipv6
 LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
 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
@@ -46,22 +54,11 @@ CONFIGURE_ARGS+=	--disable-compface
 LIB_DEPENDS+=		pisock.8:${PORTSDIR}/palm/pilot-link
 RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
 CONFIGURE_ARGS+=	--enable-jpilot
-.else
-CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 
 .if defined(WITH_LDAP)
 LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=	--enable-ldap
-.else
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
-
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=		yes
-CONFIGURE_ARGS+=	--enable-ssl
-.else
-CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 MAKEFILES=		Makefile.in		\
@@ -77,18 +74,6 @@ MAKEFILES=		Makefile.in		\
 			manual/ja/Makefile.in	\
 			src/Makefile.in
 
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "      WITH_GPGME=yes    Enable GnuPG support using GPGME."
-	@${ECHO} "      WITH_COMPFACE=yes Enable X-Face support."
-	@${ECHO} "      WITH_JPILOT=yes   Enable JPilot support."
-	@${ECHO} "      WITH_LDAP=yes     Enable LDAP support."
-	@${ECHO} ""
-	@${ECHO} "      WITHOUT_SSL=yes   Disable OpenSSL support."
-	@${ECHO} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
 		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo
index a381b7df02e3..a63ffef708c1 100644
--- a/mail/sylpheed-gtk2/distinfo
+++ b/mail/sylpheed-gtk2/distinfo
@@ -1 +1 @@
-MD5 (sylpheed-0.9.5-gtk2-20030906.tar.gz) = ae2897cccae428cfbbe490d2e3d20500
+MD5 (sylpheed-0.9.8a-gtk2-20040109.tar.gz) = fcd6e7789f2ff1f990354d089f1a4dc1
diff --git a/mail/sylpheed-gtk2/files/patch-ba b/mail/sylpheed-gtk2/files/patch-ba
deleted file mode 100644
index a6a44c7db7f8..000000000000
--- a/mail/sylpheed-gtk2/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig	Thu Sep 25 12:15:12 2003
-+++ po/Makefile.in.in	Thu Sep 25 12:16:23 2003
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/mail/sylpheed-gtk2/files/patch-aa b/mail/sylpheed-gtk2/files/patch-src::defs.h
index 1a6c2a8f0c0a..f9204c37584e 100644
--- a/mail/sylpheed-gtk2/files/patch-aa
+++ b/mail/sylpheed-gtk2/files/patch-src::defs.h
@@ -1,5 +1,5 @@
---- src/defs.h.orig	Thu Sep 25 11:14:02 2003
-+++ src/defs.h	Thu Sep 25 11:15:26 2003
+--- src/defs.h.orig	Sun Sep  7 06:09:06 2003
++++ src/defs.h	Thu Jan 22 20:23:18 2004
 @@ -64,7 +64,7 @@
  #define MARK_VERSION		2