Date: Mon, 30 Jun 2014 21:06:53 +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: r359921 - in head/mail/dovecot2: . files Message-ID: <201406302106.s5UL6rKq021443@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jun 30 21:06:53 2014 New Revision: 359921 URL: http://svnweb.freebsd.org/changeset/ports/359921 QAT: https://qat.redports.org/buildarchive/r359921/ Log: General tidying and cleanups. THe functional changes: Remove NOOP sed commands, and incorporate the pkg-deinstall message into pkg-plist. Use install-strip as the INSTALL_TARGET rather than manually stripping libraries. Technically it needs a PORTREVISION bump for the pkg-deinstall/pkg-plist thing, but I'm going to need to bump PORTREVISION for some other changes soon and I'd rather not force everyone to rebuild an extra time for a differently-phrased message. Deleted: head/mail/dovecot2/files/pkg-deinstall.in Modified: head/mail/dovecot2/Makefile head/mail/dovecot2/pkg-plist Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Mon Jun 30 21:05:11 2014 (r359920) +++ head/mail/dovecot2/Makefile Mon Jun 30 21:06:53 2014 (r359921) @@ -30,7 +30,6 @@ USES= iconv USE_RC_SUBR= dovecot GNU_CONFIGURE= yes -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=/var \ --with-statedir=/var/db/dovecot \ --without-shadow @@ -39,61 +38,67 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= ${PREFIX}/lib/dovecot +INSTALL_TARGET= install-strip USERS= dovecot dovenull GROUPS= ${USERS} -PROTOCOLS= imap pop3 - # Default requirement for dovecot rc script _REQUIRE= LOGIN OPTIONS_DEFINE= KQUEUE SSL GSSAPI VPOPMAIL LDAP LUCENE PGSQL MYSQL SQLITE \ SOLR DOCS EXAMPLES LIBWRAP -OPTIONS_DEFAULT= KQUEUE SSL +OPTIONS_DEFAULT=KQUEUE SSL +OPTIONS_SUB= yes KQUEUE_DESC= kqueue(2) support VPOPMAIL_DESC= vpopmail support LUCENE_DESC= CLucene FTS support SOLR_DESC= Solr FTS support -OPTIONS_SUB= yes DOCS_CONFIGURE_WITH= docs + GSSAPI_CONFIGURE_WITH= gssapi GSSAPI_LDFLAGS= -lgssapi_krb5 + KQUEUE_CONFIGURE_OFF= --with-ioloop=poll KQUEUE_CONFIGURE_ON= --with-ioloop=kqueue + LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes + LIBWRAP_CONFIGURE_WITH= libwrap + LUCENE_CONFIGURE_WITH= lucene LUCENE_LIB_DEPENDS= libclucene-core.so:${PORTSDIR}/textproc/clucene + MYSQL_CONFIGURE_WITH= mysql MYSQL_USE= MYSQL=yes + PGSQL_CONFIGURE_WITH= pgsql PGSQL_USE= PGSQL=yes + SOLR_BUILD_DEPENDS= curl:${PORTSDIR}/ftp/curl SOLR_CONFIGURE_WITH= solr SOLR_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 + SQLITE_CONFIGURE_WITH= sqlite SQLITE_USE= SQLITE=3 + SSL_CONFIGURE_OFF= --without-ssl SSL_CONFIGURE_ON= --with-ssl=openssl + VPOPMAIL_BUILD_DEPENDS= ${LOCALBASE}/vpopmail/bin/vchkpw:${PORTSDIR}/mail/vpopmail VPOPMAIL_CONFIGURE_WITH=vpopmail -.include <bsd.port.options.mk> - -.if ${ARCH} == "arm" -BROKEN= Does not build on arm -.endif - DOCS= AUTHORS COPYING COPYING.LGPL COPYING.MIT INSTALL NEWS TODO README PORTDOCS= * PORTEXAMPLES= * -.if ${PORT_OPTIONS:MSSL} -PROTOCOLS+= imaps pop3s +.include <bsd.port.options.mk> + +.if ${ARCH} == "arm" +BROKEN= Does not build on arm .endif .if ${PORT_OPTIONS:MLDAP} @@ -109,35 +114,17 @@ _REQUIRE+= mysql .endif SUB_LIST+= REQUIRE="${_REQUIRE}" -SUB_FILES+= pkg-deinstall pkg-message - -# sed script for dovecot.conf -REINPLACE= s!%%PROTOCOLS%%!${PROTOCOLS}!g;\ - s!/usr/!${PREFIX}/!g;\ - s!=/usr!=${PREFIX}!g;\ - s!=/etc !=${PREFIX}/etc !g;\ - s!/etc/dovecot!${PREFIX}&!g;\ - s![[:<:]]doc/(dovecot-[^-]+)-example.conf[[:>:]]!${EXAMPLESDIR}/\1.conf!g;\ - s!\#sendmail_path = /usr/.*!sendmail_path = /usr/sbin/sendmail!g; +SUB_FILES+= pkg-message post-patch: - @${REINPLACE_CMD} -E -e '${REINPLACE}' \ - ${WRKSRC}/doc/example-config/dovecot.conf - @${REINPLACE_CMD} -E -e'\ - s!-example\.conf[[:>:]]!.conf!g;\ - s!^(confdir[[:space:]]+=[[:space:]]+)\$$\(sysconfdir\)!\1${EXAMPLESDIR}!g;\ - ' ${WRKSRC}/*/Makefile.in ${WRKSRC}/Makefile.in -# exclude this file - ${REINPLACE_CMD} -e '/2b/d' ${WRKSRC}/doc/wiki/Makefile.in + @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ + s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ + ${WRKSRC}/doc/example-config/*.conf ${WRKSRC}/doc/example-config/conf.d/* post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/doc && ${INSTALL_SCRIPT} dovecot-openssl.cnf mkcert.sh ${STAGEDIR}${EXAMPLESDIR}) -.if ${PORT_OPTIONS:MDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/lib*.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/auth/lib*.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dovecot/doveadm/lib*.so .include <bsd.port.mk> Modified: head/mail/dovecot2/pkg-plist ============================================================================== --- head/mail/dovecot2/pkg-plist Mon Jun 30 21:05:11 2014 (r359920) +++ head/mail/dovecot2/pkg-plist Mon Jun 30 21:06:53 2014 (r359921) @@ -1,7 +1,6 @@ bin/doveadm bin/doveconf bin/dsync -%%PORTDOCS%%%%ETCDIR%%/README include/dovecot/abspath.h include/dovecot/access-lookup.h include/dovecot/anvil-client.h @@ -436,9 +435,6 @@ lib/dovecot/doveadm/lib10_doveadm_expire lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so -%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a -%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.la -%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so @@ -500,12 +496,6 @@ lib/dovecot/lib20_virtual_plugin.so lib/dovecot/lib20_zlib_plugin.a lib/dovecot/lib20_zlib_plugin.la lib/dovecot/lib20_zlib_plugin.so -%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a -%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.la -%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so -%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a -%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.la -%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so lib/dovecot/lib21_fts_squat_plugin.a lib/dovecot/lib21_fts_squat_plugin.la lib/dovecot/lib21_fts_squat_plugin.so @@ -542,9 +532,6 @@ lib/dovecot/libdovecot.a lib/dovecot/libdovecot.la lib/dovecot/libdovecot.so lib/dovecot/libdovecot.so.0 -%%SSL%%lib/dovecot/libssl_iostream_openssl.a -%%SSL%%lib/dovecot/libssl_iostream_openssl.la -%%SSL%%lib/dovecot/libssl_iostream_openssl.so libexec/dovecot/aggregator libexec/dovecot/anvil libexec/dovecot/auth @@ -578,7 +565,6 @@ libexec/dovecot/script libexec/dovecot/script-login libexec/dovecot/ssl-params libexec/dovecot/stats -%%LIBWRAP%%libexec/dovecot/tcpwrap libexec/dovecot/xml2text man/man1/deliver.1.gz man/man1/doveadm-altmove.1.gz @@ -620,9 +606,24 @@ man/man1/dsync.1.gz man/man7/doveadm-search-query.7.gz sbin/dovecot share/aclocal/dovecot.m4 -%%PORTDOCS%%@dirrmtry %%ETCDIR%% @dirrm include/dovecot @dirrmtry lib/dovecot/auth @dirrm lib/dovecot/doveadm @dirrm lib/dovecot @dirrm libexec/dovecot +%%PORTDOCS%%%%ETCDIR%%/README +%%PORTDOCS%%@dirrmtry %%ETCDIR%% +%%LIBWRAP%%libexec/dovecot/tcpwrap +%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a +%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.la +%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so +%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a +%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.la +%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so +%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a +%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.la +%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so +%%SSL%%lib/dovecot/libssl_iostream_openssl.a +%%SSL%%lib/dovecot/libssl_iostream_openssl.la +%%SSL%%lib/dovecot/libssl_iostream_openssl.so +@unexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406302106.s5UL6rKq021443>