Update to new upstream release 1.2.4 which basically only contained what

patches we hade in the 1.2.3 port.

9 files changed, 6 insertions, 166 deletions

diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 20955be621af..573888f320dd 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-sqlite
 
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index 2de20ddbc461..b8c3060b6328 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tc
 
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index ee7640bb9081..c87cfd4149a6 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	bogofilter
-PORTVERSION=	1.2.3
-PORTREVISION?=	1
+PORTVERSION=	1.2.4
+PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION}
 
diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo
index 743ece9c2fb7..edf94524a2e7 100644
--- a/mail/bogofilter/distinfo
+++ b/mail/bogofilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bogofilter-1.2.3.tar.bz2) = 8ed85fc5ff03d9b07986ee2ce33e1149e30abe2ad8bae1d0c94503ccd2c92e76
-SIZE (bogofilter-1.2.3.tar.bz2) = 868902
+SHA256 (bogofilter-1.2.4.tar.bz2) = e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4
+SIZE (bogofilter-1.2.4.tar.bz2) = 887848
diff --git a/mail/bogofilter/files/patch-SVNr6988-lexer b/mail/bogofilter/files/patch-SVNr6988-lexer
deleted file mode 100644
index b86996bdcd9e..000000000000
--- a/mail/bogofilter/files/patch-SVNr6988-lexer
+++ /dev/null
@@ -1,113 +0,0 @@
-| Upstream SVN revision 6988, without "NEWS":
-|
-Index: src/msgcounts.c
-===================================================================
---- src/msgcounts.c	(Revision 6987)
-+++ src/msgcounts.c	(Revision 6988)
-@@ -85,3 +85,9 @@
- 
-     msg_count_header_len= strlen(msg_count_header);
- }
-+
-+long msg_count_get_token(byte **output)
-+{
-+    *output = (byte *)msg_count_text;
-+    return msg_count_leng;
-+}
-Index: src/msgcounts.h
-===================================================================
---- src/msgcounts.h	(Revision 6987)
-+++ src/msgcounts.h	(Revision 6988)
-@@ -30,4 +30,6 @@
- void set_msg_counts(u_int32_t good, u_int32_t spam);
- void set_msg_counts_from_str(char  *str);
- 
-+long msg_count_get_token(byte **output);
-+
- #endif	/* MSGCOUNTS_H */
-Index: src/lexer_v3.l
-===================================================================
---- src/lexer_v3.l	(Revision 6987)
-+++ src/lexer_v3.l	(Revision 6988)
-@@ -241,7 +241,7 @@
- <INITIAL>^Content-(Transfer-Encoding|Type|Disposition):{MTYPE}	{ mime_content(yy_text()); skip_to(':'); header(); return TOKEN; }
- 
- <INITIAL>^Message-ID:.*				{ /* save token for logging */
--						  int off = 11;
-+						  unsigned long off = 11;
- 						  while(isspace((unsigned char)yytext[off]) && off < yyleng)
- 						      off++;
- 						  set_msg_id((unsigned char *)(yytext+off), yyleng-off);
-@@ -470,6 +470,12 @@
- #endif
- }
- 
-+long lexer_v3_get_token(byte **output)
-+{
-+	*output = (byte *)yytext;
-+	return yyleng;
-+}
-+
- /*
-  * The following sets edit modes for GNU EMACS
-  * Local Variables:
-Index: src/token.c
-===================================================================
---- src/token.c	(Revision 6987)
-+++ src/token.c	(Revision 6988)
-@@ -205,8 +205,7 @@
- 
- 	cls = (*lexer->yylex)();
- 
--	token->leng = (uint)   *lexer->yyleng;
--	token->u.text = (byte *) *lexer->yytext;
-+	token->leng = lexer->get_parser_token(&token->u.text);
- 	Z(token->u.text[token->leng]);	/* for easier debugging - removable */
- 
- 	leng = token->leng;
-Index: src/lexer.c
-===================================================================
---- src/lexer.c	(Revision 6987)
-+++ src/lexer.c	(Revision 6988)
-@@ -43,14 +43,12 @@
- 
- static lexer_t v3_lexer = {
-     yylex,
--    &yytext,
--    &yyleng
-+    lexer_v3_get_token
- };
- 
- lexer_t msg_count_lexer = {
-     read_msg_count_line,
--    &msg_count_text,
--    &msg_count_leng
-+    msg_count_get_token
- };
- 
- /* Function Prototypes */
-Index: src/lexer.h
-===================================================================
---- src/lexer.h	(Revision 6987)
-+++ src/lexer.h	(Revision 6988)
-@@ -47,8 +47,7 @@
- 
- typedef struct lexer_s {
-     yylex_t  *yylex;
--    char    **yytext;
--    int      *yyleng; /* DO NOT EVEN CONSIDER MAKING THIS SIZE_T! */
-+    long (*get_parser_token)(byte **data);
- } lexer_t;
- 
- extern lexer_t *lexer;
-@@ -56,9 +55,8 @@
- 
- /* in lexer_v3.l */
- extern token_t	yylex(void);
--extern int	yyleng;
--extern char   * yytext;
- extern void	lexer_v3_init(FILE *fp);
-+extern long	lexer_v3_get_token(byte **output);
- 
- /* in lexer_v?.c */
- extern char yy_get_state(void);
diff --git a/mail/bogofilter/files/patch-SVNr6989 b/mail/bogofilter/files/patch-SVNr6989
deleted file mode 100644
index ce087c919b73..000000000000
--- a/mail/bogofilter/files/patch-SVNr6989
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bogoconfig.c	(Revision 6988)
-+++ src/bogoconfig.c	(Revision 6989)
-@@ -102,7 +102,7 @@
-     LONGOPTIONS_DB
-     /* bogofilter specific options */
-     { "classify-files",			N, 0, 'B' },
--    { "syslog-tag",			N, 0, 'L' },
-+    { "syslog-tag",			R, 0, 'L' },
-     { "classify-mbox",			N, 0, 'M' },
-     { "unregister-nonspam",		N, 0, 'N' },
-     { "dataframe",			N, 0, 'R' },
diff --git a/mail/bogofilter/files/patch-SVNr6990 b/mail/bogofilter/files/patch-SVNr6990
deleted file mode 100644
index 5cf982e5f243..000000000000
--- a/mail/bogofilter/files/patch-SVNr6990
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/bogotune.c	(Revision 6989)
-+++ src/bogotune.c	(Revision 6990)
-@@ -1852,6 +1852,11 @@
- 	if (ds_path == NULL)
- 	    ds_path = get_directory(PR_ENV_HOME);
- 
-+	if (ds_path == NULL) {
-+	    fprintf(stderr, "Cannot derive bogofilter directory from environment, aborting.\n");
-+	    exit(EX_ERROR);
-+	}
-+
- 	set_bogohome(ds_path);
- 	bfp = bfpath_create(ds_path);
- 
diff --git a/mail/bogofilter/files/patch-SVNr6991 b/mail/bogofilter/files/patch-SVNr6991
deleted file mode 100644
index 393103d22d86..000000000000
--- a/mail/bogofilter/files/patch-SVNr6991
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/longoptions.h	(Revision 6990)
-+++ src/longoptions.h	(Revision 6991)
-@@ -133,7 +133,7 @@
- 
- #define LONGOPTIONS_DB \
-     { "db-transaction",			R, 0, O_DB_TRANSACTION }, \
--    { "timestamp-date",			N, 0, 'y' }, \
-+    { "timestamp-date",			R, 0, 'y' }, \
-     lo1 lo2
- 
- #endif
diff --git a/mail/bogofilter/files/patch-SVNr6993-minimal b/mail/bogofilter/files/patch-SVNr6993-minimal
deleted file mode 100644
index 4d8a0c123bb0..000000000000
--- a/mail/bogofilter/files/patch-SVNr6993-minimal
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bogoconfig.c	(Revision 6992)
-+++ src/bogoconfig.c	(Revision 6993)
-@@ -121,7 +121,7 @@
-     { "debug-to-stdout",		N, 0, 'D' },
-     { "no-header-tags",			N, 0, 'H' },
-     { "query",				N, 0, 'Q' },
--    { "db-cachesize",			N, 0, 'k' },
-+    { "db-cachesize",			R, 0, 'k' },
-     { "ns-esf",				R, 0, O_NS_ESF },
-     { "sp-esf",				R, 0, O_SP_ESF },
-     { "ham-cutoff",			R, 0, O_HAM_CUTOFF },