diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 01c19bcfb489..5edabeed6513 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,79 +1,73 @@
 PORTNAME=	dbmail
-PORTVERSION=	3.4.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+DISTVERSION=	3.5
 CATEGORIES=	mail
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SQL database-based mail system (POP3 and IMAP)
 WWW=		http://www.dbmail.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		docbook-sgml>0:textproc/docbook-sgml \
 		xmlto:textproc/xmlto
-LIB_DEPENDS=	libevent.so:devel/libevent \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libevent.so:devel/libevent \
 		libgmime-3.0.so:mail/gmime30 \
 		libmhash.so:security/mhash \
 		libzdb.so:databases/libzdb
 
 USES=		autoreconf gmake gnome libtool localbase pkgconfig shebangfix \
 		ssl
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
-
 SHEBANG_FILES=	man/fixsp.pl
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-manpages \
 			--sysconfdir=${LOCALBASE}/etc \
 			--with-zdb=${LOCALBASE}
 
-MAKE_ARGS+=	mandir=${PREFIX}/share/man
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB+=	DBMAIL_GROUP="${DBMAIL_GROUP}" \
 		DBMAIL_USER="${DBMAIL_USER}" \
 		PIDDIR="${PIDDIR}"
 
 OPTIONS_DEFINE=		DOCS LDAP SIEVE
 OPTIONS_DEFAULT=	SIEVE
 OPTIONS_SUB=		yes
+
 SIEVE_DESC=		Sieve mail sorting language support
 
 DOCS=		AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING
-
 LDAP_USES=		gettext-runtime ldap
 LDAP_CONFIGURE_WITH=	ldap
 SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
 SIEVE_CONFIGURE_WITH=	sieve
 
 DBMAIL_USER?=	mailnull
 DBMAIL_GROUP?=	mail
 PIDDIR?=	/var/run/dbmail
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/dbmail-sieved\.8 /d' \
 		${WRKSRC}/man/Makefile.am \
 		${WRKSRC}/man/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PIDDIR}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 6e2848a95435..938e24030f9a 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697969396
