# HG changeset patch
# User John Donoghue
# Date 1422025405 18000
# Node ID 7f250bf4c4729e77b33b3ce321348f1012f10d00
# Parent  d76aee4b2c2b0be1a1e754c6351cb745a4d63147
postgresql: update to v9.4.0

* src/postgresql.mk: update version,checksum, install common and extra includes.

* src/postgresql-1-fixes.patch: removed

* dist-files.mk: remove postgresql-1-fixes.patch

diff -r d76aee4b2c2b -r 7f250bf4c472 dist-files.mk
--- a/dist-files.mk	Wed Jan 21 11:09:13 2015 -0500
+++ b/dist-files.mk	Fri Jan 23 10:03:25 2015 -0500
@@ -511,7 +511,6 @@
   portaudio-1-win32.patch \
   portaudio-test.c \
   portaudio.mk \
-  postgresql-1-fixes.patch \
   postgresql.mk \
   proj.mk \
   protobuf-test.cpp \
diff -r d76aee4b2c2b -r 7f250bf4c472 src/postgresql-1-fixes.patch
--- a/src/postgresql-1-fixes.patch	Wed Jan 21 11:09:13 2015 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From a92f8ef8826f38edfe010752badc5c280f5b9605 Mon Sep 17 00:00:00 2001
-From: "a@a.org" <a@a.org>
-Date: Mon, 24 Oct 2011 14:02:33 +0200
-Subject: [PATCH 1/4] use unix style names for openssl on mingw-cross-env
-
-
-diff --git a/configure.in b/configure.in
-index 2f8bb3d..441b42b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -926,13 +926,8 @@ fi
- 
- if test "$with_openssl" = yes ; then
-   dnl Order matters!
--  if test "$PORTNAME" != "win32"; then
--     AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
--     AC_CHECK_LIB(ssl,    SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
--  else
--     AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
--     AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
--  fi
-+  AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-+  AC_CHECK_LIB(ssl,    SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
- fi
- 
- if test "$with_pam" = yes ; then
--- 
-1.9.1
-
-
-From 6bbf26ce1f6c0bbd6fc53db1152b1132795b2850 Mon Sep 17 00:00:00 2001
-From: "a@a.org" <a@a.org>
-Date: Mon, 24 Oct 2011 14:09:38 +0200
-Subject: [PATCH 2/4] do not check autoconf version
-
-
-diff --git a/configure.in b/configure.in
-index 441b42b..1257071 100644
---- a/configure.in
-+++ b/configure.in
-@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
- 
- AC_INIT([PostgreSQL], [9.2.4], [pgsql-bugs@postgresql.org])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
--- 
-1.9.1
-
-
-From e7cdd570742aa958d5b45c6971253d9a0ac8ecf4 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Tue, 1 Jul 2014 14:27:21 -0700
-Subject: [PATCH 3/4] Fix shared lib install location
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/src/Makefile.shlib b/src/Makefile.shlib
-index 294d10f..3acdd81 100644
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -293,6 +293,7 @@ endif
- ifeq ($(PORTNAME), win32)
-   ifdef SO_MAJOR_VERSION
-     shlib		= lib$(NAME)$(DLSUFFIX)
-+    stlib		= lib$(NAME)$(DLSUFFIX).a
-   endif
-   haslibarule   = yes
- endif
-@@ -447,14 +448,16 @@ ifeq ($(PORTNAME), darwin)
- endif
- 
- ifeq ($(enable_shared), yes)
--install-lib-shared: $(shlib) installdirs-lib
-+install-lib-shared: $(shlib)
-+ifeq (, $(filter $(PORTNAME), win32 cygwin))
-+install-lib-shared: $(shlib) installdirs-lib
-+endif # not win32 or cygwin
- ifdef soname
- # we don't install $(shlib) on AIX
- # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE@EXADV1.host.magwien.gv.at)
- ifneq ($(PORTNAME), aix)
-+ifeq (, $(filter $(PORTNAME), win32 cygwin))
- 	$(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/$(shlib)'
--ifneq ($(PORTNAME), cygwin)
--ifneq ($(PORTNAME), win32)
- ifneq ($(shlib), $(shlib_major))
- 	cd '$(DESTDIR)$(libdir)' && \
- 	rm -f $(shlib_major) && \
-@@ -465,8 +468,9 @@ ifneq ($(shlib), $(shlib_bare))
- 	rm -f $(shlib_bare) && \
- 	$(LN_S) $(shlib) $(shlib_bare)
- endif
--endif # not win32
--endif # not cygwin
-+else  # win32 or cygwin
-+	$(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
-+endif # not win32 or cygwin
- endif # not aix
- else # no soname
- 	$(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
--- 
-1.9.1
-
-
-From 49f1ebdd0a4523f77b889b7dfbd5d34c2e11dab1 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Tue, 1 Jul 2014 14:41:44 -0700
-Subject: [PATCH 4/4] Don't build shared lib on win32 if --disable-shared is
- set
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/src/Makefile.shlib b/src/Makefile.shlib
-index 3acdd81..68084cd 100644
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -291,11 +291,15 @@ ifeq ($(PORTNAME), cygwin)
- endif
- 
- ifeq ($(PORTNAME), win32)
--  ifdef SO_MAJOR_VERSION
--    shlib		= lib$(NAME)$(DLSUFFIX)
--    stlib		= lib$(NAME)$(DLSUFFIX).a
-+  ifeq ($(enable_shared), yes)
-+    ifdef SO_MAJOR_VERSION
-+      shlib		= lib$(NAME)$(DLSUFFIX)
-+      stlib		= lib$(NAME)$(DLSUFFIX).a
-+    endif
-+    haslibarule   = yes
-+  else
-+    shlib		=
-   endif
--  haslibarule   = yes
- endif
- 
- 
--- 
-1.9.1
-
diff -r d76aee4b2c2b -r 7f250bf4c472 src/postgresql.mk
--- a/src/postgresql.mk	Wed Jan 21 11:09:13 2015 -0500
+++ b/src/postgresql.mk	Fri Jan 23 10:03:25 2015 -0500
@@ -3,8 +3,8 @@
 
 PKG             := postgresql
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.2.4
-$(PKG)_CHECKSUM := 75b53c884cb10ed9404747b51677358f12082152
+$(PKG)_VERSION  := 9.4.0
+$(PKG)_CHECKSUM := bdf7f4872c7dd6bfee5ba04de81bf5097b73d5d7
 $(PKG)_SUBDIR   := postgresql-$($(PKG)_VERSION)
 $(PKG)_FILE     := postgresql-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -55,11 +55,14 @@
         --with-zlib \
         --with-system-tzdata=/dev/null \
         LIBS="$($(PKG)_LIBS) `'$(MXE_PKG_CONFIG)' openssl --libs`"
+    $(MAKE) -C '$(1)'/src/common             -j '$(JOBS)'         
     $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install DESTDIR='$(3)'
     $(MAKE) -C '$(1)'/src/port             -j '$(JOBS)'         
     $(MAKE) -C '$(1)'/src/bin/psql         -j '$(JOBS)' install DESTDIR='$(3)'
     $(MAKE) -C '$(1)'/src/bin/pg_config    -j '$(JOBS)' install DESTDIR='$(3)'
     $(INSTALL) -m644 '$(1)/src/include/pg_config.h'    '$(3)$(HOST_INCDIR)'
+    $(INSTALL) -m644 '$(1)/src/include/pg_config_ext.h' '$(3)$(HOST_INCDIR)'
+    $(INSTALL) -m644 '$(1)/src/include/pg_config_os.h' '$(3)$(HOST_INCDIR)'
     $(INSTALL) -m644 '$(1)/src/include/postgres_ext.h' '$(3)$(HOST_INCDIR)'
     $(INSTALL) -d    '$(3)$(HOST_INCDIR)/libpq'
     $(INSTALL) -m644 '$(1)'/src/include/libpq/*        '$(3)$(HOST_INCDIR)/libpq/'