Add vmailmgr-cgi.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Add vmailmgr-cgi.
From: Amitai Schleier <schmonz%NetBSD.org@localhost>
Date: Wed, 21 Feb 2024 21:22:58 +0000
Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz%NetBSD.org@localhost>
Pushed By:	schmonz
Date:		Wed Feb 21 16:22:58 2024 -0500
Changeset:	0a5da46fa6b0719fbf6ea36ea5a3d7fb16ce222b

Modified Files:
	vmailmgr/Makefile
	vmailmgr/Makefile.common
	vmailmgr/PLIST
	vmailmgr/TODO.md
	vmailmgr/distinfo
	vmailmgr/patches/patch-Makefile.am
	vmailmgr/patches/patch-configure.ac
	vmailmgr/patches/patch-doc_Makefile.am
Added Files:
	vmailmgr-cgi/DESCR
	vmailmgr-cgi/Makefile
	vmailmgr-cgi/PLIST
Removed Files:
	vmailmgr/patches/patch-cgi_Makefile.am

Log Message:
Add vmailmgr-cgi.

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

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

diffstat:
 vmailmgr-cgi/DESCR                     |  2 ++
 vmailmgr-cgi/Makefile                  | 12 ++++++++++++
 vmailmgr-cgi/PLIST                     |  8 ++++++++
 vmailmgr/Makefile                      | 20 ++++++++++++++++++++
 vmailmgr/Makefile.common               |  1 +
 vmailmgr/PLIST                         |  7 -------
 vmailmgr/TODO.md                       |  2 +-
 vmailmgr/distinfo                      |  7 +++----
 vmailmgr/patches/patch-Makefile.am     | 15 +++++++++------
 vmailmgr/patches/patch-cgi_Makefile.am | 13 -------------
 vmailmgr/patches/patch-configure.ac    | 22 ++++++++++++++++++++--
 vmailmgr/patches/patch-doc_Makefile.am | 10 +++++++++-
 12 files changed, 85 insertions(+), 34 deletions(-)

diffs:
diff --git a/vmailmgr-cgi/DESCR b/vmailmgr-cgi/DESCR
new file mode 100644
index 0000000000..6adda4b0f8
--- /dev/null
+++ b/vmailmgr-cgi/DESCR
@@ -0,0 +1,2 @@
+These are the VMailMgr CGI programs to setup a virtual domain, add and
+delete individual virtual users and aliases, and to change passwords.
diff --git a/vmailmgr-cgi/Makefile b/vmailmgr-cgi/Makefile
new file mode 100644
index 0000000000..652346996a
--- /dev/null
+++ b/vmailmgr-cgi/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+.include "../../wip/vmailmgr/Makefile.common"
+
+PKGNAME=		vmailmgr-cgi-${VERSION}
+
+CONFIGURE_ARGS+=	--enable-cgi
+
+BUILD_DIRS=		lib cgi
+INSTALL_DIRS=		cgi
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr-cgi/PLIST b/vmailmgr-cgi/PLIST
new file mode 100644
index 0000000000..eb4ca00099
--- /dev/null
+++ b/vmailmgr-cgi/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD$
+libexec/cgi-bin/listvdomain
+libexec/cgi-bin/vaddalias
+libexec/cgi-bin/vadduser
+libexec/cgi-bin/vchattr
+libexec/cgi-bin/vchforwards
+libexec/cgi-bin/vdeluser
+libexec/cgi-bin/vpasswd
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index 28723f0d4c..dc788d7e59 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -4,8 +4,28 @@
 
 PKGNAME=		vmailmgr-${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/Makefile.common b/vmailmgr/Makefile.common
index 0d44a939d3..087f047297 100644
--- a/vmailmgr/Makefile.common
+++ b/vmailmgr/Makefile.common
@@ -1,6 +1,7 @@
 # $NetBSD$
 #
 # used by wip/vmailmgr/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
diff --git a/vmailmgr/PLIST b/vmailmgr/PLIST
index f902ca8ee2..f1b78c978e 100644
--- a/vmailmgr/PLIST
+++ b/vmailmgr/PLIST
@@ -17,13 +17,6 @@ bin/vpasswds
 bin/vrehash
 bin/vsetup
 bin/vupgrade
-libexec/cgi-bin/listvdomain
-libexec/cgi-bin/vaddalias
-libexec/cgi-bin/vadduser
-libexec/cgi-bin/vchattr
-libexec/cgi-bin/vchforwards
-libexec/cgi-bin/vdeluser
-libexec/cgi-bin/vpasswd
 man/man1/checkvpw.1
 man/man1/dumpvuser.1
 man/man1/listvdomain.1
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index b00a8fd654..1fab0dfa64 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -2,5 +2,5 @@
 
 - Fix build warnings
 - PKG_SYSCONFSUBDIR
-- Add separate packages for cgi, daemon?
+- Add separate package for 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 7c7ef23203..6efc81dce8 100644
--- a/vmailmgr/distinfo
+++ b/vmailmgr/distinfo
@@ -3,16 +3,15 @@ $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) = 57eef2fbe9b898a0a110008ac59db4fa32c5df0b
+SHA1 (patch-Makefile.am) = e78f4db1430c54b6a7a7db4020a4d5169b1b9d22
 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) = d0f3aa80241e1777880b0832a380a78f404df71b
