postgresql95-contrib: Drop uuid-ossp dependency on BSD.

(Use --with-uuid=bsd as per documentation section F.43.2)

Also probably fix the UUID extension on Solaris and Linux, but untested.

3 files changed, 16 insertions, 30 deletions

diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 7954ecfd16c..746801cc29d 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/21 01:42:54 tnn Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-contrib-/}
+PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql95/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/postgresql95/distinfo b/databases/postgresql95/distinfo
index cae9dcece03..00e960515e3 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/10/29 19:41:54 adam Exp $
+$NetBSD: distinfo,v 1.6 2016/11/21 01:42:54 tnn Exp $
 
 SHA1 (postgresql-9.5.5.tar.bz2) = daf67622692f066d78150a2c4ffae1ec6568ced8
 RMD160 (postgresql-9.5.5.tar.bz2) = 87a90023bdae604f1356e9f0e5a9b7f4c333c847
@@ -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
diff --git a/databases/postgresql95/patches/patch-contrib_uuid-ossp_uuid-ossp.c b/databases/postgresql95/patches/patch-contrib_uuid-ossp_uuid-ossp.c
deleted file mode 100644
index 3700fa04385..00000000000
--- a/databases/postgresql95/patches/patch-contrib_uuid-ossp_uuid-ossp.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-contrib_uuid-ossp_uuid-ossp.c,v 1.1 2016/02/25 21:37:35 tnn Exp $
-
-Explicitly define HAVE_UUID_H and HAVE_UUID_OSSP.
-
---- contrib/uuid-ossp/uuid-ossp.c.orig	2015-01-14 20:54:38.000000000 +0000
-+++ contrib/uuid-ossp/uuid-ossp.c
-@@ -26,6 +26,7 @@
-  */
- #define uuid_hash bsd_uuid_hash
- 
-+#define HAVE_UUID_H
- #ifdef HAVE_UUID_H
- #include <uuid.h>
- #endif
-@@ -42,6 +43,7 @@
-  * Some BSD variants offer md5 and sha1 implementations but Linux does not,
-  * so we use a copy of the ones from pgcrypto.  Not needed with OSSP, though.
-  */
-+#define HAVE_UUID_OSSP
- #ifndef HAVE_UUID_OSSP
- #include "md5.h"
- #include "sha1.h"