| 1 |
hanno 07/09/14 02:02:45 |
| 2 |
|
| 3 |
Modified: mailman-2.1.9-r1.ebuild |
| 4 |
Log: |
| 5 |
fix mailman installdir for real |
| 6 |
(Portage version: 2.1.3.9) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-mail/mailman/mailman-2.1.9-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: mailman-2.1.9-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- mailman-2.1.9-r1.ebuild 13 Sep 2007 21:59:22 -0000 1.1 |
| 22 |
+++ mailman-2.1.9-r1.ebuild 14 Sep 2007 02:02:44 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild,v 1.1 2007/09/13 21:59:22 hanno Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailman/mailman-2.1.9-r1.ebuild,v 1.2 2007/09/14 02:02:44 hanno Exp $ |
| 28 |
|
| 29 |
inherit eutils depend.apache |
| 30 |
IUSE="postfix sendmail qmail courier exim xmail" |
| 31 |
@@ -11,16 +11,13 @@ |
| 32 |
|
| 33 |
SLOT="0" |
| 34 |
LICENSE="GPL-2" |
| 35 |
-KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
| 36 |
+KEYWORDS="amd64 ppc sparc x86" |
| 37 |
|
| 38 |
DEPEND=">=dev-lang/python-2.3 |
| 39 |
virtual/mta |
| 40 |
virtual/cron |
| 41 |
|| ( www-servers/apache www-servers/lighttpd )" |
| 42 |
|
| 43 |
-INSTALLDIR="/usr/local/mailman" |
| 44 |
-APACHEGID="81" |
| 45 |
- |
| 46 |
if use postfix; then |
| 47 |
MAILGID="280" |
| 48 |
elif use sendmail; then |
| 49 |
@@ -38,6 +35,10 @@ |
| 50 |
fi |
| 51 |
|
| 52 |
pkg_setup() { |
| 53 |
+ INSTALLDIR=${MAILMAN_PREFIX:-"/usr/lib/mailman"} |
| 54 |
+ VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"} |
| 55 |
+ APACHEGID=${MAILMAN_APACHEGID:-81} |
| 56 |
+ |
| 57 |
# Bug #58526: switch to enew{group,user}. |
| 58 |
# need to add mailman here for compile process. |
| 59 |
# Duplicated at pkg_postinst() for binary install. |
| 60 |
@@ -55,27 +56,27 @@ |
| 61 |
} |
| 62 |
|
| 63 |
src_compile() { |
| 64 |
- econf \ |
| 65 |
+ econf --without-permcheck \ |
| 66 |
--prefix=${INSTALLDIR} \ |
| 67 |
--with-mail-gid=${MAILGID} \ |
| 68 |
--with-cgi-gid=${APACHEGID} \ |
| 69 |
+ --with-var-prefix=${VAR_PREFIX} \ |
| 70 |
|| die "configure failed" |
| 71 |
|
| 72 |
make || die "make failed" |
| 73 |
} |
| 74 |
|
| 75 |
src_install () { |
| 76 |
- ID=${D}${INSTALLDIR} |
| 77 |
+ make DESTDIR=${D} doinstall || die |
| 78 |
|
| 79 |
- make prefix=${ID} var_prefix=${ID} doinstall || die |
| 80 |
+ keepdir ${VAR_PREFIX}/logs |
| 81 |
+ keepdir ${VAR_PREFIX}/locks |
| 82 |
+ keepdir ${VAR_PREFIX}/spam |
| 83 |
+ keepdir ${VAR_PREFIX}/archives/public |
| 84 |
+ keepdir ${VAR_PREFIX}/archives/private |
| 85 |
+ keepdir ${VAR_PREFIX}/lists |
| 86 |
+ keepdir ${VAR_PREFIX}/qfiles |
| 87 |
|
| 88 |
- keepdir ${INSTALLDIR}/logs |
| 89 |
- keepdir ${INSTALLDIR}/locks |
| 90 |
- keepdir ${INSTALLDIR}/spam |
| 91 |
- keepdir ${INSTALLDIR}/archives/public |
| 92 |
- keepdir ${INSTALLDIR}/archives/private |
| 93 |
- keepdir ${INSTALLDIR}/lists |
| 94 |
- keepdir ${INSTALLDIR}/qfiles |
| 95 |
|
| 96 |
insinto ${APACHE2_MODULES_CONFDIR} |
| 97 |
doins ${FILESDIR}/50_mailman.conf |
| 98 |
@@ -85,8 +86,9 @@ |
| 99 |
dodoc contrib/README.check_perms_grsecurity contrib/mm-handler.readme |
| 100 |
dodoc contrib/virtusertable contrib/mailman.mc |
| 101 |
|
| 102 |
- cp build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ |
| 103 |
- contrib/mm-handler* ${ID}/bin |
| 104 |
+ exeinto ${INSTALLDIR}/bin |
| 105 |
+ doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \ |
| 106 |
+ contrib/mm-handler* || die |
| 107 |
|
| 108 |
# Save the old config into the new package as CONFIG_PROTECT |
| 109 |
# doesn't work for this package. |
| 110 |
@@ -95,7 +97,7 @@ |
| 111 |
do |
| 112 |
if [ -f ${i}/Mailman/mm_cfg.py ]; then |
| 113 |
cp ${i}/Mailman/mm_cfg.py \ |
| 114 |
- ${ID}/Mailman/mm_cfg.py |
| 115 |
+ ${D}/${INSTALLDIR}/Mailman/mm_cfg.py |
| 116 |
elog "Your old config has been saved as mm_cfg.py" |
| 117 |
elog "A new config has been installed as mm_cfg.dist" |
| 118 |
fi |
| 119 |
@@ -103,8 +105,8 @@ |
| 120 |
|
| 121 |
newinitd ${FILESDIR}/mailman.rc mailman |
| 122 |
|
| 123 |
- chown -R mailman:mailman ${ID} |
| 124 |
- chmod 2775 ${ID} |
| 125 |
+ chown -R mailman:mailman ${D}/${INSTALLDIR} |
| 126 |
+ chmod 2775 ${D}/${INSTALLDIR} |
| 127 |
} |
| 128 |
|
| 129 |
pkg_postinst() { |
| 130 |
@@ -126,4 +128,9 @@ |
| 131 |
elog "To enable, you will need to add \"-D MAILMAN\" to" |
| 132 |
elog "/etc/conf.d/apache2." |
| 133 |
elog |
| 134 |
+ |
| 135 |
+ ewarn "Default-Paths have changed with 2.1.9-r1. You can change paths with the" |
| 136 |
+ ewarn "MAILMAN_INSTALLDIR and MAILMAN_VAR_PREFIX variables." |
| 137 |
+ ewarn |
| 138 |
+ ebeep |
| 139 |
} |
| 140 |
|
| 141 |
|
| 142 |
|
| 143 |
-- |
| 144 |
gentoo-commits@g.o mailing list |
Archives