- Update to 2.2.6

PR:		ports/118446
Submitted by:	Derkjan de Haan <haanjdj@gmail.com>
Approved by:	Mark Starovoytov <mark_sf@kikg.ifmo.ru> (maintainer)

3 files changed, 4 insertions, 54 deletions

diff --git a/mail/libsieve/Makefile b/mail/libsieve/Makefile
index 8cd229dbef08..395bc838bd2e 100644
--- a/mail/libsieve/Makefile
+++ b/mail/libsieve/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libsieve
-PORTVERSION=	2.2.5
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	libsieve
@@ -24,7 +23,5 @@ BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/src
 USE_BISON=	build
 USE_LDCONFIG=	yes
-# get rid of the `size_t' problem in header.y
-USE_GCC=	3.2+
 
 .include <bsd.port.mk>
diff --git a/mail/libsieve/distinfo b/mail/libsieve/distinfo
index 11811e79cd29..6a0029da320c 100644
--- a/mail/libsieve/distinfo
+++ b/mail/libsieve/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsieve-2.2.5.tar.gz) = f0adbfa59254d07611d907f78aaa20cd
-SHA256 (libsieve-2.2.5.tar.gz) = c449830592eebe1651f072bda524427134a52d9873b4a2d4725e076388911db8
-SIZE (libsieve-2.2.5.tar.gz) = 573924
+MD5 (libsieve-2.2.6.tar.gz) = c97050a3e823de8f6e960ab92cd8bd98
+SHA256 (libsieve-2.2.6.tar.gz) = dce45d73fba98afbffc6fbb6743b3f727cd41d5d3b09ac398a0cb90b21e7f0f0
+SIZE (libsieve-2.2.6.tar.gz) = 564722
diff --git a/mail/libsieve/files/patch-freebsd4_fix b/mail/libsieve/files/patch-freebsd4_fix
deleted file mode 100644
index 9bc8b5e54f6f..000000000000
--- a/mail/libsieve/files/patch-freebsd4_fix
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sv_interface/tree.h.orig	Tue Jul 18 17:17:23 2006
-+++ src/sv_interface/tree.h	Mon Aug  7 10:11:05 2006
-@@ -30,7 +30,7 @@
- 
- #include "comparator.h"
- 
--//#include <sys/types.h>
-+#include <sys/types.h>
- #include "regex.h"
- 
- 
---- src/sv_parser/comparator.h	Tue Jul 18 17:15:16 2006
-+++ src/sv_parser/comparator.h	Mon Aug  7 10:05:29 2006
-@@ -27,6 +27,8 @@
- #ifndef COMPARATOR_H
- #define COMPARATOR_H
- 
-+// sys/types.h was required prior to the FreeBSD 5.0
-+#include <sys/types.h>
- #include "regex.h"
- 
- /* compares pat to text; returns 1 if it's true, 0 otherwise 
---- src/sv_parser/sieve.y.orig	Mon Jul 24 14:24:53 2006
-+++ src/sv_parser/sieve.y	Mon Aug  7 10:28:04 2006
-@@ -36,6 +36,9 @@
- #include <ctype.h>
- 
- /* sv_regex */
-+/* POSIX says that <sys/types.h> must be included (by the caller) before
-+   <regex.h>.  */
-+#include <sys/types.h>
- #include "regex.h"
- 
- /* sv_parser */
---- src/sv_util/xsize.h.orig	Tue Jul 18 17:15:16 2006
-+++ src/sv_util/xsize.h	Mon Aug  7 10:47:36 2006
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #if HAVE_STDINT_H
- # include <stdint.h>
-+#else
-+// stdint.h was introduced in FreeBSD 5.0
-+// limits.h in 4.0 has SIZE_T_MAX, not SIZE_MAX
-+# define SIZE_MAX SIZE_T_MAX
- #endif
- 
- /* The size of memory objects is often computed through expressions of