From owner-freebsd-ports Sat Nov 30 19:20:13 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CD2F37B401 for ; Sat, 30 Nov 2002 19:20:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4E5A43ECD for ; Sat, 30 Nov 2002 19:20:00 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gB13K0x3045470 for ; Sat, 30 Nov 2002 19:20:00 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gB13K0p0045469; Sat, 30 Nov 2002 19:20:00 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9409B37B401 for ; Sat, 30 Nov 2002 19:19:48 -0800 (PST) Received: from mail.dt.e-technik.uni-dortmund.de (krusty.dt.E-Technik.Uni-Dortmund.DE [129.217.163.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2587943E4A for ; Sat, 30 Nov 2002 19:19:47 -0800 (PST) (envelope-from matthias.andree@web.de) Received: from m2a2.yi.org (krusty.dt.e-technik.uni-dortmund.de [129.217.163.1]) by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id 88B97A3841 for ; Sun, 1 Dec 2002 04:19:43 +0100 (CET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.0.2]) by merlin.emma.line.org (Postfix) with ESMTP id 508CA6B8BF; Sun, 1 Dec 2002 04:19:38 +0100 (CET) Received: from libertas.emma.line.org (localhost [127.0.0.1]) by libertas.emma.line.org (8.12.6/8.12.6) with ESMTP id gB13Jbu6026133; Sun, 1 Dec 2002 04:19:37 +0100 (CET) (envelope-from emma@libertas.emma.line.org) Received: (from emma@localhost) by libertas.emma.line.org (8.12.6/8.12.6/Submit) id gB13Ja1w026132; Sun, 1 Dec 2002 04:19:36 +0100 (CET) Message-Id: <200212010319.gB13Ja1w026132@libertas.emma.line.org> Date: Sun, 1 Dec 2002 04:19:36 +0100 (CET) From: Matthias Andree Reply-To: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/45891: maintainer update port: mail/bogofilter 0.8.0 -> 0.9.1 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 45891 >Category: ports >Synopsis: maintainer update port: mail/bogofilter 0.8.0 -> 0.9.1 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Nov 30 19:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 4.7-STABLE FreeBSD 4.7-STABLE #2: Tue Nov 26 02:23:12 CET 2002 toor@libertas.emma.line.org:/usr/obj/usr/src/sys/LIBERTAS i386 >Description: This PR fixes the PREFIX built of the bogofilter port. This PR changes the pkg-plist to use %%DOCSDIR%% again. This PR updates the bogofilter port to 0.9.1. >How-To-Repeat: >Fix: Please apply this patch AND REMOVE THE FILES DIRECTORY UNLESS IT'S EMPTY. Probably patch -p3 will do. Thanks. Note #1: please do *not* remove the make check, we don't have enough data to know how portable bogofilter is yet. Particularly alpha and sparc64 on FreeBSD are untested. If make check fails, the software MUST NOT be installed, because it must be fixed for that platform first. Note #2: the do-install is necessary for PREFIX. (unless there is a better way that I'm unaware of...) diff -Nur /usr/ports/mail/bogofilter/Makefile /root/bogofilter/Makefile --- /usr/ports/mail/bogofilter/Makefile Sat Nov 23 03:04:26 2002 +++ /root/bogofilter/Makefile Sun Dec 1 04:11:21 2002 @@ -6,8 +6,8 @@ # PORTNAME= bogofilter -PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTVERSION= 0.9.1 +PORTREVISION= 0 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,18 +22,27 @@ PATCH_STRIP= -p1 CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include/db4" \ LDFLAGS="-L${PREFIX}/lib" - +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc MAN1= bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 +post-build: + cd ${WRKSRC} && make check SHELL=${SH} + +do-install: + cd ${WRKSRC} && make install prefix=${PREFIX} + .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${DOCSDIR} .for i in AUTHORS COPYING INSTALL NEWS README TODO UPGRADE \ doc/integrating-with-qmail contrib/README.unbase64 \ - README.freebsd README.hp-ux README.solaris + contrib/dot-qmail-bogofilter-default \ + README.freebsd README.hp-ux README.dcdflib \ + README.Robinson bogofilter-SA-2002-01 METHODS ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR} .endfor -.for i in bogo.R contrib/bogofilter-qfe contrib/unbase64 +.for i in bogo.R contrib/bogofilter-qfe contrib/unbase64 \ + contrib/bogopass ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif diff -Nur /usr/ports/mail/bogofilter/distinfo /root/bogofilter/distinfo --- /usr/ports/mail/bogofilter/distinfo Mon Nov 11 18:34:27 2002 +++ /root/bogofilter/distinfo Sun Dec 1 03:41:39 2002 @@ -1 +1 @@ -MD5 (bogofilter-0.8.0.tar.gz) = 447d6045f0268c0f6f36c59176c08137 +MD5 (bogofilter-0.9.1.tar.gz) = 9f1686eecdc20ea86ecea0d3b3892147 diff -Nur /usr/ports/mail/bogofilter/files/patch-Makefile.in /root/bogofilter/files/patch-Makefile.in --- /usr/ports/mail/bogofilter/files/patch-Makefile.in Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,84 +0,0 @@ ---- bogofilter-0.8.0/Makefile.in Sat Nov 9 19:21:40 2002 -+++ bogofilter-0.8.0.1/Makefile.in Mon Nov 11 02:07:42 2002 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.7 from Makefile.am. -+# Makefile.in generated by automake 1.7.1 from Makefile.am. - # @configure_input@ - - # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -@@ -119,7 +119,9 @@ - man1_MANS = bogofilter.1 bogoutil.1 bogoupgrade.1 bogolexer.1 - - # what to build that from --MYCOMMON = xmalloc.h xmalloc.c xstrdup.h xstrdup.c globals.h debug.h debug.c -+MYCOMMON = xmalloc.h xmalloc.c xstrdup.h xstrdup.c globals.h debug.h \ -+debug.c find_home.c find_home.h -+ - - BUILT_SOURCES = version.h - -@@ -164,7 +166,8 @@ - check_PROGRAMS = debugtest$(EXEEXT) configtest$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am__objects_1 = xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) debug.$(OBJEXT) -+am__objects_1 = xmalloc.$(OBJEXT) xstrdup.$(OBJEXT) debug.$(OBJEXT) \ -+ find_home.$(OBJEXT) - am_bogofilter_OBJECTS = bogofilter.$(OBJEXT) main.$(OBJEXT) \ - lexer.$(OBJEXT) datastore_db.$(OBJEXT) config.$(OBJEXT) \ - rstats.$(OBJEXT) wordhash.$(OBJEXT) wordlists.$(OBJEXT) \ -@@ -206,10 +209,11 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/bogolexer.Po ./$(DEPDIR)/bogoutil.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/config.Po ./$(DEPDIR)/configtest.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/datastore_db.Po ./$(DEPDIR)/debug.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/debug.main.Po ./$(DEPDIR)/lexer.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/rstats.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/wordhash.Po ./$(DEPDIR)/wordlists.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xstrdup.Po -+@AMDEP_TRUE@ ./$(DEPDIR)/debug.main.Po ./$(DEPDIR)/find_home.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/lexer.Po ./$(DEPDIR)/main.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/rstats.Po ./$(DEPDIR)/wordhash.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/wordlists.Po ./$(DEPDIR)/xmalloc.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/xstrdup.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) -@@ -351,6 +355,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datastore_db.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug.main.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find_home.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexer.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rstats.Po@am__quote@ -@@ -567,9 +572,11 @@ - mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/contrib $(distdir)/doc - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -@@ -628,7 +635,6 @@ - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ -- && $(mkinstalldirs) $$dc_destdir \ - && cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ -@@ -641,7 +647,9 @@ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ -- && ({ $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ -+ && ({ \ -+ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ -+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ diff -Nur /usr/ports/mail/bogofilter/files/patch-config.c /root/bogofilter/files/patch-config.c --- /usr/ports/mail/bogofilter/files/patch-config.c Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-config.c Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- bogofilter-0.8.0/config.c Thu Oct 31 06:23:32 2002 -+++ bogofilter-0.8.0.1/config.c Mon Nov 11 02:06:36 2002 -@@ -21,6 +21,7 @@ - #include "wordlists.h" - #include "xmalloc.h" - #include "xstrdup.h" -+#include "find_home.h" - - #ifndef DEBUG_CONFIG - #define DEBUG_CONFIG(level) (verbose > level) -@@ -150,7 +151,7 @@ - - if ( *filename == '~' ) - { -- char *home = getenv( "HOME" ); -+ char *home = find_home(TRUE); - if ( home == NULL ) - { - fprintf( stderr, "Can't find $HOME.\n" ); diff -Nur /usr/ports/mail/bogofilter/files/patch-configure /root/bogofilter/files/patch-configure --- /usr/ports/mail/bogofilter/files/patch-configure Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- bogofilter-0.8.0/configure Sat Nov 9 19:21:44 2002 -+++ bogofilter-0.8.0.1/configure Mon Nov 11 02:07:43 2002 -@@ -1500,7 +1500,7 @@ - - # Define the identity of the package. - PACKAGE=bogofilter -- VERSION=0.8.0 -+ VERSION=0.8.0.1 - - - cat >>confdefs.h <<_ACEOF -@@ -2563,7 +2563,7 @@ - if depmode=$depmode \ - source=conftest.c object=conftest.o \ - depfile=conftest.Po tmpdepfile=conftest.TPo \ -- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && -+ $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && - grep conftest.h conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - am_cv_CC_dependencies_compiler_type=$depmode diff -Nur /usr/ports/mail/bogofilter/files/patch-find_home.c /root/bogofilter/files/patch-find_home.c --- /usr/ports/mail/bogofilter/files/patch-find_home.c Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-find_home.c Thu Jan 1 01:00:00 1970 @@ -1,59 +0,0 @@ ---- bogofilter-0.8.0/find_home.c Thu Jan 1 01:00:00 1970 -+++ bogofilter-0.8.0.1/find_home.c Mon Nov 11 02:05:44 2002 -@@ -0,0 +1,56 @@ -+/* find_home.c -- library function to figure out the home dir of current user */ -+ -+/* (C) 2002 by Matthias Andree -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details, it is in the file named -+ * COPYING. -+ */ -+ -+/* $Id: find_home.c,v 1.5 2002/11/11 00:03:25 m-a Exp $ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include "find_home.h" -+#include "xmalloc.h" -+#include "xstrdup.h" -+ -+/* This function will try to figure out the home directory of the user. -+ * -+ * If read_env is not zero, it will try to obtain the HOME environment -+ * variable and return if it is defined and not empty. -+ * -+ * Then, it will look up the password entry of the current effective -+ * user id and return the pw_dir field. -+ * -+ * This function returns NULL in case of failure. -+ */ -+const char *find_home(int read_env) { -+ char *r; -+ uid_t u; -+ struct passwd *pw; -+ -+ if (read_env) { -+ if ((r = getenv("HOME")) != NULL && *r != '\0') -+ return r; -+ } -+ -+ u = geteuid(); -+ pw = getpwuid(u); -+ if (pw != NULL) { -+ return pw -> pw_dir; -+ } -+ return NULL; -+} diff -Nur /usr/ports/mail/bogofilter/files/patch-find_home.h /root/bogofilter/files/patch-find_home.h --- /usr/ports/mail/bogofilter/files/patch-find_home.h Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-find_home.h Thu Jan 1 01:00:00 1970 @@ -1,36 +0,0 @@ ---- bogofilter-0.8.0/find_home.h Thu Jan 1 01:00:00 1970 -+++ bogofilter-0.8.0.1/find_home.h Mon Nov 11 02:05:44 2002 -@@ -0,0 +1,33 @@ -+/* $Id: find_home.h,v 1.7 2002/11/11 00:03:25 m-a Exp $ */ -+ -+/* find_home.h -- library function to figure out the home dir of current user */ -+ -+#ifndef FIND_HOME_H -+#define FIND_HOME_H -+ -+/* (C) 2002 by Matthias Andree -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of version 2 of the GNU General Public License as -+ * published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details, it is in the file named -+ * COPYING. -+ */ -+ -+/*@null@*/ /*@observer@*/ -+const char * -+find_home(int read_env) /*@globals errno@*/; -+ -+/*@null@*/ /*@observer@*/ -+const char * -+find_home_user(const char *username) /*@globals errno@*/; -+ -+/*@only@*/ -+char * -+tildeexpand(const char *filename) /*@globals errno@*/; -+ -+#endif diff -Nur /usr/ports/mail/bogofilter/files/patch-main.c /root/bogofilter/files/patch-main.c --- /usr/ports/mail/bogofilter/files/patch-main.c Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-main.c Thu Jan 1 01:00:00 1970 @@ -1,29 +0,0 @@ ---- bogofilter-0.8.0/main.c Wed Nov 6 01:07:59 2002 -+++ bogofilter-0.8.0.1/main.c Mon Nov 11 02:28:08 2002 -@@ -26,6 +26,9 @@ - #include "version.h" - #include "common.h" - #include "bogofilter.h" -+#include "find_home.h" -+#include "xmalloc.h" -+#include "xstrdup.h" - - #define BOGODIR ".bogofilter" - -@@ -254,6 +257,16 @@ - { - int exitcode; - -+ if (NULL == getenv("HOME")) { -+ const char *t; -+ if ((t = find_home(FALSE)) != NULL) { -+ char *t2 = xmalloc(strlen(t) + 6); -+ strcpy(t2, "HOME="); -+ strcat(t2, t); -+ putenv(xstrdup(t2)); /* putenv may leak memory by copying again */ -+ free(t2); -+ } -+ } - set_dir_from_env(directory, "HOME", BOGODIR); - set_dir_from_env(directory, "BOGOFILTER_DIR", NULL); - diff -Nur /usr/ports/mail/bogofilter/files/patch-version.h /root/bogofilter/files/patch-version.h --- /usr/ports/mail/bogofilter/files/patch-version.h Sat Nov 16 05:50:15 2002 +++ /root/bogofilter/files/patch-version.h Thu Jan 1 01:00:00 1970 @@ -1,6 +0,0 @@ ---- bogofilter-0.8.0/version.h Sat Nov 9 19:22:01 2002 -+++ bogofilter-0.8.0.1/version.h Mon Nov 11 02:28:09 2002 -@@ -1,2 +1,2 @@ - #undef VERSION --#define VERSION "0.8.0" -+#define VERSION "0.8.0.1" diff -Nur /usr/ports/mail/bogofilter/files/patch-z-stats /root/bogofilter/files/patch-z-stats --- /usr/ports/mail/bogofilter/files/patch-z-stats Sat Nov 23 00:22:54 2002 +++ /root/bogofilter/files/patch-z-stats Thu Jan 1 01:00:00 1970 @@ -1,57 +0,0 @@ ---- bogofilter.c Thu Nov 7 07:05:58 2002 -+++ bogofilter.c Fri Nov 22 12:51:33 2002 -@@ -255,10 +255,14 @@ - - int compare_extrema(const void *id1, const void *id2) - { -+ double d; - const discrim_t *d1 = id1; - const discrim_t *d2 = id2; -- return ( (d1->prob > d2->prob) || -- ((d1->prob == d2->prob) && (strcmp(d1->key, d2->key) > 0))); -+ d = d2->prob - d1->prob; -+ if (fabs(d) < EPS) return strcmp(d1->key, d2->key); -+ if (d1->prob > d2->prob) return 1; -+ if (d1->prob < d2->prob) return -1; -+ return 0; - } - - void init_bogostats(bogostat_t *bogostats) ---- common.h Mon Oct 28 03:46:17 2002 -+++ common.h Fri Nov 22 12:53:23 2002 -@@ -9,6 +9,10 @@ - #include - #endif - -+#include -+#define EPS (100.0 * DBL_EPSILON) -+ -+ - #include "debug.h" - - #define GOODFILE "goodlist.db" ---- rstats.c Wed Nov 6 11:45:03 2002 -+++ rstats.c Fri Nov 22 12:52:12 2002 -@@ -84,10 +84,14 @@ - - int compare_rstats_t(const void *ir1, const void *ir2) - { -+ double d; - const rstats_t *r1 = *(rstats_t **)ir1; - const rstats_t *r2 = *(rstats_t **)ir2; -- return ( (r1->prob > r2->prob) || -- ((r1->prob == r2->prob) && (strcmp(r1->token, r2->token) > 0))); -+ d = r1->prob - r2->prob; -+ if (fabs(d) < EPS) return strcmp(r1->token, r2->token); -+ if (r1->prob > r2->prob) return 1; -+ if (r1->prob < r2->prob) return -1; -+ return 0; - } - - #define INTERVALS 10 ---- version.h Fri Nov 22 12:55:52 2002 -+++ version.h Fri Nov 22 12:55:13 2002 -@@ -1,2 +1,2 @@ - #undef VERSION --#define VERSION "0.8.0.1" -+#define VERSION "0.8.0.freebsd2" diff -Nur /usr/ports/mail/bogofilter/pkg-plist /root/bogofilter/pkg-plist --- /usr/ports/mail/bogofilter/pkg-plist Sat Nov 16 00:35:32 2002 +++ /root/bogofilter/pkg-plist Sun Dec 1 03:59:47 2002 @@ -2,19 +2,25 @@ bin/bogolexer bin/bogoutil bin/bogoupgrade -%%PORTDOCS%%share/doc/bogofilter/AUTHORS -%%PORTDOCS%%share/doc/bogofilter/COPYING -%%PORTDOCS%%share/doc/bogofilter/INSTALL -%%PORTDOCS%%share/doc/bogofilter/NEWS -%%PORTDOCS%%share/doc/bogofilter/README -%%PORTDOCS%%share/doc/bogofilter/README.freebsd -%%PORTDOCS%%share/doc/bogofilter/README.hp-ux -%%PORTDOCS%%share/doc/bogofilter/README.solaris -%%PORTDOCS%%share/doc/bogofilter/README.unbase64 -%%PORTDOCS%%share/doc/bogofilter/TODO -%%PORTDOCS%%share/doc/bogofilter/UPGRADE -%%PORTDOCS%%share/doc/bogofilter/bogo.R -%%PORTDOCS%%share/doc/bogofilter/bogofilter-qfe -%%PORTDOCS%%share/doc/bogofilter/integrating-with-qmail -%%PORTDOCS%%share/doc/bogofilter/unbase64 -%%PORTDOCS%%@dirrm share/doc/bogofilter +etc/bogofilter.cf.example +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/METHODS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.Robinson +%%PORTDOCS%%%%DOCSDIR%%/README.dcdflib +%%PORTDOCS%%%%DOCSDIR%%/README.freebsd +%%PORTDOCS%%%%DOCSDIR%%/README.hp-ux +%%PORTDOCS%%%%DOCSDIR%%/README.unbase64 +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/UPGRADE +%%PORTDOCS%%%%DOCSDIR%%/bogo.R +%%PORTDOCS%%%%DOCSDIR%%/bogofilter-SA-2002-01 +%%PORTDOCS%%%%DOCSDIR%%/bogofilter-qfe +%%PORTDOCS%%%%DOCSDIR%%/bogopass +%%PORTDOCS%%%%DOCSDIR%%/dot-qmail-bogofilter-default +%%PORTDOCS%%%%DOCSDIR%%/integrating-with-qmail +%%PORTDOCS%%%%DOCSDIR%%/unbase64 +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message