Tue Jul 3 10:16:20 2012 UTC ()
This package got broken by the upgrade of the "gnutls" package to
version 3.0.20. Add a patch which fixes one of the problem and mark is
as broken until somebody has the time to fix it.


(tron)
diff -r1.44 -r1.45 pkgsrc/mail/wmbiff/Makefile
diff -r1.13 -r1.14 pkgsrc/mail/wmbiff/distinfo
diff -r0 -r1.1 pkgsrc/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c
cvs diff -r1.44 -r1.45 pkgsrc/mail/wmbiff/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/wmbiff/Makefile 2012/02/06 12:40:51 1.44
+++ pkgsrc/mail/wmbiff/Makefile 2012/07/03 10:16:20 1.45
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.44 2012/02/06 12:40:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.45 2012/07/03 10:16:20 tron Exp $
2 2
3DISTNAME= wmbiff-0.4.26 3DISTNAME= wmbiff-0.4.26
4PKGREVISION= 14 4PKGREVISION= 15
5CATEGORIES= mail x11 windowmaker 5CATEGORIES= mail x11 windowmaker
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://sourceforge.net/projects/wmbiff/ 9HOMEPAGE= http://sourceforge.net/projects/wmbiff/
10COMMENT= xbuffy like "mail-checker" for WindowMaker 10COMMENT= xbuffy like "mail-checker" for WindowMaker
11 11
 12BROKEN= wmbiff doesn't build with GnuTLS 3.0.
 13
12PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
13 15
14USE_TOOLS+= gmake 16USE_TOOLS+= gmake
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16 18
17EX_DIR= ${PREFIX}/share/examples/wmbiff 19EX_DIR= ${PREFIX}/share/examples/wmbiff
18INSTALLATION_DIRS+= ${EX_DIR} 20INSTALLATION_DIRS+= ${EX_DIR}
19 21
20post-install: 22post-install:
21 ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${DESTDIR}${EX_DIR} 23 ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${DESTDIR}${EX_DIR}
22 24
23.include "../../security/gnutls/buildlink3.mk" 25.include "../../security/gnutls/buildlink3.mk"
24.include "../../security/gnutls/libgnutls-config.mk" 26.include "../../security/gnutls/libgnutls-config.mk"
cvs diff -r1.13 -r1.14 pkgsrc/mail/wmbiff/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/wmbiff/distinfo 2005/09/06 15:49:35 1.13
+++ pkgsrc/mail/wmbiff/distinfo 2012/07/03 10:16:20 1.14
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.13 2005/09/06 15:49:35 adam Exp $ 1$NetBSD: distinfo,v 1.14 2012/07/03 10:16:20 tron Exp $
2 2
3SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d 3SHA1 (wmbiff-0.4.26.tar.gz) = cb2fc49bc741209c22d8a50f0f164e34c4a9332d
4RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883 4RMD160 (wmbiff-0.4.26.tar.gz) = f5ccb17fb6846283cb7cde7996310a65600a8883
5Size (wmbiff-0.4.26.tar.gz) = 200237 bytes 5Size (wmbiff-0.4.26.tar.gz) = 200237 bytes
6SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b 6SHA1 (patch-aa) = 0a4607f2e5d6d3066d9b9994665b659dfbcc003b
7SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d 7SHA1 (patch-ab) = d84f1c4333d7c192748f5170460563ae7fe0955d
8SHA1 (patch-ac) = d7abfc902dffdfa646957d1bc0157e1ee59dfb86 8SHA1 (patch-ac) = d7abfc902dffdfa646957d1bc0157e1ee59dfb86
 9SHA1 (patch-wmbiff_gnutls-common.c) = fd9f29a6ead51d4479c6d4fedbcbc905f94b9b54
File Added: pkgsrc/mail/wmbiff/patches/patch-wmbiff_gnutls-common.c
$NetBSD: patch-wmbiff_gnutls-common.c,v 1.1 2012/07/03 10:16:20 tron Exp $

Fix build with GnuTLS 3.0.

--- wmbiff/gnutls-common.c.orig	2004-06-23 03:52:42.000000000 +0100
+++ wmbiff/gnutls-common.c	2012-07-03 10:56:31.000000000 +0100
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
 #include <gnutls/x509.h>
 #include <gnutls/openpgp.h>
 #include <time.h>
@@ -508,7 +507,6 @@
 
 	printf("Compression methods:");
 	printf(" ZLIB");
-	printf(", LZO");
 	printf(", NULL\n");
 }
 
@@ -636,8 +634,6 @@
 				comp_priority[j++] = GNUTLS_COMP_NULL;
 			if (strncasecmp(comp[i], "ZLI", 3) == 0)
 				comp_priority[j++] = GNUTLS_COMP_ZLIB;
-			if (strncasecmp(comp[i], "LZO", 3) == 0)
-				comp_priority[j++] = GNUTLS_COMP_LZO;
 		}
 		comp_priority[j] = 0;
 	}