Extract vmailmgr-{courier-imap,php,python} packages.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Extract vmailmgr-{courier-imap,php,python} packages.
From: Amitai Schleier <schmonz%NetBSD.org@localhost>
Date: Wed, 21 Feb 2024 19:31:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz%NetBSD.org@localhost>
Pushed By:	schmonz
Date:		Wed Feb 21 14:31:20 2024 -0500
Changeset:	34f81b4c4d8d3690d2497814938e612b7539a6bf

Modified Files:
	vmailmgr/Makefile
	vmailmgr/TODO.md
	vmailmgr/distinfo
	vmailmgr/patches/patch-Makefile.am
	vmailmgr/patches/patch-authenticate_Makefile.am
	vmailmgr/patches/patch-cgi_Makefile.am
	vmailmgr/patches/patch-commands_Makefile.am
	vmailmgr/patches/patch-commands_vdeliver.cc
	vmailmgr/patches/patch-daemon_Makefile.am
	vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
	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
Added Files:
	vmailmgr-courier-imap/DESCR
	vmailmgr-courier-imap/Makefile
	vmailmgr-courier-imap/PLIST
	vmailmgr-php/DESCR
	vmailmgr-php/Makefile
	vmailmgr-php/PLIST
	vmailmgr-python/DESCR
	vmailmgr-python/Makefile
	vmailmgr-python/PLIST
	vmailmgr/Makefile.common
	vmailmgr/patches/patch-acinclude.m4
	vmailmgr/patches/patch-configure.ac
	vmailmgr/patches/patch-python_Makefile.am
Removed Files:
	vmailmgr/patches/patch-lib_misc_response.h

Log Message:
Extract vmailmgr-{courier-imap,php,python} packages.

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

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

diffstat:
 vmailmgr-courier-imap/DESCR                        |  1 +
 vmailmgr-courier-imap/Makefile                     | 13 ++++++
 vmailmgr-courier-imap/PLIST                        |  2 +
 vmailmgr-php/DESCR                                 |  3 ++
 vmailmgr-php/Makefile                              | 19 ++++++++
 vmailmgr-php/PLIST                                 |  3 ++
 vmailmgr-python/DESCR                              |  1 +
 vmailmgr-python/Makefile                           | 21 +++++++++
 vmailmgr-python/PLIST                              | 22 ++++++++++
 vmailmgr/Makefile                                  | 24 +++-------
 vmailmgr/Makefile.common                           | 40 +++++++++++++++++
 vmailmgr/TODO.md                                   |  8 +---
 vmailmgr/distinfo                                  | 30 +++++++------
 vmailmgr/patches/patch-Makefile.am                 | 15 ++++---
 vmailmgr/patches/patch-acinclude.m4                | 31 +++++++++++++
 vmailmgr/patches/patch-authenticate_Makefile.am    | 27 +++++++-----
 vmailmgr/patches/patch-cgi_Makefile.am             |  2 +
 vmailmgr/patches/patch-commands_Makefile.am        |  6 ++-
 vmailmgr/patches/patch-commands_vdeliver.cc        |  2 +
 vmailmgr/patches/patch-configure.ac                | 51 ++++++++++++++++++++++
 vmailmgr/patches/patch-daemon_Makefile.am          |  9 ++--
 vmailmgr/patches/patch-lib_fdbuf_fdbuf.h           |  2 +
 vmailmgr/patches/patch-lib_misc_response.h         | 13 ------
 vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc  |  2 +
 vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc   |  2 +
 .../patches/patch-lib_vpwtable_gdbm__exists.cc     |  2 +
 .../patches/patch-lib_vpwtable_gdbm__getbyname.cc  |  2 +
 vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc   |  2 +
 vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc |  2 +
 vmailmgr/patches/patch-python_Makefile.am          | 15 +++++++
 30 files changed, 300 insertions(+), 72 deletions(-)

