vmailmgr: point at GitHub, some newer commits there.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: vmailmgr: point at GitHub, some newer commits there.
From: Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Date: Tue, 20 Feb 2024 20:13:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Pushed By:	schmonz
Date:		Tue Feb 20 15:13:52 2024 -0500
Changeset:	ca7a0b295243376251415aa8d2cf82cc2f3caca9

Modified Files:
	vmailmgr/Makefile
	vmailmgr/PLIST
	vmailmgr/TODO.md
	vmailmgr/distinfo
Added Files:
	vmailmgr/patches/patch-commands_Makefile.am
	vmailmgr/patches/patch-doc_Makefile.am
	vmailmgr/patches/patch-lib_mergelib.sh
Removed Files:
	vmailmgr/patches/patch-Makefile.in
	vmailmgr/patches/patch-lib_misc_server.cc

Log Message:
vmailmgr: point at GitHub, some newer commits there.

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

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

diffstat:
 vmailmgr/Makefile                           | 16 ++++++++--------
 vmailmgr/PLIST                              |  1 +
 vmailmgr/TODO.md                            |  3 +--
 vmailmgr/distinfo                           | 11 ++++++-----
 vmailmgr/patches/patch-Makefile.in          | 13 -------------
 vmailmgr/patches/patch-commands_Makefile.am | 16 ++++++++++++++++
 vmailmgr/patches/patch-doc_Makefile.am      | 14 ++++++++++++++
 vmailmgr/patches/patch-lib_mergelib.sh      | 14 ++++++++++++++
 vmailmgr/patches/patch-lib_misc_server.cc   | 12 ------------
 9 files changed, 60 insertions(+), 40 deletions(-)

diffs:
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
index 08e50905a3..1d13630e3f 100644
--- a/vmailmgr/Makefile
+++ b/vmailmgr/Makefile
@@ -1,24 +1,24 @@
 # $NetBSD$
 
-DISTNAME=		vmailmgr-0.97-1.src.rpm
-PKGNAME=		${DISTNAME:S/-1.src.rpm$//}
+DISTNAME=		vmailmgr-${GITHUB_TAG}
+PKGNAME=		vmailmgr-0.97.0.20150901
 CATEGORIES=		mail
-MASTER_SITES=		${HOMEPAGE}current/
-EXTRACT_SUFX=		# none
-EXTRACT_CMD=		${TAR} xzf $${extract_file} && ${TAR} xzf ${PKGNAME_NOREV}.tar.gz
+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}/${PKGNAME_NOREV}
-
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		autoconf213 automake14 gmake perl tar
+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
 
diff --git a/vmailmgr/PLIST b/vmailmgr/PLIST
index 14593f3ee4..f902ca8ee2 100644
--- a/vmailmgr/PLIST
+++ b/vmailmgr/PLIST
@@ -28,6 +28,7 @@ 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
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
index 2a812af67e..226f6257e9 100644
--- a/vmailmgr/TODO.md
+++ b/vmailmgr/TODO.md
@@ -1,7 +1,6 @@
 # TODO
 
-- PKGMANDIR
-- Fix macOS build
+- [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
diff --git a/vmailmgr/distinfo b/vmailmgr/distinfo
index 54f2ee461e..5d20aa82e1 100644
--- a/vmailmgr/distinfo
+++ b/vmailmgr/distinfo
@@ -1,16 +1,17 @@
 $NetBSD$
 
-BLAKE2s (vmailmgr-0.97-1.src.rpm) = 7d123e15f2e42edcafc780f157fe636706770be32142d43ee7b981e4b0cd42b8
-SHA512 (vmailmgr-0.97-1.src.rpm) = b8a4518a1b182a56f5db9f9a982dd35b574bb08a3fc00f58e36a85ecad2f77f22a3f392d8739be0fb67bbafe250ec6c01b8d8c44e6dee8c8d1f1b95c12d450e5
-Size (vmailmgr-0.97-1.src.rpm) = 637291 bytes
+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-Makefile.in) = 77d418acd00895d7747fccd8e298c88cc66190fc
 SHA1 (patch-authenticate_Makefile.am) = 70882f5912b7ea2e5e4ca32b8132f16bb541c454
 SHA1 (patch-cgi_Makefile.am) = 5cab84302883fbaf7477def403ec0025cd9e7eb4
