summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2003-06-18 17:24:29 +0000
committerMichael Cummings <mcummings@gentoo.org>2003-06-18 17:24:29 +0000
commit597f7cfecf98435650e453dbd17af46dedbf29d1 (patch)
treee522dd15c5bf0c9e7c0d1a506eaa8598a59f390e /dev-perl
parentbump and cleanups (diff)
downloadhistorical-597f7cfecf98435650e453dbd17af46dedbf29d1.tar.gz
historical-597f7cfecf98435650e453dbd17af46dedbf29d1.tar.bz2
historical-597f7cfecf98435650e453dbd17af46dedbf29d1.zip
should close bug 21349
Diffstat (limited to 'dev-perl')
-rw-r--r--dev-perl/Mail-SpamAssassin/ChangeLog9
-rw-r--r--dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild18
-rw-r--r--dev-perl/Mail-SpamAssassin/Manifest4
3 files changed, 15 insertions, 16 deletions
diff --git a/dev-perl/Mail-SpamAssassin/ChangeLog b/dev-perl/Mail-SpamAssassin/ChangeLog
index c55af4723f2f..85cd27b2d3b3 100644
--- a/dev-perl/Mail-SpamAssassin/ChangeLog
+++ b/dev-perl/Mail-SpamAssassin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-perl/Mail-SpamAssassin
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.25 2003/06/18 14:13:58 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/ChangeLog,v 1.26 2003/06/18 17:24:29 mcummings Exp $
+
+ 18 Jun 2003; Michael Cummings <mcummings@gentoo.org>
+ Mail-SpamAssassin-2.55-r1.ebuild:
+ New version of the ebuild for 2.55-r1 submitted by Wayne Davison
+ (gentoo@blorf.net) is a cleaner build using the config vars that SpamAssassis
+ is looking for (vs our sed's of the resulting files). This should close bug
+ 21349.
*Mail-SpamAssassin-2.55-r1 (18 Jun 2003)
diff --git a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild
index e38a5f6cc7e4..25084824e7d1 100644
--- a/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild
+++ b/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild,v 1.3 2003/06/18 14:30:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Mail-SpamAssassin/Mail-SpamAssassin-2.55-r1.ebuild,v 1.4 2003/06/18 17:24:29 mcummings Exp $
inherit perl-module
@@ -18,14 +18,15 @@ DEPEND="dev-perl/Net-DNS
dev-perl/PodParser
dev-perl/Time-Local"
+myconf="INST_PREFIX=/usr SITEPREFIX=\$(PREFIX) INST_SYSCONFDIR=/etc SYSCONFDIR=${D}/etc RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n"
+mymake="PREFIX=/usr SYSCONFDIR=/etc"
mydoc="License Changes procmailrc.example sample-nonspam.txt sample-spam.txt"
-myinst="LOCAL_RULES_DIR=${D}/etc/mail/spamassassin"
-myconf="SYSCONFDIR=${D}/etc INST_PREFIX=/usr RUN_RAZOR1_TESTS=n RUN_RAZOR2_TESTS=n"
+
src_compile() {
- perl-module_src_prep
+ perl-module_src_compile
dodir /etc/mail/spamassassin
}
@@ -39,15 +40,6 @@ src_install () {
chmod +x ${D}/etc/init.d/spamd
cp ${FILESDIR}/spamd.conf ${D}/etc/conf.d/spamd
- for FILE in `find ${D}usr/share/spamassassin/ -type f -name "*.cf"`; do
- sed -i -e "s:${D}::g" ${FILE}
- done
-
- sed -i -e "s:${D}::g" ${D}/usr/bin/sa-learn
- sed -i -e "s:${D}::g" ${D}/usr/bin/spamassassin
- chmod 555 ${D}/usr/bin/spamassassin
- sed -i -e "s:${D}::g" ${D}/usr/bin/spamd
- chmod 555 ${D}/usr/bin/spamd
}
diff --git a/dev-perl/Mail-SpamAssassin/Manifest b/dev-perl/Mail-SpamAssassin/Manifest
index 6a9a9915b334..0ba1420c2bd4 100644
--- a/dev-perl/Mail-SpamAssassin/Manifest
+++ b/dev-perl/Mail-SpamAssassin/Manifest
@@ -1,4 +1,4 @@
-MD5 2a85e7dd33facc926945c6b1883ef9fe ChangeLog 4027
+MD5 7b4e6f9a3db907aa50702ec4bafd40ff ChangeLog 4353
MD5 ccf83fc965eed277e532a8237416fd90 Mail-SpamAssassin-2.31-r3.ebuild 916
MD5 27413230ce373faa97ea015d60f26062 Mail-SpamAssassin-2.43-r1.ebuild 1103
MD5 2c5a43d30caa9d60f16618f0f4eceb6d Mail-SpamAssassin-2.43-r2.ebuild 1103
@@ -9,7 +9,7 @@ MD5 8651ab68e20f9e13a8a39ad8d7360978 Mail-SpamAssassin-2.52.ebuild 1344
MD5 b1212c7fec3a367ae7cd7efd37095a51 Mail-SpamAssassin-2.53.ebuild 1376
MD5 e818a5adc9bf2ef77bec963262be4953 Mail-SpamAssassin-2.54.ebuild 1378
MD5 252be2377bb3823d47711fafa550e721 Mail-SpamAssassin-2.55.ebuild 1377
-MD5 a4cc3b431e36dee8b02cf418d71e10be Mail-SpamAssassin-2.55-r1.ebuild 1440
+MD5 c3f1ee6f8d8c185c823fe31584f4ecb8 Mail-SpamAssassin-2.55-r1.ebuild 1157
MD5 071b210fa381f461253a65352c5c2199 files/digest-Mail-SpamAssassin-2.31-r3 74
MD5 02f72d0558f22519d07902b508cbdff2 files/digest-Mail-SpamAssassin-2.43-r1 74
MD5 02f72d0558f22519d07902b508cbdff2 files/digest-Mail-SpamAssassin-2.43-r2 74