Extract vmailmgr-base. Make this a meta-package.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Extract vmailmgr-base. Make this a meta-package.
From: Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Date: Thu, 22 Feb 2024 15:30:38 +0000
Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Pushed By:	schmonz
Date:		Thu Feb 22 10:30:38 2024 -0500
Changeset:	51e57c1f487715282210a62c8bbcc14c32ba4fe7

Modified Files:
	vmailmgr/DESCR
	vmailmgr/Makefile
	vmailmgr/Makefile.common
Added Files:
	vmailmgr-base/DESCR
	vmailmgr-base/Makefile
	vmailmgr-base/PLIST
	vmailmgr-base/distinfo
	vmailmgr-base/patches/patch-Makefile.am
	vmailmgr-base/patches/patch-acinclude.m4
	vmailmgr-base/patches/patch-authenticate_Makefile.am
	vmailmgr-base/patches/patch-commands_Makefile.am
	vmailmgr-base/patches/patch-commands_vdeliver.cc
	vmailmgr-base/patches/patch-configure.ac
	vmailmgr-base/patches/patch-daemon_Makefile.am
	vmailmgr-base/patches/patch-doc_HOWTO.texi
	vmailmgr-base/patches/patch-doc_Makefile.am
	vmailmgr-base/patches/patch-lib_fdbuf_fdbuf.h
	vmailmgr-base/patches/patch-lib_mergelib.sh
	vmailmgr-base/patches/patch-lib_vpwtable_cdb__write.cc
	vmailmgr-base/patches/patch-lib_vpwtable_gdbm__del.cc
	vmailmgr-base/patches/patch-lib_vpwtable_gdbm__exists.cc
	vmailmgr-base/patches/patch-lib_vpwtable_gdbm__getbyname.cc
	vmailmgr-base/patches/patch-lib_vpwtable_gdbm__put.cc
	vmailmgr-base/patches/patch-lib_vpwtable_gdbm__write.cc
	vmailmgr-base/patches/patch-python_Makefile.am
	vmailmgr/version.mk
Removed Files:
	vmailmgr/PLIST
	vmailmgr/distinfo
	vmailmgr/patches/patch-Makefile.am
	vmailmgr/patches/patch-acinclude.m4
	vmailmgr/patches/patch-authenticate_Makefile.am
	vmailmgr/patches/patch-commands_Makefile.am
	vmailmgr/patches/patch-commands_vdeliver.cc
	vmailmgr/patches/patch-configure.ac
	vmailmgr/patches/patch-daemon_Makefile.am
	vmailmgr/patches/patch-doc_HOWTO.texi
	vmailmgr/patches/patch-doc_Makefile.am
	vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
	vmailmgr/patches/patch-lib_mergelib.sh
	vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
	vmailmgr/patches/patch-python_Makefile.am

Log Message:
Extract vmailmgr-base. Make this a meta-package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=51e57c1f487715282210a62c8bbcc14c32ba4fe7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vmailmgr-base/DESCR                                | 18 +++++
 vmailmgr-base/Makefile                             | 31 ++++++++
 vmailmgr-base/PLIST                                | 37 ++++++++++
 vmailmgr-base/distinfo                             | 23 ++++++
 vmailmgr-base/patches/patch-Makefile.am            | 22 ++++++
 vmailmgr-base/patches/patch-acinclude.m4           | 31 ++++++++
 .../patches/patch-authenticate_Makefile.am         | 41 +++++++++++
 vmailmgr-base/patches/patch-commands_Makefile.am   | 33 +++++++++
 vmailmgr-base/patches/patch-commands_vdeliver.cc   | 15 ++++
 vmailmgr-base/patches/patch-configure.ac           | 84 ++++++++++++++++++++++
 vmailmgr-base/patches/patch-daemon_Makefile.am     | 22 ++++++
 vmailmgr-base/patches/patch-doc_HOWTO.texi         | 13 ++++
 vmailmgr-base/patches/patch-doc_Makefile.am        | 41 +++++++++++
 vmailmgr-base/patches/patch-lib_fdbuf_fdbuf.h      | 14 ++++
 vmailmgr-base/patches/patch-lib_mergelib.sh        | 14 ++++
 .../patches/patch-lib_vpwtable_cdb__write.cc       | 17 +++++
 .../patches/patch-lib_vpwtable_gdbm__del.cc        | 15 ++++
 .../patches/patch-lib_vpwtable_gdbm__exists.cc     | 15 ++++
 .../patches/patch-lib_vpwtable_gdbm__getbyname.cc  | 15 ++++
 .../patches/patch-lib_vpwtable_gdbm__put.cc        | 18 +++++
 .../patches/patch-lib_vpwtable_gdbm__write.cc      | 29 ++++++++
 vmailmgr-base/patches/patch-python_Makefile.am     | 15 ++++
 vmailmgr/DESCR                                     | 23 +-----
 vmailmgr/Makefile                                  | 34 +++------
 vmailmgr/Makefile.common                           |  9 +--
 vmailmgr/PLIST                                     | 37 ----------
 vmailmgr/distinfo                                  | 23 ------
 vmailmgr/patches/patch-Makefile.am                 | 22 ------
 vmailmgr/patches/patch-acinclude.m4                | 31 --------
 vmailmgr/patches/patch-authenticate_Makefile.am    | 41 -----------
 vmailmgr/patches/patch-commands_Makefile.am        | 33 ---------
 vmailmgr/patches/patch-commands_vdeliver.cc        | 15 ----
 vmailmgr/patches/patch-configure.ac                | 84 ----------------------
 vmailmgr/patches/patch-daemon_Makefile.am          | 22 ------
 vmailmgr/patches/patch-doc_HOWTO.texi              | 13 ----
 vmailmgr/patches/patch-doc_Makefile.am             | 41 -----------
 vmailmgr/patches/patch-lib_fdbuf_fdbuf.h           | 14 ----
 vmailmgr/patches/patch-lib_mergelib.sh             | 14 ----
 vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc  | 17 -----
 vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc   | 15 ----
 .../patches/patch-lib_vpwtable_gdbm__exists.cc     | 15 ----
 .../patches/patch-lib_vpwtable_gdbm__getbyname.cc  | 15 ----
 vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc   | 18 -----
 vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc | 29 --------
 vmailmgr/patches/patch-python_Makefile.am          | 15 ----
 vmailmgr/version.mk                                |  6 ++
 46 files changed, 585 insertions(+), 564 deletions(-)