-SHA256 (dbmail-dbmail-v3.4.1_GH0.tar.gz) = eb11ec7c1a09b206a6b1816f18bb53aa41600a8de6e169ab61effa856a621e4e
-SIZE (dbmail-dbmail-v3.4.1_GH0.tar.gz) = 2531604
+TIMESTAMP = 1736600585
+SHA256 (dbmail-dbmail-v3.5_GH0.tar.gz) = d7bc133536453f6be573533b6468eb1e6043e69737e26d715cd6b04c99626213
+SIZE (dbmail-dbmail-v3.5_GH0.tar.gz) = 2538259
diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4
index e8584f6c9264..8130b502937f 100644
--- a/mail/dbmail/files/patch-acinclude.m4
+++ b/mail/dbmail/files/patch-acinclude.m4
@@ -1,191 +1,191 @@
---- acinclude.m4.orig	2022-10-15 15:02:38 UTC
+--- acinclude.m4.orig	2025-01-09 16:25:33 UTC
 +++ acinclude.m4
 @@ -43,7 +43,7 @@ AC_DEFINE_UNQUOTED([DM_VERSION], "$PACKAGE_VERSION", [
  AC_DEFINE_UNQUOTED([DM_PWD], "$ac_pwd", [Build directory])
  AC_DEFINE_UNQUOTED([DM_VERSION], "$PACKAGE_VERSION", [DBMail Version])
  ])
 -	
 +
  AC_DEFUN([DM_SET_SHARED_OR_STATIC], [dnl
  if test [ "$enable_shared" = "yes" -a "$enable_static" = "yes" ]; then
       AC_MSG_ERROR([
 @@ -89,7 +89,7 @@ if test [ "x$lookforsieve" != "xno" ]; then
      fi
      AC_MSG_CHECKING([for libSieve headers])
      STOP_LOOKING_FOR_SIEVE=""
 -    while test [ -z $STOP_LOOKING_FOR_SIEVE ]; do 
 +    while test [ -z $STOP_LOOKING_FOR_SIEVE ]; do
  
  	if test [ "x$lookforsieve" = "xyes" ]; then
              DM_SIEVE_INC([SIEVEINC=""], [SIEVEINC="failed"])
 @@ -97,7 +97,7 @@ if test [ "x$lookforsieve" != "xno" ]; then
                  break
              fi
          fi
 - 
 +
          for TEST_PATH in $sieveprefixes; do
  	    TEST_PATH="$TEST_PATH/include"
              SAVE_CFLAGS=$CFLAGS
 @@ -120,7 +120,7 @@ if test [ "x$lookforsieve" != "xno" ]; then
  
      AC_MSG_CHECKING([for libSieve libraries])
      STOP_LOOKING_FOR_SIEVE=""
 -    while test [ -z $STOP_LOOKING_FOR_SIEVE ]; do 
 +    while test [ -z $STOP_LOOKING_FOR_SIEVE ]; do
  
          if test [ "x$lookforsieve" = "xyes" ]; then
              DM_SIEVE_LIB([SIEVELIB="-lsieve"], [SIEVELIB="failed"])
 @@ -128,7 +128,7 @@ if test [ "x$lookforsieve" != "xno" ]; then
                  break
              fi
          fi
 - 
 +
          for TEST_PATH in $sieveprefixes; do
  	    TEST_PATH="$TEST_PATH/lib"
              SAVE_CFLAGS=$CFLAGS
 @@ -186,7 +186,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo
      fi
  
      STOP_LOOKING_FOR_LDAP=""
 -    while test [ -z $STOP_LOOKING_FOR_LDAP ]; do 
 +    while test [ -z $STOP_LOOKING_FOR_LDAP ]; do
  
          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.
 @@ -196,7 +196,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo
                  break
              fi
          fi
 - 
 +
          dnl Explicitly test paths from --with-ldap or configure.in
          for TEST_PATH in $ldapprefixes; do
  	    TEST_PATH="$TEST_PATH/include"
 @@ -217,7 +217,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo
      fi
  
      STOP_LOOKING_FOR_LDAP=""
 -    while test [ -z $STOP_LOOKING_FOR_LDAP ]; do 
 +    while test [ -z $STOP_LOOKING_FOR_LDAP ]; do
  
          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.
 @@ -227,7 +227,7 @@ if ( test [ "x$lookforldap" != "xno" ] || test [ "x$lo
                  break
              fi
          fi
 - 
 +
          dnl Explicitly test paths from --with-ldap or configure.in
          for TEST_PATH in $ldapprefixes; do
  	    TEST_PATH="$TEST_PATH/lib"
 @@ -261,14 +261,14 @@ AC_DEFUN([DM_CHECK_JEMALLOC], [dnl
  	AC_ARG_WITH(jemalloc,[  --with-jemalloc=PATH	  path to libjemalloc base directory (e.g. /usr/local or /usr)],
  		[lookforjemalloc="$withval"],[lookforjemalloc="yes"])
  	if test [ "x$lookforjemalloc" != "xno" ] ; then
 -		if test [ "x$lookforjemalloc" = "xyes" ] ; then 
 +		if test [ "x$lookforjemalloc" = "xyes" ] ; then
  			CFLAGS="$CFLAGS -I${ac_default_prefix}/include/jemalloc -I/usr/include/jemalloc"
  		else
  			CFLAGS="$CFLAGS -I${lookforjemalloc}/include/jemalloc"
  		fi
  	fi
  	AC_CHECK_HEADERS([jemalloc.h],
 -		[JEMALLOCLIB="-ljemalloc"], 
 +		[JEMALLOCLIB="-ljemalloc"],
  		[JEMALLOCLIB="no"],
  	[[
  #include <jemalloc.h>
 @@ -288,7 +288,7 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl
  		CFLAGS="$CFLAGS -I${lookforzdb}/include/zdb"
  	fi
  	AC_CHECK_HEADERS([zdb.h],
 -		[ZDBLIB="-lzdb"], 
 +		[ZDBLIB="-lzdb"],
  		[ZDBLIB="failed"],
  	[[
           #include <zdb.h>
 @@ -334,7 +334,7 @@ AC_DEFUN([DM_CHECK_SSL], [
  
  AC_DEFUN([DM_CHECK_SSL], [
  	AC_CHECK_HEADERS([openssl/ssl.h],
 -	 [SSLLIB=`pkg-config --libs openssl 2>/dev/null`],[SSLLIB="failed"])
 +	 [SSLLIB="-lcrypto -lssl"],[SSLLIB="failed"])
  	if test [ "x$SSLLIB" = "xfailed" ]; then
  		AC_MSG_ERROR([Could not find OPENSSL library.])
  	else
 @@ -389,7 +389,7 @@ else
  		AC_MSG_RESULT([no])
  		AC_MSG_ERROR([Unable to locate glib development files])
  	fi
 - 
 +
  	CFLAGS="$CFLAGS $ac_glib_cflags"
  	AC_MSG_RESULT([$ac_glib_cflags])
          AC_MSG_CHECKING([Glib libraries])
 @@ -428,7 +428,7 @@ else
  		CFLAGS="$CFLAGS $ac_gmime_cflags"
  		AC_MSG_RESULT([$ac_gmime_cflags])
  	fi
 -	
 +
          AC_MSG_CHECKING([GMime libraries])
  	ac_gmime_libs=`${gmimeconfig} --libs gmime-3.0 2>/dev/null|| ${gmimeconfig} --libs gmime-3.0 2>/dev/null`
  	if test -z "$ac_gmime_libs"
 @@ -447,7 +447,7 @@ AC_DEFUN([DM_PATH_CHECK],[dnl
    [  --with-check=PATH       prefix where check is installed [default=auto]],
    [test x"$with_check" = xno && with_check="no"],
    [with_check="no"])
 -  
 +
  if test "x$with_check" != xno; then
  	AC_PATH_PROG(checkconfig,pkg-config)
  	if test [ -z "$checkconfig" ]
 @@ -546,15 +546,15 @@ AC_DEFUN([CMU_SOCKETS], [
  	save_LIBS="$LIBS"
  	SOCKETLIB=""
  	AC_CHECK_FUNC(connect, :,
 -		AC_CHECK_LIB(nsl, gethostbyname,
 -			     SOCKETLIB="-lnsl $SOCKETLIB")
 -		AC_CHECK_LIB(socket, connect,
 -			     SOCKETLIB="-lsocket $SOCKETLIB")
 +		AC_CHECK_LIB(c, gethostbyname,
 +			     SOCKETLIB="-lc $SOCKETLIB")
 +		AC_CHECK_LIB(c, connect,
 +			     SOCKETLIB="-lc $SOCKETLIB")
  	)
  	LIBS="$SOCKETLIB $save_LIBS"
  	AC_CHECK_FUNC(res_search, :,
 -                AC_CHECK_LIB(resolv, res_search,
 -                              SOCKETLIB="-lresolv $SOCKETLIB") 
 +                AC_CHECK_LIB(c, res_search,
 +                              SOCKETLIB="-lc $SOCKETLIB")
          )
  	LIBS="$SOCKETLIB $save_LIBS"
  	AC_CHECK_FUNCS(dn_expand dns_lookup)
-@@ -592,19 +592,19 @@ AC_DEFUN([DM_UPGRADE_STEPS], [dnl
+@@ -611,19 +611,19 @@ AC_DEFUN([DM_UPGRADE_STEPS], [dnl
  	PGSQL_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/postgresql/upgrades/32004.psql`
  	MYSQL_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/mysql/upgrades/32004.mysql`
  	SQLITE_32004=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/sqlite/upgrades/32004.sqlite`
 -	
 +
  	AC_SUBST(PGSQL_32004)
  	AC_SUBST(MYSQL_32004)
  	AC_SUBST(SQLITE_32004)
 -	
 +
  	PGSQL_32005=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/postgresql/upgrades/32005.psql`
  	MYSQL_32005=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/mysql/upgrades/32005.mysql`
  	SQLITE_32005=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/sqlite/upgrades/32005.sqlite`
 -	
 +
  	AC_SUBST(PGSQL_32005)
  	AC_SUBST(MYSQL_32005)
  	AC_SUBST(SQLITE_32005)
 -	
 +
  	PGSQL_32006=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/postgresql/upgrades/32006.psql`
  	MYSQL_32006=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/mysql/upgrades/32006.mysql`
  	SQLITE_32006=`sed -e 's/\"/\\\"/g' -e 's/^/\"/' -e 's/$/\\\n\"/' -e '$!s/$/ \\\\/'  sql/sqlite/upgrades/32006.sqlite`
diff --git a/mail/dbmail/files/patch-src_mpool_mpool.c b/mail/dbmail/files/patch-src_mpool_mpool.c
index 281c65aab0ab..4dfca012db3a 100644
--- a/mail/dbmail/files/patch-src_mpool_mpool.c
+++ b/mail/dbmail/files/patch-src_mpool_mpool.c
@@ -1,38 +1,38 @@
---- src/mpool/mpool.c.orig
+--- src/mpool/mpool.c.orig	2023-10-21 13:00:24 UTC
 +++ src/mpool/mpool.c
-@@ -241,6 +241,7 @@
+@@ -241,6 +241,7 @@ static	void	*alloc_pages(mpool_t *mp_p, const unsigned
    (void)printf("allocating %u pages or %lu bytes\n", page_n, size);
  #endif
    
 +#if 0
    if (BIT_IS_SET(mp_p->mp_flags, MPOOL_FLAG_USE_SBRK)) {
      mem = sbrk(size);
      if (mem == (void *)-1) {
-@@ -263,7 +264,9 @@
+@@ -263,7 +264,9 @@ static	void	*alloc_pages(mpool_t *mp_p, const unsigned
        mem = (char *)mem + fill;
      }
    }
 -  else {
 +  else
 +#endif
 +  {
      state = MAP_PRIVATE;
  #ifdef MAP_FILE
      state |= MAP_FILE;
-@@ -937,12 +940,15 @@
+@@ -937,12 +940,15 @@ mpool_t	*mpool_open(const unsigned int flags, const un
      }
    }
    
 +#if 0
    if (BIT_IS_SET(flags, MPOOL_FLAG_USE_SBRK)) {
      mp.mp_fd = -1;
      mp.mp_addr = NULL;
      mp.mp_top = 0;
    }
 -  else {
 +  else
 +#endif
 +  {
      /* open dev-zero for our mmaping */
      mp.mp_fd = open("/dev/zero", O_RDWR, 0);
      if (mp.mp_fd < 0) {
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index b0bc36b4ba70..081f99c650de 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -1,112 +1,112 @@
 @sample etc/dbmail.conf.sample
 %%LDAP%%lib/dbmail/libauth_ldap.so
 %%LDAP%%lib/dbmail/libauth_ldap.so.0
 %%LDAP%%lib/dbmail/libauth_ldap.so.0.0.0
 lib/dbmail/libauth_sql.so
 lib/dbmail/libauth_sql.so.0
 lib/dbmail/libauth_sql.so.0.0.0
 lib/dbmail/libdbmail.so
 lib/dbmail/libdbmail.so.0
 lib/dbmail/libdbmail.so.0.0.0
 %%SIEVE%%lib/dbmail/libsort_sieve.so
 %%SIEVE%%lib/dbmail/libsort_sieve.so.0
 %%SIEVE%%lib/dbmail/libsort_sieve.so.0.0.0
 share/man/man1/dbmail-deliver.1.gz
 share/man/man1/dbmail.1.gz
 share/man/man5/dbmail.conf.5.gz
 share/man/man8/dbmail-export.8.gz
 share/man/man8/dbmail-httpd.8.gz
 share/man/man8/dbmail-imapd.8.gz
 share/man/man8/dbmail-lmtpd.8.gz
 share/man/man8/dbmail-pop3d.8.gz
 share/man/man8/dbmail-sievecmd.8.gz
-share/man/man8/dbmail-timsieved.8.gz
 share/man/man8/dbmail-users.8.gz
 share/man/man8/dbmail-util.8.gz
 sbin/dbmail-deliver
 sbin/dbmail-export
 sbin/dbmail-httpd
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
 sbin/dbmail-users
 sbin/dbmail-util
 %%SIEVE%%sbin/dbmail-sievecmd
 %%SIEVE%%sbin/dbmail-sieved
-%%SIEVE%%sbin/dbmail-timsieved
 %%DATADIR%%/dbmail.schema
 %%DATADIR%%/mysql/2_1_7-2_2_0.mysql
 %%DATADIR%%/mysql/2_2-3_0.mysql
 %%DATADIR%%/mysql/2_2_5-2_3_0.mysql
 %%DATADIR%%/mysql/2_3_0-2_3_2.mysql
 %%DATADIR%%/mysql/2_3_4-2_3_5.mysql
 %%DATADIR%%/mysql/2_3_5-2_3_6.mysql
 %%DATADIR%%/mysql/2_3_6-3_0_0.mysql
 %%DATADIR%%/mysql/3_0_2-3_1_0.mysql
 %%DATADIR%%/mysql/create_tables.mysql
 %%DATADIR%%/mysql/fix_foreign_keys.mysql
 %%DATADIR%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
 %%DATADIR%%/mysql/migrate_from_2.0_to_2.2.mysql
 %%DATADIR%%/mysql/update_headervalue_01.mysql
 %%DATADIR%%/mysql/upgrades/32001.mysql
 %%DATADIR%%/mysql/upgrades/32002.mysql
 %%DATADIR%%/mysql/upgrades/32003.mysql
 %%DATADIR%%/mysql/upgrades/32004.mysql
 %%DATADIR%%/mysql/upgrades/32005.mysql
 %%DATADIR%%/mysql/upgrades/32006.mysql
-%%DATADIR%%/mysql/upgrades/upgrade.mysql
+%%DATADIR%%/mysql/upgrades/35001.mysql
+%%DATADIR%%/mysql/upgrades/create_tables.mysql
 %%DATADIR%%/oracle/dbmail_grant.sql
 %%DATADIR%%/oracle/dbmail_schema.sql
 %%DATADIR%%/oracle/dbmail_ts.sql
 %%DATADIR%%/postgresql/2_1_7-2_2_0.pgsql
 %%DATADIR%%/postgresql/2_2-3_0.pgsql
 %%DATADIR%%/postgresql/2_2_5-2_3_0.pgsql
 %%DATADIR%%/postgresql/2_3_4-2_3_5.pgsql
 %%DATADIR%%/postgresql/2_3_5-2_3_6.pgsql
 %%DATADIR%%/postgresql/2_3_6-3_0_0.pgsql
 %%DATADIR%%/postgresql/3_0_2-3_1_0.psql
 %%DATADIR%%/postgresql/create_tables.pgsql
 %%DATADIR%%/postgresql/migrate_from_1.x_to_2.0.pgsql
 %%DATADIR%%/postgresql/migrate_from_2.0_to_2.2.pgsql
 %%DATADIR%%/postgresql/upgrades/32001.psql
 %%DATADIR%%/postgresql/upgrades/32002.psql
 %%DATADIR%%/postgresql/upgrades/32003.psql
 %%DATADIR%%/postgresql/upgrades/32004.psql
 %%DATADIR%%/postgresql/upgrades/32005.psql
 %%DATADIR%%/postgresql/upgrades/32006.psql
-%%DATADIR%%/postgresql/upgrades/upgrade.psql
+%%DATADIR%%/postgresql/upgrades/35001.psql
+%%DATADIR%%/postgresql/upgrades/create_tables.psql
 %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite
 %%DATADIR%%/sqlite/2_2-3_0.sqlite
 %%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite
 %%DATADIR%%/sqlite/2_3_4-2_3_5.sqlite
 %%DATADIR%%/sqlite/2_3_5-2_3_6.sqlite
 %%DATADIR%%/sqlite/2_3_6-3_0_0.sqlite
 %%DATADIR%%/sqlite/3_0_2-3_1_0.sqlite
 %%DATADIR%%/sqlite/create_tables.sqlite
 %%DATADIR%%/sqlite/trigger.tmpl.sql
 %%DATADIR%%/sqlite/upgrades/32001.sqlite
 %%DATADIR%%/sqlite/upgrades/32002.sqlite
 %%DATADIR%%/sqlite/upgrades/32003.sqlite
 %%DATADIR%%/sqlite/upgrades/32004.sqlite
 %%DATADIR%%/sqlite/upgrades/32005.sqlite
 %%DATADIR%%/sqlite/upgrades/32006.sqlite
-%%DATADIR%%/sqlite/upgrades/upgrade.sqlite
+%%DATADIR%%/sqlite/upgrades/35001.sqlite
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.aliases
 %%PORTDOCS%%%%DOCSDIR%%/README.exim
 %%PORTDOCS%%%%DOCSDIR%%/README.filters
 %%PORTDOCS%%%%DOCSDIR%%/README.http
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
 %%PORTDOCS%%%%DOCSDIR%%/README.postfix
 %%PORTDOCS%%%%DOCSDIR%%/README.qmail
 %%PORTDOCS%%%%DOCSDIR%%/README.sieve
 %%PORTDOCS%%%%DOCSDIR%%/README.smtp
 %%PORTDOCS%%%%DOCSDIR%%/README.security-password
 %%PORTDOCS%%%%DOCSDIR%%/README.solaris
 %%PORTDOCS%%%%DOCSDIR%%/README.usermap
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 @dir(%%DBMAIL_USER%%,%%DBMAIL_GROUP%%,) %%PIDDIR%%