summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Hadaway <raker@gentoo.org>2003-07-16 08:11:04 +0000
committerNick Hadaway <raker@gentoo.org>2003-07-16 08:11:04 +0000
commitb690cc08a575c95b51b687f4d3d7e5c7d8fb31fa (patch)
treefc3caa6136875c7a986719ef0f0545443a7ce6bb /net-mail/mailman
parentcommited scribus 1.0 (diff)
downloadgentoo-2-b690cc08a575c95b51b687f4d3d7e5c7d8fb31fa.tar.gz
gentoo-2-b690cc08a575c95b51b687f4d3d7e5c7d8fb31fa.tar.bz2
gentoo-2-b690cc08a575c95b51b687f4d3d7e5c7d8fb31fa.zip
made mailman compatible with both apache and apache2
Diffstat (limited to 'net-mail/mailman')
-rw-r--r--net-mail/mailman/ChangeLog6
-rw-r--r--net-mail/mailman/Manifest18
-rw-r--r--net-mail/mailman/mailman-2.1.2.ebuild36
3 files changed, 40 insertions, 20 deletions
diff --git a/net-mail/mailman/ChangeLog b/net-mail/mailman/ChangeLog
index f8a325d1ced4..5a6bc012a452 100644
--- a/net-mail/mailman/ChangeLog
+++ b/net-mail/mailman/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-mail/mailman
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.16 2003/07/09 20:50:48 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/ChangeLog,v 1.17 2003/07/16 08:11:04 raker Exp $
+
+ 16 Jul 2003; Nick Hadaway <raker@gentoo.org> mailman-2.1.2.ebuild:
+ Added apache and apache2 to IUSE and made pkg_config procedure
+ compatible with both installations types.
09 Jul 2003; Nick Hadaway <raker@gentoo.org> files/README.gentoo:
Updated the readme to be a little more explicit and complete.
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 2b6a59d7a8a4..bf90cfff2775 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -1,12 +1,12 @@
+MD5 b6ba1e9ebe12dfce53fb8d89e3952d1b mailman-2.1.1-r3.ebuild 2895
+MD5 dab1b4d55cf6b2e232eb0be19d16036f mailman-2.1.1-r2.ebuild 2745
+MD5 502dbab8271f7bfc58a9208aa893889e mailman-2.1.2.ebuild 3882
+MD5 eaa0f593e61dfd8b02af526b45d6a022 ChangeLog 2478
+MD5 db7f50be9ad50e5f63f9cade7f183ce0 files/mailman.2.1.1-r2.conf 361
+MD5 7696a83219b38b7e7842de3f11305f56 files/mailman.2.1.1-r3.conf 365
MD5 2fd035ad0e0b3f747ad1602bd7808f00 files/README.gentoo 4618
-MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r3 63
-MD5 c633b40bfc65dcf74cc36594b311031a files/digest-mailman-2.1.2 63
MD5 3089c1f0f8d91abdd612997b085959eb files/mailman.conf 385
-MD5 4e8df002cf51ad9f2f2195c26246aaba files/mailman.rc 559
-MD5 db7f50be9ad50e5f63f9cade7f183ce0 files/mailman.2.1.1-r2.conf 361
+MD5 c633b40bfc65dcf74cc36594b311031a files/digest-mailman-2.1.2 63
MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r2 63
-MD5 7696a83219b38b7e7842de3f11305f56 files/mailman.2.1.1-r3.conf 365
-MD5 b6ba1e9ebe12dfce53fb8d89e3952d1b mailman-2.1.1-r3.ebuild 2895
-MD5 f4d200ff12e21bbee2f10e9db7644c64 ChangeLog 2299
-MD5 0cec3b8bed613f1dd45bdcae6bb4e75a mailman-2.1.2.ebuild 3329
-MD5 dab1b4d55cf6b2e232eb0be19d16036f mailman-2.1.1-r2.ebuild 2745
+MD5 3163b3164584897610113805a484fd2d files/digest-mailman-2.1.1-r3 63
+MD5 4e8df002cf51ad9f2f2195c26246aaba files/mailman.rc 559
diff --git a/net-mail/mailman/mailman-2.1.2.ebuild b/net-mail/mailman/mailman-2.1.2.ebuild
index dbc211ef8d0f..19bcb488580b 100644
--- a/net-mail/mailman/mailman-2.1.2.ebuild
+++ b/net-mail/mailman/mailman-2.1.2.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/net-mail/mailman/mailman-2.1.2.ebuild,v 1.3 2003/06/08 05:01:37 tberman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.2.ebuild,v 1.4 2003/07/16 08:11:04 raker Exp $
S=${WORKDIR}/${P}
DESCRIPTION="GNU Mailman, the mailing list server with webinterface"
@@ -11,7 +11,7 @@ SLOT="O"
LICENSE="GPL-2"
KEYWORDS="~x86 ~sparc "
-IUSE=""
+IUSE="apache apache2"
DEPEND=">=dev-lang/python-1.5.2
virtual/mta
@@ -51,9 +51,16 @@ src_install () {
chown -R mailman.mailman ${ID}
chmod 2775 ${ID}
make prefix=${ID} var_prefix=${ID} doinstall || die
- insinto /etc/apache/conf/addon-modules
- doins ${FILESDIR}/mailman.conf
-
+ if [ "`use apache`" ]; then
+ dodir /etc/apache/conf/addon-modules
+ insinto /etc/apache/conf/addon-modules
+ doins ${FILESDIR}/mailman.conf
+ fi
+ if [ "`use apache2`" ]; then
+ dodir /etc/apache2/conf/addon-modules
+ insinto /etc/apache2/conf/addon-modules
+ doins ${FILESDIR}/mailman.conf
+ fi
dodoc ${FILESDIR}/README.gentoo
dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL
dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme
@@ -97,9 +104,18 @@ pkg_postinst() {
}
pkg_config() {
- einfo "Updating apache config"
- einfo "added: \"Include conf/addon-modules/mailman.conf\""
- einfo "to ${ROOT}/etc/apache/conf/apache.conf"
- echo "Include conf/addon-modules/mailman.conf" \
- >> ${ROOT}/etc/apache/conf/apache.conf
+ if [ "`use apache`" ]; then
+ einfo "Updating apache config"
+ einfo "added: \"Include conf/addon-modules/mailman.conf\""
+ einfo "to ${ROOT}etc/apache/conf/apache.conf"
+ echo "Include conf/addon-modules/mailman.conf" \
+ >> ${ROOT}etc/apache/conf/apache.conf
+ fi
+ if [ "`use apache2`" ]; then
+ einfo "Updating apache2 config"
+ einfo "added: \"Include conf/addon-modules/mailman.conf\""
+ einfo "to ${ROOT}etc/apache2/conf/apache2.conf"
+ echo "Include conf/addon-modules/mailman.conf" \
+ >> ${ROOT}etc/apache2/conf/apache2.conf
+ fi
}