[pkgsrc/trunk]: pkgsrc/databases Follow a suggestion by Josh Berkus (pgsql co...

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e38787be58cb
branches:  trunk
changeset: 473562:e38787be58cb
user:      recht <recht%pkgsrc.org@localhost>
date:      Tue Apr 20 22:37:22 2004 +0000

description:
Follow a suggestion by Josh Berkus (pgsql core team) and build
with --enable-thread-safety.
Bump PKGREVISIONs accordingly (meta-pkg, -client, -lib).

diffstat:

 databases/postgresql74-client/Makefile   |   3 ++-
 databases/postgresql74-lib/Makefile      |  11 ++++++++++-
 databases/postgresql74-lib/buildlink3.mk |   4 ++--
 databases/postgresql74/Makefile          |   5 +++--
 databases/postgresql74/distinfo          |   3 ++-
 databases/postgresql74/patches/patch-ab  |  10 ++++++++++
 6 files changed, 29 insertions(+), 7 deletions(-)

diffs (110 lines):

diff -r 2f30706fabac -r e38787be58cb databases/postgresql74-client/Makefile
--- a/databases/postgresql74-client/Makefile    Tue Apr 20 22:11:48 2004 +0000
+++ b/databases/postgresql74-client/Makefile    Tue Apr 20 22:37:22 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/19 00:03:25 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/20 22:37:22 recht Exp $
 
 PKGNAME=               postgresql-client-${BASE_VERS}
+PKGREVISION=           1
 SVR4_PKGNAME=          pstgc
 COMMENT=               PostgreSQL database client programs
 
diff -r 2f30706fabac -r e38787be58cb databases/postgresql74-lib/Makefile
--- a/databases/postgresql74-lib/Makefile       Tue Apr 20 22:11:48 2004 +0000
+++ b/databases/postgresql74-lib/Makefile       Tue Apr 20 22:37:22 2004 +0000
@@ -1,18 +1,26 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/19 00:02:30 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/20 22:37:22 recht Exp $
 
 PKGNAME=               postgresql-lib-${BASE_VERS}
+PKGREVISION=           1
 SVR4_PKGNAME=          pstgl
 COMMENT=               PostgreSQL database headers and libraries
 
 .include "../../databases/postgresql74/Makefile.common"
 
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
+
 BUILD_DIRS=            ${WRKSRC}/src/include
 BUILD_DIRS+=           ${WRKSRC}/src/interfaces
 BUILD_DIRS+=           ${WRKSRC}/src/pl
 
 .include "../../mk/bsd.prefs.mk"
 
+# As told by Josh Berkus
+# currently broken for SunOS, will be fixed in 7.4.3
+.if (${OPSYS} != "SunOS")
+CONFIGURE_ARGS+=       --enable-thread-safety
+.endif
+
 # handle additional headers installed by hierarchical queries patch
 .if defined(PGSQL_USE_HIER) && !empty(PGSQL_USE_HIER:M[yY][eE][sS])
 PLIST_SUBST+=          PG_HIER=
@@ -37,4 +45,5 @@
                -f ${WRKSRC}/doc/man.tar.gz
 
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2f30706fabac -r e38787be58cb databases/postgresql74-lib/buildlink3.mk
--- a/databases/postgresql74-lib/buildlink3.mk  Tue Apr 20 22:11:48 2004 +0000
+++ b/databases/postgresql74-lib/buildlink3.mk  Tue Apr 20 22:37:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/04/19 00:02:33 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/04/20 22:37:22 recht Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 POSTGRESQL_LIB_BUILDLINK3_MK:= ${POSTGRESQL_LIB_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   postgresql-lib
 
 .if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.postgresql-lib+=     postgresql-lib>=7.4.2
+BUILDLINK_DEPENDS.postgresql-lib+=     postgresql-lib>=7.4.2nb1
 BUILDLINK_PKGSRCDIR.postgresql-lib?=   ../../databases/postgresql74-lib
 BUILDLINK_INCDIRS.postgresql-lib?=     include/postgresql
 .endif # POSTGRESQL_LIB_BUILDLINK3_MK
diff -r 2f30706fabac -r e38787be58cb databases/postgresql74/Makefile
--- a/databases/postgresql74/Makefile   Tue Apr 20 22:11:48 2004 +0000
+++ b/databases/postgresql74/Makefile   Tue Apr 20 22:37:22 2004 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/19 00:07:12 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/20 22:37:22 recht Exp $
 
 PKGNAME=       postgresql-${BASE_VERS}
+PKGREVISION=   1
 COMMENT=       Robust, next generation, object-relational DBMS
 
-DEPENDS+=      postgresql-client>=${BASE_VERS}:../../databases/postgresql74-client
+DEPENDS+=      postgresql-client>=${BASE_VERS}nb1:../../databases/postgresql74-client
 DEPENDS+=      postgresql-server>=${BASE_VERS}:../../databases/postgresql74-server
 DEPENDS+=      postgresql-docs>=${BASE_VERS}:../../databases/postgresql74-docs
 
diff -r 2f30706fabac -r e38787be58cb databases/postgresql74/distinfo
--- a/databases/postgresql74/distinfo   Tue Apr 20 22:11:48 2004 +0000
+++ b/databases/postgresql74/distinfo   Tue Apr 20 22:37:22 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/19 00:07:13 recht Exp $
+$NetBSD: distinfo,v 1.2 2004/04/20 22:37:22 recht Exp $
 
 SHA1 (postgresql-7.4.2.tar.bz2) = 52b8a8a3467298c659e424213b72a15b08be9d59
 Size (postgresql-7.4.2.tar.bz2) = 10100398 bytes
 SHA1 (hier-Pg7.4-0.5.2.tar.gz) = 8681cecbb0424a1c147b205a826816ea9146a261
 Size (hier-Pg7.4-0.5.2.tar.gz) = 34747 bytes
 SHA1 (patch-aa) = e9b99b04c02b3f04d21144a22489618948c378a8
+SHA1 (patch-ab) = 0c9bda017744807db2b98051acdab017616a1add
diff -r 2f30706fabac -r e38787be58cb databases/postgresql74/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/postgresql74/patches/patch-ab   Tue Apr 20 22:37:22 2004 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1 2004/04/20 22:37:22 recht Exp $
+
+--- src/template/netbsd.orig   2003-10-10 00:55:46.000000000 +0200
++++ src/template/netbsd        2004-04-20 01:54:45.000000000 +0200
+@@ -1,2 +1,5 @@
+ THREAD_SUPPORT=yes
+ NEED_REENTRANT_FUNCS=yes      # 1.6 2003-09-14
++case $build in
++      *-netbsdelf[2-9]*) THREAD_CPPFLAGS="-pthread"; THREAD_LIBS="-pthread" ;;
++esac