From 76efc7c6e66e1f82a25a345bae5d48f3388078d9 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 6 Mar 2019 01:05:57 +0300
Subject: Release version 9.6.5+4

---
 libpq/buildfile | 33 ++++++++++++++++++++-------------
 manifest        |  8 ++++----
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/libpq/buildfile b/libpq/buildfile
index d877511..c261ba2 100644
--- a/libpq/buildfile
+++ b/libpq/buildfile
@@ -17,25 +17,23 @@ lib{pq}: c{*} h{$h} file{**.h -{$h}} def{win32/libpqdll} \
 
 tclass = $c.target.class
 
-windows = ($tclass == 'windows')
-macos   = ($tclass == 'macos')
 bsd     = ($tclass == 'bsd')
+macos   = ($tclass == 'macos')
+windows = ($tclass == 'windows')
+
+gcc   = ($c.class == 'gcc')
+msvc  = ($c.class == 'msvc')
 
 lib{pq}: win32/c{*}:   include = $windows
 lib{pq}: non-bsd/c{*}: include = (($bsd || $macos) == false)
 
-# See bootstrap.build for details.
-#
-if $version.pre_release
-  lib{pq}: bin.lib.version = @"-$version.project_id"
-else
-  lib{pq}: bin.lib.version = @"-$abi_version"
-
 # The version file is an internal one (it is only included from
 # postgresql/pg_config.h) so we don't distribute nor install it (see below).
 #
 h{version}: in{version} $src_root/manifest
 
+# Build options.
+#
 c.poptions += -DFRONTEND -DUNSAFE_STAT_OK -DSO_MAJOR_VERSION=$abi_major
 
 if! $windows
@@ -72,9 +70,9 @@ c.poptions =+ "-I$out_root" "-I$src_root" "-I$src_base" \
               "-I$src_base/postgresql"
 
 if $windows
-  obj{*}: c.poptions =+ "-I$src_base/win32"
+  c.poptions =+ "-I$src_base/win32"
 
-if ($c.class == 'msvc')
+if $msvc
 {
   c.poptions =+ "-I$src_base/postgresql/port/win32_msvc"
 
@@ -83,7 +81,7 @@ if ($c.class == 'msvc')
   c.poptions += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
   c.coptions += /wd4018 /wd4244 /wd4267
 }
-elif ($c.class == 'gcc')
+elif $gcc
 {
   # Omit -fexcess-precision=standard as -std=9x implies it.
   #
@@ -94,7 +92,7 @@ elif ($c.class == 'gcc')
   # that works across compilers/version (some -Wno-* options are only
   # recognized in newer versions).
   #
-  cc.coptions += -Wno-all -Wno-extra
+  c.coptions += -Wno-all -Wno-extra
 }
 
 # Define SYSCONFDIR macro. This path is used as a last resort for the
@@ -168,8 +166,17 @@ else
                          '(.+)',                                            \
                          $c.target.system == "mingw32" ? '-l\1' : '\1.lib')
 
+# Export options.
+#
 lib{pq}: cc.export.poptions = "-I$src_base" "-I$src_base/postgresql"
 
+# See bootstrap.build for details.
+#
+if $version.pre_release
+  lib{pq}: bin.lib.version = @"-$version.project_id"
+else
+  lib{pq}: bin.lib.version = @"-$abi_version"
+
 # Internal header (see above).
 #
 h{version}: install = false
diff --git a/manifest b/manifest
index 6296177..55a897a 100644
--- a/manifest
+++ b/manifest
@@ -3,7 +3,7 @@ name: libpq
 
 # Note: remember to update doc-url below!
 #
-version: 9.6.5+3
+version: 9.6.5+4
 
 project: postgresql
 summary: PostgreSQL C API client library
@@ -17,6 +17,6 @@ package-url: https://git.build2.org/cgit/packaging/postgresql/
 email: pgsql-general@postgresql.org ; Mailing list.
 package-email: packaging@build2.org ; Mailing list.
 build-email: builds@build2.org
-#builds: all
-depends: * build2 >= 0.8.0-
-depends: * bpkg >= 0.8.0-
+builds: all
+depends: * build2 >= 0.9.0
+depends: * bpkg >= 0.9.0
-- 
cgit v1.1