From matthias.andree@gmx.de  Sun Jan 14 13:20:48 2007
Return-Path: <matthias.andree@gmx.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B84B016A415
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Jan 2007 13:20:48 +0000 (UTC)
	(envelope-from matthias.andree@gmx.de)
Received: from m2a2.dyndns.org (p50913612.dip0.t-ipconnect.de [80.145.54.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 599D513C442
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Jan 2007 13:20:48 +0000 (UTC)
	(envelope-from matthias.andree@gmx.de)
Received: by merlin.emma.line.org (Postfix, from userid 500)
	id C2BA2C859; Sun, 14 Jan 2007 14:20:46 +0100 (CET)
Message-Id: <20070114132046.C2BA2C859@merlin.emma.line.org>
Date: Sun, 14 Jan 2007 14:20:46 +0100 (CET)
From: Matthias Andree <matthias.andree@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] mail/bogofilter: update to 1.1.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         107907
>Category:       ports
>Synopsis:       [MAINTAINER] mail/bogofilter: update to 1.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 14 13:30:17 GMT 2007
>Closed-Date:    Mon Jan 15 15:10:31 GMT 2007
>Last-Modified:  Mon Jan 15 15:20:23 GMT 2007
>Originator:     Matthias Andree
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD merlin.emma.line.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #18: Sun Jan 14 13:10:49 CET 2007
>Description:
- Update to 1.1.4
- add mandir to INSTALL_TARGET
- reset bogofilter-qdbm PORTREVISION after the update.

NOTE WELL: the patch changes files in mail/bogofilter/ and mail/bogofilter-qdbm/!

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- bogofilter-1.1.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile	Tue Jul 11 16:07:25 2006
+++ /usr/home/emma/ports/mail/bogofilter/Makefile	Sun Jan 14 14:06:58 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTVERSION=	1.0.3
+PORTVERSION=	1.1.4
 PORTREVISION?=	0
 CATEGORIES?=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -47,7 +47,7 @@
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" LIBS="${BF_LIBS}" \
 		PERL="${PERL}" CPPFLAGS="${BF_CPPFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALL_TARGET=	install-strip prefix=${PREFIX}
+INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
 
 MAN1=		bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 bogotune.1 \
 		bf_copy.1 bf_compact.1 bf_tar.1
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/distinfo /usr/home/emma/ports/mail/bogofilter/distinfo
--- /usr/ports/mail/bogofilter/distinfo	Tue Jul 11 16:07:25 2006
+++ /usr/home/emma/ports/mail/bogofilter/distinfo	Sun Jan 14 14:07:50 2007
@@ -1,3 +1,3 @@
-MD5 (bogofilter-1.0.3.tar.bz2) = f3ccde59a29c1d3519e31fe7e6a9fd29
-SHA256 (bogofilter-1.0.3.tar.bz2) = 71d9f184ceba98233543a7f620eed6fdd447c38541f7e46a99e2c991f38c5e95
-SIZE (bogofilter-1.0.3.tar.bz2) = 778983
+MD5 (bogofilter-1.1.4.tar.bz2) = 6c72a2e482908cf78288c3bc6b11f57b
+SHA256 (bogofilter-1.1.4.tar.bz2) = 2cd09fac0c1e425d54028415c238627847543a5c03adf7a79d71158129d2b419
+SIZE (bogofilter-1.1.4.tar.bz2) = 797924
--- /usr/ports/mail/bogofilter-qdbm/Makefile	Thu Aug  3 01:33:55 2006
+++ /usr/home/emma/ports/mail/bogofilter-qdbm/Makefile	Fri Dec 29 02:09:39 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bogofilter
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-qdbm
 
--- bogofilter-1.1.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Jan 14 13:45:05 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107907 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Sun Jan 14 15:22:48 UTC 2007 
State-Changed-Why:  
Ask for maintainer fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107907 

From: Matthias Andree <matthias.andree@gmx.de>
To: bug-followup@FreeBSD.org
Cc: matthias.andree@gmx.de,  miwi@freebsd.org
Subject: Re: ports/107907: [MAINTAINER] mail/bogofilter: update to 1.1.4
Date: Sun, 14 Jan 2007 18:13:07 +0100

 This is a multi-part message in MIME format.
 --------------050606050407070801010004
 Content-Type: text/plain; charset=ISO-8859-15
 Content-Transfer-Encoding: 8bit
 
 Please use the attached incremental patch to work around the build issue,
 fix a sporadic build issue that affects /some/ configuration on later
 FreeBSD versions, and fix a programmatic bug which is in the upstream CVS.
 
 -- 
 Matthias Andree
 
 --------------050606050407070801010004
 Content-Type: text/x-patch;
  name="bogofilter-1.1.4-take2.patch"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline;
  filename="bogofilter-1.1.4-take2.patch"
 
 diff -Nur /tmp/bogofilter/Makefile /home/emma/ports/mail/bogofilter/Makef=
 ile
 --- /tmp/bogofilter/Makefile	Sun Jan 14 18:06:02 2007
 +++ /home/emma/ports/mail/bogofilter/Makefile	Sun Jan 14 16:34:06 2007
 @@ -67,7 +67,7 @@
  .endif
 =20
  post-build::
 -	cd ${WRKSRC} && make check SHELL=3D${SH}
 +	cd ${WRKSRC}/src && make check SHELL=3D${SH}
 =20
  post-install::
  	@${MKDIR} ${DOCSDIR}/contrib
 diff -Nur /tmp/bogofilter/files/patch-aa-fix-deptracking /home/emma/ports=
 /mail/bogofilter/files/patch-aa-fix-deptracking
 --- /tmp/bogofilter/files/patch-aa-fix-deptracking	Thu Jan  1 01:00:00 19=
 70
 +++ /home/emma/ports/mail/bogofilter/files/patch-aa-fix-deptracking	Sun J=
 an 14 17:55:31 2007
 @@ -0,0 +1,29 @@
 +--- ./src/Makefile.am.orig	Sat Dec  9 14:53:57 2006
 ++++ ./src/Makefile.am	Sun Jan 14 17:51:18 2007
 +@@ -27,4 +27,6 @@
 + endif
 +=20
 ++BUILT_SOURCES=3D	version.c directories.c
 ++
 + # what to build
 + bin_PROGRAMS =3D bogofilter bogoutil bogolexer bogotune
 +@@ -44,5 +46,4 @@
 + bogoutil_LDADD =3D $(LDADD) $(LIBDB)
 + configtest_LDADD =3D $(LDADD) $(LIBDB)
 +-bogofilter_DEPENDENCIES =3D $(LDADD)
 +=20
 + if NEED_GSL
 +@@ -60,5 +61,5 @@
 + noinst_LIBRARIES +=3D libbf_gsl.a
 + libbf_gsl_a_CPPFLAGS=3D -I$(top_srcdir)
 +-bogofilter_DEPENDENCIES +=3D libbf_gsl.a
 ++BUILT_SOURCES +=3D libbf_gsl.a
 + endif
 +=20
 +@@ -152,6 +153,4 @@
 + 	datastore_db.h \
 + 	mysetvbuf.c mysetvbuf.h
 +-
 +-BUILT_SOURCES=3D	version.c directories.c
 +=20
 + libbogofilter_a_SOURCES =3D \
 diff -Nur /tmp/bogofilter/files/patch-ab-fix-deptracking /home/emma/ports=
 /mail/bogofilter/files/patch-ab-fix-deptracking
 --- /tmp/bogofilter/files/patch-ab-fix-deptracking	Thu Jan  1 01:00:00 19=
 70
 +++ /home/emma/ports/mail/bogofilter/files/patch-ab-fix-deptracking	Sun J=
 an 14 17:55:37 2007
 @@ -0,0 +1,70 @@
 +--- ./src/Makefile.in.orig	Sun Jan 14 17:51:53 2007
 ++++ ./src/Makefile.in	Sun Jan 14 17:52:38 2007
 +@@ -233,4 +233,6 @@
 + am_bogofilter_OBJECTS =3D bogofilter.$(OBJEXT) main.$(OBJEXT)
 + bogofilter_OBJECTS =3D $(am_bogofilter_OBJECTS)
 ++bogofilter_DEPENDENCIES =3D $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_2)=
  \
 ++	$(am__DEPENDENCIES_2)
 + am__objects_5 =3D bogofilter.$(OBJEXT) main.$(OBJEXT)
 + am_bogofilter_static_OBJECTS =3D $(am__objects_5)
 +@@ -384,5 +386,4 @@
 + EXEEXT =3D @EXEEXT@
 + EXE_EXT =3D @EXE_EXT@
 +-GREP =3D @GREP@
 + GSL_CFLAGS =3D @GSL_CFLAGS@
 + GSL_CONFIG =3D @GSL_CONFIG@
 +@@ -443,5 +444,8 @@
 + USE_UNICODE =3D @USE_UNICODE@
 + VERSION =3D @VERSION@
 ++ac_ct_AR =3D @ac_ct_AR@
 + ac_ct_CC =3D @ac_ct_CC@
 ++ac_ct_RANLIB =3D @ac_ct_RANLIB@
 ++ac_ct_STRIP =3D @ac_ct_STRIP@
 + ac_cv_enable_xmlto =3D @ac_cv_enable_xmlto@
 + am__fastdepCC_FALSE =3D @am__fastdepCC_FALSE@
 +@@ -459,7 +463,4 @@
 + build_vendor =3D @build_vendor@
 + datadir =3D @datadir@
 +-datarootdir =3D @datarootdir@
 +-docdir =3D @docdir@
 +-dvidir =3D @dvidir@
 + exec_prefix =3D @exec_prefix@
 + host =3D @host@
 +@@ -468,5 +469,4 @@
 + host_os =3D @host_os@
 + host_vendor =3D @host_vendor@
 +-htmldir =3D @htmldir@
 + includedir =3D @includedir@
 + infodir =3D @infodir@
 +@@ -474,13 +474,10 @@
 + libdir =3D @libdir@
 + libexecdir =3D @libexecdir@
 +-localedir =3D @localedir@
 + localstatedir =3D @localstatedir@
 + mandir =3D @mandir@
 + mkdir_p =3D @mkdir_p@
 + oldincludedir =3D @oldincludedir@
 +-pdfdir =3D @pdfdir@
 + prefix =3D @prefix@
 + program_transform_name =3D @program_transform_name@
 +-psdir =3D @psdir@
 + sbindir =3D @sbindir@
 + sharedstatedir =3D @sharedstatedir@
 +@@ -503,4 +500,5 @@
 +=20
 + AM_CFLAGS =3D -DBOGOFILTER $(am__append_1)
 ++BUILT_SOURCES =3D version.c directories.c $(am__append_4)
 + bin_SCRIPTS =3D bogoupgrade
 + dist_bin_SCRIPTS =3D bf_copy bf_compact bf_tar
 +@@ -514,5 +512,4 @@
 + bogoutil_LDADD =3D $(LDADD) $(LIBDB)
 + configtest_LDADD =3D $(LDADD) $(LIBDB)
 +-bogofilter_DEPENDENCIES =3D $(LDADD) $(am__append_4)
 + @NEED_GSL_TRUE@libbf_gsl_a_CFLAGS =3D $(AM_CFLAGS) -DRENAMEFILES
 + @NEED_GSL_TRUE@libbf_gsl_a_SOURCES =3D \
 +@@ -600,5 +597,4 @@
 + 	mysetvbuf.c mysetvbuf.h
 +=20
 +-BUILT_SOURCES =3D version.c directories.c
 + libbogofilter_a_SOURCES =3D version.c $(version_sources) \
 + 	$(datastore_SOURCE)
 diff -Nur /tmp/bogofilter/files/patch-ba-fix-subnet-tokens /home/emma/por=
 ts/mail/bogofilter/files/patch-ba-fix-subnet-tokens
 --- /tmp/bogofilter/files/patch-ba-fix-subnet-tokens	Thu Jan  1 01:00:00 =
 1970
 +++ /home/emma/ports/mail/bogofilter/files/patch-ba-fix-subnet-tokens	Sun=
  Jan 14 18:01:26 2007
 @@ -0,0 +1,66 @@
 +Index: src/token.c
 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 +RCS file: /cvsroot/bogofilter/bogofilter/src/token.c,v
 +retrieving revision 1.153
 +retrieving revision 1.155
 +diff -u -r1.153 -r1.155
 +--- src/token.c	26 Nov 2006 16:34:30 -0000	1.153
 ++++ src/token.c	12 Jan 2007 00:20:16 -0000	1.155
 +@@ -1,4 +1,4 @@
 +-/* $Id: token.c,v 1.153 2006/11/26 16:34:30 relson Exp $ */
 ++/* $Id: token.c,v 1.155 2007/01/12 00:20:16 relson Exp $ */
 +=20
 + /**********************************************************************=
 *******
 +=20
 +@@ -121,22 +121,17 @@
 +     token_set(dst, src->text, src->leng);
 + }
 +=20
 +-static void build_prefixed_token( word_t *token, word_t *prefix,=20
 ++static void build_prefixed_token( word_t *prefix, word_t *token,
 + 				  word_t *temp, uint32_t temp_size )
 + {
 +-    uint pfx_len =3D (prefix =3D=3D NULL) ? 0 : prefix->leng;
 +-    uint len =3D token->leng + pfx_len;
 ++    uint len =3D token->leng + prefix->leng;
 +    =20
 +     if (len >=3D temp_size)
 +-	len =3D temp_size - pfx_len - 1;
 ++	len =3D temp_size - prefix->leng - 1;
 +=20
 +     temp->leng =3D len;
 +-
 +-    /* copy prefix, if there is one */
 +-    if (prefix !=3D NULL)
 +-	memcpy(temp->text, prefix->text, pfx_len);
 +-
 +-    memcpy(temp->text + pfx_len, token->text, len-pfx_len);
 ++    memmove(temp->text+prefix->leng, token->text, len-prefix->leng);
 ++    memcpy(temp->text, prefix->text, prefix->leng);
 +     Z(temp->text[temp->leng]);
 +=20
 +     token->leng =3D temp->leng;
 +@@ -167,12 +162,11 @@
 +     if (token_prefix !=3D NULL) {
 + 	/* IP addresses get special prefix */
 + 	if (save_class !=3D IPADDR) {
 +-	    build_prefixed_token(token, token_prefix, &yylval, yylval_text_siz=
 e);
 ++	    build_prefixed_token(token_prefix, token, &yylval, yylval_text_siz=
 e);
 + 	}
 + 	else {
 +-
 + 	    word_t *prefix =3D (wordlist_version >=3D IP_PREFIX) ? w_ip : w_ur=
 l;
 +-	    build_prefixed_token(token, prefix, ipsave, max_token_len);
 ++	    build_prefixed_token(prefix, token, &yylval, yylval_text_size);
 + 	}
 +=20
 + 	/* if excessive length caused by prefix, get another token */
 +@@ -198,7 +192,7 @@
 + 	else
 + 	{
 + 	    ipsave->leng =3D (uint) (t - ipsave->text);
 +-	    token_set( &yylval, ipsave->text, ipsave->leng);
 ++	    token_set( token, ipsave->text, ipsave->leng);
 + 	    cls =3D save_class;
 + 	    done =3D true;
 + 	}
 
 --------------050606050407070801010004--

From: Matthias Andree <matthias.andree@gmx.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107907: [MAINTAINER] mail/bogofilter: update to 1.1.4
Date: Mon, 15 Jan 2007 14:31:33 +0100

 If I may suggest to hold off on the release: upstream has issued 1.1.5
 which doesn't require our files/* patches.
 
 I'll see to updating the port to 1.1.5 in the next few days.
 
 Matthias Andree
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 15 15:10:29 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107907 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107907: commit references a PR
Date: Mon, 15 Jan 2007 15:10:28 +0000 (UTC)

 miwi        2007-01-15 15:10:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/bogofilter-qdbm Makefile 
   Log:
   - Reset PORTREVISION after the update.
   
   PR:             ports/107907
   Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
   
   Revision  Changes    Path
   1.23      +1 -1      ports/mail/bogofilter-qdbm/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107907: commit references a PR
Date: Mon, 15 Jan 2007 15:10:31 +0000 (UTC)

 miwi        2007-01-15 15:10:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/bogofilter      Makefile distinfo 
   Added files:
     mail/bogofilter/files patch-aa-fix-deptracking 
                           patch-ab-fix-deptracking 
                           patch-ba-fix-subnet-tokens 
   Log:
   - Update to 1.1.4
   - Add mandir to INSTALL_TARGET
   
   PR:             ports/107907
   Submitted by:   Matthias Andree <matthias.andree@gmx.de> (maintainer)
   
   Revision  Changes    Path
   1.76      +4 -4      ports/mail/bogofilter/Makefile
   1.52      +3 -3      ports/mail/bogofilter/distinfo
   1.1       +29 -0     ports/mail/bogofilter/files/patch-aa-fix-deptracking (new)
   1.1       +70 -0     ports/mail/bogofilter/files/patch-ab-fix-deptracking (new)
   1.1       +61 -0     ports/mail/bogofilter/files/patch-ba-fix-subnet-tokens (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
