>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# dbmail23
# dbmail23/Makefile
# dbmail23/files
# dbmail23/files/dbmail-lmtpd.sh.in
# dbmail23/files/dbmail-pop3d.sh.in
# dbmail23/files/pkg-message.in
# dbmail23/files/dbmail-imapd.sh.in
# dbmail23/files/dbmail-timsieved.sh.in
# dbmail23/files/patch-timsieve.c
# dbmail23/files/patch-imap4.c
# dbmail23/files/patch-dbmail.h.in
# dbmail23/pkg-descr
# dbmail23/pkg-plist
# dbmail23/distinfo
#
echo c - dbmail23
mkdir -p dbmail23 > /dev/null 2>&1
echo x - dbmail23/Makefile
sed 's/^X//' >dbmail23/Makefile << 'END-of-dbmail23/Makefile'
X# New ports collection makefile for: dbmail23
X# Date created: 5 Feb 2008
X# Whom: Mark Starovoytov <mar...@kikg.ifmo.ru>
X#
X# $FreeBSD$
X#
X
XPORTNAME= dbmail
XPORTVERSION= 2.3.2
XCATEGORIES= mail
XMASTER_SITES= http://www.dbmail.org/download/2.3/
X
XMAINTAINER= mar...@kikg.ifmo.ru
XCOMMENT= An SQL database-based mail system (POP3 and IMAP)
X
XLIB_DEPENDS+= gmime-2.0.4:${PORTSDIR}/mail/gmime2
XLIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash
X
XCONFLICTS= dbmail-*-2.0.* dbmail-2.1.* dbmail-2.2.*
X
XOPTIONS= MYSQL "Build with MySQL support" on \
X POSTGRESQL "Build with PostgreSQL support" off \
X SQLITE "Build with SQLite support" off \
X SIEVE "Build w. support for Sieve mail sorting language" off \
X LDAP "Build with support for LDAP authentication" off \
X MANPAGES "Install man pages" on
X
XUSE_AUTOTOOLS= libtool:15
XUSE_GMAKE= YES
XUSE_GCC= 3.2+
XUSE_LDCONFIG= ${PREFIX}/lib/dbmail
XUSE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
XUSE_GNOME= glib20 pkgconfig
XUSE_OPENSSL= YES
X
XCFLAGS+= -fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
XLDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
XCONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE}
XCONFIGURE_ARGS+=--with-pkglibdir=${LOCALBASE}/lib/dbmail \
X --sysconfdir=${PREFIX}/etc
XMAKE_ARGS+= mandir=${MANPREFIX}/man
X
XMAIN_DOCS= AUTHORS BUGS COPYING INSTALL NEWS README \
X THANKS UPGRADING VERSION \
X dbmail.schema
XADDITIONAL_DOCS=README.aliases README.exim README.ldap \
X README.postfix README.qmail README.sieve \
X README.smtp README.solaris README.usermap
XPORTDOCS= ${MAIN_DOCS} ${ADDITIONAL_DOCS}
XSUB_FILES= pkg-message
X
XPLIST_SUB+= PORTNAME=${PORTNAME}
X
X.include <bsd.port.pre.mk>
X
X.if defined(WITH_MYSQL)
XCONFIGURE_ARGS+=--with-mysql
XUSE_MYSQL= YES
XDATABASE+= mysql
XPLIST_SUB+= MYSQL=""
X.else
XPLIST_SUB+= MYSQL="@comment "
X.endif
X
X.if defined(WITH_POSTGRESQL)
XCONFIGURE_ARGS+=--with-pgsql
XUSE_PGSQL= yes
XDATABASE+= postgresql
XPLIST_SUB+= PGSQL=""
X.else
XPLIST_SUB+= PGSQL="@comment "
X.endif
X
X.if defined(WITH_SQLITE)
XCONFIGURE_ARGS+=--with-sqlite
XUSE_SQLITE= yes
XDATABASE+= sqlite
XPLIST_SUB+= SQLITE=""
X.else
XPLIST_SUB+= SQLITE="@comment "
X.endif
X
X.if defined(WITH_SIEVE)
XCONFIGURE_ARGS+=--with-sieve
XLIB_DEPENDS+= sieve.1:${PORTSDIR}/mail/libsieve
XPLIST_SUB+= SIEVE=""
X.else
XPLIST_SUB+= SIEVE="@comment "
X.endif
X
X.if defined(WITH_LDAP)
XCONFIGURE_ARGS+=--with-auth-ldap
XUSE_OPENLDAP= yes
XPLIST_SUB+= LDAP=""
X.else
XPLIST_SUB+= LDAP="@comment "
X.endif
X
X.if defined(WITH_MANPAGES)
XCONFIGURE_ARGS+=--enable-manpages=yes
XBUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc
XBUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto
XMAN1= dbmail-deliver.1 dbmail.1
XMAN5= dbmail.conf.5
XMAN8= dbmail-export.8 dbmail-imapd.8 dbmail-lmtpd.8 \
X dbmail-pop3d.8 dbmail-sievecmd.8 dbmail-timsieved.8 \
X dbmail-users.8 dbmail-util.8
XMANCOMPRESSED= no
X.else
XNO_INSTALL_MANPAGES=yes
X.endif
X
X.if !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL) && !defined(WITH_SQLITE)
XIGNORE="requires at least one database backend selected. Run 'make config'"
X.endif
X
Xpost-patch:
X @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
X @${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr
X
Xpost-install:
X @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist
X @if [ ! -f ${PREFIX}/etc/dbmail.conf ] ; then \
X ${CP} -p ${PREFIX}/etc/dbmail.conf-dist ${PREFIX}/etc/dbmail.conf; \
X fi
X @${MKDIR} ${DATADIR}
X @for f in ${DATABASE}; do \
X ${MKDIR} ${DATADIR}/$$f ; \
X ${INSTALL_DATA} ${WRKSRC}/sql/$$f/* ${DATADIR}/$$f; \
X done
X.if !defined(NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}
X @cd ${WRKSRC} && ${INSTALL_DATA} ${MAIN_DOCS} ${DOCSDIR}
X @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${ADDITIONAL_DOCS} ${DOCSDIR}
X.endif
X @${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.post.mk>
END-of-dbmail23/Makefile
echo c - dbmail23/files
mkdir -p dbmail23/files > /dev/null 2>&1
echo x - dbmail23/files/dbmail-lmtpd.sh.in
sed 's/^X//' >dbmail23/files/dbmail-lmtpd.sh.in << 'END-of-dbmail23/files/dbmail-lmtpd.sh.in'
X#!/bin/sh
X#
X# $FreeBSD: ports/mail/dbmail/files/dbmail-lmtpd.sh.in,v 1.1 2005/07/18 16:04:16 pav Exp $
X#
X
X# PROVIDE: dbmail-lmtpd
X# REQUIRE: DAEMON
X# KEYWORD: shutdown
X
X#
X# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd:
X#
X#dbmail_lmtpd_enable="YES"
X#
X# See dbmail-lmtpd(8) for flags
X#
X
X. %%RC_SUBR%%
X
Xname=dbmail_lmtpd
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/sbin/dbmail-lmtpd
Xpidfile=/var/run/dbmail-lmtpd.pid
Xrequired_files=%%PREFIX%%/etc/dbmail.conf
X
X# read settings, set default values
Xload_rc_config "$name"
X: ${dbmail_lmtpd_enable="NO"}
X: ${dbmail_lmtpd_flags=""}
X
Xrun_rc_command "$1"
END-of-dbmail23/files/dbmail-lmtpd.sh.in
echo x - dbmail23/files/dbmail-pop3d.sh.in
sed 's/^X//' >dbmail23/files/dbmail-pop3d.sh.in << 'END-of-dbmail23/files/dbmail-pop3d.sh.in'
X#!/bin/sh
X#
X# $FreeBSD: ports/mail/dbmail/files/dbmail-pop3d.sh.in,v 1.1 2005/07/18 16:04:16 pav Exp $
X#
X
X# PROVIDE: dbmail-pop3d
X# REQUIRE: DAEMON
X# KEYWORD: shutdown
X
X#
X# Add the following lines to /etc/rc.conf to enable dbmail-pop3d:
X#
X#dbmail_pop3d_enable="YES"
X#
X# See dbmail-pop3d(8) for flags
X#
X
X. %%RC_SUBR%%
X
Xname=dbmail_pop3d
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/sbin/dbmail-pop3d
Xpidfile=/var/run/dbmail-pop3d.pid
Xrequired_files=%%PREFIX%%/etc/dbmail.conf
X
X# read settings, set default values
Xload_rc_config "$name"
X: ${dbmail_pop3d_enable="NO"}
X: ${dbmail_pop3d_flags=""}
X
Xrun_rc_command "$1"
END-of-dbmail23/files/dbmail-pop3d.sh.in
echo x - dbmail23/files/pkg-message.in
sed 's/^X//' >dbmail23/files/pkg-message.in << 'END-of-dbmail23/files/pkg-message.in'
X
XNOTE FOR ADMINS UPGRADING FROM 2.2.X -> 2.3 :
X
X *) Update database using a script
X %%DATADIR%%/mysql/2_2_5-2_3_0.mysql (if you're using MySQL)
X %%DATADIR%%/postgresql/2_2_5-2_3_0.pgsql (PostgreSQL)
X %%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite (SQLite3)
X *) Run `dbmail-util -by'
END-of-dbmail23/files/pkg-message.in
echo x - dbmail23/files/dbmail-imapd.sh.in
sed 's/^X//' >dbmail23/files/dbmail-imapd.sh.in << 'END-of-dbmail23/files/dbmail-imapd.sh.in'
X#!/bin/sh
X#
X# $FreeBSD: ports/mail/dbmail/files/dbmail-imapd.sh.in,v 1.1 2005/07/18 16:04:16 pav Exp $
X#
X
X# PROVIDE: dbmail-imapd
X# REQUIRE: DAEMON
X# KEYWORD: shutdown
X
X#
X# Add the following lines to /etc/rc.conf to enable dbmail-imapd:
X#
X#dbmail_imapd_enable="YES"
X#
X# See dbmail-imapd(8) for flags
X#
X
X. %%RC_SUBR%%
X
Xname=dbmail_imapd
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/sbin/dbmail-imapd
Xpidfile=/var/run/dbmail-imapd.pid
Xrequired_files=%%PREFIX%%/etc/dbmail.conf
X
X# read settings, set default values
Xload_rc_config "$name"
X: ${dbmail_imapd_enable="NO"}
X: ${dbmail_imapd_flags=""}
X
Xrun_rc_command "$1"
END-of-dbmail23/files/dbmail-imapd.sh.in
echo x - dbmail23/files/dbmail-timsieved.sh.in
sed 's/^X//' >dbmail23/files/dbmail-timsieved.sh.in << 'END-of-dbmail23/files/dbmail-timsieved.sh.in'
X#!/bin/sh
X#
X# $FreeBSD: ports/mail/dbmail/files/dbmail-timsieved.sh.in,v 1.1 2006/12/16 10:27:25 miwi Exp $
X#
X
X# PROVIDE: dbmail-timsieved
X# REQUIRE: DAEMON
X# KEYWORD: shutdown
X
X#
X# Add the following lines to /etc/rc.conf to enable dbmail-timsieved:
X#
X#dbmail_timsieved_enable="YES"
X#
X# See dbmail-timsieved(8) for flags
X#
X
X. %%RC_SUBR%%
X
Xname=dbmail_timsieved
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/sbin/dbmail-timsieved
Xpidfile=/var/run/dbmail-timsieved.pid
Xrequired_files=%%PREFIX%%/etc/dbmail.conf
X
X# read settings, set default values
Xload_rc_config "$name"
X: ${dbmail_timsieved_enable="NO"}
X: ${dbmail_timsieved_flags=""}
X
Xrun_rc_command "$1"
END-of-dbmail23/files/dbmail-timsieved.sh.in
echo x - dbmail23/files/patch-timsieve.c
sed 's/^X//' >dbmail23/files/patch-timsieve.c << 'END-of-dbmail23/files/patch-timsieve.c'
X--- src/timsieve.c.orig Mon Feb 4 17:37:40 2008
X+++ src/timsieve.c Tue Feb 5 19:19:12 2008
X@@ -40,7 +40,7 @@
X if (strlen(banner) > 0) \
X ci_write(stream, "\"IMPLEMENTATION\" \"%s\"\r\n", banner); \
X else \
X- ci_write(stream, "\"IMPLEMENTATION\" \"DBMail timsieved v%s\"\r\n", VERSION); \
X+ ci_write(stream, "\"IMPLEMENTATION\" \"DBMail timsieved v%s\"\r\n", DBMAIL_VERSION); \
X ci_write(stream, "\"SASL\" \"PLAIN\"\r\n"); \
X ci_write(stream, "\"SIEVE\" \"%s\"\r\n", sieve_extensions); \
X ci_write(stream, "OK\r\n")
END-of-dbmail23/files/patch-timsieve.c
echo x - dbmail23/files/patch-imap4.c
sed 's/^X//' >dbmail23/files/patch-imap4.c << 'END-of-dbmail23/files/patch-imap4.c'
X--- src/imap4.c.orig Mon Feb 4 17:37:40 2008
X+++ src/imap4.c Tue Feb 5 19:20:34 2008
X@@ -120,7 +120,7 @@
X } else {
X if (dbmail_imap_session_printf(session,
X "* OK dbmail imap (protocol version 4r1) server %s "
X- "ready to run\r\n", VERSION) < 0) {
X+ "ready to run\r\n", DBMAIL_VERSION) < 0) {
X dbmail_imap_session_delete(session);
X return EOF;
X }
END-of-dbmail23/files/patch-imap4.c
echo x - dbmail23/files/patch-dbmail.h.in
sed 's/^X//' >dbmail23/files/patch-dbmail.h.in << 'END-of-dbmail23/files/patch-dbmail.h.in'
X--- src/dbmail.h.in.orig Mon Feb 4 17:37:40 2008
X+++ src/dbmail.h.in Tue Feb 5 19:45:09 2008
X@@ -72,6 +72,13 @@
X #include <time.h>
X #include <termios.h>
X #include <unistd.h>
X+#undef PACKAGE
X+#undef PACKAGE_BUGREPORT
X+#undef PACKAGE_NAME
X+#undef PACKAGE_STRING
X+#undef PACKAGE_TARNAME
X+#undef PACKAGE_VERSION
X+#undef VERSION
X #include <mhash.h>
X
X #ifdef AUTHLDAP
END-of-dbmail23/files/patch-dbmail.h.in
echo x - dbmail23/pkg-descr
sed 's/^X//' >dbmail23/pkg-descr << 'END-of-dbmail23/pkg-descr'
XDbmail is the name of a group of programs that enable the possibility of
Xstoring and retrieving mail messages from a database (currently MySQL,
XPostgreSQL or SQLite).
X
X* Scalability.
X Dbmail is as scalable as the database system that is used for the mail
X storage. In theory millions of accounts can be managed using dbmail. One
X could, for example, run 4 different servers with the pop3 daemon each
X connecting to the same database (cluster) server.
X* Manageability.
X Dbmail is based upon a database. Dbmail can be managed by changing settings
X in the database (f.e. using PHP/Perl/SQL), without needing shell access.
X* Speed.
X Dbmail uses very efficient, database specific queries for retrieving mail
X information. This is much faster then parsing a filesystem.
X* Security.
X Dbmail has got nothing to do with the filesystem or interaction with other
X programs in the Unix environment which need special permissions. Dbmail is
X as secure as the database it's based upon.
X* Flexibility.
X Changes on a Dbmail system (adding of users, changing passwords etc.) are
X effective immediately.
X
XWWW: http://www.dbmail.org/
END-of-dbmail23/pkg-descr
echo x - dbmail23/pkg-plist
sed 's/^X//' >dbmail23/pkg-plist << 'END-of-dbmail23/pkg-plist'
X@unexec if cmp -s %D/etc/dbmail.conf-dist %D/etc/dbmail.conf; then rm -f %D/etc/dbmail.conf; fi
Xetc/dbmail.conf-dist
X@exec if [ ! -f %D/etc/dbmail.conf ] ; then cp -p %D/%F %B/dbmail.conf; fi
X@exec mkdir -p %D/lib/dbmail
X%%LDAP%%lib/dbmail/libauth_ldap.a
X%%LDAP%%lib/dbmail/libauth_ldap.la
X%%LDAP%%lib/dbmail/libauth_ldap.so
X%%LDAP%%lib/dbmail/libauth_ldap.so.0
Xlib/dbmail/libauth_sql.a
Xlib/dbmail/libauth_sql.la
Xlib/dbmail/libauth_sql.so
Xlib/dbmail/libauth_sql.so.0
Xlib/dbmail/libdbmail.a
Xlib/dbmail/libdbmail.la
Xlib/dbmail/libdbmail.so
Xlib/dbmail/libdbmail.so.0
X%%MYSQL%%lib/dbmail/libmysql.a
X%%MYSQL%%lib/dbmail/libmysql.la
X%%MYSQL%%lib/dbmail/libmysql.so
X%%MYSQL%%lib/dbmail/libmysql.so.0
X%%PGSQL%%lib/dbmail/libpgsql.a
X%%PGSQL%%lib/dbmail/libpgsql.la
X%%PGSQL%%lib/dbmail/libpgsql.so
X%%PGSQL%%lib/dbmail/libpgsql.so.0
X%%SIEVE%%lib/dbmail/libsort_sieve.a
X%%SIEVE%%lib/dbmail/libsort_sieve.la
X%%SIEVE%%lib/dbmail/libsort_sieve.so
X%%SIEVE%%lib/dbmail/libsort_sieve.so.0
X%%SQLITE%%lib/dbmail/libsqlite.a
X%%SQLITE%%lib/dbmail/libsqlite.la
X%%SQLITE%%lib/dbmail/libsqlite.so
X%%SQLITE%%lib/dbmail/libsqlite.so.0
X@dirrm lib/dbmail
Xsbin/dbmail-deliver
Xsbin/dbmail-export
Xsbin/dbmail-imapd
Xsbin/dbmail-lmtpd
Xsbin/dbmail-pop3d
X%%SIEVE%%sbin/dbmail-sievecmd
X%%SIEVE%%sbin/dbmail-timsieved
Xsbin/dbmail-top
Xsbin/dbmail-users
Xsbin/dbmail-util
X@exec mkdir -p %D/share/%%PORTNAME%%
X%%MYSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/2_1_7-2_2_0.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/2_2_5-2_3_0.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/2_3_0-2_3_2.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/create_tables.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/fix_foreign_keys.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_1.x_to_2.0_innodb.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/migrate_from_2.0_to_2.2.mysql
X%%MYSQL%%share/%%PORTNAME%%/mysql/update_headervalue_01.mysql
X%%MYSQL%%@dirrm share/%%PORTNAME%%/mysql
X%%PGSQL%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/postgresql
X%%PGSQL%%share/%%PORTNAME%%/postgresql/2_1_7-2_2_0.pgsql
X%%PGSQL%%share/%%PORTNAME%%/postgresql/2_2_5-2_3_0.pgsql
X%%PGSQL%%share/%%PORTNAME%%/postgresql/create_tables.pgsql
X%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_1.x_to_2.0.pgsql
X%%PGSQL%%share/%%PORTNAME%%/postgresql/migrate_from_2.0_to_2.2.pgsql
X%%PGSQL%%@dirrm share/%%PORTNAME%%/postgresql
X%%SQLITE%%@exec mkdir -p %D/share/PORTNAME/%%PORTNAME%%/sqlite
X%%SQLITE%%share/%%PORTNAME%%/sqlite/2_1_7-2_2_0.sqlite
X%%SQLITE%%share/%%PORTNAME%%/sqlite/2_2_5-2_3_0.sqlite
X%%SQLITE%%share/%%PORTNAME%%/sqlite/create_tables.sqlite
X%%SQLITE%%share/%%PORTNAME%%/sqlite/trigger.tmpl.sql
X%%SQLITE%%@dirrm share/%%PORTNAME%%/sqlite
X@dirrm share/%%PORTNAME%%
END-of-dbmail23/pkg-plist
echo x - dbmail23/distinfo
sed 's/^X//' >dbmail23/distinfo << 'END-of-dbmail23/distinfo'
XMD5 (dbmail-2.3.2.tar.gz) = bfa92e7a3f74be6a779c6ea9b730f114
XSHA256 (dbmail-2.3.2.tar.gz) = 38739e32e209d30c8c4efdde4a7737d4c40fb36dd30b0e2dfd65993843b39fcb
XSIZE (dbmail-2.3.2.tar.gz) = 921616
END-of-dbmail23/distinfo
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Responsible-Changed-From-To: freebsd-ports-bugs->lippe
Responsible-Changed-By: lippe
Responsible-Changed-When: Thu Mar 20 15:01:25 UTC 2008
Responsible-Changed-Why:
I'll take it.