wmbiff: Fix build.

3 files changed, 44 insertions, 3 deletions

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index eceaf1cfc0f..8a097cb6254 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.68 2021/04/21 13:24:59 adam Exp $
+# $NetBSD: Makefile,v 1.69 2021/06/21 15:07:06 nia Exp $
 
 DISTNAME=	wmbiff-0.4.26
-PKGREVISION=	33
+PKGREVISION=	34
 CATEGORIES=	mail x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wmbiff/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sourceforge.net/projects/wmbiff/
 COMMENT=	WindowMaker xbuffy-like "mail-checker"
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--disable-libgcrypttest
+
 EX_DIR=		${PREFIX}/share/examples/wmbiff
 
 INSTALLATION_DIRS+=	${EX_DIR}
@@ -21,6 +24,7 @@ post-install:
 
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/gnutls/libgnutls-config.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 464248db761..0257bad9cc1 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2016/10/01 13:03:10 joerg Exp $
+$NetBSD: distinfo,v 1.19 2021/06/21 15:07:06 nia Exp $
 
 SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d
 RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883
@@ -7,4 +7,5 @@ Size (wmbiff-0.4.26.tar.gz) = 200237 bytes
 SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b
 SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d
 SHA1 (patch-ac) = 8c7da1f23d72c3530d33f1faa141d39a7a8b84da
+SHA1 (patch-wmbiff_Makefile.in) = 9e54cf21f193d02b92b934dabd9e8702a6cb05b8
 SHA1 (patch-wmbiff_gnutls-common.c) = 645e2c2f463d20cf063f4a2ab0c6268daaa0cc85
diff --git a/mail/wmbiff/patches/patch-wmbiff_Makefile.in b/mail/wmbiff/patches/patch-wmbiff_Makefile.in
new file mode 100644
index 00000000000..338c78a64cf
--- /dev/null
+++ b/mail/wmbiff/patches/patch-wmbiff_Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-wmbiff_Makefile.in,v 1.1 2021/06/21 15:07:06 nia Exp $
+
+Avoid building test programs. They do nasty things like override
+read() and select() that conflicts with SSP.
+
+--- wmbiff/Makefile.in.orig	2004-10-11 00:34:02.000000000 +0000
++++ wmbiff/Makefile.in
+@@ -121,8 +121,8 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-TESTS = test_wmbiff test_tlscomm
+-noinst_PROGRAMS = test_wmbiff test_tlscomm
++TESTS =
++noinst_PROGRAMS =
+ bin_PROGRAMS = wmbiff
+ wmbiff_SOURCES = wmbiff.c socket.c Pop3Client.c LicqClient.c mboxClient.c \
+ 	maildirClient.c Imap4Client.c tlsComm.c tlsComm.h ShellClient.c  \
+@@ -154,7 +154,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/a
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = wmbiffrc.5
+ bin_PROGRAMS = wmbiff$(EXEEXT)
+-noinst_PROGRAMS = test_wmbiff$(EXEEXT) test_tlscomm$(EXEEXT)
++noinst_PROGRAMS =
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ 
+ am_test_tlscomm_OBJECTS = test_tlscomm.$(OBJEXT) tlsComm.$(OBJEXT)
+@@ -205,7 +205,7 @@ MANS = $(man_MANS)
+ DATA = $(skin_DATA)
+ 
+ DIST_COMMON = $(srcdir)/Makefile.in Makefile.am wmbiffrc.5.in
+-SOURCES = $(test_tlscomm_SOURCES) $(test_wmbiff_SOURCES) $(EXTRA_test_wmbiff_SOURCES) $(wmbiff_SOURCES) $(EXTRA_wmbiff_SOURCES)
++SOURCES = $(wmbiff_SOURCES) $(EXTRA_wmbiff_SOURCES)
+ 
+ all: all-am
+