[pkgsrc/trunk]: pkgsrc/mail/dbmail Merge with wip/dbmail.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/dbmail Merge with wip/dbmail.
From: obache <obache%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:26:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1dc24ebd3e22
branches:  trunk
changeset: 534867:1dc24ebd3e22
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Nov 03 11:39:49 2007 +0000

description:
Merge with wip/dbmail.

* Honor PKG_SYSCONFDIR and VARBASE.
* Added sqlite and ldap option.
* Fixes PLIST when db driver != mysql.
* Install more documentation.
* Install initial create tables sql script files.
* Rename timsieved's rc script to similar name with other scripts.

Bump PKGREVISION.

diffstat:

 mail/dbmail/DESCR                     |   2 +-
 mail/dbmail/MESSAGE                   |  12 ++++++
 mail/dbmail/Makefile                  |  38 +++++++++++++------
 mail/dbmail/PLIST                     |  58 ++++++++++++++++++++++++-----
 mail/dbmail/PLIST.sieve               |   5 --
 mail/dbmail/distinfo                  |   2 +-
 mail/dbmail/files/dbmail-timsieved.sh |  18 ---------
 mail/dbmail/files/dbmail.sh           |   4 +-
 mail/dbmail/files/dbmailimapd.sh      |   4 +-
 mail/dbmail/files/dbmaillmtpd.sh      |   4 +-
 mail/dbmail/files/dbmailpop3d.sh      |   4 +-
 mail/dbmail/files/dbmailtimsieved.sh  |  18 +++++++++
 mail/dbmail/options.mk                |  68 +++++++++++++++++++++++++++++-----
 13 files changed, 171 insertions(+), 66 deletions(-)

diffs (truncated from 423 to 300 lines):

diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/DESCR
--- a/mail/dbmail/DESCR Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/DESCR Sat Nov 03 11:39:49 2007 +0000
@@ -1,6 +1,6 @@
 Dbmail is the name of a group of programs that enable the possibility
 of storing and retrieving mail messages from a database. Currently
-MySQL and PostgreSQL can be used as database backends.
+MySQL, PostgreSQL and SQLite can be used as database backends.
 
 DBMail is made up of several components. A normal MTA (Postfix,
 SendMail, QMail, Exim) is used for accepting messages. The MTA
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dbmail/MESSAGE       Sat Nov 03 11:39:49 2007 +0000
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/11/03 11:39:49 obache Exp $
+
+Anyone upgrading from an earlier version of the dbmail should read:
+
+       ${DOCSDIR}/UPGRADING
+
+Here are migration scripts:
+
+       ${DATADIR}/sql
+
+===========================================================================
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/Makefile
--- a/mail/dbmail/Makefile      Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/Makefile      Sat Nov 03 11:39:49 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/10/30 22:52:42 shannonjr Exp $
+# $NetBSD: Makefile,v 1.15 2007/11/03 11:39:49 obache Exp $
 #
 
 DISTNAME=              dbmail-2.2.7
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dbmail.org/download/2.2/
 
@@ -10,37 +11,50 @@
 COMMENT=               Store and retrieve mail messages in a database
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-${SQLDB}
-CONFIGURE_ARGS+=       --with-pkglibdir=${PREFIX}/lib/dbmail
-USE_TOOLS+=            gmake
+CONFIGURE_ARGS+=       --with-logdir=${VARBASE:Q}/log
+CONFIGURE_ARGS+=       --with-pkglibdir=${PREFIX:Q}/lib/dbmail
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}/run
+USE_TOOLS+=            gmake pkg-config
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 
 EGDIR=                 ${PREFIX}/share/examples/dbmail
 CONF_FILES=            ${EGDIR}/dbmail.conf ${PKG_SYSCONFDIR}/dbmail.conf
-RCD_SCRIPTS=           dbmail dbmailimapd dbmaillmtpd dbmailpop3d dbmail-timsieved
+RCD_SCRIPTS=           dbmail dbmailimapd dbmaillmtpd dbmailpop3d
+DATADIR=               ${PREFIX}/share/dbmail
+DOCSDIR=               ${PREFIX}/share/doc/dbmail
+DOCS=                  AUTHORS BUGS COPYING INSTALL NEWS README
+DOCS+=                 README.aliases README.exim README.ldap
+DOCS+=                 README.postfix README.qmail README.sieve
+DOCS+=                 README.smtp README.solaris README.usermap
+DOCS+=                 THANKS UPGRADING
 
