fix install locations

3 files changed, 48 insertions, 10 deletions

diff --git a/net-mail/vmailmgr/ChangeLog b/net-mail/vmailmgr/ChangeLog
index 16f518b234b4..7b0d5d0d846b 100644
--- a/net-mail/vmailmgr/ChangeLog
+++ b/net-mail/vmailmgr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/vmailmgr
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.2 2002/04/27 21:46:45 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.3 2002/04/29 08:49:21 bangert Exp $
+
+  29 Apr 2002; Thilo Bangert <bangert@gentoo.org> ChangeLog :
+
+  fix install locations for the courier-imap auth lib and php and cgi scripts
 
 *vmailmgr-0.96.9-r1 (16 Apr 2002)
 
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff
new file mode 100644
index 000000000000..044bf0b8b5bb
--- /dev/null
+++ b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo.diff
@@ -0,0 +1,35 @@
+diff -ur vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am
+--- vmailmgr-0.96.9.orig/authenticate/Makefile.am	Sat Sep 23 22:23:32 2000
++++ vmailmgr-0.96.9/authenticate/Makefile.am	Sun Apr 28 20:42:01 2002
+@@ -1,6 +1,6 @@
+ bin_PROGRAMS = checkvpw vauthenticate
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${prefix}/lib/courier-imap/authlib/
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+diff -ur vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in
+--- vmailmgr-0.96.9.orig/authenticate/Makefile.in	Sun Oct  1 06:33:29 2000
++++ vmailmgr-0.96.9/authenticate/Makefile.in	Sun Apr 28 20:42:17 2002
+@@ -83,7 +83,7 @@
+ 
+ bin_PROGRAMS = checkvpw vauthenticate
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${prefix}/lib/courier-imap/authlib/
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+diff -ur vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure
+--- vmailmgr-0.96.9.orig/configure	Sun Oct  1 06:24:23 2000
++++ vmailmgr-0.96.9/configure	Sun Apr 28 20:40:59 2002
+@@ -2682,7 +2682,7 @@
+ done
+ 
+ 
+-cgidir='${prefix}/cgi-bin'
++cgidir='/home/httpd/cgi-bin'
+ 
+ 
+ trap '' 1 2 15
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
index ad506a2c47a8..975642adbcc2 100644
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
 # Maintainer: Thilo Bangert <bangert@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.2 2002/04/27 21:46:45 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.3 2002/04/29 08:49:21 bangert Exp $
 
 S=${WORKDIR}/${P}
 
@@ -18,11 +18,8 @@ src_unpack() {
 	unpack ${A} ; cd ${S}
 
 	#make sure stuff get's installed the right places
-	mv configure configure.orig
-	sed -e "s:^cgidir=.*:cgidir=\"/etc/vmailmgr/cgi-bin\":" \
-		-e "s:^phpdir=.*:phpdir=\"/etc/vmailmgr/php\":" \
-		configure.orig > configure
-	chmod ug+x configure
+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
+
 }
 
 src_compile() {
@@ -39,7 +36,7 @@ src_install () {
 
 	make DESTDIR=${D} install || die
 
-	#add documentation
+	dodoc AUTHORS INSTALL README TODO NEWS
 
 	exeinto /var/lib/supervise/vmailmgrd
 	newexe ${S}/scripts/vmailmgrd.run run
@@ -51,8 +48,10 @@ src_install () {
 	newexe ${S}/scripts/autoresponder.sh vdeliver-postdeliver
 
 	doexe ${FILESDIR}/checkvpw-loginfail
-	doexe ${FILESDIR}/socket-file
-	doexe ${FILESDIR}/separators
+	
+	insinto /etc/vmailmgr
+	doins ${FILESDIR}/socket-file
+	doins ${FILESDIR}/separators
 
 }