Mon Nov 21 01:42:54 2016 UTC ()
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.


(tnn)
diff -r1.5 -r1.6 pkgsrc/databases/postgresql95/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/postgresql95-contrib/Makefile
diff -r1.1 -r0 pkgsrc/databases/postgresql95/patches/patch-contrib_uuid-ossp_uuid-ossp.c
cvs diff -r1.5 -r1.6 pkgsrc/databases/postgresql95/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/postgresql95/Attic/distinfo 2016/10/29 19:41:54 1.5
+++ pkgsrc/databases/postgresql95/Attic/distinfo 2016/11/21 01:42:54 1.6
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1$NetBSD: distinfo,v 1.5 2016/10/29 19:41:54 adam Exp $ 1$NetBSD: distinfo,v 1.6 2016/11/21 01:42:54 tnn Exp $
2 2
3SHA1 (postgresql-9.5.5.tar.bz2) = daf67622692f066d78150a2c4ffae1ec6568ced8 3SHA1 (postgresql-9.5.5.tar.bz2) = daf67622692f066d78150a2c4ffae1ec6568ced8
4RMD160 (postgresql-9.5.5.tar.bz2) = 87a90023bdae604f1356e9f0e5a9b7f4c333c847 4RMD160 (postgresql-9.5.5.tar.bz2) = 87a90023bdae604f1356e9f0e5a9b7f4c333c847
5SHA512 (postgresql-9.5.5.tar.bz2) = 727ab57796cd393ec3755e9aabf515ebbdc3152b4062c20e64511e866a7e7038ba5c5e2843f13f3a79e2263296451f0e93108346b6f638611fba2449394e338e 5SHA512 (postgresql-9.5.5.tar.bz2) = 727ab57796cd393ec3755e9aabf515ebbdc3152b4062c20e64511e866a7e7038ba5c5e2843f13f3a79e2263296451f0e93108346b6f638611fba2449394e338e
6Size (postgresql-9.5.5.tar.bz2) = 18525082 bytes 6Size (postgresql-9.5.5.tar.bz2) = 18525082 bytes
7SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 7SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
8SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 8SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
9SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 9SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
10SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921 10SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
11SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = efaffec2f51de70823430ca162d499b2886a9190 
12SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a 11SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
13SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3 12SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3
14SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca 13SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
15SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289 14SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
16SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd 15SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd
17SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c 16SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
18SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0 17SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
19SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef 18SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
20SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61 19SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
cvs diff -r1.1 -r1.2 pkgsrc/databases/postgresql95-contrib/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/postgresql95-contrib/Attic/Makefile 2016/06/19 20:48:29 1.1
+++ pkgsrc/databases/postgresql95-contrib/Attic/Makefile 2016/11/21 01:42:54 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2016/06/19 20:48:29 fhajny Exp $ 1# $NetBSD: Makefile,v 1.2 2016/11/21 01:42:54 tnn Exp $
2 2
3PKGNAME= ${DISTNAME:C/-/95-contrib-/} 3PKGNAME= ${DISTNAME:C/-/95-contrib-/}
 4PKGREVISION= 1
4COMMENT= Contrib subtree of tools and plug-ins 5COMMENT= Contrib subtree of tools and plug-ins
5 6
6.include "../../databases/postgresql95/Makefile.common" 7.include "../../databases/postgresql95/Makefile.common"
7 8
8DEPENDS+= postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server 9DEPENDS+= postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
9 10
10BUILD_MAKE_FLAGS= USE_PGXS=1 11BUILD_MAKE_FLAGS= USE_PGXS=1
11 12
12BUILD_DIRS+= contrib/adminpack 13BUILD_DIRS+= contrib/adminpack
13BUILD_DIRS+= contrib/auth_delay 14BUILD_DIRS+= contrib/auth_delay
14BUILD_DIRS+= contrib/auto_explain 15BUILD_DIRS+= contrib/auto_explain
15BUILD_DIRS+= contrib/btree_gin 16BUILD_DIRS+= contrib/btree_gin
16BUILD_DIRS+= contrib/btree_gist 17BUILD_DIRS+= contrib/btree_gist
@@ -47,26 +48,34 @@ BUILD_DIRS+= contrib/spi @@ -47,26 +48,34 @@ BUILD_DIRS+= contrib/spi
47BUILD_DIRS+= contrib/sslinfo 48BUILD_DIRS+= contrib/sslinfo
48BUILD_DIRS+= contrib/tablefunc 49BUILD_DIRS+= contrib/tablefunc
49BUILD_DIRS+= contrib/tcn 50BUILD_DIRS+= contrib/tcn
50BUILD_DIRS+= contrib/test_decoding 51BUILD_DIRS+= contrib/test_decoding
51BUILD_DIRS+= contrib/tsearch2 52BUILD_DIRS+= contrib/tsearch2
52BUILD_DIRS+= contrib/tsm_system_rows 53BUILD_DIRS+= contrib/tsm_system_rows
53BUILD_DIRS+= contrib/tsm_system_time 54BUILD_DIRS+= contrib/tsm_system_time
54BUILD_DIRS+= contrib/unaccent 55BUILD_DIRS+= contrib/unaccent
55BUILD_DIRS+= contrib/vacuumlo 56BUILD_DIRS+= contrib/vacuumlo
56 57
57CONFIGURE_ARGS+= --with-openssl 58CONFIGURE_ARGS+= --with-openssl
58 59
59PLIST_VARS+= uuid 60PLIST_VARS+= uuid
60.if ${OPSYS} != "Darwin" 61.if ${OPSYS:M*BSD} || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
61PLIST.uuid= yes 62PLIST.uuid= yes
62CONFIGURE_ARGS+= --with-uuid=ossp 
63BUILD_DIRS+= contrib/uuid-ossp 63BUILD_DIRS+= contrib/uuid-ossp
64# because global pg_config.h is included, we have to define this 64. if ${OPSYS:M*BSD}
65BUILD_MAKE_FLAGS+= PG_CPPFLAGS=-DHAVE_UUID_H 65BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_BSD -DSHA1_RESULTLEN=20"
66.include "../../devel/ossp-uuid/buildlink3.mk" 66CONFIGURE_ARGS+= --with-uuid=bsd
 67. elif ${OPSYS} == "Linux"
 68BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_UUID_H -DHAVE_UUID_E2FS"
 69CONFIGURE_ARGS+= --with-uuid=e2fs
 70. elif ${OPSYS} == "SunOS"
 71BUILD_MAKE_FLAGS+= PG_CPPFLAGS="-DHAVE_UUID_H -DHAVE_UUID_OSSP"
 72CONFIGURE_ARGS+= --with-uuid=ossp
 73BUILD_MAKE_FLAGS+= UUID_LIBS=-lossp-uuid
 74. include "../../devel/ossp-uuid/buildlink3.mk"
 75. endif
67.endif 76.endif
68 77
69PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}} 78PRINT_PLIST_AWK+= {if ($$0 ~ /uuid-ossp/) {$$0 = "$${PLIST.uuid}" $$0;}}
70 79
71.include "../../databases/postgresql95-client/buildlink3.mk" 80.include "../../databases/postgresql95-client/buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/databases/postgresql95/patches/Attic/patch-contrib_uuid-ossp_uuid-ossp.c