-PLIST_SUBST+=          SQLDB=${SQLDB:Q}
+MESSAGE_SUBST+=                DOCSDIR=${DOCSDIR}
+MESSAGE_SUBST+=                DATADIR=${DATADIR}
 
 SUBST_CLASSES+=                sysconf
 SUBST_STAGE.sysconf=   do-configure
 SUBST_FILES.sysconf=   man/dbmail-imapd.8 man/dbmail-lmtpd.8 man/dbmail-pop3d.8
 SUBST_FILES.sysconf+=  man/dbmail-smtp.1 man/dbmail-users.8 man/dbmail-util.8
-SUBST_FILES.sysconf+=  dbmail.h
+SUBST_FILES.sysconf+=  man/dbmail.1 man/dbmail.conf.5 man/dbmail-export.8
+SUBST_FILES.sysconf+=  man/dbmail-sievecmd.8 mail/dbmail-timsieved.8
 SUBST_SED.sysconf=     -e 's|/etc/dbmail\.conf|${PKG_SYSCONFDIR}/dbmail.conf|g'
 SUBST_MESSAGE.sysconf= Fixing sysconf paths.
 
-INSTALLATION_DIRS=     lib man ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 sbin share/examples/dbmail
+INSTALLATION_DIRS=     lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin ${DOCSDIR} ${EGDIR} ${DATADIR}/sql
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/sql/mysql/migrate_from_2.0_to_2.2.mysql ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/sql/postgresql/migrate_from_2.0_to_2.2.pgsql ${EGDIR}
-
+.for f in ${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}
+.endfor
 
 .include "options.mk"
 
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.8.0
 .include "../../mail/gmime/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gmime+=  gmime>=2.1.19
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/PLIST
--- a/mail/dbmail/PLIST Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/PLIST Sat Nov 03 11:39:49 2007 +0000
@@ -1,31 +1,69 @@
-@comment $NetBSD: PLIST,v 1.5 2007/10/30 22:52:43 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/11/03 11:39:49 obache Exp $
+${MYSQL}lib/dbmail/libmysql.la
+${PGSQL}lib/dbmail/libpgsql.la
+${SQLITE}lib/dbmail/libsqlite.la
+${LDAP}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
-lib/dbmail/libmysql.la
+${SIEVE}lib/dbmail/libsort_sieve.la
+man/man1/dbmail.1
 man/man1/dbmail-smtp.1
+man/man5/dbmail.conf.5
+man/man8/dbmail-export.8
 man/man8/dbmail-imapd.8
 man/man8/dbmail-lmtpd.8
 man/man8/dbmail-pop3d.8
+man/man8/dbmail-sievecmd.8
+man/man8/dbmail-timsieved.8
 man/man8/dbmail-users.8
 man/man8/dbmail-util.8
-man/man1/dbmail.1
-man/man5/dbmail.conf.5
-man/man8/dbmail-export.8
-man/man8/dbmail-sievecmd.8
-man/man8/dbmail-timsieved.8
+sbin/dbmail-export
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
+${SIEVE}sbin/dbmail-sievecmd
 sbin/dbmail-smtp
+${SIEVE}sbin/dbmail-timsieved
 sbin/dbmail-users
 sbin/dbmail-util
+share/doc/dbmail/AUTHORS
+share/doc/dbmail/BUGS
+share/doc/dbmail/COPYING
+share/doc/dbmail/INSTALL
+share/doc/dbmail/NEWS
+share/doc/dbmail/README
+share/doc/dbmail/README.aliases
+share/doc/dbmail/README.exim
+share/doc/dbmail/README.ldap
+share/doc/dbmail/README.postfix
+share/doc/dbmail/README.qmail
+share/doc/dbmail/README.sieve
+share/doc/dbmail/README.smtp
+share/doc/dbmail/README.solaris
+share/doc/dbmail/README.usermap
+share/doc/dbmail/THANKS
+share/doc/dbmail/UPGRADING
 share/examples/dbmail/dbmail.conf
-share/examples/dbmail/migrate_from_2.0_to_2.2.mysql
-share/examples/dbmail/migrate_from_2.0_to_2.2.pgsql
+${MYSQL}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
+${MYSQL}share/dbmail/sql/mysql/create_tables.mysql
+${MYSQL}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql
+${MYSQL}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql
+${MYSQL}share/dbmail/sql/mysql/update_headervalue_01.mysql
+${PGSQL}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
+${PGSQL}share/dbmail/sql/postgresql/create_tables.pgsql
+${PGSQL}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql
+${PGSQL}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql
+${SQLITE}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
+${SQLITE}share/dbmail/sql/sqlite/create_tables.sqlite
 share/examples/rc.d/dbmail
 share/examples/rc.d/dbmailimapd
 share/examples/rc.d/dbmaillmtpd
 share/examples/rc.d/dbmailpop3d
-share/examples/rc.d/dbmail-timsieved
+${SIEVE}share/examples/rc.d/dbmailtimsieved
 @dirrm share/examples/dbmail
