From 2fcee47a69c73e559e6894177ce11b1853f59503 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Thu, 8 Jan 2004 11:55:30 +0000
Subject: [PATCH] - Update to version 0.4.20. - Autodetect if gnutls is
 installed to get dependencies right.

Approved by:	edwin
---
 mail/wmbiff/Makefile | 19 +++++++++++++------
 mail/wmbiff/distinfo |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index d04bbfb79d2a..7ade7f2478f3 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		wmbiff
-PORTVERSION=		0.4.19
+PORTVERSION=		0.4.20
 CATEGORIES=		mail windowmaker afterstep
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,12 +14,19 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		simon@FreeBSD.org
 COMMENT=		An xbiff-like Window Maker dock app
 
-.ifdef WITH_GNUTLS
-LIB_DEPENDS=		gcrypt:${PORTSDIR}/security/libgcrypt \
-			gnutls:${PORTSDIR}/security/gnutls
+USE_X_PREFIX=		yes
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libgnutls.so.7)
+WITH_GNUTLS=		yes
+.endif
+
+.ifdef WITH_GNUTLS
+LIB_DEPENDS+=		gcrypt.6:${PORTSDIR}/security/libgcrypt \
+			gnutls.7:${PORTSDIR}/security/gnutls
 .endif
 
-USE_X_PREFIX=		yes
 USE_XPM=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -32,4 +39,4 @@ post-install:
 	@${ECHO_MSG} "===>   Modify it to suit your needs and copy to ~/.wmbiffrc"
 	@${INSTALL_DATA} -m 644 ${WRKSRC}/wmbiff/sample.wmbiffrc ${DATADIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 2a05eec8b6e1..8765ff071671 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1 +1 @@
-MD5 (wmbiff-0.4.19.tar.gz) = b03959da8e802cdd6ad3b76a04ba99d3
+MD5 (wmbiff-0.4.20.tar.gz) = e9f93c4618e6ab35f4d89ced2ea477f5