ports/92762: [MAINTAINER] mail/dspam: add a patch file; minor cleanups
Ion-Mihai IOnut Tetcu
itetcu at people.tecnik93.com
Fri Feb 3 10:30:10 UTC 2006
>Number: 92762
>Category: ports
>Synopsis: [MAINTAINER] mail/dspam: add a patch file; minor cleanups
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 03 10:30:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.0-STABLE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.0-STABLE #1: Mon Jan 23 00:45:10 EET 2006
>Description:
files/patch-scripts_train.pl was missed in the last commit.
Small Makefile cleanup.
Insist dspam.conf should be updated to include the new directives.
Fix typo in files/UPDATING [1]
[1] Obtained from edwin@
>How-To-Repeat:
>Fix:
--- dspam.diff begins here ---
diff -urN dspam_FPT/Makefile dspam/Makefile
--- dspam_FPT/Makefile Thu Feb 2 21:00:25 2006
+++ dspam/Makefile Fri Feb 3 11:57:32 2006
@@ -3,7 +3,7 @@
# Whom: Dominic Marks <dom at wirespeed.org.uk>
#
# $FreeBSD: ports/mail/dspam/Makefile,v 1.46 2006/02/02 19:00:25 erwin Exp $
-# $Tecnik: ports/mail/dspam/Makefile,v 1.4 2006/02/01 02:15:35 itetcu Exp $
+# $Tecnik: ports/mail/dspam/Makefile,v 1.7 2006/02/03 09:57:32 itetcu Exp $
#
# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
@@ -25,29 +25,16 @@
.ifdef(SNAP_DATE)
MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
-WRKSRC= ${WRKDIR}/dspam-cvs${SNAP_DATE}
+WRKSRC= ${WRKDIR}/dspam-${SNAP_DATE}
.else
MASTER_SITES= http://dspam.irontec.com/sources/ \
http://dspam.nuclearelephant.com/sources/ \
http://dspam.systemadministrator.org/sources/ \
http://dspam.sourceforge.net/sources/ \
http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
-DISTFILES= dspam-${PORTVER_MAJ}.tar.gz
.endif
-## maintainer only
-.ifdef(MAINT)
-MASTER_SITES= http://dspam.nuclearelephant.com/sources/
-DISTFILES= dspam-${PORTVER_MAJ}.tar.gz
-NO_CHECKSUM= yes
-. ifdef(SNAP_DATE)
-DISTFILES= snapshot-devel.tar.gz
-#FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
-. endif
-FETCH_BEFORE_ARGS= -v -o ${DISTDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
-.endif
-
-_UPD_LINE_NO= 19
+_UPD_LINE_NO= 13
## debug / log / admin options
OPTIONS= DEBUG "Enable debugging logging" on
@@ -536,13 +523,6 @@
.endfor
post-patch:
- @${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
- s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \
- s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \
- s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
${WRKSRC}/src/tools.mysql_drv/purge.sql
@${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' \
@@ -633,8 +613,6 @@
purge-4.1.sql purge.sql \
virtual_user_aliases.sql \
virtual_users.sql ${EXAMPLESDIR}/mysql
-# @${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql
-# @${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql
.endif
.ifdef(WITH_POSTGRESQL)
@${MKDIR} ${EXAMPLESDIR}/pgsql
diff -urN dspam_FPT/files/UPDATING dspam/files/UPDATING
--- dspam_FPT/files/UPDATING Thu Feb 2 21:00:26 2006
+++ dspam/files/UPDATING Fri Feb 3 12:18:25 2006
@@ -1,5 +1,5 @@
# $FreeBSD: ports/mail/dspam/files/UPDATING,v 1.19 2006/02/02 19:00:26 erwin Exp $
-# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.3 2006/02/01 02:15:42 itetcu Exp $
+# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.6 2006/02/03 10:18:25 itetcu Exp $
#
# for each PKGNAME or user option change an entry should be added in this file
# each entry
@@ -16,13 +16,14 @@
in the port directory:
make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
-
###########################################################################
# dspam-3.6.3
#
-To manny things to note here, please see mail-dspam-devel/UPDATING and read
-UPGRADING and CHANGELOG and adjust your dspam.conf accordingly
+To manny things to note here, please see mail/dsapm-devel/UPDATING and read
+UPGRADING and CHANGELOG and adjust your dspam.conf accordingly; there are
+NEW DIRECTIVES (see dspam.conf.sample) so if you miss this dspam will have
+bad accuracy or could (possibly) crash.
- you can now have the database drivers dynamically loaded at run time so
you can select multiple drivers in the OPTIONS screen; see dspam.conf.
- also algorithm selection is done exclusively via dspam.conf
diff -urN dspam_FPT/files/dspam.sh.in dspam/files/dspam.sh.in
--- dspam_FPT/files/dspam.sh.in Thu Feb 2 21:00:26 2006
+++ dspam/files/dspam.sh.in Fri Feb 3 12:13:00 2006
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD: ports/mail/dspam/files/dspam.sh.in,v 1.3 2006/02/02 19:00:26 erwin Exp $
# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
-# $Tecnik: ports/mail/dspam/files/dspam.sh.in,v 1.3 2006/02/01 02:15:42 itetcu Exp $
+# $Tecnik: ports/mail/dspam/files/dspam.sh.in,v 1.5 2006/02/03 10:13:00 itetcu Exp $
#
# PROVIDE: dspam
diff -urN dspam_FPT/files/patch-scripts_train.pl dspam/files/patch-scripts_train.pl
--- dspam_FPT/files/patch-scripts_train.pl Thu Jan 1 02:00:00 1970
+++ dspam/files/patch-scripts_train.pl Wed Feb 1 04:15:42 2006
@@ -0,0 +1,17 @@
+--- scripts/train.pl.dist Tue Nov 8 14:34:38 2005
++++ scripts/train.pl Tue Nov 8 14:36:06 2005
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!%%PERL%%
+
+ # train.pl
+ # This tool trains a corpus of messages (a directory containing a nonspam and
+@@ -14,7 +14,7 @@
+ use vars qw { $USER $PATH $REPORTING_WINDOW $CORPUS $TRAINING_MODE };
+
+ $REPORTING_WINDOW = 250; # How often to summarize
+-$PATH = "/usr/local/dspam/bin"; # Path to dspam binaries
++$PATH = "%%DSPAM_PATH%%"; # Path to dspam binaries
+ $TRAINING_MODE = "teft"; # Training mode
+
+ ### DO NOT CONFIGURE BELOW THIS LINE ###
--- dspam.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list