+${SQLITE}@dirrm share/dbmail/sql/sqlite
+${PGSQL}@dirrm share/dbmail/sql/pgsql
+${MYSQL}@dirrm share/dbmail/sql/mysql
+@dirrm share/dbmail/sql
+@dirrm share/doc/dbmail
 @dirrm lib/dbmail
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/PLIST.sieve
--- a/mail/dbmail/PLIST.sieve   Sat Nov 03 11:23:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.sieve,v 1.1 2007/10/30 22:52:43 shannonjr Exp $
-lib/dbmail/libsort_sieve.la
-sbin/dbmail-export
-sbin/dbmail-sievecmd
-sbin/dbmail-timsieved
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/distinfo
--- a/mail/dbmail/distinfo      Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/distinfo      Sat Nov 03 11:39:49 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/10/30 22:52:43 shannonjr Exp $
+$NetBSD: distinfo,v 1.6 2007/11/03 11:39:49 obache Exp $
 
 SHA1 (dbmail-2.2.7.tar.gz) = 15d3bbd945ee09fdc36da6f988f2b4723bd1cc28
 RMD160 (dbmail-2.2.7.tar.gz) = aac1d5a7d049b7384455b37e8380d4e57eae5164
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/files/dbmail-timsieved.sh
--- a/mail/dbmail/files/dbmail-timsieved.sh     Sat Nov 03 11:23:06 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dbmail-timsieved.sh,v 1.1 2007/10/30 22:52:44 shannonjr Exp $
-#
-
-# PROVIDE: timsieved
-# REQUIRE: 
-
-. /etc/rc.subr
-
-name="timsieved"
-rcvar=${name}
-required_files="@PKG_SYSCONFDIR@/dbmail.conf"
-command="@PREFIX@/sbin/dbmail-timsieved"
-pidfile="/var/run/dbmail-timsieved.pid"
-
-load_rc_config $name
-run_rc_command "$1"
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/files/dbmail.sh
--- a/mail/dbmail/files/dbmail.sh       Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/files/dbmail.sh       Sat Nov 03 11:39:49 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmail.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
+# $NetBSD: dbmail.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
 #
 
 # KEYWORD: nostart
@@ -44,7 +44,7 @@
        done
 }
 
-COMMAND_LIST="dbmailimapd dbmailpop3d dbmaillmtpd"
+COMMAND_LIST="dbmailimapd dbmailpop3d dbmaillmtpd @TIMSIEVED@"
 
 name="dbmail"
 start_cmd="forward_commands"
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/files/dbmailimapd.sh
--- a/mail/dbmail/files/dbmailimapd.sh  Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/files/dbmailimapd.sh  Sat Nov 03 11:39:49 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailimapd.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
+# $NetBSD: dbmailimapd.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
 #
 
 # PROVIDE: dbmailimap mail
@@ -12,7 +12,7 @@
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-imapd"
-pidfile="/var/run/dbmail-imapd.pid"
+pidfile="@VARBASE@/run/dbmail-imapd.pid"
 
 load_rc_config $name
 run_rc_command "$1"
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/files/dbmaillmtpd.sh
--- a/mail/dbmail/files/dbmaillmtpd.sh  Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/files/dbmaillmtpd.sh  Sat Nov 03 11:39:49 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmaillmtpd.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
+# $NetBSD: dbmaillmtpd.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
 #
 
 # PROVIDE: dbmaillmtp mail
@@ -12,7 +12,7 @@
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-lmtpd"
-pidfile="/var/run/dbmail-lmtpd.pid"
+pidfile="@VARBASE@/run/dbmail-lmtpd.pid"
 
 load_rc_config $name
 run_rc_command "$1"
diff -r 866ae0636145 -r 1dc24ebd3e22 mail/dbmail/files/dbmailpop3d.sh
--- a/mail/dbmail/files/dbmailpop3d.sh  Sat Nov 03 11:23:06 2007 +0000
+++ b/mail/dbmail/files/dbmailpop3d.sh  Sat Nov 03 11:39:49 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbmailpop3d.sh,v 1.1 2005/01/09 04:17:39 schmonz Exp $
+# $NetBSD: dbmailpop3d.sh,v 1.2 2007/11/03 11:39:50 obache Exp $
 #
 
 # PROVIDE: dbmailpop3 mail
@@ -12,7 +12,7 @@
 rcvar=${name}
 required_files="@PKG_SYSCONFDIR@/dbmail.conf"
 command="@PREFIX@/sbin/dbmail-pop3d"
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/opencdk Update to 0.6.5:
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Imported x11/awesome-1.3nb1 from pkgsrc-wip
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/opencdk Update to 0.6.5:
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Imported x11/awesome-1.3nb1 from pkgsrc-wip
Indexes:
Home | Main Index | Thread Index | Old Index