upgrade p5-Mail-SpamAssassin to 2.61

--
From: new MAINTAINER Ben Lovett <ben at tilderoot dot com>
This commit is contained in:
brad 2003-12-27 04:17:01 +00:00
parent 3b95b40581
commit 189876eb88
7 changed files with 61 additions and 38 deletions

View File

@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.26 2003/12/07 23:15:19 naddy Exp $
# $OpenBSD: Makefile,v 1.27 2003/12/27 04:17:01 brad Exp $
COMMENT= "mailfilter to identify and mark spam"
DISTNAME= Mail-SpamAssassin-2.55
PKGNAME= p5-${DISTNAME}p2
DISTNAME= Mail-SpamAssassin-2.61
PKGNAME= p5-${DISTNAME}
CATEGORIES= mail perl5
MAINTAINER= Ben Lovett <ben@tilderoot.com>
HOMEPAGE= http://spamassassin.org/
# Artistic License
@ -21,15 +23,19 @@ RUN_DEPENDS= :p5-Net-DNS-*:net/p5-Net-DNS \
:p5-HTML-Parser-*:www/p5-HTML-Parser
CONFIGURE_STYLE= perl
CONFIGURE_ARGS= RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n
CONFIGURE_ARGS+= RUN_RAZOR_TESTS="no" \
SYSCONFDIR=${SYSCONFDIR} \
CONTACT_ADDRESS="the administrator of that system"
SAMPLE_CONFIG_DIR= ${PREFIX}/share/examples/SpamAssassin
CONFIG_DIR= ${SYSCONFDIR}/mail/spamassassin
CONFDIR= ${SYSCONFDIR}/mail/spamassassin
RULES_DIR= ${PREFIX}/share/spamassassin
SAMPLE_CONFDIR= ${PREFIX}/share/examples/SpamAssassin
SUBST_VARS= CONFDIR SAMPLE_CONFDIR
FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \
PKG_DEF_RULES_DIR=${WRKINST}${RULES_DIR} \
PKG_LOCAL_RULES_DIR=${WRKINST}${SAMPLE_CONFIG_DIR}
PKG_LOCAL_RULES_DIR=${WRKINST}${SAMPLE_CONFDIR}
# regress insists on creating files in $HOME
PORTHOME= ${WRKDIR}/temp-home
@ -37,13 +43,16 @@ PORTHOME= ${WRKDIR}/temp-home
FAQS= ${FILESDIR}/OpenBSD-SpamAssassin-mini-howto.html
DOCS= README procmailrc.example \
sample-nonspam.txt sample-spam.txt
LOCALCF= rules/local.cf
post-patch:
perl -pi -e "s#\@\@LOCAL_RULES_DIR\@\@#${CONFIG_DIR}#" ${WRKSRC}/rules/*
perl -pi -e "s#\@\@LOCAL_RULES_DIR\@\@#${CONFDIR}#" ${WRKSRC}/rules/*
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin
${INSTALL_DATA_DIR} ${SAMPLE_CONFDIR}
${INSTALL_DATA} ${FAQS} ${PREFIX}/share/doc/SpamAssassin
cd ${WRKSRC} && ${INSTALL_DATA} ${LOCALCF} ${SAMPLE_CONFDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/SpamAssassin
cd ${WRKSRC} && pod2man --section=1 spamd/spamc.pod > \
${PREFIX}/man/man1/spamc.1

View File

@ -1,3 +1,3 @@
MD5 (Mail-SpamAssassin-2.55.tar.gz) = f4d7898301851c83ad157c0a59b98833
RMD160 (Mail-SpamAssassin-2.55.tar.gz) = ec50090e049bc17ab8452d8e6b767e88796d361f
SHA1 (Mail-SpamAssassin-2.55.tar.gz) = 35aa4f2264694b656154ed5732e4ffecde08c76a
MD5 (Mail-SpamAssassin-2.61.tar.gz) = 6521ad3e6ed5a2eba35476c43c1697b7
RMD160 (Mail-SpamAssassin-2.61.tar.gz) = 08c54afba8e4038305407db8971dad02bda53a40
SHA1 (Mail-SpamAssassin-2.61.tar.gz) = da8f10c1c7eb91f2fced05366f4d792bcb6255ec

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-Makefile_PL,v 1.1 2003/12/27 04:17:01 brad Exp $
--- Makefile.PL.orig Thu Nov 13 11:55:46 2003
+++ Makefile.PL Thu Nov 13 11:55:55 2003
@@ -760,7 +760,7 @@
foreach (@code) {
# Add our install targets as a dependency to all top-level install targets
- s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 conf__install data__install/;
+ s/^(install(?:_[a-z]+)?\s*::?\s*.*)$/$1 data__install/;
# Now do the DESTDIR hack, if necessary.
next if !$mm_needs_destdir;
@@ -962,11 +962,6 @@
spamd/binaries.mk: spamd/configure
cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
-
-conf__install:
- -$(MKPATH) $(B_CONFDIR)
- $(PERL) -MFile::Spec -MFile::Copy \
- -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};"
data__install:
-$(MKPATH) $(B_DATADIR)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-spamd_libspamc_c,v 1.4 2003/06/19 01:03:22 avsm Exp $
--- spamd/libspamc.c.orig Mon May 12 20:15:36 2003
+++ spamd/libspamc.c Thu Jun 19 01:58:49 2003
@@ -595,7 +595,7 @@ static int
_handle_spamd_header (struct message *m, int flags, char *buf, int len)
{
char is_spam[6];
- char s_str[20], t_str[20];
+ char s_str[21], t_str[21];
/* Feb 12 2003 jm: actually, I think sccanf is working fine here ;)
* let's stick with it for this parser.

View File

@ -1,14 +1,13 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.3 2002/10/06 23:34:26 lebel Exp $
# $OpenBSD: DEINSTALL,v 1.4 2003/12/27 04:17:01 brad Exp $
#
# SpamAssassin de-installation
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/mail/spamassassin
CONFIG_DIR=${CONFDIR}
if [ -d $CONFIG_DIR ]; then
if [ "$PKG_DELETE_EXTRA" != Yes -a -d $CONFIG_DIR ]; then
echo
echo "+---------------"
echo "| To completely deinstall the $1 package you"

View File

@ -1,15 +1,12 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 2002/10/06 23:34:26 lebel Exp $
# $OpenBSD: INSTALL,v 1.2 2003/12/27 04:17:01 brad Exp $
#
# Pre/post-installation setup of SpamAssassin
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
CONFIG_DIR=${SYSCONFDIR}/mail/spamassassin
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/SpamAssassin
CONFIG_DIR=${CONFDIR}
SAMPLE_CONFIG_DIR=${SAMPLE_CONFDIR}
do_notice()
{
@ -37,15 +34,11 @@ do_install()
echo
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2003/02/22 14:55:51 lebel Exp $
@comment $OpenBSD: PLIST,v 1.11 2003/12/27 04:17:01 brad Exp $
bin/sa-learn
bin/spamassassin
bin/spamc
@ -22,11 +22,13 @@ ${P5SITE}/Mail/SpamAssassin/Locales.pm
${P5SITE}/Mail/SpamAssassin/Locker.pm
${P5SITE}/Mail/SpamAssassin/MailingList.pm
${P5SITE}/Mail/SpamAssassin/Message.pm
${P5SITE}/Mail/SpamAssassin/NetSet.pm
${P5SITE}/Mail/SpamAssassin/NoMailAudit.pm
${P5SITE}/Mail/SpamAssassin/PerMsgLearner.pm
${P5SITE}/Mail/SpamAssassin/PerMsgStatus.pm
${P5SITE}/Mail/SpamAssassin/PersistentAddrList.pm
${P5SITE}/Mail/SpamAssassin/PhraseFreqs.pm
${P5SITE}/Mail/SpamAssassin/Received.pm
${P5SITE}/Mail/SpamAssassin/Replier.pm
${P5SITE}/Mail/SpamAssassin/Reporter.pm
${P5SITE}/Mail/SpamAssassin/SHA1.pm
@ -34,6 +36,7 @@ ${P5SITE}/Mail/SpamAssassin/TextCat.pm
${P5SITE}/Mail/SpamAssassin/UnixLocker.pm
${P5SITE}/Mail/SpamAssassin/Util.pm
${P5SITE}/Mail/SpamAssassin/Win32Locker.pm
@comment ${P5ARCH}/auto/Mail/SpamAssassin/.packlist
man/man1/sa-learn.1
man/man1/spamassassin.1
man/man1/spamc.1
@ -57,6 +60,8 @@ share/spamassassin/10_misc.cf
share/spamassassin/20_anti_ratware.cf
share/spamassassin/20_body_tests.cf
share/spamassassin/20_compensate.cf
share/spamassassin/20_dnsbl_tests.cf
share/spamassassin/20_fake_helo_tests.cf
share/spamassassin/20_head_tests.cf
share/spamassassin/20_html_tests.cf
share/spamassassin/20_meta_tests.cf
@ -74,6 +79,7 @@ share/spamassassin/30_text_es.cf
share/spamassassin/30_text_fr.cf
share/spamassassin/30_text_it.cf
share/spamassassin/30_text_pl.cf
share/spamassassin/30_text_sk.cf
share/spamassassin/50_scores.cf
share/spamassassin/60_whitelist.cf
share/spamassassin/languages
@ -82,4 +88,8 @@ share/spamassassin/user_prefs.template
@dirrm share/spamassassin
@dirrm share/examples/SpamAssassin
@dirrm share/doc/SpamAssassin
@comment @dirrm ${P5ARCH}/auto/Mail/SpamAssassin
@comment @dirrm ${P5ARCH}/auto/Mail
@dirrm ${P5SITE}/Mail/SpamAssassin
@dirrm ${P5SITE}/Mail
@extraunexec rm -rf ${CONFDIR}