svn commit: r521556 - in head/databases: postgresql10-contrib postgresql10-server postgresql11-contrib postgresql11-server postgresql96-contrib postgresql96-server
Adam Weinberger
adamw at FreeBSD.org
Mon Dec 30 18:04:41 UTC 2019
Author: adamw
Date: Mon Dec 30 18:04:39 2019
New Revision: 521556
URL: https://svnweb.freebsd.org/changeset/ports/521556
Log:
postgresql{96,10,11}-contrib: Add an XML option
Avoids the libxml/libxslt2 dependency chain for systems that don't need
the XML datatype plugin.
PR: 239638
Approved by: maintainer timeout (pgsql team, nearly 5 months)
Modified:
head/databases/postgresql10-contrib/Makefile
head/databases/postgresql10-server/pkg-plist-contrib
head/databases/postgresql11-contrib/Makefile
head/databases/postgresql11-server/pkg-plist-contrib
head/databases/postgresql96-contrib/Makefile
head/databases/postgresql96-server/pkg-plist-contrib
Modified: head/databases/postgresql10-contrib/Makefile
==============================================================================
--- head/databases/postgresql10-contrib/Makefile Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql10-contrib/Makefile Mon Dec 30 18:04:39 2019 (r521556)
@@ -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}/../postgresql10-server
USES= bison pgsql:10
@@ -20,10 +17,16 @@ INSTALL_DIRS= contrib
SLAVE_ONLY= yes
COMPONENT= -contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
+CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
LDFLAGS+= -lpthread -L${PREFIX}/lib
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS XML
+OPTIONS_DEFAULT=XML
+OPTIONS_SUB= yes
+
+XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+ libxml2.so:textproc/libxml2
+XML_CONFIGURE_WITH= libxml libxslt
post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
Modified: head/databases/postgresql10-server/pkg-plist-contrib
==============================================================================
--- head/databases/postgresql10-server/pkg-plist-contrib Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql10-server/pkg-plist-contrib Mon Dec 30 18:04:39 2019 (r521556)
@@ -36,7 +36,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
@@ -244,9 +244,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
Modified: head/databases/postgresql11-contrib/Makefile
==============================================================================
--- head/databases/postgresql11-contrib/Makefile Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql11-contrib/Makefile Mon Dec 30 18:04:39 2019 (r521556)
@@ -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}/../postgresql11-server
USES= bison pgsql:11
@@ -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_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+ libxml2.so:textproc/libxml2
+XML_CONFIGURE_WITH= libxml libxslt
post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
Modified: head/databases/postgresql11-server/pkg-plist-contrib
==============================================================================
--- head/databases/postgresql11-server/pkg-plist-contrib Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql11-server/pkg-plist-contrib Mon Dec 30 18:04:39 2019 (r521556)
@@ -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
@@ -258,9 +258,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
Modified: head/databases/postgresql96-contrib/Makefile
==============================================================================
--- head/databases/postgresql96-contrib/Makefile Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql96-contrib/Makefile Mon Dec 30 18:04:39 2019 (r521556)
@@ -8,22 +8,25 @@ 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}/../postgresql96-server
-USES= bison pgsql:9.6
+USES= bison pgsql:9.6 ssl
BUILD_DIRS= src/port src/include src/common contrib
INSTALL_DIRS= contrib
SLAVE_ONLY= yes
COMPONENT= -contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
+CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
LDFLAGS+= -lpthread -L${PREFIX}/lib
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS XML
+OPTIONS_DEFAULT=XML
+OPTIONS_SUB= yes
+
+XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+ libxml2.so:textproc/libxml2
+XML_CONFIGURE_WITH= libxml libxslt
post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
Modified: head/databases/postgresql96-server/pkg-plist-contrib
==============================================================================
--- head/databases/postgresql96-server/pkg-plist-contrib Mon Dec 30 17:55:09 2019 (r521555)
+++ head/databases/postgresql96-server/pkg-plist-contrib Mon Dec 30 18:04:39 2019 (r521556)
@@ -35,7 +35,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
@@ -233,9 +233,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-head
mailing list