View | Details | Raw Unified | Return to bug 239638 | Differences between
and this patch

Collapse All | Expand All

(-)postgresql11-contrib/Makefile (-6 / +7 lines)
Lines 8-16 Link Here
8
MAINTAINER=	pgsql@FreeBSD.org
8
MAINTAINER=	pgsql@FreeBSD.org
9
COMMENT=	The contrib utilities from the PostgreSQL distribution
9
COMMENT=	The contrib utilities from the PostgreSQL distribution
10
10
11
LIB_DEPENDS=	libxslt.so:textproc/libxslt \
12
		libxml2.so:textproc/libxml2
13
14
MASTERDIR=	${.CURDIR}/../postgresql11-server
11
MASTERDIR=	${.CURDIR}/../postgresql11-server
15
12
16
USES=		bison pgsql:11
13
USES=		bison pgsql:11
Lines 20-30 Link Here
20
17
21
SLAVE_ONLY=	yes
18
SLAVE_ONLY=	yes
22
COMPONENT=	-contrib
19
COMPONENT=	-contrib
23
CONFIGURE_ARGS=	--with-libxslt --with-libxml --disable-nls --with-uuid=bsd
20
CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
24
LDFLAGS+=	-lpthread -L${PREFIX}/lib
21
LDFLAGS+=	-lpthread -L${PREFIX}/lib
25
22
26
OPTIONS_DEFINE=	DOCS OPENSSL
23
OPTIONS_DEFINE=	DOCS OPENSSL XML
27
OPTIONS_DEFAULT=OPENSSL
24
OPTIONS_DEFAULT=OPENSSL XML
28
OPTIONS_SUB=	yes
25
OPTIONS_SUB=	yes
29
26
30
OPENSSL_DESC=		Build with OpenSSL support
27
OPENSSL_DESC=		Build with OpenSSL support
Lines 31-36 Link Here
31
OPENSSL_USES=		ssl
28
OPENSSL_USES=		ssl
32
OPENSSL_CONFIGURE_WITH=	openssl
29
OPENSSL_CONFIGURE_WITH=	openssl
33
30
31
XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
32
		libxml2.so:textproc/libxml2
33
XML_CONFIGURE_WITH=	libxml libxslt
34
34
post-configure:
35
post-configure:
35
	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
36
	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
36
37
(-)postgresql11-server/pkg-plist-contrib (-5 / +5 lines)
Lines 40-46 Link Here
40
lib/postgresql/pgcrypto.so
40
lib/postgresql/pgcrypto.so
41
lib/postgresql/pgrowlocks.so
41
lib/postgresql/pgrowlocks.so
42
lib/postgresql/pgstattuple.so
42
lib/postgresql/pgstattuple.so
43
lib/postgresql/pgxml.so
43
%%XML%%lib/postgresql/pgxml.so
44
lib/postgresql/postgres_fdw.so
44
lib/postgresql/postgres_fdw.so
45
lib/postgresql/refint.so
45
lib/postgresql/refint.so
46
lib/postgresql/seg.so
46
lib/postgresql/seg.so
Lines 258-266 Link Here
258
%%DATADIR%%/extension/uuid-ossp--1.1.sql
258
%%DATADIR%%/extension/uuid-ossp--1.1.sql
259
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
259
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
260
%%DATADIR%%/extension/uuid-ossp.control
260
%%DATADIR%%/extension/uuid-ossp.control
261
%%DATADIR%%/extension/xml2--1.0--1.1.sql
261
%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
262
%%DATADIR%%/extension/xml2--1.1.sql
262
%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
263
%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
263
%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
264
%%DATADIR%%/extension/xml2.control
264
%%XML%%%%DATADIR%%/extension/xml2.control
265
%%DATADIR%%/tsearch_data/unaccent.rules
265
%%DATADIR%%/tsearch_data/unaccent.rules
266
%%DATADIR%%/tsearch_data/xsyn_sample.rules
266
%%DATADIR%%/tsearch_data/xsyn_sample.rules
(-)postgresql96-contrib/Makefile (-6 / +9 lines)
Lines 8-19 Link Here
8
MAINTAINER=	pgsql@FreeBSD.org
8
MAINTAINER=	pgsql@FreeBSD.org
9
COMMENT=	The contrib utilities from the PostgreSQL distribution
9
COMMENT=	The contrib utilities from the PostgreSQL distribution
10
10
11
LIB_DEPENDS=	libxslt.so:textproc/libxslt \
12
		libxml2.so:textproc/libxml2
13
14
MASTERDIR=	${.CURDIR}/../postgresql96-server
11
MASTERDIR=	${.CURDIR}/../postgresql96-server
15
12
16
USES=		bison pgsql:9.6
13
USES=		bison pgsql:9.6 ssl
17
14
18
BUILD_DIRS=	src/port src/include src/common contrib
15
BUILD_DIRS=	src/port src/include src/common contrib
19
INSTALL_DIRS=	contrib
16
INSTALL_DIRS=	contrib
Lines 20-30 Link Here
20
17
21
SLAVE_ONLY=	yes
18
SLAVE_ONLY=	yes
22
COMPONENT=	-contrib
19
COMPONENT=	-contrib
23
CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
20
CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
24
LDFLAGS+=	-lpthread -L${PREFIX}/lib
21
LDFLAGS+=	-lpthread -L${PREFIX}/lib
25
22
26
OPTIONS_DEFINE=	DOCS
23
OPTIONS_DEFINE=	DOCS XML
24
OPTIONS_DEFAULT=XML
25
OPTIONS_SUB=	yes
27
26
27
XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
28
		libxml2.so:textproc/libxml2
29
XML_CONFIGURE_WITH=	libxml libxslt
30
28
post-configure: 
31
post-configure: 
29
		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
32
		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
30
33
(-)postgresql96-server/pkg-plist-contrib (-5 / +5 lines)
Lines 35-41 Link Here
35
lib/postgresql/pgcrypto.so
35
lib/postgresql/pgcrypto.so
36
lib/postgresql/pgrowlocks.so
36
lib/postgresql/pgrowlocks.so
37
lib/postgresql/pgstattuple.so
37
lib/postgresql/pgstattuple.so
38
lib/postgresql/pgxml.so
38
%%XML%%lib/postgresql/pgxml.so
39
lib/postgresql/postgres_fdw.so
39
lib/postgresql/postgres_fdw.so
40
lib/postgresql/refint.so
40
lib/postgresql/refint.so
41
lib/postgresql/seg.so
41
lib/postgresql/seg.so
Lines 233-241 Link Here
233
%%DATADIR%%/extension/uuid-ossp--1.1.sql
233
%%DATADIR%%/extension/uuid-ossp--1.1.sql
234
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
234
%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
235
%%DATADIR%%/extension/uuid-ossp.control
235
%%DATADIR%%/extension/uuid-ossp.control
236
%%DATADIR%%/extension/xml2--1.0--1.1.sql
236
%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
237
%%DATADIR%%/extension/xml2--1.1.sql
237
%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
238
%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
238
%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
239
%%DATADIR%%/extension/xml2.control
239
%%XML%%%%DATADIR%%/extension/xml2.control
240
%%DATADIR%%/tsearch_data/unaccent.rules
240
%%DATADIR%%/tsearch_data/unaccent.rules
241
%%DATADIR%%/tsearch_data/xsyn_sample.rules
241
%%DATADIR%%/tsearch_data/xsyn_sample.rules

Return to bug 239638