- 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. - Fix brain-dead CONFLICTS from MFD. PR: ports/93109 Submitted by: maintainer
This commit is contained in:
Renato Botelho
parent
c1349884a0
commit
ce4b906020
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=155666
3 changed files with 13 additions and 46 deletions
|
|
@ -3,7 +3,7 @@
|
|||
# Whom: Dominic Marks <dom@wirespeed.org.uk>
|
||||
#
|
||||
# $FreeBSD$
|
||||
# $Tecnik: ports/mail/dspam/Makefile,v 1.7 2006/02/03 09:57:32 itetcu Exp $
|
||||
# $Tecnik: ports/mail/dspam/Makefile,v 1.10 2006/02/09 22:20:22 itetcu Exp $
|
||||
#
|
||||
|
||||
# Note to commiters: If don't commit a maintainer patch and as a result PKGNAME
|
||||
|
|
@ -106,7 +106,7 @@ STRIP=
|
|||
|
||||
PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD
|
||||
|
||||
CONFLICTS= dspam-[0-9]*
|
||||
CONFLICTS= dspam-devel-[0-9]*
|
||||
|
||||
SIGNATURE_LIFE?= 15
|
||||
|
||||
|
|
@ -124,15 +124,6 @@ DSPAM_HOME_MODE?= 0770
|
|||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
|
||||
MIN_OPTIONS_VER= dspam-devel-3.6.3
|
||||
.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}
|
||||
|
||||
|
|
@ -469,13 +460,7 @@ post-fetch:
|
|||
. endif
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
.ifdef(OPTIONS_MESSAGE)
|
||||
@${ECHO_CMD} ""
|
||||
@${ECHO_CMD} ${OPTIONS_MESSAGE}
|
||||
@${ECHO_CMD} ""
|
||||
exit 1
|
||||
.endif
|
||||
pre-extract: check-options-version
|
||||
@${ECHO_CMD} ""
|
||||
@${ECHO_CMD} "Define vars below before make-ing if you need:"
|
||||
@${ECHO_CMD} ""
|
||||
|
|
@ -496,32 +481,6 @@ pre-extract:
|
|||
@${ECHO_CMD} ""
|
||||
@sleep 5
|
||||
|
||||
.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
|
||||
|
|
@ -682,4 +641,12 @@ post-install:
|
|||
@${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>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# $FreeBSD$
|
||||
# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.6 2006/02/03 10:18:25 itetcu Exp $
|
||||
# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.8 2006/02/09 19:52:34 itetcu Exp $
|
||||
#
|
||||
# for each PKGNAME or user option change an entry should be added in this file
|
||||
# each entry
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
# $FreeBSD$
|
||||
# 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.5 2006/02/03 10:13:00 itetcu Exp $
|
||||
# $Tecnik: ports/mail/dspam/files/dspam.sh.in,v 1.6 2006/02/09 19:14:29 itetcu Exp $
|
||||
#
|
||||
|
||||
# PROVIDE: dspam
|
||||
|
|
|
|||
Loading…
Reference in a new issue