svn commit: r489813 - in head/databases: postgresql11-contrib postgresql11-server

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Jan  9 16:03:49 2019
New Revision: 489813
URL: https://svnweb.freebsd.org/changeset/ports/489813

Log:
  - Optionize SSL support in postgresql11-contrib
  
  PR:		233257
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (pgsql, 7 weeks)

Modified:
  head/databases/postgresql11-contrib/Makefile
  head/databases/postgresql11-server/pkg-plist-contrib

Modified: head/databases/postgresql11-contrib/Makefile
==============================================================================
--- head/databases/postgresql11-contrib/Makefile	Wed Jan  9 15:57:18 2019	(r489812)
+++ head/databases/postgresql11-contrib/Makefile	Wed Jan  9 16:03:49 2019	(r489813)
@@ -20,13 +20,19 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
+CONFIGURE_ARGS=	--with-libxslt --with-libxml --disable-nls --with-uuid=bsd
 LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+OPTIONS_SUB=	yes
 
-post-configure: 
-		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
+OPENSSL_DESC=		Build with OpenSSL support
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_WITH=	openssl
+
+post-configure:
+	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README

Modified: head/databases/postgresql11-server/pkg-plist-contrib
==============================================================================
--- head/databases/postgresql11-server/pkg-plist-contrib	Wed Jan  9 15:57:18 2019	(r489812)
+++ head/databases/postgresql11-server/pkg-plist-contrib	Wed Jan  9 16:03:49 2019	(r489813)
@@ -44,7 +44,7 @@ lib/postgresql/pgxml.so
 lib/postgresql/postgres_fdw.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
-lib/postgresql/sslinfo.so
+%%OPENSSL%%lib/postgresql/sslinfo.so
 lib/postgresql/tablefunc.so
 lib/postgresql/tcn.so
 lib/postgresql/test_decoding.so
@@ -233,11 +233,11 @@ lib/postgresql/uuid-ossp.so
 %%DATADIR%%/extension/seg--1.2--1.3.sql
 %%DATADIR%%/extension/seg--unpackaged--1.0.sql
 %%DATADIR%%/extension/seg.control
-%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
-%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
-%%DATADIR%%/extension/sslinfo--1.2.sql
-%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
-%%DATADIR%%/extension/sslinfo.control
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
 %%DATADIR%%/extension/tablefunc--1.0.sql
 %%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
 %%DATADIR%%/extension/tablefunc.control