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

(Portage version: 2.0.51.19)

3 files changed, 132 insertions, 109 deletions

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"
+