install vmail.inc into ${libdir}/php; remove obsolete version

(Portage version: 2.0.51.19)

6 files changed, 154 insertions, 134 deletions

diff --git a/net-mail/vmailmgr/ChangeLog b/net-mail/vmailmgr/ChangeLog
index 7a4b8985665d..db7fe35a8426 100644
--- a/net-mail/vmailmgr/ChangeLog
+++ b/net-mail/vmailmgr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/vmailmgr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.19 2005/05/16 10:01:52 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/ChangeLog,v 1.20 2005/05/24 05:23:11 mrness Exp $
+
+*vmailmgr-0.96.9-r3 (24 May 2005)
+
+  24 May 2005; Alin Nastac <mrness@gentoo.org>
+  -files/vmailmgr-0.96.9-gentoo-r1.diff, -vmailmgr-0.96.9-r1.ebuild,
+  +files/vmailmgr-0.96.9-gentoo-r3.patch, +vmailmgr-0.96.9-r3.ebuild:
+  Fix installation path of vmail.inc (#40324). Remove obsolete version.
 
   16 May 2005; Andrej Kacian <ticho@gentoo.org> vmailmgr-0.96.9-r1.ebuild,
   vmailmgr-0.96.9-r2.ebuild:
diff --git a/net-mail/vmailmgr/Manifest b/net-mail/vmailmgr/Manifest
index acb94a6cf248..631f36ceacbc 100644
--- a/net-mail/vmailmgr/Manifest
+++ b/net-mail/vmailmgr/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa3a1de95affffc13599471e23cad33c vmailmgr-0.96.9-r1.ebuild 1632
+MD5 716963e06bce7cf9d84b37cc52fef346 vmailmgr-0.96.9-r3.ebuild 1656
 MD5 ceeaf22fc933ce069ded9977ac447e70 ChangeLog 2725
 MD5 11b51793c29cb4cafdc40bb13ba3cb00 vmailmgr-0.96.9-r2.ebuild 1654
 MD5 911634f611838bc9b119dfb48b047c35 metadata.xml 250
-MD5 9c31bdc6361d69e632bda1dc65587fb9 files/vmailmgr-0.96.9-gentoo-r1.diff 4249
 MD5 fcb3e0b872a5f1719f7b9aa76eac8eba files/vmailmgr-0.96.9-gcc3.3.patch 3494
 MD5 0279b46d6d44e209fead5769b6fdea30 files/checkvpw-loginfail 45
 MD5 d8e019e2a0047f70578608f16b233489 files/vmailmgr-0.96.9-gentoo-r2.patch 4939
+MD5 106e71c406367cc524e732c7e0b70749 files/vmailmgr-0.96.9-gentoo-r3.patch 5109
 MD5 3a361d677a497af106a197e48acbc129 files/separators 3
-MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r1 67
 MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r2 67
+MD5 dada9de263c4a08a0d043350821a42b4 files/digest-vmailmgr-0.96.9-r3 67
 MD5 bf55605617fc5acfdca3a28a796e82a4 files/socket-file 35
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCiG+wQlM6RnzZP+IRAiNcAJ47kSqxxxT53OsjaXHGa/9wTtYQiACgsqC/
-tVGl2ACl1+K0IcGsbj6IIzI=
-=0JmP
------END PGP SIGNATURE-----
diff --git a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r1 b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r3
index 27e6b788aa4d..27e6b788aa4d 100644
--- a/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r1
+++ b/net-mail/vmailmgr/files/digest-vmailmgr-0.96.9-r3
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r1.diff b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r1.diff
deleted file mode 100644
index 170491dff485..000000000000
--- a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r1.diff
+++ /dev/null
@@ -1,109 +0,0 @@
-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 23:23:32 2000
-+++ vmailmgr-0.96.9/authenticate/Makefile.am	Sat Jul 16 20:26:57 2011
-@@ -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 07:33:29 2000
-+++ vmailmgr-0.96.9/authenticate/Makefile.in	Sat Jul 16 20:26:57 2011
-@@ -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/authenticate/authvmailmgr.cc vmailmgr-0.96.9/authenticate/authvmailmgr.cc
---- vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc	Tue Aug  1 20:09:27 2000
-+++ vmailmgr-0.96.9/authenticate/authvmailmgr.cc	Sat Jul 16 20:31:09 2011
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "misc/exec.h"
- #include "authvlib.h"
- // Courier-IMAP includes
-diff -ur vmailmgr-0.96.9.orig/authenticate/checkvpw.cc vmailmgr-0.96.9/authenticate/checkvpw.cc
---- vmailmgr-0.96.9.orig/authenticate/checkvpw.cc	Fri Aug 11 01:39:27 2000
-+++ vmailmgr-0.96.9/authenticate/checkvpw.cc	Sat Jul 16 20:57:31 2011
-@@ -18,6 +18,7 @@
- #include <errno.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <stdlib.h>
- #include "config/configrc.h"
- #include "misc/exec.h"
- #include "misc/stat_fns.h"
-diff -ur vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc vmailmgr-0.96.9/authenticate/vauthenticate.cc
---- vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc	Tue Aug  1 21:05:31 2000
-+++ vmailmgr-0.96.9/authenticate/vauthenticate.cc	Sat Jul 16 20:56:36 2011
-@@ -17,6 +17,7 @@
- #include <config.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include "authvlib.h"
- #include "fdbuf/fdbuf.h"
- 
-diff -ur vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure
---- vmailmgr-0.96.9.orig/configure	Sun Oct  1 07:24:23 2000
-+++ vmailmgr-0.96.9/configure	Sat Jul 16 20:26:57 2011
-@@ -2682,7 +2682,7 @@
- done
- 
- 
--cgidir='${prefix}/cgi-bin'
-+cgidir='/home/httpd/cgi-bin'
- 
- 
- trap '' 1 2 15
-diff -ur vmailmgr-0.96.9.orig/lib/misc/exec.cc vmailmgr-0.96.9/lib/misc/exec.cc
---- vmailmgr-0.96.9.orig/lib/misc/exec.cc	Thu Aug  3 19:35:09 2000
-+++ vmailmgr-0.96.9/lib/misc/exec.cc	Sat Jul 16 20:28:08 2011
-@@ -21,6 +21,7 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
-+#include <string.h>
- #include "exec.h"
- #include "config/configrc.h"
- 
-diff -ur vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc vmailmgr-0.96.9/lib/misc/keystrlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc	Mon Apr  3 21:22:13 2000
-+++ vmailmgr-0.96.9/lib/misc/keystrlist.cc	Sat Jul 16 20:28:41 2011
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- void keystrlist::set(const mystring& var, const mystring& val)
-diff -ur vmailmgr-0.96.9.orig/lib/misc/strlist.cc vmailmgr-0.96.9/lib/misc/strlist.cc
---- vmailmgr-0.96.9.orig/lib/misc/strlist.cc	Mon Apr  3 21:22:14 2000
-+++ vmailmgr-0.96.9/lib/misc/strlist.cc	Sat Jul 16 20:29:20 2011
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- #include <config.h>
-+#include <string.h>
- #include "strlist.h"
- 
- static const char* compare(const char* ptr, const char* end,
-diff -ur vmailmgr-0.96.9.orig/lib/mystring/append.cc vmailmgr-0.96.9/lib/mystring/append.cc
---- vmailmgr-0.96.9.orig/lib/mystring/append.cc	Sun Feb 13 07:16:03 2000
-+++ vmailmgr-0.96.9/lib/mystring/append.cc	Sat Jul 16 20:30:01 2011
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "mystring.h"
- #include "trace.h"
- 
diff --git a/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch
new file mode 100644
index 000000000000..0c5236378eef
--- /dev/null
+++ b/net-mail/vmailmgr/files/vmailmgr-0.96.9-gentoo-r3.patch
@@ -0,0 +1,132 @@
+diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.am vmailmgr-0.96.9/authenticate/Makefile.am
+--- vmailmgr-0.96.9.orig/authenticate/Makefile.am	2000-09-23 14:23:32.000000000 -0600
++++ vmailmgr-0.96.9/authenticate/Makefile.am	2005-05-23 16:23:41.264118445 -0600
+@@ -1,6 +1,6 @@
+ bin_PROGRAMS = checkvpw vauthenticate
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${libdir}/courier-imap/authlib/
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+diff -Nru vmailmgr-0.96.9.orig/authenticate/Makefile.in vmailmgr-0.96.9/authenticate/Makefile.in
+--- vmailmgr-0.96.9.orig/authenticate/Makefile.in	2000-09-30 22:33:29.000000000 -0600
++++ vmailmgr-0.96.9/authenticate/Makefile.in	2005-05-23 16:23:41.265118291 -0600
+@@ -83,7 +83,7 @@
+ 
+ bin_PROGRAMS = checkvpw vauthenticate
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${libdir}/courier-imap/authlib/
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+diff -Nru vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc vmailmgr-0.96.9/authenticate/authvmailmgr.cc
+--- vmailmgr-0.96.9.orig/authenticate/authvmailmgr.cc	2000-08-01 11:09:27.000000000 -0600
++++ vmailmgr-0.96.9/authenticate/authvmailmgr.cc	2005-05-23 16:23:41.265118291 -0600
+@@ -15,6 +15,7 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <config.h>
++#include <string.h>
+ #include "misc/exec.h"
+ #include "authvlib.h"
+ // Courier-IMAP includes
+diff -Nru vmailmgr-0.96.9.orig/authenticate/checkvpw.cc vmailmgr-0.96.9/authenticate/checkvpw.cc
+--- vmailmgr-0.96.9.orig/authenticate/checkvpw.cc	2000-08-10 16:39:27.000000000 -0600
++++ vmailmgr-0.96.9/authenticate/checkvpw.cc	2005-05-23 16:23:41.266118138 -0600
+@@ -18,6 +18,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <stdlib.h>
+ #include "config/configrc.h"
+ #include "misc/exec.h"
+ #include "misc/stat_fns.h"
+diff -Nru vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc vmailmgr-0.96.9/authenticate/vauthenticate.cc
+--- vmailmgr-0.96.9.orig/authenticate/vauthenticate.cc	2000-08-01 12:05:31.000000000 -0600
++++ vmailmgr-0.96.9/authenticate/vauthenticate.cc	2005-05-23 16:23:41.266118138 -0600
+@@ -17,6 +17,7 @@
+ #include <config.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include "authvlib.h"
+ #include "fdbuf/fdbuf.h"
+ 
+diff -Nru vmailmgr-0.96.9.orig/configure vmailmgr-0.96.9/configure
+--- vmailmgr-0.96.9.orig/configure	2000-09-30 22:24:23.000000000 -0600
++++ vmailmgr-0.96.9/configure	2005-05-23 16:30:28.481474749 -0600
+@@ -1604,7 +1604,7 @@
+   WANTPYTHON_FALSE=
+ fi
+ 
+-phpdir="/home/httpd/php"
++phpdir="${libdir}/php"
+ 
+ 
+ # Extract the first word of "w3m", so it can be a program name with args.
+@@ -2682,7 +2682,7 @@
+ done
+ 
+ 
+-cgidir='${prefix}/cgi-bin'
++cgidir='/var/www/localhost/cgi-bin'
+ 
+ 
+ trap '' 1 2 15
+diff -Nru vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h vmailmgr-0.96.9/lib/cdb++/cdb++.h
+--- vmailmgr-0.96.9.orig/lib/cdb++/cdb++.h	2000-04-05 13:11:45.000000000 -0600
++++ vmailmgr-0.96.9/lib/cdb++/cdb++.h	2005-05-23 16:23:41.269117676 -0600
+@@ -20,8 +20,9 @@
+ #include "mystring/mystring.h"
+ #include "cdb++/datum.h"
+ #include "fdbuf/fdbuf.h"
++#include <inttypes.h>
+ 
+-typedef unsigned long uint32;
++typedef uint32_t uint32;
+ 
+ #define CDBMAKE_HPLIST 1000
+ 
+diff -Nru vmailmgr-0.96.9.orig/lib/misc/exec.cc vmailmgr-0.96.9/lib/misc/exec.cc
+--- vmailmgr-0.96.9.orig/lib/misc/exec.cc	2000-08-03 10:35:09.000000000 -0600
++++ vmailmgr-0.96.9/lib/misc/exec.cc	2005-05-23 16:23:41.270117522 -0600
+@@ -21,6 +21,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <string.h>
+ #include "exec.h"
+ #include "config/configrc.h"
+ 
+diff -Nru vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc vmailmgr-0.96.9/lib/misc/keystrlist.cc
+--- vmailmgr-0.96.9.orig/lib/misc/keystrlist.cc	2000-04-03 12:22:13.000000000 -0600
++++ vmailmgr-0.96.9/lib/misc/keystrlist.cc	2005-05-23 16:23:41.270117522 -0600
+@@ -15,6 +15,7 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <config.h>
++#include <string.h>
+ #include "strlist.h"
+ 
+ void keystrlist::set(const mystring& var, const mystring& val)
+diff -Nru vmailmgr-0.96.9.orig/lib/misc/strlist.cc vmailmgr-0.96.9/lib/misc/strlist.cc
+--- vmailmgr-0.96.9.orig/lib/misc/strlist.cc	2000-04-03 12:22:14.000000000 -0600
++++ vmailmgr-0.96.9/lib/misc/strlist.cc	2005-05-23 16:23:41.271117369 -0600
+@@ -15,6 +15,7 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include <config.h>
++#include <string.h>
+ #include "strlist.h"
+ 
+ static const char* compare(const char* ptr, const char* end,
+diff -Nru vmailmgr-0.96.9.orig/lib/mystring/append.cc vmailmgr-0.96.9/lib/mystring/append.cc
+--- vmailmgr-0.96.9.orig/lib/mystring/append.cc	2000-02-12 22:16:03.000000000 -0700
++++ vmailmgr-0.96.9/lib/mystring/append.cc	2005-05-23 16:23:41.271117369 -0600
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "mystring.h"
+ #include "trace.h"
+ 
diff --git a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild b/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild
index 243c4e6d0711..33bddab626dc 100644
--- a/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild
+++ b/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r1.ebuild,v 1.25 2005/05/16 10:01:52 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vmailmgr/vmailmgr-0.96.9-r3.ebuild,v 1.1 2005/05/24 05:23:11 mrness Exp $
 
 inherit toolchain-funcs eutils
 
@@ -10,31 +10,31 @@ HOMEPAGE="http://www.vmailmgr.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
 RDEPEND=">=sys-apps/ucspi-unix-0.34
 	>=mail-mta/qmail-1.03-r7
-	>=net-mail/qmail-autoresponder-0.95"
+	>=net-mail/qmail-autoresponder-0.95
+	!>=net-mail/courier-imap-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo-r1.diff || die "-gentoo-r1 patch failed"
+	epatch ${FILESDIR}/${P}-gentoo-${PR}.patch
+
+	if [ `gcc-major-version` -eq 3 ] && [ `gcc-minor-version` -ge 3 ]; then
+		epatch ${FILESDIR}/${P}-gcc3.3.patch
+	fi
 }
 
 src_compile() {
 	export CXX=g++
 
-	if [ "`gcc-major-version`" = "3" ]; then
+	if [ `gcc-major-version` -eq 3 ]; then
 		export LIBS="-lcrypt -lsupc++"
-		if [ `gcc-minor-version` -ge 3 ]; then
-			epatch ${FILESDIR}/${P}-gcc3.3.patch
-		fi
-	fi
-
-	if [ "`gcc-major-version`" = "2" ]; then
+	elif [ `gcc-major-version` -eq 2 ]; then
 		export LIBS="-lcrypt"
 	fi