diffs:
diff --git a/vmailmgr-base/DESCR b/vmailmgr-base/DESCR
new file mode 100644
index 0000000000..4deacb8c53
--- /dev/null
+++ b/vmailmgr-base/DESCR
@@ -0,0 +1,18 @@
+VMailMgr (short for Virtual MAIL ManaGeR) is a package of programs
+designed to manage multiple domains of mail addresses and mailboxes on a
+single host. It co-operates with qmail for mail delivery and program
+control. It features:
+
+- A password checking interface between qmail-popup and qmail-pop3d
+  which replaces the usual checkpassword, as well as an authentication
+  module for Courier IMAP, that provide access to the virtual mailboxes
+  by one of three methods:
+  - IP-based virtual server access (invisible to the POP3 user)
+  - username-based access (username-virtualuser)
+  - hostname-based access (virtualuser%virtual.host@localhost or
+    virtualuser:virtual.host)
+- CDB-based password tables to speed up access for domains of any size.
+- Tools to setup a virtual domain, add and delete individual virtual
+  users and aliases, and to change passwords.
+- A separate delivery agent that automatically deals with any address
+  inside a virtual domain from a single .qmail-default file.
diff --git a/vmailmgr-base/Makefile b/vmailmgr-base/Makefile
new file mode 100644
index 0000000000..0e19c359cb
--- /dev/null
+++ b/vmailmgr-base/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-base-${VERSION}
+
+CONFIGURE_ARGS+=	--disable-cgi
+CONFIGURE_ARGS+=	--disable-courier-imap
+CONFIGURE_ARGS+=	--disable-php
+CONFIGURE_ARGS+=	--disable-python
+
+# for vmailmgr.7, without building the heavier docs
+# copy-paste-changed from ../../mk/build/build.mk:
+post-build:
+.for dir in doc
+	${RUN}${_ULIMIT_CMD}						\
+	cd ${WRKSRC} && cd ${dir} &&					\
+	${BUILD_MAKE_CMD} man
+.endfor
+
+# copy-paste-changed from ../../mk/install/install.mk:
+post-install:
+.for dir in doc
+	${RUN} ${_ULIMIT_CMD}						\
+	cd ${WRKSRC} && cd ${dir} &&					\
+	${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} 			\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}	\
+			-f ${MAKE_FILE} install-man
+.endfor
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-base/PLIST b/vmailmgr-base/PLIST
new file mode 100644
index 0000000000..f1b78c978e
--- /dev/null
+++ b/vmailmgr-base/PLIST
@@ -0,0 +1,37 @@
+@comment $NetBSD$
+bin/checkvpw
+bin/dumpvuser
+bin/listvdomain
+bin/showvconfig
+bin/vaddalias
+bin/vadduser
+bin/vaddusers
+bin/vauthenticate
+bin/vchattr
+bin/vchforwards
+bin/vconf2dir
+bin/vdeliver
+bin/vdeluser
+bin/vpasswd
+bin/vpasswds
+bin/vrehash
+bin/vsetup
+bin/vupgrade
+man/man1/checkvpw.1
+man/man1/dumpvuser.1
+man/man1/listvdomain.1
+man/man1/vadduser.1
+man/man1/vaddusers.1
+man/man1/vauthenticate.1
+man/man1/vchattr.1
+man/man1/vchforwards.1
+man/man1/vdeliver.1
+man/man1/vdeluser.1
+man/man1/vpasswd.1
+man/man1/vpasswds.1
+man/man1/vrehash.1
+man/man1/vsetup.1
+man/man1/vupgrade.1
+man/man7/vmailmgr.7
+man/man8/vmailmgrd.8
+sbin/vmailmgrd
diff --git a/vmailmgr-base/distinfo b/vmailmgr-base/distinfo
new file mode 100644
index 0000000000..6efc81dce8
--- /dev/null
+++ b/vmailmgr-base/distinfo
@@ -0,0 +1,23 @@
+$NetBSD$
+
+BLAKE2s (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 6e83ecea2a0defebd20323fbe9833dc1d4e63e8e2d4c6d904c9558ba32cc9a59
+SHA512 (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 9d717b4b9ae763509d8192c40167606acdc56622d8f9351c763140f5b2573d6c2c1364c33003e1649d2b0d628aadab03690ade20f9e3210c5b44a89237bdd62b
+Size (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 191933 bytes
+SHA1 (patch-Makefile.am) = e78f4db1430c54b6a7a7db4020a4d5169b1b9d22
+SHA1 (patch-acinclude.m4) = 950092d07a7021fb92e4fd4716107a7988a21d22
+SHA1 (patch-authenticate_Makefile.am) = 3529853104846d64882d64be39597cacb0bc6e98
+SHA1 (patch-commands_Makefile.am) = 0fc9881f76fefad7648ecde4bb230278237e33b5
+SHA1 (patch-commands_vdeliver.cc) = 2f63addd758b14516a3acaf6ed79a4770c263968
+SHA1 (patch-configure.ac) = d48ce7a3912a1ab2dd9b27e5ed271bba0118d951
+SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
+SHA1 (patch-doc_HOWTO.texi) = 29a8e8413d653e6901c520ecf38d4febfe7a9845
+SHA1 (patch-doc_Makefile.am) = 95118818ccd228f3b5d20458bff7adeed222b772
+SHA1 (patch-lib_fdbuf_fdbuf.h) = 2607bb82c4d9123df0a94b30fc5930db6429010d
+SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4
+SHA1 (patch-lib_vpwtable_cdb__write.cc) = 68e159457a1c6dd152c9d33abeb4457078a4e666
+SHA1 (patch-lib_vpwtable_gdbm__del.cc) = 9eb35e3d6daaf55aaefdaf7fec33a500e51d7856
+SHA1 (patch-lib_vpwtable_gdbm__exists.cc) = c819d6fb8d410b83faf113d639620dcb44d7ba2d
+SHA1 (patch-lib_vpwtable_gdbm__getbyname.cc) = 6a74f8a8398b6344116d1ded1553a0e795dc809c
+SHA1 (patch-lib_vpwtable_gdbm__put.cc) = 26e9c45bba56cb22fcf17d4a61daef3803ddc752
+SHA1 (patch-lib_vpwtable_gdbm__write.cc) = 5cb4a746cbc82d4d3524114d334752b603bfa2a3
+SHA1 (patch-python_Makefile.am) = b1991252f66714b31709a50029fb8c85cd277d79
diff --git a/vmailmgr-base/patches/patch-Makefile.am b/vmailmgr-base/patches/patch-Makefile.am
new file mode 100644
index 0000000000..7128c56a92
--- /dev/null
+++ b/vmailmgr-base/patches/patch-Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Build cgi, php, and python as their own packages.
+
+--- Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
++++ Makefile.am
+@@ -1,7 +1,12 @@
++SUBDIRS = lib authenticate commands daemon scripts
++if WANTCGI
++SUBDIRS += cgi
++endif
++if WANTPHP
++SUBDIRS += php
++endif
+ if WANTPYTHON
+-SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
+-else
+-SUBDIRS = php lib authenticate commands daemon cgi doc scripts
++SUBDIRS += python
+ endif
+ 
+ dist-hook:
diff --git a/vmailmgr-base/patches/patch-acinclude.m4 b/vmailmgr-base/patches/patch-acinclude.m4
new file mode 100644
index 0000000000..525f553181
--- /dev/null
+++ b/vmailmgr-base/patches/patch-acinclude.m4
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Fix autoreconf warnings.
+
+--- acinclude.m4.orig	2024-02-21 15:45:31.387684310 +0000
++++ acinclude.m4
+@@ -1,5 +1,5 @@
+ dnl TRY_CXX_FLAG(FLAG,[ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
+-AC_DEFUN(TRY_CXX_FLAG,
++AC_DEFUN([TRY_CXX_FLAG],
+ [echo >conftest.cc
+ if ${CXX-g++} ${CXXFLAGS} -c [$1] conftest.cc >/dev/null 2>&1; then
+   ifelse([$2], , :, [rm -f conftest*
+@@ -10,7 +10,7 @@ else
+ fi
+ rm -f conftest*])
+ 
+-AC_DEFUN(CXX_NO_RTTI,
++AC_DEFUN([CXX_NO_RTTI],
+ [AC_CACHE_CHECK(whether ${CXX-g++} accepts -fno-rtti,
+ 	local_cv_flag_NO_RTTI,
+ 	TRY_CXX_FLAG(-fno-rtti,
+@@ -19,7 +19,7 @@ AC_DEFUN(CXX_NO_RTTI,
+ test "$local_cv_flag_NO_RTTI" = yes && CXXFLAGS="$CXXFLAGS -fno-rtti"
+ ])
+ 
+-AC_DEFUN(CXX_NO_EXCEPTIONS,
++AC_DEFUN([CXX_NO_EXCEPTIONS],
+ [AC_CACHE_CHECK(whether ${CXX-g++} accepts -fno-exceptions,
+ 	local_cv_flag_NO_EXCEPTIONS,
+ 	TRY_CXX_FLAG(-fno-exceptions,
diff --git a/vmailmgr-base/patches/patch-authenticate_Makefile.am b/vmailmgr-base/patches/patch-authenticate_Makefile.am
new file mode 100644
index 0000000000..4ed0141c54
--- /dev/null
+++ b/vmailmgr-base/patches/patch-authenticate_Makefile.am
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Build Courier IMAP authenticator as a separate package.
+
+Avoid "warning: ignoring prerequisites on suffix rule definition"
+
+--- authenticate/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
++++ authenticate/Makefile.am
+@@ -1,6 +1,8 @@
+ bin_PROGRAMS = checkvpw vauthenticate
++if WANTCOURIER
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${prefix}/libexec/courier-authlib/
++endif
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+@@ -17,9 +19,9 @@ docs: $(noinst_HTMLS) $(man_MANS)
+ dist-hook:
+ 	touch $(distdir)/*.html $(distdir)/*.[123456789]
+ 
+-.pod.1: ../configure.ac
++.pod.1:
+ 	$(POD2MAN) --section=1 $< >$@
+-.pod.html: ../configure.ac
++.pod.html:
+ 	$(POD2HTML) $< >$@
+ 
+ AM_CPPFLAGS = -I../lib
+@@ -27,8 +29,10 @@ AM_CPPFLAGS = -I../lib
+ checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
+ checkvpw_LDADD = ../lib/libvmailmgr.a
+ 
++if WANTCOURIER
+ authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
+ authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
++endif
+ 
+ vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
+ vauthenticate_LDADD = ../lib/libvmailmgr.a
diff --git a/vmailmgr-base/patches/patch-commands_Makefile.am b/vmailmgr-base/patches/patch-commands_Makefile.am
new file mode 100644
index 0000000000..2658c1d6cc
--- /dev/null
+++ b/vmailmgr-base/patches/patch-commands_Makefile.am
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Fix typo in list of .pod files, spotted on Ubuntu via "install: will not
+overwrite just-created vadduser.1"
+
+Avoid "warning: ignoring prerequisites on suffix rule definition"
+
+--- commands/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
++++ commands/Makefile.am
+@@ -4,7 +4,7 @@ bin_SCRIPTS = vaddalias vconf2dir
+ noinst_HEADERS = vcommand.h
+ 
+ noinst_PODS = \
+-	dumpvuser.pod listvdomain.pod vadduser.pod vadduser.pod vchattr.pod \
++	dumpvuser.pod listvdomain.pod vadduser.pod vaddusers.pod vchattr.pod \
+ 	vchforwards.pod vdeliver.pod vdeluser.pod \
+ 	vpasswd.pod vpasswds.pod vrehash.pod vsetup.pod vupgrade.pod
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+@@ -23,11 +23,11 @@ docs: $(noinst_HTMLS) $(man_MANS)
+ dist-hook:
+ 	touch $(distdir)/*.html $(distdir)/*.[123456789]
+ 
+-.cc.pod: ../configure.ac ../lib/cli++/cli++topod.pl
++.cc.pod:
+ 	perl ../lib/cli++/cli++topod.pl $< >$@
+-.pod.1: ../configure.ac
++.pod.1:
+ 	$(POD2MAN) --section=1 $< >$@
+-.pod.html: ../configure.ac
++.pod.html:
+ 	$(POD2HTML) $< >$@
+ 
+ AM_CPPFLAGS = -I../lib -DBINDIR=\"@bindir@\"
diff --git a/vmailmgr-base/patches/patch-commands_vdeliver.cc b/vmailmgr-base/patches/patch-commands_vdeliver.cc
new file mode 100644
index 0000000000..c583014d14
--- /dev/null
+++ b/vmailmgr-base/patches/patch-commands_vdeliver.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- commands/vdeliver.cc.orig	2024-02-20 03:26:27.764197339 +0000
++++ commands/vdeliver.cc
+@@ -262,7 +262,7 @@ void inject(mystring sender, mystring re
+     close(pipe2[1]);
+     if((dup2(pipe1[0], 0) != 0) || (dup2(pipe2[0], 1) != 1))
+       exit(111);
+-    execl(qq.c_str(), qq.c_str(), 0);
++    execl(qq.c_str(), qq.c_str(), (char *)0);
+     die_temp("Exec of qmail-queue failed.");
+   default:
+     close(pipe1[0]);
diff --git a/vmailmgr-base/patches/patch-configure.ac b/vmailmgr-base/patches/patch-configure.ac
new file mode 100644
index 0000000000..2d9f7de755
--- /dev/null
+++ b/vmailmgr-base/patches/patch-configure.ac
@@ -0,0 +1,84 @@
+$NetBSD$
+
+Don't build courier-imap, cgi, php, or python by default.
+Remove unused text-browser checks.
+
+--- configure.ac.orig	2015-09-01 16:03:21.000000000 +0000
++++ configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([vmailmgr], [0.97.1])
++AC_INIT([vmailmgr], [@PKGVERSION@])
+ AC_CONFIG_SRCDIR([lib/mergelib.sh])
+ AM_INIT_AUTOMAKE
+ 
+@@ -55,34 +55,42 @@ AC_PATH_PROG(RM, rm)
+ AC_PATH_PROG(MKDIR, mkdir)
+ AC_PATH_PROG(LN, ln)
+ 
+-AC_PATH_PROG(PYTHON, python2)
++USE_PYTHON=no
++AC_ARG_ENABLE(python,
++[  --enable-python         Install Python bindings.],
++USE_PYTHON=$enableval)
++PYTHON=@PYTHONBIN@
+ AC_CACHE_CHECK(Python library path, local_cv_python_lib_dir,
+ [[if test -x "$PYTHON"; then
+-  local_cv_python_lib_dir=`$PYTHON -c "import sys;print sys.path[1]"`
++  local_cv_python_lib_dir=`$PYTHON -c "import sys;print(sys.path[2])"`/site-packages
+ else
+   local_cv_python_lib_dir=NONE
+ fi]])
+ pythonlibdir="$local_cv_python_lib_dir/vmailmgr"
+ AC_SUBST(pythonlibdir)
+-AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE)
++AM_CONDITIONAL(WANTPYTHON, test "$USE_PYTHON" != no)
+ 
+-phpdir="/home/httpd/php"
++USE_PHP=no
++AC_ARG_ENABLE(php,
++[  --enable-php            Install PHP bindings.],
++USE_PHP=$enableval)
++phpdir='${prefix}/share/vmailmgr/php'
+ AC_SUBST(phpdir)
++AM_CONDITIONAL(WANTPHP, test "$USE_PHP" != no)
+ 
+-AC_PATH_PROG(W3M, w3m)
+-AC_PATH_PROG(LYNX, lynx)
+-if test "x$W3M" != x; then
+-  echo Using w3m to format html pages.
+-  HTML2TXT="w3m -dump"
+-elif test "x$LYNX" != x; then
+-  echo Using lynx to format html pages.
+-  HTML2TXT="lynx -dump -nolist"
+-else
+-  echo "Can't find either w3m or lynx, building the plain text"
+-  echo "documentation files will fail."
+-  HTML2TXT="false"
+-fi
+-AC_SUBST(HTML2TXT)
++USE_COURIER=no
++AC_ARG_ENABLE(courier-imap,
++[  --enable-courier-imap   Install Courier-IMAP authenticator.],
++USE_COURIER=$enableval)
++AM_CONDITIONAL(WANTCOURIER, test "$USE_COURIER" != no)
++
++USE_CGI=no
++AC_ARG_ENABLE(cgi,
++[  --enable-cgi            Install CGI programs.],
++USE_CGI=$enableval)
++cgidir='${prefix}/libexec/cgi-bin'
++AC_SUBST(cgidir)
++AM_CONDITIONAL(WANTCGI, test "$USE_CGI" != no)
+ 
+ TODAY=`date +%Y-%m-%d`
+ POD2MAN="pod2man --release='vmailmgr ${VERSION}' --center='VMailMgr Tools Documentation' --date='${TODAY}'"
+@@ -117,9 +125,6 @@ dnl Checks for library functions.
+ AC_CHECK_FUNCS(gethostname gettimeofday mkdir putenv rmdir socket)
+ AC_CHECK_FUNCS(srandom random crypt strcasestr)
+ 
+-cgidir='${prefix}/cgi-bin'
+-AC_SUBST(cgidir)
+-
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES(Makefile
+ 	cgi/Makefile
diff --git a/vmailmgr-base/patches/patch-daemon_Makefile.am b/vmailmgr-base/patches/patch-daemon_Makefile.am
new file mode 100644
index 0000000000..666e14b3e2
--- /dev/null
+++ b/vmailmgr-base/patches/patch-daemon_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Avoid "warning: ignoring prerequisites on suffix rule definition"
+
+--- daemon/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
++++ daemon/Makefile.am
+@@ -15,11 +15,11 @@ docs: $(noinst_HTMLS) $(noinst_TXTS)
+ dist-hook:
+ 	touch $(distdir)/*.html $(distdir)/*.[123456789]
+ 
+-vmailmgrd.pod: main.cc ../configure.ac ../lib/cli++/cli++topod.pl
+-	perl ../lib/cli++/cli++topod.pl $< >$@
+-.pod.8: ../configure.ac
++vmailmgrd.pod:
++	perl ../lib/cli++/cli++topod.pl main.cc >$@
++.pod.8:
+ 	$(POD2MAN) --section=8 $< >$@
+-.pod.html: ../configure.ac
++.pod.html:
+ 	$(POD2HTML) $< >$@
+ 
+ AM_CPPFLAGS = -I../lib
diff --git a/vmailmgr-base/patches/patch-doc_HOWTO.texi b/vmailmgr-base/patches/patch-doc_HOWTO.texi
new file mode 100644
index 0000000000..a5569da022
--- /dev/null
+++ b/vmailmgr-base/patches/patch-doc_HOWTO.texi
@@ -0,0 +1,13 @@
+$NetBSD$
+
+Avoid encoding error for umlaut-laden character.
+
+--- doc/HOWTO.texi.orig	2024-02-21 20:15:30.534197736 +0000
++++ doc/HOWTO.texi
+@@ -1,5 +1,6 @@
+ \input texinfo @c -*-texinfo-*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename HOWTO.info
+ @settitle VMailMgr HOWTO
+ @setchapternewpage off
diff --git a/vmailmgr-base/patches/patch-doc_Makefile.am b/vmailmgr-base/patches/patch-doc_Makefile.am
new file mode 100644
index 0000000000..42aa7693d3
--- /dev/null
+++ b/vmailmgr-base/patches/patch-doc_Makefile.am
@@ -0,0 +1,41 @@
+$NetBSD$
+
+Avoid "warning: ignoring prerequisites on suffix rule definition"
+
+--- doc/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
++++ doc/Makefile.am
+@@ -31,6 +31,7 @@ TEXI2INFO = texi2any --info --no-split -
+ TEXI2TXT = texi2any --plaintext
+ 
+ all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
++man: $(man_MANS)
+ 
+ dist-hook:
+ 	touch $(distdir)/*.html
+@@ -43,15 +44,15 @@ ChangeLog.html: ../ChangeLog
+ NEWS.html: ../NEWS
+ 	$(NEWS2HTML) $< >$@
+ 
+-.pod.1: ../configure.ac; $(POD2MAN) --section=1 $< >$@
+-.pod.5: ../configure.ac; $(POD2MAN) --section=5 $< >$@
+-.pod.7: ../configure.ac; $(POD2MAN) --section=7 $< >$@
+-.pod.8: ../configure.ac; $(POD2MAN) --section=8 $< >$@
+-.pod.html: ../configure.ac; $(POD2HTML) $< >$@
+-.texi.html: ../configure.ac; $(TEXI2HTML) $< >$@
+-.texi.txt: ../configure.ac; $(TEXI2TXT) $< >$@
+-.texi.pdf: ../configure.ac; $(TEXI2PDF) $<
+-.texi.info: ../configure.ac; $(TEXI2INFO) $<
++.pod.1: ; $(POD2MAN) --section=1 $< >$@
++.pod.5: ; $(POD2MAN) --section=5 $< >$@
++.pod.7: ; $(POD2MAN) --section=7 $< >$@
++.pod.8: ; $(POD2MAN) --section=8 $< >$@
++.pod.html: ; $(POD2HTML) $< >$@
++.texi.html: ; $(TEXI2HTML) $< >$@
++.texi.txt: ; $(TEXI2TXT) $< >$@
++.texi.pdf: ; $(TEXI2PDF) $<
++.texi.info: ; $(TEXI2INFO) $<
+ 
+-.fig.pdf: ../configure.ac; $(FIG2PDF) $< $@
+-.fig.ps: ../configure.ac; $(FIG2PS) $< $@
++.fig.pdf: ; $(FIG2PDF) $< $@
++.fig.ps: ; $(FIG2PS) $< $@
diff --git a/vmailmgr-base/patches/patch-lib_fdbuf_fdbuf.h b/vmailmgr-base/patches/patch-lib_fdbuf_fdbuf.h
new file mode 100644
index 0000000000..d1054bb06e
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_fdbuf_fdbuf.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix warnings.
+
+--- lib/fdbuf/fdbuf.h.orig	2024-02-20 03:19:48.448432259 +0000
++++ lib/fdbuf/fdbuf.h
+@@ -21,6 +21,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>
diff --git a/vmailmgr-base/patches/patch-lib_mergelib.sh b/vmailmgr-base/patches/patch-lib_mergelib.sh
new file mode 100644
index 0000000000..383896d4d6
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_mergelib.sh
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fix macOS "ld: multiple SYMDEF member files found in an archive".
+
+--- lib/mergelib.sh.orig	2015-09-01 16:03:21.000000000 +0000
++++ lib/mergelib.sh
+@@ -10,6 +10,7 @@ for input in "$@"; do
+ 	mkdir "$dir"
+ 	cd "$dir"
+ 	ar x ../../"$input"
++	rm -f __.SYMDEF*
+ 	cd ..
+ done
+ ar rc ../"$archive" */*
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_cdb__write.cc b/vmailmgr-base/patches/patch-lib_vpwtable_cdb__write.cc
new file mode 100644
index 0000000000..9539557028
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_cdb__write.cc
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Fix warnings.
+
+--- lib/vpwtable/cdb_write.cc.orig	2024-02-20 03:14:13.278367363 +0000
++++ lib/vpwtable/cdb_write.cc
+@@ -23,8 +23,8 @@
+ class cdb_vpwtable_writer : public vpwtable_writer
+ {
+ private:
+-  const mystring& tmpname;
+-  const mystring& cdbname;
++  const mystring tmpname;
++  const mystring cdbname;
+   cdb_writer out;
+   bool opened;
+ public:
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__del.cc b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__del.cc
new file mode 100644
index 0000000000..8d402983e4
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__del.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- lib/vpwtable/gdbm_del.cc.orig	2024-02-20 03:20:54.978827529 +0000
++++ lib/vpwtable/gdbm_del.cc
+@@ -23,7 +23,7 @@ bool vpwtable::del(const mystring& name)
+   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_WRITER, 0, 0);
+   if(!db)
+     return false;
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   bool result = gdbm_delete(db, key) == 0;
+   gdbm_close(db);
+   return result;
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__exists.cc b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__exists.cc
new file mode 100644
index 0000000000..f66c80f1e9
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__exists.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- lib/vpwtable/gdbm_exists.cc.orig	2024-02-20 03:21:16.821104286 +0000
++++ lib/vpwtable/gdbm_exists.cc
+@@ -23,7 +23,7 @@ bool vpwtable::exists(const mystring& na
+   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_READER, 0, 0);
+   if(!db)
+     return false;
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   bool result = gdbm_exists(db, key);
+   gdbm_close(db);
+   return result;
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__getbyname.cc b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__getbyname.cc
new file mode 100644
index 0000000000..027f8bc4a8
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__getbyname.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- lib/vpwtable/gdbm_getbyname.cc.orig	2024-02-20 03:21:36.626537464 +0000
++++ lib/vpwtable/gdbm_getbyname.cc
+@@ -24,7 +24,7 @@ vpwentry* vpwtable::getbyname(const myst
+   if(!db)
+     return 0;
+   mystring lower = name.lower();
+-  datum key = { (char*)lower.c_str(), lower.length() };
++  datum key = { (char*)lower.c_str(), static_cast<int>(lower.length()) };
+   datum result = gdbm_fetch(db, key);
+   gdbm_close(db);
+   return vpwentry::new_from_record(name, mystring(result.dptr, result.dsize));
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__put.cc b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__put.cc
new file mode 100644
index 0000000000..664c59e4cf
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__put.cc
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- lib/vpwtable/gdbm_put.cc.orig	2024-02-20 03:21:52.065572565 +0000
++++ lib/vpwtable/gdbm_put.cc
+@@ -25,9 +25,9 @@ bool vpwtable::put(const vpwentry* vpw,
+   if(!db)
+     return false;
+   mystring name = vpw->name.lower();
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   mystring binary = vpw->to_record();
+-  datum data = { (char*)binary.c_str(), binary.length() };
++  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
+   bool result = gdbm_store(db, key, data,
+ 			   onlyadd ? GDBM_INSERT : GDBM_REPLACE) == 0;
+   gdbm_close(db);
diff --git a/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__write.cc b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__write.cc
new file mode 100644
index 0000000000..3ec27dfccc
--- /dev/null
+++ b/vmailmgr-base/patches/patch-lib_vpwtable_gdbm__write.cc
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Patch from FreeBSD ports.
+
+--- lib/vpwtable/gdbm_write.cc.orig	2024-02-20 03:22:19.220947617 +0000
++++ lib/vpwtable/gdbm_write.cc
+@@ -22,8 +22,8 @@
+ class gdbm_vpwtable_writer : public vpwtable_writer
+ {
+ private:
+-  const mystring& tmpname;
+-  const mystring& destname;
++  const mystring tmpname;
++  const mystring destname;
+   GDBM_FILE out;
+   bool opened;
+ public:
+@@ -60,9 +60,9 @@ bool gdbm_vpwtable_writer::operator!() c
+ bool gdbm_vpwtable_writer::put(const vpwentry& vpw)
+ {
+   mystring name = vpw->name.lower();
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   mystring binary = vpw->to_record();
+-  datum data = { (char*)binary.c_str(), binary.length() };
++  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
+   return gdbm_store(out, key, data, GDBM_INSERT) == 0;
+ }
+ 
diff --git a/vmailmgr-base/patches/patch-python_Makefile.am b/vmailmgr-base/patches/patch-python_Makefile.am
new file mode 100644
index 0000000000..611f3924ed
--- /dev/null
+++ b/vmailmgr-base/patches/patch-python_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use pkgsrc-selected python.
+
+--- python/Makefile.am.orig	2024-02-21 18:22:04.641768913 +0000
++++ python/Makefile.am
+@@ -26,6 +26,6 @@ types.pyc: types.py local.py
+ types.pyo: types.py local.py
+ 
+ .py.pyc:
+-	python -c 'import $*' && touch $@
++	@PYTHONBIN@ -c 'import $*' && touch $@
+ .py.pyo:
+-	python -O -c 'import $*' && touch $@
++	@PYTHONBIN@ -O -c 'import $*' && touch $@
diff --git a/vmailmgr/DESCR b/vmailmgr/DESCR
index e7a5835996..06da788ec0 100644
--- a/vmailmgr/DESCR
+++ b/vmailmgr/DESCR
@@ -1,22 +1 @@
-VMailMgr (short for Virtual MAIL ManaGeR) is a package of programs
-designed to manage multiple domains of mail addresses and mailboxes on a
-single host. It co-operates with qmail for mail delivery and program
-control. It features:
-
-- A password checking interface between qmail-popup and qmail-pop3d
-  which replaces the usual checkpassword, as well as an authentication
-  module for Courier IMAP, that provide access to the virtual mailboxes
-  by one of three methods:
-  - IP-based virtual server access (invisible to the POP3 user)
-  - username-based access (username-virtualuser)
-  - hostname-based access (virtualuser%virtual.host@localhost or
-    virtualuser:virtual.host)
-- CDB-based password tables to speed up access for domains of any size.
-- Tools to setup a virtual domain, add and delete individual virtual
-  users and aliases, and to change passwords. CGI programs to accomplish
-  the above tasks from a set of web pages.
-- A native PHP library to complement or replace the CGIs.
-- A daemon process that securely directs the operation of the CGIs
-  and PHP code.
-- A separate delivery agent that automatically deals with any address
-  inside a virtual domain from a single .qmail-default file.
+This is the meta package of VMailMgr and all its components.
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index dc788d7e59..a2ab73e2af 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -1,31 +1,17 @@
 # $NetBSD$
 
-.include "../../wip/vmailmgr/Makefile.common"
+.include "../../wip/vmailmgr/version.mk"
 
-PKGNAME=		vmailmgr-${VERSION}
+PKGNAME=	vmailmgr-${VERSION}
+CATEGORIES=	mail
 
-CONFIGURE_ARGS+=	--disable-cgi
-CONFIGURE_ARGS+=	--disable-courier-imap
-CONFIGURE_ARGS+=	--disable-php
-CONFIGURE_ARGS+=	--disable-python
+DEPENDS+=	vmailmgr-base>=${VERSION}:../../wip/vmailmgr-base
+DEPENDS+=	vmailmgr-cgi>=${VERSION}:../../wip/vmailmgr-cgi
+DEPENDS+=	vmailmgr-courier-imap>=${VERSION}:../../wip/vmailmgr-courier-imap
+DEPENDS+=	vmailmgr-docs>=${VERSION}:../../wip/vmailmgr-docs
+DEPENDS+=	vmailmgr-php>=${VERSION}:../../wip/vmailmgr-php
+DEPENDS+=	vmailmgr-python>=${VERSION}:../../wip/vmailmgr-python
 
-# for vmailmgr.7, without building the heavier docs
-# copy-paste-changed from ../../mk/build/build.mk:
-post-build:
-.for dir in doc
-	${RUN}${_ULIMIT_CMD}						\
-	cd ${WRKSRC} && cd ${dir} &&					\
-	${BUILD_MAKE_CMD} man
-.endfor
-
-# copy-paste-changed from ../../mk/install/install.mk:
-post-install:
-.for dir in doc
-	${RUN} ${_ULIMIT_CMD}						\
-	cd ${WRKSRC} && cd ${dir} &&					\
-	${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} 			\
-		${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS}	\
-			-f ${MAKE_FILE} install-man
-.endfor
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
index 087f047297..8f8cafdc73 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -1,14 +1,15 @@
 # $NetBSD$
 #
-# used by wip/vmailmgr/Makefile
+# used by wip/vmailmgr-base/Makefile
 # used by wip/vmailmgr-cgi/Makefile
 # used by wip/vmailmgr-courier-imap/Makefile
 # used by wip/vmailmgr-docs/Makefile
 # used by wip/vmailmgr-php/Makefile
 # used by wip/vmailmgr-python/Makefile
 
+.include "../../wip/vmailmgr/version.mk"
+
 DISTNAME=		vmailmgr-${GITHUB_TAG}
-VERSION=		0.97.0.20150901
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=bruceg/}
 GITHUB_TAG=		526d53c1d0e604ec29ada61b79485ceeb8b978cd
@@ -25,8 +26,8 @@ USE_TOOLS+=		autoconf automake gmake perl sh
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-PATCHDIR=		${.CURDIR}/../../wip/vmailmgr/patches
-DISTINFO_FILE=		${.CURDIR}/../../wip/vmailmgr/distinfo
+PATCHDIR=		${.CURDIR}/../../wip/vmailmgr-base/patches
+DISTINFO_FILE=		${.CURDIR}/../../wip/vmailmgr-base/distinfo
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	pre-configure
diff --git a/vmailmgr/PLIST b/vmailmgr/PLIST
deleted file mode 100644
index f1b78c978e..0000000000
--- a/vmailmgr/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD$
-bin/checkvpw
-bin/dumpvuser
-bin/listvdomain
-bin/showvconfig
-bin/vaddalias
-bin/vadduser
-bin/vaddusers
-bin/vauthenticate
-bin/vchattr
-bin/vchforwards
-bin/vconf2dir
-bin/vdeliver
-bin/vdeluser
-bin/vpasswd
-bin/vpasswds
-bin/vrehash
-bin/vsetup
-bin/vupgrade
-man/man1/checkvpw.1
-man/man1/dumpvuser.1
-man/man1/listvdomain.1
-man/man1/vadduser.1
-man/man1/vaddusers.1
-man/man1/vauthenticate.1
-man/man1/vchattr.1
-man/man1/vchforwards.1
-man/man1/vdeliver.1
-man/man1/vdeluser.1
-man/man1/vpasswd.1
-man/man1/vpasswds.1
-man/man1/vrehash.1
-man/man1/vsetup.1
-man/man1/vupgrade.1
-man/man7/vmailmgr.7
-man/man8/vmailmgrd.8
-sbin/vmailmgrd
diff --git a/vmailmgr/distinfo b/vmailmgr/distinfo
deleted file mode 100644
index 6efc81dce8..0000000000
--- a/vmailmgr/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-BLAKE2s (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 6e83ecea2a0defebd20323fbe9833dc1d4e63e8e2d4c6d904c9558ba32cc9a59
-SHA512 (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 9d717b4b9ae763509d8192c40167606acdc56622d8f9351c763140f5b2573d6c2c1364c33003e1649d2b0d628aadab03690ade20f9e3210c5b44a89237bdd62b
-Size (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 191933 bytes
-SHA1 (patch-Makefile.am) = e78f4db1430c54b6a7a7db4020a4d5169b1b9d22
-SHA1 (patch-acinclude.m4) = 950092d07a7021fb92e4fd4716107a7988a21d22
-SHA1 (patch-authenticate_Makefile.am) = 3529853104846d64882d64be39597cacb0bc6e98
-SHA1 (patch-commands_Makefile.am) = 0fc9881f76fefad7648ecde4bb230278237e33b5
-SHA1 (patch-commands_vdeliver.cc) = 2f63addd758b14516a3acaf6ed79a4770c263968
-SHA1 (patch-configure.ac) = d48ce7a3912a1ab2dd9b27e5ed271bba0118d951
-SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
-SHA1 (patch-doc_HOWTO.texi) = 29a8e8413d653e6901c520ecf38d4febfe7a9845
-SHA1 (patch-doc_Makefile.am) = 95118818ccd228f3b5d20458bff7adeed222b772
-SHA1 (patch-lib_fdbuf_fdbuf.h) = 2607bb82c4d9123df0a94b30fc5930db6429010d
-SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4
-SHA1 (patch-lib_vpwtable_cdb__write.cc) = 68e159457a1c6dd152c9d33abeb4457078a4e666
-SHA1 (patch-lib_vpwtable_gdbm__del.cc) = 9eb35e3d6daaf55aaefdaf7fec33a500e51d7856
-SHA1 (patch-lib_vpwtable_gdbm__exists.cc) = c819d6fb8d410b83faf113d639620dcb44d7ba2d
-SHA1 (patch-lib_vpwtable_gdbm__getbyname.cc) = 6a74f8a8398b6344116d1ded1553a0e795dc809c
-SHA1 (patch-lib_vpwtable_gdbm__put.cc) = 26e9c45bba56cb22fcf17d4a61daef3803ddc752
-SHA1 (patch-lib_vpwtable_gdbm__write.cc) = 5cb4a746cbc82d4d3524114d334752b603bfa2a3
-SHA1 (patch-python_Makefile.am) = b1991252f66714b31709a50029fb8c85cd277d79
diff --git a/vmailmgr/patches/patch-Makefile.am b/vmailmgr/patches/patch-Makefile.am
deleted file mode 100644
index 7128c56a92..0000000000
--- a/vmailmgr/patches/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Build cgi, php, and python as their own packages.
-
---- Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
-+++ Makefile.am
-@@ -1,7 +1,12 @@
-+SUBDIRS = lib authenticate commands daemon scripts
-+if WANTCGI
-+SUBDIRS += cgi
-+endif
-+if WANTPHP
-+SUBDIRS += php
-+endif
- if WANTPYTHON
--SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
--else
--SUBDIRS = php lib authenticate commands daemon cgi doc scripts
-+SUBDIRS += python
- endif
- 
- dist-hook:
diff --git a/vmailmgr/patches/patch-acinclude.m4 b/vmailmgr/patches/patch-acinclude.m4
deleted file mode 100644
index 525f553181..0000000000
--- a/vmailmgr/patches/patch-acinclude.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-Fix autoreconf warnings.
-
---- acinclude.m4.orig	2024-02-21 15:45:31.387684310 +0000
-+++ acinclude.m4
-@@ -1,5 +1,5 @@
- dnl TRY_CXX_FLAG(FLAG,[ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
--AC_DEFUN(TRY_CXX_FLAG,
-+AC_DEFUN([TRY_CXX_FLAG],
- [echo >conftest.cc
- if ${CXX-g++} ${CXXFLAGS} -c [$1] conftest.cc >/dev/null 2>&1; then
-   ifelse([$2], , :, [rm -f conftest*
-@@ -10,7 +10,7 @@ else
- fi
- rm -f conftest*])
- 
--AC_DEFUN(CXX_NO_RTTI,
-+AC_DEFUN([CXX_NO_RTTI],
- [AC_CACHE_CHECK(whether ${CXX-g++} accepts -fno-rtti,
- 	local_cv_flag_NO_RTTI,
- 	TRY_CXX_FLAG(-fno-rtti,
-@@ -19,7 +19,7 @@ AC_DEFUN(CXX_NO_RTTI,
- test "$local_cv_flag_NO_RTTI" = yes && CXXFLAGS="$CXXFLAGS -fno-rtti"
- ])
- 
--AC_DEFUN(CXX_NO_EXCEPTIONS,
-+AC_DEFUN([CXX_NO_EXCEPTIONS],
- [AC_CACHE_CHECK(whether ${CXX-g++} accepts -fno-exceptions,
- 	local_cv_flag_NO_EXCEPTIONS,
- 	TRY_CXX_FLAG(-fno-exceptions,
diff --git a/vmailmgr/patches/patch-authenticate_Makefile.am b/vmailmgr/patches/patch-authenticate_Makefile.am
deleted file mode 100644
index 4ed0141c54..0000000000
--- a/vmailmgr/patches/patch-authenticate_Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-Build Courier IMAP authenticator as a separate package.
-
-Avoid "warning: ignoring prerequisites on suffix rule definition"
-
---- authenticate/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
-+++ authenticate/Makefile.am
-@@ -1,6 +1,8 @@
- bin_PROGRAMS = checkvpw vauthenticate
-+if WANTCOURIER
- authlib_PROGRAMS = authvmailmgr
--authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
-+authlibdir = ${prefix}/libexec/courier-authlib/
-+endif
- 
- noinst_PODS = checkvpw.pod vauthenticate.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-@@ -17,9 +19,9 @@ docs: $(noinst_HTMLS) $(man_MANS)
- dist-hook:
- 	touch $(distdir)/*.html $(distdir)/*.[123456789]
- 
--.pod.1: ../configure.ac
-+.pod.1:
- 	$(POD2MAN) --section=1 $< >$@
--.pod.html: ../configure.ac
-+.pod.html:
- 	$(POD2HTML) $< >$@
- 
- AM_CPPFLAGS = -I../lib
-@@ -27,8 +29,10 @@ AM_CPPFLAGS = -I../lib
- checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
- checkvpw_LDADD = ../lib/libvmailmgr.a
- 
-+if WANTCOURIER
- authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
- authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
-+endif
- 
- vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
- vauthenticate_LDADD = ../lib/libvmailmgr.a
diff --git a/vmailmgr/patches/patch-commands_Makefile.am b/vmailmgr/patches/patch-commands_Makefile.am
deleted file mode 100644
index 2658c1d6cc..0000000000
--- a/vmailmgr/patches/patch-commands_Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Fix typo in list of .pod files, spotted on Ubuntu via "install: will not
-overwrite just-created vadduser.1"
-
-Avoid "warning: ignoring prerequisites on suffix rule definition"
-
---- commands/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
-+++ commands/Makefile.am
-@@ -4,7 +4,7 @@ bin_SCRIPTS = vaddalias vconf2dir
- noinst_HEADERS = vcommand.h
- 
- noinst_PODS = \
--	dumpvuser.pod listvdomain.pod vadduser.pod vadduser.pod vchattr.pod \
-+	dumpvuser.pod listvdomain.pod vadduser.pod vaddusers.pod vchattr.pod \
- 	vchforwards.pod vdeliver.pod vdeluser.pod \
- 	vpasswd.pod vpasswds.pod vrehash.pod vsetup.pod vupgrade.pod
- noinst_HTMLS = $(noinst_PODS:.pod=.html)
-@@ -23,11 +23,11 @@ docs: $(noinst_HTMLS) $(man_MANS)
- dist-hook:
- 	touch $(distdir)/*.html $(distdir)/*.[123456789]
- 
--.cc.pod: ../configure.ac ../lib/cli++/cli++topod.pl
-+.cc.pod:
- 	perl ../lib/cli++/cli++topod.pl $< >$@
--.pod.1: ../configure.ac
-+.pod.1:
- 	$(POD2MAN) --section=1 $< >$@
--.pod.html: ../configure.ac
-+.pod.html:
- 	$(POD2HTML) $< >$@
- 
- AM_CPPFLAGS = -I../lib -DBINDIR=\"@bindir@\"
diff --git a/vmailmgr/patches/patch-commands_vdeliver.cc b/vmailmgr/patches/patch-commands_vdeliver.cc
deleted file mode 100644
index c583014d14..0000000000
--- a/vmailmgr/patches/patch-commands_vdeliver.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- commands/vdeliver.cc.orig	2024-02-20 03:26:27.764197339 +0000
-+++ commands/vdeliver.cc
-@@ -262,7 +262,7 @@ void inject(mystring sender, mystring re
-     close(pipe2[1]);
-     if((dup2(pipe1[0], 0) != 0) || (dup2(pipe2[0], 1) != 1))
-       exit(111);
--    execl(qq.c_str(), qq.c_str(), 0);
-+    execl(qq.c_str(), qq.c_str(), (char *)0);
-     die_temp("Exec of qmail-queue failed.");
-   default:
-     close(pipe1[0]);
diff --git a/vmailmgr/patches/patch-configure.ac b/vmailmgr/patches/patch-configure.ac
deleted file mode 100644
index 2d9f7de755..0000000000
--- a/vmailmgr/patches/patch-configure.ac
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD$
-
-Don't build courier-imap, cgi, php, or python by default.
-Remove unused text-browser checks.
-
---- configure.ac.orig	2015-09-01 16:03:21.000000000 +0000
-+++ configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([vmailmgr], [0.97.1])
-+AC_INIT([vmailmgr], [@PKGVERSION@])
- AC_CONFIG_SRCDIR([lib/mergelib.sh])
- AM_INIT_AUTOMAKE
- 
-@@ -55,34 +55,42 @@ AC_PATH_PROG(RM, rm)
- AC_PATH_PROG(MKDIR, mkdir)
- AC_PATH_PROG(LN, ln)
- 
--AC_PATH_PROG(PYTHON, python2)
-+USE_PYTHON=no
-+AC_ARG_ENABLE(python,
-+[  --enable-python         Install Python bindings.],
-+USE_PYTHON=$enableval)
-+PYTHON=@PYTHONBIN@
- AC_CACHE_CHECK(Python library path, local_cv_python_lib_dir,
- [[if test -x "$PYTHON"; then
--  local_cv_python_lib_dir=`$PYTHON -c "import sys;print sys.path[1]"`
-+  local_cv_python_lib_dir=`$PYTHON -c "import sys;print(sys.path[2])"`/site-packages
- else
-   local_cv_python_lib_dir=NONE
- fi]])
- pythonlibdir="$local_cv_python_lib_dir/vmailmgr"
- AC_SUBST(pythonlibdir)
--AM_CONDITIONAL(WANTPYTHON, test x$local_cv_python_lib_dir != xNONE)
-+AM_CONDITIONAL(WANTPYTHON, test "$USE_PYTHON" != no)
- 
--phpdir="/home/httpd/php"
-+USE_PHP=no
-+AC_ARG_ENABLE(php,
-+[  --enable-php            Install PHP bindings.],
-+USE_PHP=$enableval)
-+phpdir='${prefix}/share/vmailmgr/php'
- AC_SUBST(phpdir)
-+AM_CONDITIONAL(WANTPHP, test "$USE_PHP" != no)
- 
--AC_PATH_PROG(W3M, w3m)
--AC_PATH_PROG(LYNX, lynx)
--if test "x$W3M" != x; then
--  echo Using w3m to format html pages.
--  HTML2TXT="w3m -dump"
--elif test "x$LYNX" != x; then
--  echo Using lynx to format html pages.
--  HTML2TXT="lynx -dump -nolist"
--else
--  echo "Can't find either w3m or lynx, building the plain text"
--  echo "documentation files will fail."
--  HTML2TXT="false"
--fi
--AC_SUBST(HTML2TXT)
-+USE_COURIER=no
-+AC_ARG_ENABLE(courier-imap,
-+[  --enable-courier-imap   Install Courier-IMAP authenticator.],
-+USE_COURIER=$enableval)
-+AM_CONDITIONAL(WANTCOURIER, test "$USE_COURIER" != no)
-+
-+USE_CGI=no
-+AC_ARG_ENABLE(cgi,
-+[  --enable-cgi            Install CGI programs.],
-+USE_CGI=$enableval)
-+cgidir='${prefix}/libexec/cgi-bin'
-+AC_SUBST(cgidir)
-+AM_CONDITIONAL(WANTCGI, test "$USE_CGI" != no)
- 
- TODAY=`date +%Y-%m-%d`
- POD2MAN="pod2man --release='vmailmgr ${VERSION}' --center='VMailMgr Tools Documentation' --date='${TODAY}'"
-@@ -117,9 +125,6 @@ dnl Checks for library functions.
- AC_CHECK_FUNCS(gethostname gettimeofday mkdir putenv rmdir socket)
- AC_CHECK_FUNCS(srandom random crypt strcasestr)
- 
--cgidir='${prefix}/cgi-bin'
--AC_SUBST(cgidir)
--
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES(Makefile
- 	cgi/Makefile
diff --git a/vmailmgr/patches/patch-daemon_Makefile.am b/vmailmgr/patches/patch-daemon_Makefile.am
deleted file mode 100644
index 666e14b3e2..0000000000
--- a/vmailmgr/patches/patch-daemon_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Avoid "warning: ignoring prerequisites on suffix rule definition"
-
---- daemon/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
-+++ daemon/Makefile.am
-@@ -15,11 +15,11 @@ docs: $(noinst_HTMLS) $(noinst_TXTS)
- dist-hook:
- 	touch $(distdir)/*.html $(distdir)/*.[123456789]
- 
--vmailmgrd.pod: main.cc ../configure.ac ../lib/cli++/cli++topod.pl
--	perl ../lib/cli++/cli++topod.pl $< >$@
--.pod.8: ../configure.ac
-+vmailmgrd.pod:
-+	perl ../lib/cli++/cli++topod.pl main.cc >$@
-+.pod.8:
- 	$(POD2MAN) --section=8 $< >$@
--.pod.html: ../configure.ac
-+.pod.html:
- 	$(POD2HTML) $< >$@
- 
- AM_CPPFLAGS = -I../lib
diff --git a/vmailmgr/patches/patch-doc_HOWTO.texi b/vmailmgr/patches/patch-doc_HOWTO.texi
deleted file mode 100644
index a5569da022..0000000000
--- a/vmailmgr/patches/patch-doc_HOWTO.texi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Avoid encoding error for umlaut-laden character.
-
---- doc/HOWTO.texi.orig	2024-02-21 20:15:30.534197736 +0000
-+++ doc/HOWTO.texi
-@@ -1,5 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
-+@documentencoding ISO-8859-1
- @setfilename HOWTO.info
- @settitle VMailMgr HOWTO
- @setchapternewpage off
diff --git a/vmailmgr/patches/patch-doc_Makefile.am b/vmailmgr/patches/patch-doc_Makefile.am
deleted file mode 100644
index 42aa7693d3..0000000000
--- a/vmailmgr/patches/patch-doc_Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-Avoid "warning: ignoring prerequisites on suffix rule definition"
-
---- doc/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
-+++ doc/Makefile.am
-@@ -31,6 +31,7 @@ TEXI2INFO = texi2any --info --no-split -
- TEXI2TXT = texi2any --plaintext
- 
- all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
-+man: $(man_MANS)
- 
- dist-hook:
- 	touch $(distdir)/*.html
-@@ -43,15 +44,15 @@ ChangeLog.html: ../ChangeLog
- NEWS.html: ../NEWS
- 	$(NEWS2HTML) $< >$@
- 
--.pod.1: ../configure.ac; $(POD2MAN) --section=1 $< >$@
--.pod.5: ../configure.ac; $(POD2MAN) --section=5 $< >$@
--.pod.7: ../configure.ac; $(POD2MAN) --section=7 $< >$@
--.pod.8: ../configure.ac; $(POD2MAN) --section=8 $< >$@
--.pod.html: ../configure.ac; $(POD2HTML) $< >$@
--.texi.html: ../configure.ac; $(TEXI2HTML) $< >$@
--.texi.txt: ../configure.ac; $(TEXI2TXT) $< >$@
--.texi.pdf: ../configure.ac; $(TEXI2PDF) $<
--.texi.info: ../configure.ac; $(TEXI2INFO) $<
-+.pod.1: ; $(POD2MAN) --section=1 $< >$@
-+.pod.5: ; $(POD2MAN) --section=5 $< >$@
-+.pod.7: ; $(POD2MAN) --section=7 $< >$@
-+.pod.8: ; $(POD2MAN) --section=8 $< >$@
-+.pod.html: ; $(POD2HTML) $< >$@
-+.texi.html: ; $(TEXI2HTML) $< >$@
-+.texi.txt: ; $(TEXI2TXT) $< >$@
-+.texi.pdf: ; $(TEXI2PDF) $<
-+.texi.info: ; $(TEXI2INFO) $<
- 
--.fig.pdf: ../configure.ac; $(FIG2PDF) $< $@
--.fig.ps: ../configure.ac; $(FIG2PS) $< $@
-+.fig.pdf: ; $(FIG2PDF) $< $@
-+.fig.ps: ; $(FIG2PS) $< $@
diff --git a/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h b/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
deleted file mode 100644
index d1054bb06e..0000000000
--- a/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Fix warnings.
-
---- lib/fdbuf/fdbuf.h.orig	2024-02-20 03:19:48.448432259 +0000
-+++ lib/fdbuf/fdbuf.h
-@@ -21,6 +21,7 @@
- #include "config.h"
- #include <string.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #ifdef _REENTRANT
- #include <pthread.h>
diff --git a/vmailmgr/patches/patch-lib_mergelib.sh b/vmailmgr/patches/patch-lib_mergelib.sh
deleted file mode 100644
index 383896d4d6..0000000000
--- a/vmailmgr/patches/patch-lib_mergelib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Fix macOS "ld: multiple SYMDEF member files found in an archive".
-
---- lib/mergelib.sh.orig	2015-09-01 16:03:21.000000000 +0000
-+++ lib/mergelib.sh
-@@ -10,6 +10,7 @@ for input in "$@"; do
- 	mkdir "$dir"
- 	cd "$dir"
- 	ar x ../../"$input"
-+	rm -f __.SYMDEF*
- 	cd ..
- done
- ar rc ../"$archive" */*
diff --git a/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc b/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
deleted file mode 100644
index 9539557028..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Fix warnings.
-
---- lib/vpwtable/cdb_write.cc.orig	2024-02-20 03:14:13.278367363 +0000
-+++ lib/vpwtable/cdb_write.cc
-@@ -23,8 +23,8 @@
- class cdb_vpwtable_writer : public vpwtable_writer
- {
- private:
--  const mystring& tmpname;
--  const mystring& cdbname;
-+  const mystring tmpname;
-+  const mystring cdbname;
-   cdb_writer out;
-   bool opened;
- public:
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
deleted file mode 100644
index 8d402983e4..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- lib/vpwtable/gdbm_del.cc.orig	2024-02-20 03:20:54.978827529 +0000
-+++ lib/vpwtable/gdbm_del.cc
-@@ -23,7 +23,7 @@ bool vpwtable::del(const mystring& name)
-   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_WRITER, 0, 0);
-   if(!db)
-     return false;
--  datum key = { (char*)name.c_str(), name.length() };
-+  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
-   bool result = gdbm_delete(db, key) == 0;
-   gdbm_close(db);
-   return result;
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
deleted file mode 100644
index f66c80f1e9..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- lib/vpwtable/gdbm_exists.cc.orig	2024-02-20 03:21:16.821104286 +0000
-+++ lib/vpwtable/gdbm_exists.cc
-@@ -23,7 +23,7 @@ bool vpwtable::exists(const mystring& na
-   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_READER, 0, 0);
-   if(!db)
-     return false;
--  datum key = { (char*)name.c_str(), name.length() };
-+  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
-   bool result = gdbm_exists(db, key);
-   gdbm_close(db);
-   return result;
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
deleted file mode 100644
index 027f8bc4a8..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- lib/vpwtable/gdbm_getbyname.cc.orig	2024-02-20 03:21:36.626537464 +0000
-+++ lib/vpwtable/gdbm_getbyname.cc
-@@ -24,7 +24,7 @@ vpwentry* vpwtable::getbyname(const myst
-   if(!db)
-     return 0;
-   mystring lower = name.lower();
--  datum key = { (char*)lower.c_str(), lower.length() };
-+  datum key = { (char*)lower.c_str(), static_cast<int>(lower.length()) };
-   datum result = gdbm_fetch(db, key);
-   gdbm_close(db);
-   return vpwentry::new_from_record(name, mystring(result.dptr, result.dsize));
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
deleted file mode 100644
index 664c59e4cf..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- lib/vpwtable/gdbm_put.cc.orig	2024-02-20 03:21:52.065572565 +0000
-+++ lib/vpwtable/gdbm_put.cc
-@@ -25,9 +25,9 @@ bool vpwtable::put(const vpwentry* vpw,
-   if(!db)
-     return false;
-   mystring name = vpw->name.lower();
--  datum key = { (char*)name.c_str(), name.length() };
-+  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
-   mystring binary = vpw->to_record();
--  datum data = { (char*)binary.c_str(), binary.length() };
-+  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
-   bool result = gdbm_store(db, key, data,
- 			   onlyadd ? GDBM_INSERT : GDBM_REPLACE) == 0;
-   gdbm_close(db);
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
deleted file mode 100644
index 3ec27dfccc..0000000000
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Patch from FreeBSD ports.
-
---- lib/vpwtable/gdbm_write.cc.orig	2024-02-20 03:22:19.220947617 +0000
-+++ lib/vpwtable/gdbm_write.cc
-@@ -22,8 +22,8 @@
- class gdbm_vpwtable_writer : public vpwtable_writer
- {
- private:
--  const mystring& tmpname;
--  const mystring& destname;
-+  const mystring tmpname;
-+  const mystring destname;
-   GDBM_FILE out;
-   bool opened;
- public:
-@@ -60,9 +60,9 @@ bool gdbm_vpwtable_writer::operator!() c
- bool gdbm_vpwtable_writer::put(const vpwentry& vpw)
- {
-   mystring name = vpw->name.lower();
--  datum key = { (char*)name.c_str(), name.length() };
-+  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
-   mystring binary = vpw->to_record();
--  datum data = { (char*)binary.c_str(), binary.length() };
-+  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
-   return gdbm_store(out, key, data, GDBM_INSERT) == 0;
- }
- 
diff --git a/vmailmgr/patches/patch-python_Makefile.am b/vmailmgr/patches/patch-python_Makefile.am
deleted file mode 100644
index 611f3924ed..0000000000
--- a/vmailmgr/patches/patch-python_Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Use pkgsrc-selected python.
-
---- python/Makefile.am.orig	2024-02-21 18:22:04.641768913 +0000
-+++ python/Makefile.am
-@@ -26,6 +26,6 @@ types.pyc: types.py local.py
- types.pyo: types.py local.py
- 
- .py.pyc:
--	python -c 'import $*' && touch $@
-+	@PYTHONBIN@ -c 'import $*' && touch $@
- .py.pyo:
--	python -O -c 'import $*' && touch $@
-+	@PYTHONBIN@ -O -c 'import $*' && touch $@
diff --git a/vmailmgr/version.mk b/vmailmgr/version.mk
new file mode 100644
index 0000000000..fad2edece5
--- /dev/null
+++ b/vmailmgr/version.mk
@@ -0,0 +1,6 @@
+# $NetBSD$
+#
+# used by wip/vmailmgr/Makefile
+# used by wip/vmailmgr/Makefile.common
+
+VERSION=		0.97.0.20150901
Prev by Date: btop-git: regen distinfo for patch change
Next by Date: vmailmgr: use PKG_SYSCONFSUBDIR, fix other paths.
Previous by Thread: btop-git: regen distinfo for patch change
Next by Thread: vmailmgr: use PKG_SYSCONFSUBDIR, fix other paths.
Indexes:
Home | Main Index | Thread Index | Old Index