pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail Split off dovecot2-{gssapi, ldap, mysql, pgsql, sqlit...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f8b068bf063
branches:  trunk
changeset: 349901:6f8b068bf063
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Mon Jul 18 15:03:05 2016 +0000

description:
Split off dovecot2-{gssapi,ldap,mysql,pgsql,sqlite} as separate
packages, remove respective options.mk parts.

diffstat:

 mail/dovecot2-gssapi/DESCR    |   3 ++
 mail/dovecot2-gssapi/Makefile |  19 +++++++++++++++
 mail/dovecot2-gssapi/PLIST    |   2 +
 mail/dovecot2-ldap/DESCR      |   3 ++
 mail/dovecot2-ldap/Makefile   |  30 ++++++++++++++++++++++++
 mail/dovecot2-ldap/PLIST      |   5 ++++
 mail/dovecot2-mysql/DESCR     |   3 ++
 mail/dovecot2-mysql/Makefile  |  24 +++++++++++++++++++
 mail/dovecot2-mysql/PLIST     |   4 +++
 mail/dovecot2-pgsql/DESCR     |   3 ++
 mail/dovecot2-pgsql/Makefile  |  24 +++++++++++++++++++
 mail/dovecot2-pgsql/PLIST     |   4 +++
 mail/dovecot2-sqlite/DESCR    |   3 ++
 mail/dovecot2-sqlite/Makefile |  24 +++++++++++++++++++
 mail/dovecot2-sqlite/PLIST    |   4 +++
 mail/dovecot2/Makefile        |  42 ++--------------------------------
 mail/dovecot2/Makefile.common |  48 +++++++++++++++++++++++++++++++++++++++
 mail/dovecot2/Makefile.plugin |   8 ++++++
 mail/dovecot2/PLIST           |   5 +---
 mail/dovecot2/options.mk      |  52 +++---------------------------------------
 20 files changed, 219 insertions(+), 91 deletions(-)

diffs (truncated from 464 to 300 lines):

diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-gssapi/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-gssapi/DESCR        Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,3 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. This package contains the GSSAPI
+authentication plugin.
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-gssapi/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-gssapi/Makefile     Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+#
+
+.include "../../mail/dovecot2/Makefile.plugin"
+
+PKGNAME=               ${DISTNAME:S/dovecot/dovecot-gssapi/}
+COMMENT+=              (GSSAPI plugin)
+
+CONFIGURE_ARGS+=       --with-gssapi=plugin
+
+INSTALLATION_DIRS+=    lib/dovecot/auth
+
+do-install:
+       cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB}        \
+               src/auth/libmech_gssapi.la                              \
+               ${DESTDIR}${PREFIX}/lib/dovecot/auth
+
+.include "../../mk/krb5.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-gssapi/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-gssapi/PLIST        Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+lib/dovecot/auth/libmech_gssapi.la
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-ldap/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-ldap/DESCR  Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,3 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. This package contains the LDAP
+backend plugins.
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-ldap/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-ldap/Makefile       Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+#
+
+.include "../../mail/dovecot2/Makefile.plugin"
+
+PKGNAME=               ${DISTNAME:S/dovecot/dovecot-ldap/}
+COMMENT+=              (LDAP plugin)
+
+CONFIGURE_ARGS+=       --with-ldap=plugin
+
+INSTALLATION_DIRS+=    include/dovecot \
+                       lib/dovecot/auth lib/dovecot/dict
+
+do-install:
+       cd ${WRKSRC} && (\
+               ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+                       src/auth/libauthdb_ldap.la \
+                       ${DESTDIR}${PREFIX}/lib/dovecot/auth; \
+               ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+                       src/lib-ldap/libdovecot-ldap.la \
+                       ${DESTDIR}${PREFIX}/lib/dovecot; \
+               ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+                       src/plugins/dict-ldap/libdict_ldap.la \
+                       ${DESTDIR}${PREFIX}/lib/dovecot/dict; \
+       )
+       ${INSTALL_DATA} ${WRKSRC}/src/lib-ldap/ldap-client.h \
+               ${DESTDIR}${PREFIX}/include/dovecot
+
+.include "../../databases/openldap-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-ldap/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-ldap/PLIST  Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+include/dovecot/ldap-client.h
+lib/dovecot/auth/libauthdb_ldap.la
+lib/dovecot/dict/libdict_ldap.la
+lib/dovecot/libdovecot-ldap.la
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-mysql/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-mysql/DESCR Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,3 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. This package contains the MySQL
+backend plugins.
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-mysql/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-mysql/Makefile      Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+#
+
+.include "../../mail/dovecot2/Makefile.plugin"
+
+PKGNAME=               ${DISTNAME:S/dovecot/dovecot-mysql/}
+COMMENT+=              (mysql plugin)
+
+CONFIGURE_ARGS+=       --with-sql=plugin
+CONFIGURE_ARGS+=       --with-mysql
+
+INSTALLATION_DIRS+=    lib/dovecot/auth lib/dovecot/dict
+
+do-install:
+       cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB}        \
+               src/lib-sql/libdriver_mysql.la                          \
+               ${DESTDIR}${PREFIX}/lib/dovecot
+       ${LN} -s ../libdriver_mysql.so                                  \
+               ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_mysql.so
+       ${LN} -s ../libdriver_mysql.so                                  \
+               ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_mysql.so
+
+.include "../../mk/mysql.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-mysql/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-mysql/PLIST Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+lib/dovecot/auth/libdriver_mysql.so
+lib/dovecot/dict/libdriver_mysql.so
+lib/dovecot/libdriver_mysql.la
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-pgsql/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-pgsql/DESCR Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,3 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. This package contains the PostgreSQL
+backend plugins.
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-pgsql/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-pgsql/Makefile      Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+#
+
+.include "../../mail/dovecot2/Makefile.plugin"
+
+PKGNAME=               ${DISTNAME:S/dovecot/dovecot-pgsql/}
+COMMENT+=              (pgsql plugin)
+
+CONFIGURE_ARGS+=       --with-sql=plugin
+CONFIGURE_ARGS+=       --with-pgsql
+
+INSTALLATION_DIRS+=    lib/dovecot/auth lib/dovecot/dict
+
+do-install:
+       cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB}        \
+               src/lib-sql/libdriver_pgsql.la                          \
+               ${DESTDIR}${PREFIX}/lib/dovecot
+       ${LN} -s ../libdriver_pgsql.so                                  \
+               ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_pgsql.so
+       ${LN} -s ../libdriver_pgsql.so                                  \
+               ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_pgsql.so
+
+.include "../../mk/pgsql.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-pgsql/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-pgsql/PLIST Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+lib/dovecot/auth/libdriver_pgsql.so
+lib/dovecot/dict/libdriver_pgsql.so
+lib/dovecot/libdriver_pgsql.la
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-sqlite/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-sqlite/DESCR        Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,3 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. This package contains the SQLite
+backend plugins.
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-sqlite/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-sqlite/Makefile     Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+#
+
+.include "../../mail/dovecot2/Makefile.plugin"
+
+PKGNAME=               ${DISTNAME:S/dovecot/dovecot-sqlite/}
+COMMENT+=              (sqlite plugin)
+
+CONFIGURE_ARGS+=       --with-sql=plugin
+CONFIGURE_ARGS+=       --with-sqlite
+
+INSTALLATION_DIRS+=    lib/dovecot/auth lib/dovecot/dict
+
+do-install:
+       cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_LIB}        \
+               src/lib-sql/libdriver_sqlite.la                         \
+               ${DESTDIR}${PREFIX}/lib/dovecot
+       ${LN} -s ../libdriver_sqlite.so                                 \
+               ${DESTDIR}${PREFIX}/lib/dovecot/auth/libdriver_sqlite.so
+       ${LN} -s ../libdriver_sqlite.so                                 \
+               ${DESTDIR}${PREFIX}/lib/dovecot/dict/libdriver_sqlite.so
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2-sqlite/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2-sqlite/PLIST        Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2016/07/18 15:03:06 fhajny Exp $
+lib/dovecot/auth/libdriver_sqlite.so
+lib/dovecot/dict/libdriver_sqlite.so
+lib/dovecot/libdriver_sqlite.la
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2/Makefile
--- a/mail/dovecot2/Makefile    Mon Jul 18 14:24:43 2016 +0000
+++ b/mail/dovecot2/Makefile    Mon Jul 18 15:03:05 2016 +0000
@@ -1,36 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2016/07/06 10:39:22 adam Exp $
+# $NetBSD: Makefile,v 1.90 2016/07/18 15:03:05 fhajny Exp $
 #
