Date: Thu, 9 Feb 2006 00:35:19 +0200 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/93067: [MAINTAINER] mail/dspam-devel: unbreak for people with OPTIONS set; update to cvs snap 20060208.1807 Message-ID: <1139438119.94737@it.buh.cameradicommercio.ro> Resent-Message-ID: <200602082240.k18Me8RX023773@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93067
>Category: ports
>Synopsis: [MAINTAINER] mail/dspam-devel: unbreak for people with OPTIONS set; update to cvs snap 20060208.1807
>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: Wed Feb 08 22:40:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.1-PRERELEASE #1: Tue Feb 7 00:58:32 EET 2006
>Description:
Update to 3.6.3 20060208.1807 cvs snap. [1]
Rewrite minimum OPTIONS version check, the old way was broken if the OPTIONS
where set in /var/db/ports/PORTNAME/options.
Drop old knobs check, hard to maintain and conflicting with KNOBS.
[1] beginning with this update the SNAP_DATE is UTC instead of EST (GMT+2).
Diff also at:
people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/port/dspam-devel-3.6.3.20060203.1409_to_3.6.3.20060208.1807.diff
Tinderbox logs at:
people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/build_logs/
>How-To-Repeat:
>Fix:
--- dspam-devel-3.6.3.20060203.1409_to_3.6.3.20060208.1807.diff begins here ---
diff -urN dspam-devel_FPT/Makefile dspam-devel/Makefile
--- dspam-devel_FPT/Makefile Mon Feb 6 15:47:48 2006
+++ dspam-devel/Makefile Wed Feb 8 20:50:32 2006
@@ -3,7 +3,7 @@
# Whom: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
#
# $FreeBSD: ports/mail/dspam-devel/Makefile,v 1.44 2006/02/06 13:47:48 garga Exp $
-# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.26 2006/02/03 22:06:14 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/Makefile,v 1.32 2006/02/08 18:50:32 itetcu Exp $
#
# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
@@ -21,7 +21,10 @@
COMMENT= Bayesian spam filter - development version
PORTVER_MAJ= 3.6.3
-SNAP_DATE= .20060203.1409
+SNAP_DATE= .20060208.1807
+_UPD_LINE_NO= 11
+
+MIN_OPTIONS_VER= ${PORTNAME}-3.6.3.20060203.1409
.ifdef(SNAP_DATE)
MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/${PORTNAME}/sources/
@@ -35,8 +38,6 @@
WRKSRC= ${WRKDIR}/dspam-${PORTVER_MAJ}
.endif
-_UPD_LINE_NO= 31
-
## debug / log / admin options
OPTIONS= DEBUG "Enable debugging logging" on
OPTIONS+= VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off
@@ -125,14 +126,6 @@
.include <bsd.port.pre.mk>
-MIN_OPTIONS_VER= ${PORTNAME}-3.6.3.20060203.1409
-.ifdef(_OPTIONS_READ)
-OPTIONS_CMP!= ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER}
-. if ${OPTIONS_CMP} == "<"
-OPTIONS_MESSAGE= "You have unsupported (old) OPTIONS, please do a 'make config; make'"
-. endif
-.endif
-
CONFIGURE_ARGS+= --with-logdir=${LOG_DIR}
PLIST_SUB+= LOG_DIR=${LOG_DIR}
@@ -453,13 +446,7 @@
@sleep 5
.endif
-pre-extract:
-.ifdef(OPTIONS_MESSAGE)
- @${ECHO_CMD} ""
- @${ECHO_CMD} ${OPTIONS_MESSAGE}
- @${ECHO_CMD} ""
- @exit 1
-.endif
+pre-extract: check-options-version
.ifndef(MAINT)
@${ECHO_CMD} ""
@${ECHO_CMD} "Define vars below before make-ing if you need:"
@@ -482,32 +469,6 @@
@sleep 5
.endif
-.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES SPAM_SUBJ \
- USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \
- BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \
- HOMEDIR_DOT SIGNATURE_LIFE SQLITE QUARANTINE_AGENT WHITELIST \
- POSTGRESQL73 POSTGRESQL74 GRAHAM_BAYES BURTON_BAYES RNB \
- TEST_COND NO_BIAS CHI_SQUARE RPV
-. if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt})
- @${ECHO_CMD} ""
- @${ECHO_CMD} "******************************************************************"
- @${ECHO_CMD} "******************************************************************"
- @${ECHO_CMD} "Either:"
- @${ECHO_CMD} "an old option ${old_opt} or an old"
- @${ECHO_CMD} "OPTIONS config-file ${_OPTIONS_READ} has been detected !!!"
- @${ECHO_CMD} "Trying to prevent self-shooting this port's make ends here."
- @${ECHO_CMD} "You shold always read ${PORTSDIR}/UPDATING before installing/updating"
- @${ECHO_CMD} "any port. Please remove/adjust your pkgtools.conf, environment and"
- @${ECHO_CMD} "your make command-line and/or do 'make rmconfig' as appropiate."
- @${ECHO_CMD} "But before read ${FILESDIR}/UPDATING"
- @${ECHO_CMD} "as a lot of things have changed.
- @${ECHO_CMD} "******************************************************************"
- @${ECHO_CMD} "******************************************************************"
- @${ECHO_CMD} ""
- @${FALSE}
-. endif
-.endfor
-
post-patch:
@${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
@@ -568,7 +529,7 @@
@${FALSE}
.endif
.ifdef(SNAP_DATE)
- @${ECHO_CMD} "You can safely ignore the following auto* errors"
+ @${ECHO_CMD} "You can safely ignore the following auto* errors"
@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
.endif
@@ -657,5 +618,13 @@
@${ECHO_CMD} "If you haven't defined NOPORTDOCS you can review this"
@${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD"
@${ECHO_CMD}
+
+check-options-version:
+.ifdef(_OPTIONS_READ)
+ @(if ${PKG_VERSION} -t ${_OPTIONS_READ} ${MIN_OPTIONS_VER} | ${GREP} -q '<'; \
+ then ${ECHO_CMD} "You have unsupported (old) OPTIONS, please do a 'make config; make'\n" \
+ exit 1; \
+ fi)
+.endif
.include <bsd.port.post.mk>
diff -urN dspam-devel_FPT/distinfo dspam-devel/distinfo
--- dspam-devel_FPT/distinfo Mon Feb 6 15:47:48 2006
+++ dspam-devel/distinfo Wed Feb 8 20:48:51 2006
@@ -1,3 +1,3 @@
-MD5 (dspam-devel-3.6.3.20060203.1409.tar.gz) = 31a970ba8cf8b7a9aa1d45db04127bda
-SHA256 (dspam-devel-3.6.3.20060203.1409.tar.gz) = 556cc67532ef9a1110541aee24aea8a84684d34179a670b1e6320ed97908b8a7
-SIZE (dspam-devel-3.6.3.20060203.1409.tar.gz) = 391316
+MD5 (dspam-devel-3.6.3.20060208.1807.tar.gz) = 333138bb844a6fb6f8515500c7a52286
+SHA256 (dspam-devel-3.6.3.20060208.1807.tar.gz) = 361897b8704114411a19ab67765ea1fc9072bb34bceb578ad14d37f14b009a49
+SIZE (dspam-devel-3.6.3.20060208.1807.tar.gz) = 393609
diff -urN dspam-devel_FPT/files/UPDATING dspam-devel/files/UPDATING
--- dspam-devel_FPT/files/UPDATING Mon Feb 6 15:47:48 2006
+++ dspam-devel/files/UPDATING Wed Feb 8 20:48:52 2006
@@ -11,6 +11,18 @@
make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
###########################################################################
+# dspam-devel-3.6.3.20060208.1807
+#
+
+WebUI:
+- undo option for retraining
+- support for existing storeFragments option to recall message in history
+
+Documentation:
+- of all user preferences in the README.
+
+
+###########################################################################
# dspam-devel-3.6.3.20060203.1409
#
diff -urN dspam-devel_FPT/files/dspam-devel.sh.in dspam-devel/files/dspam-devel.sh.in
--- dspam-devel_FPT/files/dspam-devel.sh.in Mon Feb 6 15:47:48 2006
+++ dspam-devel/files/dspam-devel.sh.in Tue Feb 7 22:42:07 2006
@@ -1,7 +1,7 @@
#!/bin/sh
# $FreeBSD: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.6 2006/02/06 13:47:48 garga Exp $
# formerly $ FreeBSD: ports/mail/dspam-devel/files/dspam.rc,v 1.2 2005/02/25 03:09:26 leeym Exp $
-# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.5 2006/02/03 13:56:46 itetcu Exp $
+# $Tecnik: ports/mail/dspam-devel/files/dspam-devel.sh.in,v 1.6 2006/02/07 20:42:07 itetcu Exp $
# PROVIDE: dspam
# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
--- dspam-devel-3.6.3.20060203.1409_to_3.6.3.20060208.1807.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1139438119.94737>