Add vmailmgr-docs.

[Amitai Schleier <schmonz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz%NetBSD.org@localhost>
Pushed By:	schmonz
Date:		Wed Feb 21 15:43:26 2024 -0500
Changeset:	bdbcec8f37cf3a23047c9a52a92fac990b4aedb9

Modified Files:
	vmailmgr/Makefile.common
	vmailmgr/TODO.md
	vmailmgr/distinfo
	vmailmgr/patches/patch-configure.ac
	vmailmgr/patches/patch-doc_Makefile.am
Added Files:
	vmailmgr-docs/DESCR
	vmailmgr-docs/Makefile
	vmailmgr-docs/PLIST
	vmailmgr/patches/patch-doc_HOWTO.texi

Log Message:
Add vmailmgr-docs.

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

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

diffstat:
 vmailmgr-docs/DESCR                    |  1 +
 vmailmgr-docs/Makefile                 | 26 ++++++++++++++++++++++
 vmailmgr-docs/PLIST                    | 40 ++++++++++++++++++++++++++++++++++
 vmailmgr/Makefile.common               |  3 +--
 vmailmgr/TODO.md                       |  5 +++--
 vmailmgr/distinfo                      |  5 +++--
 vmailmgr/patches/patch-configure.ac    | 23 +++++++++++++++----
 vmailmgr/patches/patch-doc_HOWTO.texi  | 13 +++++++++++
 vmailmgr/patches/patch-doc_Makefile.am | 14 +-----------
 9 files changed, 107 insertions(+), 23 deletions(-)

diffs:
diff --git a/vmailmgr-docs/DESCR b/vmailmgr-docs/DESCR
new file mode 100644
index 0000000000..65e35b536b
--- /dev/null
+++ b/vmailmgr-docs/DESCR
@@ -0,0 +1 @@
+This is additional documentation for VMailMgr.
diff --git a/vmailmgr-docs/Makefile b/vmailmgr-docs/Makefile
new file mode 100644
index 0000000000..f2290e3f29
--- /dev/null
+++ b/vmailmgr-docs/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-docs-${VERSION}
+
+BUILD_TARGET=		docs
+BUILD_DIRS+=		. authenticate
+
+TOOL_DEPENDS+=		fig2dev-[0-9]*:../../print/fig2dev
+TOOL_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+TOOL_DEPENDS+=		tex-texinfo-[0-9]*:../../print/tex-texinfo
+
+AUTO_MKDIRS=		yes
+
+do-install:
+	cd ${WRKSRC}; \
+	for f in AUTHORS ChangeLog COPYING NEWS TODO \
+		doc/ChangeLog* doc/YEAR2000 doc/*.txt doc/*.html \
+		commands/*.html authenticate/*.html daemon/*.html \
+		scripts/autoresponder.sh; do \
+		${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/doc/vmailmgr/`basename $$f`; \
+	done
+
+.include "../../lang/php/phpversion.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-docs/PLIST b/vmailmgr-docs/PLIST
new file mode 100644
index 0000000000..2e36c1527f
--- /dev/null
+++ b/vmailmgr-docs/PLIST
@@ -0,0 +1,40 @@
+@comment $NetBSD$
+share/doc/vmailmgr/AUTHORS
+share/doc/vmailmgr/COPYING
+share/doc/vmailmgr/ChangeLog
+share/doc/vmailmgr/ChangeLog-pre-0.70
+share/doc/vmailmgr/ChangeLog-pre-vmailmgr
+share/doc/vmailmgr/ChangeLog.html
+share/doc/vmailmgr/FAQ.html
+share/doc/vmailmgr/FAQ.txt
+share/doc/vmailmgr/HOWTO.html
+share/doc/vmailmgr/HOWTO.txt
+share/doc/vmailmgr/NEWS
+share/doc/vmailmgr/NEWS.html
+share/doc/vmailmgr/TODO
+share/doc/vmailmgr/YEAR2000
+share/doc/vmailmgr/autoresponder.sh
+share/doc/vmailmgr/checkvpw.html
+share/doc/vmailmgr/configuration.html
+share/doc/vmailmgr/configuration.txt
+share/doc/vmailmgr/dumpvuser.html
+share/doc/vmailmgr/listvdomain.html
+share/doc/vmailmgr/protocol-new.txt
+share/doc/vmailmgr/protocol.txt
+share/doc/vmailmgr/record-format.txt
+share/doc/vmailmgr/vadduser.html
+share/doc/vmailmgr/vaddusers.html
+share/doc/vmailmgr/vauthenticate.html
+share/doc/vmailmgr/vchattr.html
+share/doc/vmailmgr/vchforwards.html
+share/doc/vmailmgr/vdeliver.html
+share/doc/vmailmgr/vdeluser.html
+share/doc/vmailmgr/vmailmgr-cgi.html
+share/doc/vmailmgr/vmailmgr-cgi.txt
+share/doc/vmailmgr/vmailmgr.html
+share/doc/vmailmgr/vmailmgrd.html
+share/doc/vmailmgr/vpasswd.html
+share/doc/vmailmgr/vpasswds.html
+share/doc/vmailmgr/vrehash.html
+share/doc/vmailmgr/vsetup.html
+share/doc/vmailmgr/vupgrade.html
diff --git a/vmailmgr/Makefile.common b/vmailmgr/Makefile.common
index 4994650d31..0d44a939d3 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -2,6 +2,7 @@
 #
 # used by wip/vmailmgr/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
 
@@ -22,8 +23,6 @@ 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
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index 9356f31eb5..b00a8fd654 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -1,5 +1,6 @@
 # TODO
 
-- get the docs to build
-- Add separate RPMs for cgi, daemon?
+- Fix build warnings
+- PKG_SYSCONFSUBDIR
+- Add separate packages for cgi, daemon?
 - [FreeBSD's vmailmgr port just before deletion](https://github.com/freebsd/freebsd-ports/tree/635ccfbf59522ddd44cd9283b321e2d9b3bc9876/mail/vmailmgr)
diff --git a/vmailmgr/distinfo b/vmailmgr/distinfo
index 5bf98b2c1f..7c7ef23203 100644
--- a/vmailmgr/distinfo
+++ b/vmailmgr/distinfo
@@ -9,9 +9,10 @@ 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-configure.ac) = d0f3aa80241e1777880b0832a380a78f404df71b
 SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
-SHA1 (patch-doc_Makefile.am) = 3bc737c61337c3d34a0c689e85366a8aed1f38c5
+SHA1 (patch-doc_HOWTO.texi) = 29a8e8413d653e6901c520ecf38d4febfe7a9845
+SHA1 (patch-doc_Makefile.am) = e643960bb27c18859590ce363f3b73a1a18afbca
 SHA1 (patch-lib_fdbuf_fdbuf.h) = 2607bb82c4d9123df0a94b30fc5930db6429010d
 SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4
 SHA1 (patch-lib_vpwtable_cdb__write.cc) = 68e159457a1c6dd152c9d33abeb4457078a4e666
diff --git a/vmailmgr/patches/patch-configure.ac b/vmailmgr/patches/patch-configure.ac
index b3c0e604d0..bfaeb17974 100644
--- a/vmailmgr/patches/patch-configure.ac
+++ b/vmailmgr/patches/patch-configure.ac
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Don't build python, php, or courier-imap by default.
+Remove unused text-browser checks.
 
 --- configure.ac.orig	2015-09-01 16:03:21.000000000 +0000
 +++ configure.ac
@@ -10,7 +11,7 @@ Don't build python, php, or courier-imap by default.
  AC_CONFIG_SRCDIR([lib/mergelib.sh])
  AM_INIT_AUTOMAKE
  
-@@ -55,19 +55,34 @@ AC_PATH_PROG(RM, rm)
+@@ -55,34 +55,34 @@ AC_PATH_PROG(RM, rm)
  AC_PATH_PROG(MKDIR, mkdir)
  AC_PATH_PROG(LN, ln)
  
@@ -40,12 +41,26 @@ Don't build python, php, or courier-imap by default.
 +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)
  
- AC_PATH_PROG(W3M, w3m)
- AC_PATH_PROG(LYNX, lynx)
+ TODAY=`date +%Y-%m-%d`
+ POD2MAN="pod2man --release='vmailmgr ${VERSION}' --center='VMailMgr Tools Documentation' --date='${TODAY}'"
diff --git a/vmailmgr/patches/patch-doc_HOWTO.texi b/vmailmgr/patches/patch-doc_HOWTO.texi
new file mode 100644
index 0000000000..a5569da022
--- /dev/null
+++ b/vmailmgr/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/patches/patch-doc_Makefile.am b/vmailmgr/patches/patch-doc_Makefile.am
index 8889f53a2d..4f1791bf7f 100644
--- a/vmailmgr/patches/patch-doc_Makefile.am
+++ b/vmailmgr/patches/patch-doc_Makefile.am
@@ -2,21 +2,9 @@ $NetBSD$
 
 Avoid "warning: ignoring prerequisites on suffix rule definition"
 
-Skip building non-manpage docs.
-
 --- doc/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
 +++ doc/Makefile.am
-@@ -30,7 +30,8 @@ TEXI2PDF = texi2pdf --clean --quiet
- TEXI2INFO = texi2any --info --no-split --number-sections
- TEXI2TXT = texi2any --plaintext
- 
--all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
-+#all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
-+all: $(man_MANS)
- 
- dist-hook:
- 	touch $(distdir)/*.html
-@@ -43,15 +44,15 @@ ChangeLog.html: ../ChangeLog
+@@ -43,15 +43,15 @@ ChangeLog.html: ../ChangeLog
  NEWS.html: ../NEWS
  	$(NEWS2HTML) $< >$@