cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

postgresql{96,10,11}-contrib: Add an XML option

Browse Source 
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)
This commit is contained in:
Adam Weinberger 2019-12-30 18:04:39 +00:00
parent c6bd31ad12
commit 6eaf92cd8f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=521556
6 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/postgresql10-contrib/Makefile
View File

@ -8,9 +8,6 @@ CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:textproc/libxslt \
libxml2.so:textproc/libxml2
MASTERDIR= ${.CURDIR}/../postgresql10-server MASTERDIR= ${.CURDIR}/../postgresql10-server
USES= bison pgsql:10 USES= bison pgsql:10
@ -20,10 +17,16 @@ INSTALL_DIRS= contrib
SLAVE_ONLY= yes SLAVE_ONLY= yes
COMPONENT= -contrib 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 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: post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks

10
databases/postgresql10-server/pkg-plist-contrib
View File

@ -36,7 +36,7 @@ lib/postgresql/pg_visibility.so
lib/postgresql/pgcrypto.so lib/postgresql/pgcrypto.so
lib/postgresql/pgrowlocks.so lib/postgresql/pgrowlocks.so
lib/postgresql/pgstattuple.so lib/postgresql/pgstattuple.so
lib/postgresql/pgxml.so %%XML%%lib/postgresql/pgxml.so
lib/postgresql/postgres_fdw.so lib/postgresql/postgres_fdw.so
lib/postgresql/refint.so lib/postgresql/refint.so
lib/postgresql/seg.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--1.1.sql
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
%%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/uuid-ossp.control
%%DATADIR%%/extension/xml2--1.0--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
%%DATADIR%%/extension/xml2--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.1.sql
%%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
%%DATADIR%%/extension/xml2.control %%XML%%%%DATADIR%%/extension/xml2.control
%%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/unaccent.rules
%%DATADIR%%/tsearch_data/xsyn_sample.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules

13
databases/postgresql11-contrib/Makefile
View File

@ -8,9 +8,6 @@ CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:textproc/libxslt \
libxml2.so:textproc/libxml2
MASTERDIR= ${.CURDIR}/../postgresql11-server MASTERDIR= ${.CURDIR}/../postgresql11-server
USES= bison pgsql:11 USES= bison pgsql:11
@ -20,17 +17,21 @@ INSTALL_DIRS= contrib
SLAVE_ONLY= yes SLAVE_ONLY= yes
COMPONENT= -contrib 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 LDFLAGS+= -lpthread -L${PREFIX}/lib
OPTIONS_DEFINE= DOCS OPENSSL OPTIONS_DEFINE= DOCS OPENSSL XML
OPTIONS_DEFAULT=OPENSSL OPTIONS_DEFAULT=OPENSSL XML
OPTIONS_SUB= yes OPTIONS_SUB= yes
OPENSSL_DESC= Build with OpenSSL support OPENSSL_DESC= Build with OpenSSL support
OPENSSL_USES= ssl OPENSSL_USES= ssl
OPENSSL_CONFIGURE_WITH= openssl OPENSSL_CONFIGURE_WITH= openssl
XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
libxml2.so:textproc/libxml2
XML_CONFIGURE_WITH= libxml libxslt
post-configure: post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks

10
databases/postgresql11-server/pkg-plist-contrib
View File

@ -40,7 +40,7 @@ lib/postgresql/pg_visibility.so
lib/postgresql/pgcrypto.so lib/postgresql/pgcrypto.so
lib/postgresql/pgrowlocks.so lib/postgresql/pgrowlocks.so
lib/postgresql/pgstattuple.so lib/postgresql/pgstattuple.so
lib/postgresql/pgxml.so %%XML%%lib/postgresql/pgxml.so
lib/postgresql/postgres_fdw.so lib/postgresql/postgres_fdw.so
lib/postgresql/refint.so lib/postgresql/refint.so
lib/postgresql/seg.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--1.1.sql
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
%%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/uuid-ossp.control
%%DATADIR%%/extension/xml2--1.0--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
%%DATADIR%%/extension/xml2--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.1.sql
%%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
%%DATADIR%%/extension/xml2.control %%XML%%%%DATADIR%%/extension/xml2.control
%%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/unaccent.rules
%%DATADIR%%/tsearch_data/xsyn_sample.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules

15
databases/postgresql96-contrib/Makefile
View File

@ -8,22 +8,25 @@ CATEGORIES= databases
MAINTAINER= pgsql@FreeBSD.org MAINTAINER= pgsql@FreeBSD.org
COMMENT= The contrib utilities from the PostgreSQL distribution COMMENT= The contrib utilities from the PostgreSQL distribution
LIB_DEPENDS= libxslt.so:textproc/libxslt \
libxml2.so:textproc/libxml2
MASTERDIR= ${.CURDIR}/../postgresql96-server MASTERDIR= ${.CURDIR}/../postgresql96-server
USES= bison pgsql:9.6 USES= bison pgsql:9.6 ssl
BUILD_DIRS= src/port src/include src/common contrib BUILD_DIRS= src/port src/include src/common contrib
INSTALL_DIRS= contrib INSTALL_DIRS= contrib
SLAVE_ONLY= yes SLAVE_ONLY= yes
COMPONENT= -contrib 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 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: post-configure:
@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks

10
databases/postgresql96-server/pkg-plist-contrib
View File

@ -35,7 +35,7 @@ lib/postgresql/pg_visibility.so
lib/postgresql/pgcrypto.so lib/postgresql/pgcrypto.so
lib/postgresql/pgrowlocks.so lib/postgresql/pgrowlocks.so
lib/postgresql/pgstattuple.so lib/postgresql/pgstattuple.so
lib/postgresql/pgxml.so %%XML%%lib/postgresql/pgxml.so
lib/postgresql/postgres_fdw.so lib/postgresql/postgres_fdw.so
lib/postgresql/refint.so lib/postgresql/refint.so
lib/postgresql/seg.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--1.1.sql
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql %%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
%%DATADIR%%/extension/uuid-ossp.control %%DATADIR%%/extension/uuid-ossp.control
%%DATADIR%%/extension/xml2--1.0--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
%%DATADIR%%/extension/xml2--1.1.sql %%XML%%%%DATADIR%%/extension/xml2--1.1.sql
%%DATADIR%%/extension/xml2--unpackaged--1.0.sql %%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
%%DATADIR%%/extension/xml2.control %%XML%%%%DATADIR%%/extension/xml2.control
%%DATADIR%%/tsearch_data/unaccent.rules %%DATADIR%%/tsearch_data/unaccent.rules
%%DATADIR%%/tsearch_data/xsyn_sample.rules %%DATADIR%%/tsearch_data/xsyn_sample.rules