Date: Sat, 9 Jul 2016 15:47:25 +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: r418284 - head/mail/dovecot2 Message-ID: <201607091547.u69FlP9P084625@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Jul 9 15:47:25 2016 New Revision: 418284 URL: https://svnweb.freebsd.org/changeset/ports/418284 Log: Fix packaging with SSL disabled. No PORTREVISION bump. While here, left-indent a comment so that 9.x doesn't log it to the console, and only set USES=ssl if SSL is enabled. Submitted by: Christian Bernard Modified: head/mail/dovecot2/Makefile head/mail/dovecot2/pkg-plist Modified: head/mail/dovecot2/Makefile ============================================================================== --- head/mail/dovecot2/Makefile Sat Jul 9 15:31:18 2016 (r418283) +++ head/mail/dovecot2/Makefile Sat Jul 9 15:47:25 2016 (r418284) @@ -27,7 +27,7 @@ LICENSE_COMB= dual CONFLICTS= dovecot-1.[0-9]* -USES= cpe iconv libtool ssl +USES= cpe iconv libtool USE_RC_SUBR= dovecot GNU_CONFIGURE= yes @@ -112,6 +112,7 @@ SOLR_LIB_DEPENDS= libexpat.so:textproc/e SQLITE_USES= sqlite:3 SQLITE_CONFIGURE_WITH= sqlite +SSL_USES= ssl SSL_CONFIGURE_WITH= ssl=openssl TEXTCAT_CONFIGURE_WITH= textcat @@ -152,7 +153,7 @@ 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/ +# 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 Modified: head/mail/dovecot2/pkg-plist ============================================================================== --- head/mail/dovecot2/pkg-plist Sat Jul 9 15:31:18 2016 (r418283) +++ head/mail/dovecot2/pkg-plist Sat Jul 9 15:47:25 2016 (r418284) @@ -620,7 +620,7 @@ lib/dovecot/lib95_imap_stats_plugin.a lib/dovecot/lib95_imap_stats_plugin.so lib/dovecot/lib99_welcome_plugin.a lib/dovecot/lib99_welcome_plugin.so -lib/dovecot/libdcrypt_openssl.so +%%SSL%%lib/dovecot/libdcrypt_openssl.so lib/dovecot/libdovecot-compression.a lib/dovecot/libdovecot-compression.so lib/dovecot/libdovecot-compression.so.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607091547.u69FlP9P084625>