fix bug reported by vapier via email, re Maildir vs. .maildir

4 files changed, 91 insertions, 6 deletions

diff --git a/net-mail/qmailadmin/ChangeLog b/net-mail/qmailadmin/ChangeLog
index d6a7df464f7c..dcebccaad48b 100644
--- a/net-mail/qmailadmin/ChangeLog
+++ b/net-mail/qmailadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/qmailadmin
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.2 2004/01/05 08:49:44 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/ChangeLog,v 1.3 2004/01/16 06:02:56 robbat2 Exp $
+
+*qmailadmin-1.2.0_rc2-r1 (15 Jan 2004)
+
+  15 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  qmailadmin-1.2.0_rc2-r1.ebuild:
+  fix bug reported by vapier via email, re Maildir vs. .maildir
 
   05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
   qmailadmin-1.2.0_rc1.ebuild, qmailadmin-1.2.0_rc2.ebuild:
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 0257316e2206..6f81e472bc5f 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -1,6 +1,8 @@
+MD5 3067942f928819c24cfa410e3409b91a qmailadmin-1.2.0_rc1.ebuild 2050
+MD5 6ec66aefc77e2959483ee4b2f9822a50 qmailadmin-1.2.0_rc2-r1.ebuild 2210
+MD5 11beaaf5d03de3bacd5dd343587976e8 qmailadmin-1.2.0_rc2.ebuild 2050
+MD5 f3f61d1471e8b334f55cacbecb43a31a ChangeLog 937
+MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
 MD5 63ee5a148962a9d3f91486faad412e38 files/digest-qmailadmin-1.2.0_rc1 72
 MD5 04ccdae0d0fb4e2aa405fb9712f3c584 files/digest-qmailadmin-1.2.0_rc2 72
-MD5 97bdda423416bdbf5bf4cc3cecbbd7a7 qmailadmin-1.2.0_rc1.ebuild 2051
-MD5 1af6796f0691ac51c035898fbf68fb31 qmailadmin-1.2.0_rc2.ebuild 2051
-MD5 8f55222fb41375b1422a4b4780df81e1 ChangeLog 746
-MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
+MD5 04ccdae0d0fb4e2aa405fb9712f3c584 files/digest-qmailadmin-1.2.0_rc2-r1 72
diff --git a/net-mail/qmailadmin/files/digest-qmailadmin-1.2.0_rc2-r1 b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.0_rc2-r1
new file mode 100644
index 000000000000..0a33e675f800
--- /dev/null
+++ b/net-mail/qmailadmin/files/digest-qmailadmin-1.2.0_rc2-r1
@@ -0,0 +1 @@
+MD5 9647834fbfc0556f3f5d7904d0ac23dc qmailadmin-1.2.0-rc2.tar.gz 293731
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..6fe3032fa996
--- /dev/null
+++ b/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmailadmin/qmailadmin-1.2.0_rc2-r1.ebuild,v 1.1 2004/01/16 06:02:56 robbat2 Exp $
+
+inherit gnuconfig
+
+DESCRIPTION="A web interface for managing a qmail system with virtual domains."
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://www.inter7.com/${PN}.html"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="net-mail/qmail
+		>=net-mail/vpopmail-5.3
+		net-mail/autorespond"
+
+RDEPEND="${DEPEND}
+		net-www/apache"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+	for i in alias.c auth.c autorespond.c command.c contrib/alias2forward.pl qmailadmin.c template.c user.c; do
+		sed -e 's|/Maildir|/.maildir|g' -i ${i}
+	done
+}
+
+src_compile() {
+	local dir_vpopmail="/var/vpopmail"
+	local dir_vhost="/var/www/localhost"
+	local dir_htdocs="${dir_vhost}/htdocs/${PN}"
+	local dir_htdocs_images="${dir_htdocs}/images"
+	local url_htdocs_images="/${PN}/images"
+	local dir_cgibin="${dir_vhost}/cgi-bin"
+	local url_cgibin="/cgi-bin/${PN}"
+	local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
+	local dir_qmail="/var/qmail"
+	local bin_true="/bin/true"
+	local dir_ezmlm="/usr/bin"
+	local dir_autorespond="/var/qmail/bin"
+
+	econf ${myopts} \
+	--enable-vpopmaildir=${dir_vpopmail} \
+	--enable-htmldir=${dir_htdocs} \
+	--enable-imageurl=${url_htdocs_images} \
+	--enable-imagedir=${dir_htdocs_images} \
+	--enable-htmllibdir=${dir_htdocs_htmlib} \
+	--enable-qmaildir=${dir_qmail} \
+	--enable-true-path=${bin_true} \
+	--enable-ezmlmdir=${dir_ezmlm} \
+	--enable-cgibindir=${dir_cgibin} \
+	--enable-cgipath=${url_cgibin} \
+	--enable-autoresponder-path=${dir_autorespond} \
+	--enable-domain-autofill \
+	--enable-modify-quota \
+	--enable-no-cache \
+	--enable-maxusersperpage=50 \
+	--enable-maxaliasesperpage=50 \
+	--enable-vpopuser=vpopmail \
+	--enable-vpopgroup=vpopmail \
+	|| die "econf failed"
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS INSTALL README.hooks BUGS TODO CHANGELOG TRANSLATORS COPYING NEWS FAQ README contrib/*
+}