Date: Tue, 24 Mar 2015 17:38:34 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382128 - in head/mail/dovecot2: . files Message-ID: <201503241738.t2OHcYnp092783@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Mar 24 17:38:34 2015 New Revision: 382128 URL: https://svnweb.freebsd.org/changeset/ports/382128 QAT: https://qat.redports.org/buildarchive/r382128/ Log: Move the sample configuration files into ETCDIR. After talking more with Rozhuk Ivan (submitter of 198792, see r381930), the sample configuration files don't belong in DOCSDIR, and they really don't belong underneath an OPTION that many people have disabled by default. I still don't think that they're good candidates for @sample, but they make more sense living in ETCDIR. While here, shuffle around a few other docs/examples files. PORTREVISION bump for the plist changes. PR: 198792 Submitted by: Rozhuk Ivan Modified: head/mail/dovecot2/Makefile head/mail/dovecot2/files/pkg-message.in head/mail/dovecot2/pkg-plist Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Tue Mar 24 17:29:47 2015 (r382127) +++ head/mail/dovecot2/Makefile Tue Mar 24 17:38:34 2015 (r382128) @@ -3,6 +3,7 @@ PORTNAME= dovecot PORTVERSION= 2.2.16 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ PKGNAMESUFFIX= 2 @@ -128,11 +129,15 @@ post-patch: ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* @${REINPLACE_CMD} -e '/^LIBS =/s/$$/ @LTLIBICONV@/' \ ${WRKSRC}/src/lib-mail/Makefile.in + # Install the sample config files into ETCDIR/example-config/ + @${REINPLACE_CMD} -e '/^exampledir =/s|\$$(docdir)|${ETCDIR}|' \ + ${WRKSRC}/doc/example-config/Makefile.in \ + ${WRKSRC}/doc/example-config/conf.d/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} + ${MV} ${STAGEDIR}${DOCSDIR}/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} + ${MV} ${STAGEDIR}${DOCSDIR}/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/mail/dovecot2/files/pkg-message.in ============================================================================== --- head/mail/dovecot2/files/pkg-message.in Tue Mar 24 17:29:47 2015 (r382127) +++ head/mail/dovecot2/files/pkg-message.in Tue Mar 24 17:38:34 2015 (r382128) @@ -3,7 +3,7 @@ You must create the configuration files yourself. Copy them over to %%ETCDIR%% and edit them as desired: - cp -R %%DOCSDIR%%/example-config \ + cp -R %%ETCDIR%%/example-config/* \ %%ETCDIR%% The default configuration includes IMAP and POP3 services, will Modified: head/mail/dovecot2/pkg-plist ============================================================================== --- head/mail/dovecot2/pkg-plist Tue Mar 24 17:29:47 2015 (r382127) +++ head/mail/dovecot2/pkg-plist Tue Mar 24 17:38:34 2015 (r382128) @@ -1,6 +1,36 @@ bin/doveadm bin/doveconf bin/dsync +%%ETCDIR%%/example-config/conf.d/10-auth.conf +%%ETCDIR%%/example-config/conf.d/10-director.conf +%%ETCDIR%%/example-config/conf.d/10-logging.conf +%%ETCDIR%%/example-config/conf.d/10-mail.conf +%%ETCDIR%%/example-config/conf.d/10-master.conf +%%ETCDIR%%/example-config/conf.d/10-ssl.conf +%%ETCDIR%%/example-config/conf.d/15-lda.conf +%%ETCDIR%%/example-config/conf.d/15-mailboxes.conf +%%ETCDIR%%/example-config/conf.d/20-imap.conf +%%ETCDIR%%/example-config/conf.d/20-lmtp.conf +%%ETCDIR%%/example-config/conf.d/20-pop3.conf +%%ETCDIR%%/example-config/conf.d/90-acl.conf +%%ETCDIR%%/example-config/conf.d/90-plugin.conf +%%ETCDIR%%/example-config/conf.d/90-quota.conf +%%ETCDIR%%/example-config/conf.d/auth-checkpassword.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-deny.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-dict.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-ldap.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-master.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-passwdfile.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-sql.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-static.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-system.conf.ext +%%ETCDIR%%/example-config/conf.d/auth-vpopmail.conf.ext +%%ETCDIR%%/example-config/dovecot-dict-auth.conf.ext +%%ETCDIR%%/example-config/dovecot-dict-sql.conf.ext +%%ETCDIR%%/example-config/dovecot-ldap.conf.ext +%%ETCDIR%%/example-config/dovecot-sql.conf.ext +%%ETCDIR%%/example-config/dovecot.conf +%%ETCDIR%%/README include/dovecot/abspath.h include/dovecot/access-lookup.h include/dovecot/anvil-client.h @@ -615,7 +645,6 @@ man/man1/dsync.1.gz man/man7/doveadm-search-query.7.gz sbin/dovecot share/aclocal/dovecot.m4 -%%PORTDOCS%%%%ETCDIR%%/README %%LIBWRAP%%libexec/dovecot/tcpwrap %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241738.t2OHcYnp092783>