-# when updating to a new release, update ABI depends in
-# the buildlink3.mk file as well, since the plugins' version
-# must match (see PR 49563).
-
-DISTNAME=      dovecot-2.2.25
-PKGREVISION=   1
-CATEGORIES=    mail
-MASTER_SITES=  http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
-
-MAINTAINER=    adam%NetBSD.org@localhost
-HOMEPAGE=      http://www.dovecot.org/
-COMMENT=       Secure IMAP and POP3 server
-LICENSE=       mit AND gnu-lgpl-v2.1 AND modified-bsd
 
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config rpcgen
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-ssldir=${SSLDIR}
-
-TEST_TARGET=   check
+.include "../../mail/dovecot2/Makefile.common"
 
-# Explicitly disable inotify on illumos, it is provided for Linux compat only.
-CONFIGURE_ENV.SunOS+=  ac_cv_func_inotify_init=no
-
-# Sharing sources between binary and lib triggers libtool bugs
-# mv: rename .deps/auth-stats.Tpo to .deps/auth-stats.Po: No such file or directory
-MAKE_JOBS_SAFE=        no
-
-.include "../../mk/bsd.prefs.mk"
+PKGREVISION=           2
 
 RCD_SCRIPTS=           dovecot
 SMF_NAME=              dovecot
@@ -48,12 +21,6 @@
 PKG_GECOS.${DOVECOT_USER}=     Dovecot IMAP/POP3 user
 PKG_GECOS.${DOVENULL_USER}=    Dovecot login user
 
-SUBST_CLASSES+=                ssldir
-SUBST_MESSAGE.ssldir=  Fixing SSLDIR
-SUBST_FILES.ssldir=    doc/example-config/conf.d/10-ssl.conf
-SUBST_STAGE.ssldir=    pre-configure
-SUBST_SED.ssldir=      -e 's,/etc/ssl,${SSLDIR},'
-
 EGDIR=                 ${PREFIX}/share/examples/dovecot
 
 CNFS_cmd=              ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST
@@ -79,7 +46,4 @@
 # Don't compress manual pages as they include each other.
 .undef MANZ
 
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../archivers/xz/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f2945b71def0 -r 6f8b068bf063 mail/dovecot2/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/dovecot2/Makefile.common     Mon Jul 18 15:03:05 2016 +0000
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile.common,v 1.1 2016/07/18 15:03:05 fhajny Exp $
+#
+# when updating to a new release, update ABI depends in
+# the buildlink3.mk file as well, since the plugins' version
+# must match (see PR 49563).
+#
+# used by mail/dovecot2/Makefile
+# used by mail/dovecot2/Makefile.plugin
+# used by mail/dovecot2-mysql/Makefile
+# used by mail/dovecot2-pgsql/Makefile
+
+DISTNAME=      dovecot-2.2.25
+CATEGORIES=    mail
+MASTER_SITES=  http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
+
+MAINTAINER=    adam%NetBSD.org@localhost
+HOMEPAGE=      http://www.dovecot.org/



Home | Main Index | Thread Index | Old Index