- Upgrade to 0.4.24 (which also unbreaks GNUTLS support).

- Use OPTIONS for enabling/disabling GNUTLS support.
- Remove auto detection of GNUTLS (in favor of OPTIONS).
- Don't actually use GNUTLS unless the GNUTLS option is enabled.

Approved by:	erwin

2 files changed, 7 insertions, 8 deletions

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index d1ce2daeda2a..18a03407c2d6 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		wmbiff
-PORTVERSION=		0.4.20
+PORTVERSION=		0.4.24
 CATEGORIES=		mail windowmaker afterstep
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,20 +16,19 @@ COMMENT=		An xbiff-like Window Maker dock app
 
 USE_X_PREFIX=		yes
 
-.include <bsd.port.pre.mk>
+OPTIONS=		GNUTLS "Support for SSL" off
 
-.if exists(${LOCALBASE}/lib/libgnutls.so.12)
-WITH_GNUTLS=		yes
-.endif
+.include <bsd.port.pre.mk>
 
 .ifdef WITH_GNUTLS
 LIB_DEPENDS+=		gcrypt.12:${PORTSDIR}/security/libgcrypt \
 			gnutls.12:${PORTSDIR}/security/gnutls
+.else
+CONFIGURE_ARGS+=	--disable-crypto
 .endif
 
 USE_XPM=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 MAN1=			wmbiff.1
 MAN5=			wmbiffrc.5
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index e18f7978fe43..e95c90bb0b32 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmbiff-0.4.20.tar.gz) = e9f93c4618e6ab35f4d89ced2ea477f5
-SIZE (wmbiff-0.4.20.tar.gz) = 194161
+MD5 (wmbiff-0.4.24.tar.gz) = 37a58123d6adb1a2d23a0aac36d81efb
+SIZE (wmbiff-0.4.24.tar.gz) = 198555