diff options
| -rw-r--r-- | databases/postgresql96-contrib/Makefile | 21 | ||||
| -rw-r--r-- | databases/postgresql96-contrib/PLIST | 5 | ||||
| -rw-r--r-- | databases/postgresql96/distinfo | 3 |
3 files changed, 19 insertions, 10 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 diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo index 0bdaf8c1fc5..44e3de86726 100644 --- a/databases/postgresql96/distinfo +++ b/databases/postgresql96/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2016/10/29 19:41:54 adam Exp $ +$NetBSD: distinfo,v 1.2 2016/11/23 15:22:48 fhajny Exp $ SHA1 (postgresql-9.6.1.tar.bz2) = 4209970c9aaf91ebb2a3b8a2e359419e5192b4ad RMD160 (postgresql-9.6.1.tar.bz2) = 5981c45f58ac5b2d3f2b7c21103b2a5ffc950224 @@ -8,7 +8,6 @@ SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921 -SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = efaffec2f51de70823430ca162d499b2886a9190 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca |