Date: Fri, 1 Nov 2019 10:35:52 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516214 - in head/mail/vmailmgr: . files Message-ID: <201911011035.xA1AZq1x027392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Nov 1 10:35:52 2019 New Revision: 516214 URL: https://svnweb.freebsd.org/changeset/ports/516214 Log: - Unbreak fetching and building against contemporary compilers - Allow to use GNU dbm for storage of virtual password tables - Define LICENSE and install the usual set of documentation files - Remove useless .if defined(PREFIX) check added back in r205864 Reported by: pkg-fallout Added: head/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc (contents, props changed) head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc (contents, props changed) head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc (contents, props changed) head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc (contents, props changed) head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc (contents, props changed) head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc (contents, props changed) Modified: head/mail/vmailmgr/Makefile Modified: head/mail/vmailmgr/Makefile ============================================================================== --- head/mail/vmailmgr/Makefile Fri Nov 1 09:35:55 2019 (r516213) +++ head/mail/vmailmgr/Makefile Fri Nov 1 10:35:52 2019 (r516214) @@ -5,26 +5,29 @@ PORTNAME= vmailmgr PORTVERSION= 0.97 PORTREVISION= 2 CATEGORIES= mail -MASTER_SITES= http://www.vmailmgr.org/current/ \ - http://mirrors.dataloss.nl/vmailmgr.org/current/ +MASTER_SITES= http://vault.101011010.xyz/distfiles/ GENTOO MAINTAINER= mij@bitchx.it COMMENT= Virtual domain manager for qmail +LICENSE= GPLv2+ + # get python paths (PYTHON_SITELIBDIR) in case we install the python API USES= autoreconf gmake perl5 python GNU_CONFIGURE= yes USE_PERL5= build -OPTIONS_DEFINE= PYTHONLIBS +PORTDOCS= AUTHORS ChangeLog NEWS README TODO + +OPTIONS_DEFINE= DOCS GDBM PYTHONLIBS PYTHONLIBS_DESC= Install the Python API +GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +GDBM_USES= localbase +GDBM_CONFIGURE_ON= --with-vpwtable=gdbm + .include <bsd.port.options.mk> -.if defined(PREFIX) -CONFIGURE_ARGS+= --prefix=${PREFIX} -.endif - .if ${PORT_OPTIONS:MPYTHONLIB} CONFIGURE_ARGS+= --with-pythonapi=${PYTHON_SITELIBDIR} PLIST_SUB+= PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR}" @@ -32,5 +35,9 @@ PLIST_SUB+= PYTHON="" .else PLIST_SUB+= PYTHON="@comment " .endif + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Added: head/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_cdb__write.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,13 @@ +--- lib/vpwtable/cdb_write.cc.orig 2002-11-20 15:54:44 UTC ++++ 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: Added: head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__del.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,11 @@ +--- lib/vpwtable/gdbm_del.cc.orig 2002-11-20 15:54:44 UTC ++++ lib/vpwtable/gdbm_del.cc +@@ -23,7 +23,7 @@ bool vpwtable::del(const mystring& name) const + 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; Added: head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__exists.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,11 @@ +--- lib/vpwtable/gdbm_exists.cc.orig 2002-11-20 15:54:44 UTC ++++ lib/vpwtable/gdbm_exists.cc +@@ -23,7 +23,7 @@ bool vpwtable::exists(const mystring& name) const + 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; Added: head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__getbyname.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,11 @@ +--- lib/vpwtable/gdbm_getbyname.cc.orig 2002-11-20 15:54:44 UTC ++++ lib/vpwtable/gdbm_getbyname.cc +@@ -24,7 +24,7 @@ vpwentry* vpwtable::getbyname(const mystring& name) co + 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)); Added: head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__put.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,14 @@ +--- lib/vpwtable/gdbm_put.cc.orig 2002-11-20 15:54:44 UTC ++++ lib/vpwtable/gdbm_put.cc +@@ -25,9 +25,9 @@ bool vpwtable::put(const vpwentry* vpw, bool onlyadd) + 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); Added: head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/vmailmgr/files/patch-lib_vpwtable_gdbm__write.cc Fri Nov 1 10:35:52 2019 (r516214) @@ -0,0 +1,33 @@ +--- lib/vpwtable/gdbm_write.cc.orig 2002-11-20 15:54:44 UTC ++++ lib/vpwtable/gdbm_write.cc +@@ -18,12 +18,13 @@ + #include <errno.h> + #include "vpwtable.h" + #include <gdbm.h> ++#include <unistd.h> + + 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: +@@ -59,10 +60,10 @@ bool gdbm_vpwtable_writer::operator!() const + + bool gdbm_vpwtable_writer::put(const vpwentry& vpw) + { +- mystring name = vpw->name.lower(); +- datum key = { (char*)name.c_str(), name.length() }; +- mystring binary = vpw->to_record(); +- datum data = { (char*)binary.c_str(), binary.length() }; ++ mystring name = vpw.name.lower(); ++ datum key = { (char*)name.c_str(), static_cast<int>(name.length()) }; ++ mystring binary = vpw.to_record(); ++ datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) }; + return gdbm_store(out, key, data, GDBM_INSERT) == 0; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911011035.xA1AZq1x027392>