diffs:
diff --git a/vmailmgr-courier-imap/DESCR b/vmailmgr-courier-imap/DESCR
new file mode 100644
index 0000000000..a913d180b7
--- /dev/null
+++ b/vmailmgr-courier-imap/DESCR
@@ -0,0 +1 @@
+This is the VMailMgr authentication module for Courier IMAP.
diff --git a/vmailmgr-courier-imap/Makefile b/vmailmgr-courier-imap/Makefile
new file mode 100644
index 0000000000..62e9e9386f
--- /dev/null
+++ b/vmailmgr-courier-imap/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-courier-imap-${VERSION}
+
+CONFIGURE_ARGS+=	--enable-courier-imap
+
+BUILD_DIRS=		lib authenticate
+INSTALL_DIRS=		authenticate
+INSTALL_TARGET=		install-authlibPROGRAMS
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-courier-imap/PLIST b/vmailmgr-courier-imap/PLIST
new file mode 100644
index 0000000000..80bebfebdc
--- /dev/null
+++ b/vmailmgr-courier-imap/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+libexec/courier-authlib/authvmailmgr
diff --git a/vmailmgr-php/DESCR b/vmailmgr-php/DESCR
new file mode 100644
index 0000000000..9c1440979f
--- /dev/null
+++ b/vmailmgr-php/DESCR
@@ -0,0 +1,3 @@
+This is the VMailMgr PHP library providing tools to setup a virtual
+domain, add and delete individual virtual users and aliases, and to
+change passwords.
diff --git a/vmailmgr-php/Makefile b/vmailmgr-php/Makefile
new file mode 100644
index 0000000000..40a7dacf36
--- /dev/null
+++ b/vmailmgr-php/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-php-${VERSION}
+
+CONFIGURE_ARGS+=	--enable-php
+
+BUILD_DIRS=		php
+INSTALL_DIRS=		php
+
+DEPENDS+=		php-[0-9]*:${PHPPKGSRCDIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/${INSTALL_DIRS}/vmail.features \
+		${DESTDIR}${PREFIX}/share/vmailmgr/php/README
+
+.include "../../lang/php/phpversion.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-php/PLIST b/vmailmgr-php/PLIST
new file mode 100644
index 0000000000..9dc82908ff
--- /dev/null
+++ b/vmailmgr-php/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+share/vmailmgr/php/README
+share/vmailmgr/php/vmail.inc
diff --git a/vmailmgr-python/DESCR b/vmailmgr-python/DESCR
new file mode 100644
index 0000000000..5ed7457375
--- /dev/null
+++ b/vmailmgr-python/DESCR
@@ -0,0 +1 @@
+These are the VMailMgr Python bindings.
diff --git a/vmailmgr-python/Makefile b/vmailmgr-python/Makefile
new file mode 100644
index 0000000000..80b1e87d09
--- /dev/null
+++ b/vmailmgr-python/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-python-${VERSION}
+
+CONFIGURE_ARGS+=	--enable-python
+CONFIGURE_ENV+=		PYTHONBIN=${PYTHONBIN:Q}
+
+BUILD_DIRS=		python
+INSTALL_DIRS=		python
+
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
+
+SUBST_CLASSES+=		pyversion
+SUBST_STAGE.pyversion=	pre-configure
+SUBST_FILES.pyversion=	configure.ac python/Makefile.am
+SUBST_VARS.pyversion=	PYTHONBIN
+
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-python/PLIST b/vmailmgr-python/PLIST
new file mode 100644
index 0000000000..71e8229f7c
--- /dev/null
+++ b/vmailmgr-python/PLIST
@@ -0,0 +1,22 @@
+@comment $NetBSD$
+${PYSITELIB}/vmailmgr/__init__.py
+${PYSITELIB}/vmailmgr/__init__.pyc
+${PYSITELIB}/vmailmgr/__init__.pyo
+${PYSITELIB}/vmailmgr/commands.py
+${PYSITELIB}/vmailmgr/commands.pyc
+${PYSITELIB}/vmailmgr/commands.pyo
+${PYSITELIB}/vmailmgr/config.py
+${PYSITELIB}/vmailmgr/config.pyc
+${PYSITELIB}/vmailmgr/config.pyo
+${PYSITELIB}/vmailmgr/constants.py
+${PYSITELIB}/vmailmgr/constants.pyc
+${PYSITELIB}/vmailmgr/constants.pyo
+${PYSITELIB}/vmailmgr/daemon.py
+${PYSITELIB}/vmailmgr/daemon.pyc
+${PYSITELIB}/vmailmgr/daemon.pyo
+${PYSITELIB}/vmailmgr/local.py
+${PYSITELIB}/vmailmgr/local.pyc
+${PYSITELIB}/vmailmgr/local.pyo
+${PYSITELIB}/vmailmgr/types.py
+${PYSITELIB}/vmailmgr/types.pyc
+${PYSITELIB}/vmailmgr/types.pyo
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index 1d13630e3f..28723f0d4c 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -1,25 +1,11 @@
 # $NetBSD$
 
-DISTNAME=		vmailmgr-${GITHUB_TAG}
-PKGNAME=		vmailmgr-0.97.0.20150901
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_GITHUB:=bruceg/}
-GITHUB_TAG=		526d53c1d0e604ec29ada61b79485ceeb8b978cd
+.include "../../wip/vmailmgr/Makefile.common"
 
