svn commit: r509159 - in head/databases: postgresql12-contrib postgresql12-server
Adam Weinberger
adamw at FreeBSD.org
Sat Aug 17 16:56:19 UTC 2019
Author: adamw
Date: Sat Aug 17 16:56:18 2019
New Revision: 509159
URL: https://svnweb.freebsd.org/changeset/ports/509159
Log:
Add an XML option to postgresql12-contrib
Avoids libxml2/libxslt for systems that don't need XML support.
Although there was substantial interest in the PR to backport to
10, I've only done pgsql12 for now, as I don't want to interfere
with the effort to make pgsql11 the default. If things work well
here, it can be backported to earlier versions as well.
PR: 239638
Approved by: maintainer timeout (2 weeks)
Modified:
head/databases/postgresql12-contrib/Makefile
head/databases/postgresql12-server/pkg-plist-contrib
Modified: head/databases/postgresql12-contrib/Makefile
==============================================================================
--- head/databases/postgresql12-contrib/Makefile Sat Aug 17 16:03:25 2019 (r509158)
+++ head/databases/postgresql12-contrib/Makefile Sat Aug 17 16:56:18 2019 (r509159)
@@ -8,9 +8,6 @@ CATEGORIES= databases
MAINTAINER= pgsql at FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution
-LIB_DEPENDS= libxslt.so:textproc/libxslt \
- libxml2.so:textproc/libxml2
-
MASTERDIR= ${.CURDIR}/../postgresql12-server
USES= bison pgsql:12
@@ -20,16 +17,20 @@ INSTALL_DIRS= contrib
SLAVE_ONLY= yes
COMPONENT= -contrib
-CONFIGURE_ARGS= --with-libxslt --with-libxml --disable-nls --with-uuid=bsd
+CONFIGURE_ARGS= --disable-nls --with-uuid=bsd
LDFLAGS+= -lpthread -L${PREFIX}/lib
-OPTIONS_DEFINE= DOCS OPENSSL
-OPTIONS_DEFAULT=OPENSSL
+OPTIONS_DEFINE= DOCS OPENSSL XML
+OPTIONS_DEFAULT=OPENSSL XML
OPTIONS_SUB= yes
OPENSSL_DESC= Build with OpenSSL support
OPENSSL_USES= ssl
OPENSSL_CONFIGURE_WITH= openssl
+
+XML_CONFIGURE_WITH= libxslt libxml
+XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+ libxml2.so:textproc/libxml2
post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
Modified: head/databases/postgresql12-server/pkg-plist-contrib
==============================================================================
--- head/databases/postgresql12-server/pkg-plist-contrib Sat Aug 17 16:03:25 2019 (r509158)
+++ head/databases/postgresql12-server/pkg-plist-contrib Sat Aug 17 16:56:18 2019 (r509159)
@@ -40,7 +40,7 @@ lib/postgresql/pg_visibility.so
lib/postgresql/pgcrypto.so
lib/postgresql/pgrowlocks.so
lib/postgresql/pgstattuple.so
-lib/postgresql/pgxml.so
+%%XML%%lib/postgresql/pgxml.so
lib/postgresql/postgres_fdw.so
lib/postgresql/refint.so
lib/postgresql/seg.so
@@ -257,9 +257,9 @@ lib/postgresql/uuid-ossp.so
%%DATADIR%%/extension/uuid-ossp--1.1.sql
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
%%DATADIR%%/extension/uuid-ossp.control
-%%DATADIR%%/extension/xml2--1.0--1.1.sql
-%%DATADIR%%/extension/xml2--1.1.sql
-%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
-%%DATADIR%%/extension/xml2.control
+%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
+%%XML%%%%DATADIR%%/extension/xml2.control
%%DATADIR%%/tsearch_data/unaccent.rules
%%DATADIR%%/tsearch_data/xsyn_sample.rules
More information about the svn-ports-all
mailing list