diff options
| author | adamw <adamw@FreeBSD.org> | 2015-03-25 01:38:34 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2015-03-25 01:38:34 +0800 |
| commit | 82dcc63be22ffaa82efacf25b0c0df7c9473c262 (patch) | |
| tree | d254fb7944cc94e581d90091fa9b787d6470818a /mail | |
| parent | ae02fab82d63b0e67901cb320c5e9bf4ddd64018 (diff) | |
| download | freebsd-ports-gnome-82dcc63be22ffaa82efacf25b0c0df7c9473c262.tar.gz freebsd-ports-gnome-82dcc63be22ffaa82efacf25b0c0df7c9473c262.tar.zst freebsd-ports-gnome-82dcc63be22ffaa82efacf25b0c0df7c9473c262.zip | |
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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dovecot2/Makefile | 9 | ||||
| -rw-r--r-- | mail/dovecot2/files/pkg-message.in | 2 | ||||
| -rw-r--r-- | mail/dovecot2/pkg-plist | 31 |
3 files changed, 38 insertions, 4 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile index af6f17521673..2e88438a06a3 100644 --- a/mail/dovecot2/Makefile +++ b/mail/dovecot2/Makefile @@ -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> diff --git a/mail/dovecot2/files/pkg-message.in b/mail/dovecot2/files/pkg-message.in index 7355adc8b4d4..ecf30bcd2213 100644 --- a/mail/dovecot2/files/pkg-message.in +++ b/mail/dovecot2/files/pkg-message.in @@ -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 diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist index 6803aa0a38e4..aca16cced4e5 100644 --- a/mail/dovecot2/pkg-plist +++ b/mail/dovecot2/pkg-plist @@ -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 |