aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/postgresql12-contrib/Makefile13
-rw-r--r--databases/postgresql12-server/pkg-plist-contrib10
2 files changed, 12 insertions, 11 deletions
diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile
index 1c8dc612d65a..f7c88aa12cd4 100644
--- a/databases/postgresql12-contrib/Makefile
+++ b/databases/postgresql12-contrib/Makefile
@@ -8,9 +8,6 @@ CATEGORIES= databases
MAINTAINER= pgsql@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,17 +17,21 @@ 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
diff --git a/databases/postgresql12-server/pkg-plist-contrib b/databases/postgresql12-server/pkg-plist-contrib
index b329ba6a9bcc..0b5cad26ca15 100644
--- a/databases/postgresql12-server/pkg-plist-contrib
+++ b/databases/postgresql12-server/pkg-plist-contrib
@@ -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