+SHA1 (patch-commands_Makefile.am) = ee2506f4b6da96492e8dc753870a720a3b7c5ae1
 SHA1 (patch-commands_vdeliver.cc) = cbbd24e3a82ea18efc69097913279f4e1d1f715b
+SHA1 (patch-doc_Makefile.am) = c49c927ad8d19ab67f60a21535f0576cd4d8403e
 SHA1 (patch-lib_fdbuf_fdbuf.h) = 49df77596e79033a1667316636a7cc7c9e7c4086
+SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4
 SHA1 (patch-lib_misc_response.h) = dd36666436fc11ea6dc6efde625f3b5ba9809922
-SHA1 (patch-lib_misc_server.cc) = 368077d018036afb68e23390ebfc382dcea1394a
 SHA1 (patch-lib_vpwtable_cdb__write.cc) = 37ec16e5c3ba97a50cfad26adbe78f433526a68a
 SHA1 (patch-lib_vpwtable_gdbm__del.cc) = 26b9325bc921ae24e5833dbe04c5b9753c52c18d
 SHA1 (patch-lib_vpwtable_gdbm__exists.cc) = 08d7bc89f01c804befd42d52e6df3bc0e42e6f41
diff --git a/vmailmgr/patches/patch-Makefile.in b/vmailmgr/patches/patch-Makefile.in
deleted file mode 100644
index 3a28ffc0a6..0000000000
--- a/vmailmgr/patches/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- Makefile.in.orig	2024-02-20 03:29:16.187148576 +0000
-+++ Makefile.in
-@@ -82,7 +82,7 @@ W3M = @W3M@
- cgidir = @cgidir@
- phpdir = @phpdir@
- pythonlibdir = @pythonlibdir@
--@WANTPYTHON_TRUE@SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
-+@WANTPYTHON_TRUE@SUBDIRS = php lib authenticate commands daemon cgi doc scripts
- @WANTPYTHON_FALSE@SUBDIRS = php lib authenticate commands daemon cgi doc scripts
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/vmailmgr/patches/patch-commands_Makefile.am b/vmailmgr/patches/patch-commands_Makefile.am
new file mode 100644
index 0000000000..1cb2127ad9
--- /dev/null
+++ b/vmailmgr/patches/patch-commands_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix typo, spotted on Ubuntu via "install: will not overwrite
+just-created vadduser.1"
+
+--- commands/Makefile.am.orig	2024-02-20 20:06:05.979521962 +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)
diff --git a/vmailmgr/patches/patch-doc_Makefile.am b/vmailmgr/patches/patch-doc_Makefile.am
new file mode 100644
index 0000000000..ae567a30e7
--- /dev/null
+++ b/vmailmgr/patches/patch-doc_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- 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
diff --git a/vmailmgr/patches/patch-lib_mergelib.sh b/vmailmgr/patches/patch-lib_mergelib.sh
new file mode 100644
index 0000000000..383896d4d6
--- /dev/null
+++ b/vmailmgr/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/patches/patch-lib_misc_server.cc b/vmailmgr/patches/patch-lib_misc_server.cc
deleted file mode 100644
index 804b60b64d..0000000000
--- a/vmailmgr/patches/patch-lib_misc_server.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/misc/server.cc.orig	2024-02-20 01:36:50.043359706 +0000
-+++ lib/misc/server.cc
-@@ -17,6 +17,7 @@
- #include <config.h>
- #include "server.h"
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #include "un.h"
- #include "debug.h"
Prev by Date: lpjs: Update to 0.0.0.295
Next by Date: squirrel: Reset MAINTAINER
Previous by Thread: lpjs: Update to 0.0.0.295
Next by Thread: squirrel: Reset MAINTAINER
Indexes:
Home | Main Index | Thread Index | Old Index