-MAINTAINER=		schmonz%NetBSD.org@localhost
-HOMEPAGE=		https://untroubled.org/vmailmgr/
-COMMENT=		Manage multiple mail domains on a single qmail host
-LICENSE=		gnu-gpl-v2
+PKGNAME=		vmailmgr-${VERSION}
 
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		autoconf automake gmake perl sh
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-post-extract:
-	cd ${WRKSRC}/lib/config && ${SH} build-config.sh
-
-pre-configure:
-	cd ${WRKSRC} && autoreconf -i
+CONFIGURE_ARGS+=	--disable-courier-imap
+CONFIGURE_ARGS+=	--disable-php
+CONFIGURE_ARGS+=	--disable-python
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
new file mode 100644
index 0000000000..4994650d31
--- /dev/null
+++ b/vmailmgr/Makefile.common
@@ -0,0 +1,40 @@
+# $NetBSD$
+#
+# used by wip/vmailmgr/Makefile
+# used by wip/vmailmgr-courier-imap/Makefile
+# used by wip/vmailmgr-php/Makefile
+# used by wip/vmailmgr-python/Makefile
+
+DISTNAME=		vmailmgr-${GITHUB_TAG}
+VERSION=		0.97.0.20150901
+CATEGORIES=		mail
+MASTER_SITES=		${MASTER_SITE_GITHUB:=bruceg/}
+GITHUB_TAG=		526d53c1d0e604ec29ada61b79485ceeb8b978cd
+
+MAINTAINER=		schmonz%NetBSD.org@localhost
+HOMEPAGE=		https://untroubled.org/vmailmgr/
+COMMENT=		Manage multiple mail domains on a single qmail host
+LICENSE=		gnu-gpl-v2
+
+WRKSRC=			${WRKDIR}/${DISTNAME}
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		autoconf automake gmake perl sh
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ENV+=		ac_cv_path_W3M=
+CONFIGURE_ENV+=		ac_cv_path_LYNX=
+
+PATCHDIR=		${.CURDIR}/../../wip/vmailmgr/patches
+DISTINFO_FILE=		${.CURDIR}/../../wip/vmailmgr/distinfo
+
+SUBST_CLASSES+=		version
+SUBST_STAGE.version=	pre-configure
+SUBST_FILES.version=	configure.ac
+SUBST_VARS.version=	PKGVERSION
+
+post-extract:
+	cd ${WRKSRC}/lib/config && ${SH} build-config.sh
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index 226f6257e9..9356f31eb5 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -1,9 +1,5 @@
 # TODO
 
+- get the docs to build
+- Add separate RPMs for cgi, daemon?
 - [FreeBSD's vmailmgr port just before deletion](https://github.com/freebsd/freebsd-ports/tree/635ccfbf59522ddd44cd9283b321e2d9b3bc9876/mail/vmailmgr)
-- Bruce shipped separate RPMs for:
-    - cgi
-    - courier-imap
-    - daemon
-    - php
-    - python
diff --git a/vmailmgr/distinfo b/vmailmgr/distinfo
index 9585262409..5bf98b2c1f 100644
--- a/vmailmgr/distinfo
+++ b/vmailmgr/distinfo
@@ -3,19 +3,21 @@ $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) = 2170216e56600228e70f237a15f482421741e2d0
-SHA1 (patch-authenticate_Makefile.am) = f41b1912bcf2ede3f86096e2d311be6b813727ec
-SHA1 (patch-cgi_Makefile.am) = 5cab84302883fbaf7477def403ec0025cd9e7eb4
-SHA1 (patch-commands_Makefile.am) = 881adeab16b77f4d146e21780682b09e5743df59
-SHA1 (patch-commands_vdeliver.cc) = cbbd24e3a82ea18efc69097913279f4e1d1f715b
-SHA1 (patch-daemon_Makefile.am) = d3fa304dca99bbe0e31186bb5b66b942509b7416
+SHA1 (patch-Makefile.am) = 57eef2fbe9b898a0a110008ac59db4fa32c5df0b
+SHA1 (patch-acinclude.m4) = 950092d07a7021fb92e4fd4716107a7988a21d22
+SHA1 (patch-authenticate_Makefile.am) = 3529853104846d64882d64be39597cacb0bc6e98
+SHA1 (patch-cgi_Makefile.am) = eb1f51287bd0eb9be655760ed438337a8a0ed0f2
+SHA1 (patch-commands_Makefile.am) = 0fc9881f76fefad7648ecde4bb230278237e33b5
+SHA1 (patch-commands_vdeliver.cc) = 2f63addd758b14516a3acaf6ed79a4770c263968
+SHA1 (patch-configure.ac) = dc1e303f76faf5fbe1f7d2dc20a78913e4067b5c
+SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
 SHA1 (patch-doc_Makefile.am) = 3bc737c61337c3d34a0c689e85366a8aed1f38c5
