From owner-svn-ports-all@freebsd.org Sun Mar 29 09:45:36 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E7EDC278F7B; Sun, 29 Mar 2020 09:45:35 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qrLP07pjz3C6f; Sun, 29 Mar 2020 09:45:33 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88F5825B69; Sun, 29 Mar 2020 09:36:31 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02T9aVid096819; Sun, 29 Mar 2020 09:36:31 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02T9aUhE096816; Sun, 29 Mar 2020 09:36:30 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202003290936.02T9aUhE096816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sun, 29 Mar 2020 09:36:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529785 - in head/mail/dbmail: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/mail/dbmail: . files X-SVN-Commit-Revision: 529785 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 09:45:36 -0000 Author: fluffy Date: Sun Mar 29 09:36:30 2020 New Revision: 529785 URL: https://svnweb.freebsd.org/changeset/ports/529785 Log: mail/dbmail: chase databases/libzdb update with new layout Modified: head/mail/dbmail/Makefile head/mail/dbmail/files/patch-acinclude.m4 head/mail/dbmail/files/patch-src_dbmail.h.in Modified: head/mail/dbmail/Makefile ============================================================================== --- head/mail/dbmail/Makefile Sun Mar 29 09:33:24 2020 (r529784) +++ head/mail/dbmail/Makefile Sun Mar 29 09:36:30 2020 (r529785) @@ -3,7 +3,7 @@ PORTNAME= dbmail PORTVERSION= 3.2.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= http://git.dbmail.eu/paul/dbmail/snapshot/ \ http://www.dbmail.org/download/3.2/ Modified: head/mail/dbmail/files/patch-acinclude.m4 ============================================================================== --- head/mail/dbmail/files/patch-acinclude.m4 Sun Mar 29 09:33:24 2020 (r529784) +++ head/mail/dbmail/files/patch-acinclude.m4 Sun Mar 29 09:36:30 2020 (r529785) @@ -1,6 +1,6 @@ --- acinclude.m4.orig 2015-01-25 10:20:50 UTC +++ acinclude.m4 -@@ -221,7 +221,7 @@ if ( test [ "x$lookforldap" != "xno" ] | +@@ -221,7 +221,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo dnl See if we already have the paths we need in the environment. dnl ...but only if --with-ldap was given without a specific path. if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then @@ -9,7 +9,7 @@ if test [ "x$LDAPLIB" != "xfailed" ]; then break fi -@@ -233,7 +233,7 @@ if ( test [ "x$lookforldap" != "xno" ] | +@@ -233,7 +233,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo SAVE_CFLAGS=$CFLAGS dnl The headers might be in a funny place, so we need to use -Ipath CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC" @@ -18,7 +18,7 @@ CFLAGS=$SAVE_CFLAGS if test [ "x$LDAPLIB" != "xfailed" ]; then break 2 -@@ -247,7 +247,7 @@ if ( test [ "x$lookforldap" != "xno" ] | +@@ -247,7 +247,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo AC_MSG_ERROR([Could not find LDAP library.]) else AC_DEFINE([AUTHLDAP], 1, [Define if LDAP will be used.]) @@ -27,7 +27,16 @@ AC_SUBST(LDAPLIB) AC_SUBST(LDAPINC) AUTHALIB="modules/.libs/libauth_ldap.a" -@@ -339,7 +339,7 @@ AC_DEFUN([DM_CHECK_EVENT], [ +@@ -291,6 +291,8 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl + [ZDBLIB="-lzdb"], + [ZDBLIB="failed"], + [[ ++#include ++#include + #include + #include + #include +@@ -339,7 +341,7 @@ AC_DEFUN([DM_CHECK_EVENT], [ AC_DEFUN([DM_CHECK_SSL], [ AC_CHECK_HEADERS([openssl/ssl.h], @@ -36,7 +45,7 @@ if test [ "x$SSLLIB" = "xfailed" ]; then AC_MSG_ERROR([Could not find OPENSSL library.]) else -@@ -539,15 +539,15 @@ AC_DEFUN([CMU_SOCKETS], [ +@@ -539,15 +541,15 @@ AC_DEFUN([CMU_SOCKETS], [ save_LIBS="$LIBS" SOCKETLIB="" AC_CHECK_FUNC(connect, :, Modified: head/mail/dbmail/files/patch-src_dbmail.h.in ============================================================================== --- head/mail/dbmail/files/patch-src_dbmail.h.in Sun Mar 29 09:33:24 2020 (r529784) +++ head/mail/dbmail/files/patch-src_dbmail.h.in Sun Mar 29 09:36:30 2020 (r529785) @@ -1,14 +1,22 @@ --- src/dbmail.h.in.orig 2015-01-25 10:20:50 UTC +++ src/dbmail.h.in -@@ -155,6 +155,11 @@ - #include +@@ -97,6 +97,7 @@ + #include #endif ++#include + #include + #include + #include +@@ -156,6 +157,11 @@ + #ifdef HAVE_ENDIAN_H + #include + #endif ++ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + -+ + #define GETCONFIGVALUE(key, sect, var) \ config_get_value(key, sect, var); \ - if (strlen(var) > 0) \