+SHA1 (patch-configure.ac) = d48ce7a3912a1ab2dd9b27e5ed271bba0118d951
 SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
 SHA1 (patch-doc_HOWTO.texi) = 29a8e8413d653e6901c520ecf38d4febfe7a9845
-SHA1 (patch-doc_Makefile.am) = e643960bb27c18859590ce363f3b73a1a18afbca
+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
diff --git a/vmailmgr/patches/patch-Makefile.am b/vmailmgr/patches/patch-Makefile.am
index 8662baeee2..7128c56a92 100644
--- a/vmailmgr/patches/patch-Makefile.am
+++ b/vmailmgr/patches/patch-Makefile.am
@@ -1,19 +1,22 @@
 $NetBSD$
 
-Build python and php as their own packages.
+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,9 @@
-+SUBDIRS = lib authenticate commands daemon cgi doc scripts
+@@ -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
-+if WANTPHP
-+SUBDIRS += php
  endif
  
  dist-hook:
diff --git a/vmailmgr/patches/patch-cgi_Makefile.am b/vmailmgr/patches/patch-cgi_Makefile.am
deleted file mode 100644
index 17e51d7b81..0000000000
--- a/vmailmgr/patches/patch-cgi_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Follow hier(7).
-
---- cgi/Makefile.am.orig	2024-02-20 03:25:23.776012371 +0000
-+++ cgi/Makefile.am
-@@ -1,5 +1,6 @@
- EXTRA_DIST = listvdomain.html vaddalias.html vadduser.html vchalias.html \
- 	vchattr.html vchforwards.html vdeluser.html vpasswd.html
-+cgidir=$(PREFIX)/libexec/cgi-bin
- cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards \
- 	listvdomain
- 
diff --git a/vmailmgr/patches/patch-configure.ac b/vmailmgr/patches/patch-configure.ac
index bfaeb17974..2d9f7de755 100644
--- a/vmailmgr/patches/patch-configure.ac
+++ b/vmailmgr/patches/patch-configure.ac
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Don't build python, php, or courier-imap by default.
+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
@@ -11,7 +11,7 @@ Remove unused text-browser checks.
  AC_CONFIG_SRCDIR([lib/mergelib.sh])
  AM_INIT_AUTOMAKE
  
-@@ -55,34 +55,34 @@ AC_PATH_PROG(RM, rm)
+@@ -55,34 +55,42 @@ AC_PATH_PROG(RM, rm)
  AC_PATH_PROG(MKDIR, mkdir)
  AC_PATH_PROG(LN, ln)
  
@@ -61,6 +61,24 @@ Remove unused text-browser checks.
 +[  --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-doc_Makefile.am b/vmailmgr/patches/patch-doc_Makefile.am
index 4f1791bf7f..42aa7693d3 100644
--- a/vmailmgr/patches/patch-doc_Makefile.am
+++ b/vmailmgr/patches/patch-doc_Makefile.am
@@ -4,7 +4,15 @@ Avoid "warning: ignoring prerequisites on suffix rule definition"
 
 --- doc/Makefile.am.orig	2015-09-01 16:03:21.000000000 +0000
 +++ doc/Makefile.am
-@@ -43,15 +43,15 @@ ChangeLog.html: ../ChangeLog
+@@ -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) $< >$@
Prev by Date: Add vmailmgr-docs.
Next by Date: auto-admin: Update to 0.8.0.25
Previous by Thread: Add vmailmgr-docs.
Next by Thread: auto-admin: Update to 0.8.0.25
Indexes:
Home | Main Index | Thread Index | Old Index