-SHA1 (patch-lib_fdbuf_fdbuf.h) = 49df77596e79033a1667316636a7cc7c9e7c4086
+SHA1 (patch-lib_fdbuf_fdbuf.h) = 2607bb82c4d9123df0a94b30fc5930db6429010d
 SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4
-SHA1 (patch-lib_misc_response.h) = dd36666436fc11ea6dc6efde625f3b5ba9809922
-SHA1 (patch-lib_vpwtable_cdb__write.cc) = 37ec16e5c3ba97a50cfad26adbe78f433526a68a
-SHA1 (patch-lib_vpwtable_gdbm__del.cc) = 26b9325bc921ae24e5833dbe04c5b9753c52c18d
-SHA1 (patch-lib_vpwtable_gdbm__exists.cc) = 08d7bc89f01c804befd42d52e6df3bc0e42e6f41
-SHA1 (patch-lib_vpwtable_gdbm__getbyname.cc) = f2d1abb4c6664fb606601585a2a0c9b627363825
-SHA1 (patch-lib_vpwtable_gdbm__put.cc) = 6e4ab7191d25920b35772a398c42ba8b8d7ec377
-SHA1 (patch-lib_vpwtable_gdbm__write.cc) = fab34888ee0af4d18d4c50dd407e9fcd54c8fa92
+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
index 4c04800492..8662baeee2 100644
--- a/vmailmgr/patches/patch-Makefile.am
+++ b/vmailmgr/patches/patch-Makefile.am
@@ -1,14 +1,19 @@
 $NetBSD$
 
---- Makefile.am.orig	2004-03-15 17:58:59.000000000 +0000
+Build python and php as their own packages.
+
+--- Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
 +++ Makefile.am
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,9 @@
++SUBDIRS = lib authenticate commands daemon cgi doc scripts
  if WANTPYTHON
 -SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
-+SUBDIRS = lib authenticate commands daemon cgi doc scripts
- else
+-else
 -SUBDIRS = php lib authenticate commands daemon cgi doc scripts
-+SUBDIRS = lib authenticate commands daemon cgi doc scripts
++SUBDIRS += python
++endif
++if WANTPHP
++SUBDIRS += php
  endif
  
  dist-hook:
diff --git a/vmailmgr/patches/patch-acinclude.m4 b/vmailmgr/patches/patch-acinclude.m4
new file mode 100644
index 0000000000..525f553181
--- /dev/null
+++ b/vmailmgr/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/patches/patch-authenticate_Makefile.am b/vmailmgr/patches/patch-authenticate_Makefile.am
index 8a0923ba0c..4ed0141c54 100644
--- a/vmailmgr/patches/patch-authenticate_Makefile.am
+++ b/vmailmgr/patches/patch-authenticate_Makefile.am
@@ -1,15 +1,22 @@
 $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,5 +1,5 @@
+@@ -1,6 +1,8 @@
  bin_PROGRAMS = checkvpw vauthenticate
--authlib_PROGRAMS = authvmailmgr
-+#authlib_PROGRAMS = authvmailmgr
- authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++if WANTCOURIER
+ authlib_PROGRAMS = authvmailmgr
+-authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
++authlibdir = ${prefix}/libexec/courier-authlib/
++endif
  
  noinst_PODS = checkvpw.pod vauthenticate.pod
