diff options
| author | fhajny <fhajny> | 2016-11-23 15:22:48 +0000 |
|---|---|---|
| committer | fhajny <fhajny> | 2016-11-23 15:22:48 +0000 |
| commit | 9f1d2d714b49068b78bd0355cb4fded9aab2ceae (patch) | |
| tree | dc3433b8ce76ac9b1ee789bc81d00347e6fe60fd /databases/postgresql96-contrib | |
| parent | 31fefb9f9b566ba000f20daa680270a8447d043a (diff) | |
| download | pkgsrc-9f1d2d714b49068b78bd0355cb4fded9aab2ceae.tar.gz | |
Replicate tnn's uuid change from postgresql95 for postgresql96.
Fix postgresql96-contrib/PLIST. Bump PKGREVISION.
Diffstat (limited to 'databases/postgresql96-contrib')
| -rw-r--r-- | databases/postgresql96-contrib/Makefile | 21 | ||||
| -rw-r--r-- | databases/postgresql96-contrib/PLIST | 5 |
2 files changed, 18 insertions, 8 deletions
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile index 337879ec525..380807fa22f 100644 --- a/databases/postgresql96-contrib/Makefile +++ b/databases/postgresql96-contrib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2016/10/29 19:41:55 adam Exp $ +# $NetBSD: Makefile,v 1.2 2016/11/23 15:22:48 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/96-contrib-/} +PKGREVISION= 1 COMMENT= Contrib subtree of tools and plug-ins .include "../../databases/postgresql96/Makefile.common" @@ -57,13 +58,21 @@ BUILD_DIRS+= contrib/vacuumlo CONFIGURE_ARGS+= --with-openssl PLIST_VARS+= uuid -.if ${OPSYS} != "Darwin" +.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" PLIST.uuid= yes -CONFIGURE_ARGS+= --with-uuid=ossp BUILD_DIRS+= contrib/uuid-ossp -# because global pg_config.h is included, we have to define this -BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H -.include "../../devel/ossp-uuid/buildlink3.mk" +. if ${OPSYS:M*BSD} +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20" +CONFIGURE_ARGS+= --with-uuid=bsd +. elif ${OPSYS} == "Linux" +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS" +CONFIGURE_ARGS+= --with-uuid=e2fs +. elif ${OPSYS} == "SunOS" +BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP" +CONFIGURE_ARGS+= --with-uuid=ossp +BUILD_MAKE_FLAGS+= UUID_LIBS=-lossp-uuid +. include "../../devel/ossp-uuid/buildlink3.mk" +. endif .endif PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}} diff --git a/databases/postgresql96-contrib/PLIST b/databases/postgresql96-contrib/PLIST index 04229415d52..07e2722eb41 100644 --- a/databases/postgresql96-contrib/PLIST +++ b/databases/postgresql96-contrib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/10/29 19:41:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/11/23 15:22:48 fhajny Exp $ bin/oid2name bin/pg_standby bin/vacuumlo @@ -218,7 +218,8 @@ share/postgresql/extension/unaccent--1.0--1.1.sql share/postgresql/extension/unaccent--1.1.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control -${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0--1.1.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.1.sql ${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql ${PLIST.uuid}share/postgresql/extension/uuid-ossp.control share/postgresql/tsearch_data/unaccent.rules |