-@@ -17,9 +17,9 @@ docs: $(noinst_HTMLS) $(man_MANS)
+ noinst_HTMLS = $(noinst_PODS:.pod=.html)
+@@ -17,9 +19,9 @@ docs: $(noinst_HTMLS) $(man_MANS)
  dist-hook:
  	touch $(distdir)/*.html $(distdir)/*.[123456789]
  
@@ -21,14 +28,14 @@ $NetBSD$
  	$(POD2HTML) $< >$@
  
  AM_CPPFLAGS = -I../lib
-@@ -27,8 +27,8 @@ 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
  
--authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
--authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
-+#authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
-+#authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
++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-cgi_Makefile.am b/vmailmgr/patches/patch-cgi_Makefile.am
index fbcbf95498..17e51d7b81 100644
--- a/vmailmgr/patches/patch-cgi_Makefile.am
+++ b/vmailmgr/patches/patch-cgi_Makefile.am
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Follow hier(7).
+
 --- cgi/Makefile.am.orig	2024-02-20 03:25:23.776012371 +0000
 +++ cgi/Makefile.am
 @@ -1,5 +1,6 @@
diff --git a/vmailmgr/patches/patch-commands_Makefile.am b/vmailmgr/patches/patch-commands_Makefile.am
index b24581b936..2658c1d6cc 100644
--- a/vmailmgr/patches/patch-commands_Makefile.am
+++ b/vmailmgr/patches/patch-commands_Makefile.am
@@ -1,7 +1,9 @@
 $NetBSD$
 
-Fix typo, spotted on Ubuntu via "install: will not overwrite
-just-created vadduser.1"
+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
diff --git a/vmailmgr/patches/patch-commands_vdeliver.cc b/vmailmgr/patches/patch-commands_vdeliver.cc
index 8be40278aa..c583014d14 100644
--- a/vmailmgr/patches/patch-commands_vdeliver.cc
+++ b/vmailmgr/patches/patch-commands_vdeliver.cc
@@ -1,5 +1,7 @@
 $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
diff --git a/vmailmgr/patches/patch-configure.ac b/vmailmgr/patches/patch-configure.ac
new file mode 100644
index 0000000000..b3c0e604d0
--- /dev/null
+++ b/vmailmgr/patches/patch-configure.ac
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Don't build python, php, or courier-imap by default.
+
+--- 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,19 +55,34 @@ 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)
++
++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)
+ 
+ AC_PATH_PROG(W3M, w3m)
+ AC_PATH_PROG(LYNX, lynx)
diff --git a/vmailmgr/patches/patch-daemon_Makefile.am b/vmailmgr/patches/patch-daemon_Makefile.am
index 5bf26728e0..666e14b3e2 100644
--- a/vmailmgr/patches/patch-daemon_Makefile.am
+++ b/vmailmgr/patches/patch-daemon_Makefile.am
@@ -1,15 +1,18 @@
 $NetBSD$
 
---- daemon/Makefile.am.orig	2024-02-21 01:26:29.339104004 +0000
+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
-+vmailmgrd.pod:
- 	perl ../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
diff --git a/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h b/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
index 40e6991797..d1054bb06e 100644
--- a/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
+++ b/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fix warnings.
+
 --- lib/fdbuf/fdbuf.h.orig	2024-02-20 03:19:48.448432259 +0000
 +++ lib/fdbuf/fdbuf.h
 @@ -21,6 +21,7 @@
diff --git a/vmailmgr/patches/patch-lib_misc_response.h b/vmailmgr/patches/patch-lib_misc_response.h
deleted file mode 100644
index 841b2b035f..0000000000
--- a/vmailmgr/patches/patch-lib_misc_response.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- lib/misc/response.h.orig	2024-02-20 01:35:31.754629170 +0000
-+++ lib/misc/response.h
-@@ -19,7 +19,7 @@ struct response
-   mystring message() const;
-   mystring codestr() const;
- 
--  static const unsigned long maxsize = 1<<16-1;
-+  static const unsigned long maxsize = 1<<(16-1);
- };
- 
- #define RETURN(CODE,STR) return response(response::CODE, STR)
diff --git a/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc b/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
index ae64dfdb76..9539557028 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
@@ -1,5 +1,7 @@
 $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 @@
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
index 164d9d9b84..8d402983e4 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
@@ -1,5 +1,7 @@
 $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)
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
index c1c2ef825a..f66c80f1e9 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
@@ -1,5 +1,7 @@
 $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
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
index 3f0bb61901..027f8bc4a8 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
@@ -1,5 +1,7 @@
 $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
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
index 11d879e29d..664c59e4cf 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
@@ -1,5 +1,7 @@
 $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,
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
index ed90eb203c..3ec27dfccc 100644
--- a/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
@@ -1,5 +1,7 @@
 $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 @@
diff --git a/vmailmgr/patches/patch-python_Makefile.am b/vmailmgr/patches/patch-python_Makefile.am
new file mode 100644
index 0000000000..611f3924ed
--- /dev/null
+++ b/vmailmgr/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 $@
Prev by Date: dunst-git: add librsvg dependency
Next by Date: Add vmailmgr-docs.
Previous by Thread: dunst-git: add librsvg dependency
Next by Thread: Add vmailmgr-docs.
Indexes:
Home | Main Index | Thread Index | Old Index