Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1466368810124960"
MIME-Version: 1.0
Date: Sun, 19 Jun 2016 20:40:10 +0000
From: "Filip Hajny" <fhajny@netbsd.org>
Subject: CVS commit: pkgsrc/databases/postgresql93
To: pkgsrc-changes@NetBSD.org
Reply-To: fhajny@netbsd.org
Message-Id: <20160619204010.64E38FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1466368810124960
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	fhajny
Date:		Sun Jun 19 20:40:10 UTC 2016

Modified Files:
	pkgsrc/databases/postgresql93: distinfo
Added Files:
	pkgsrc/databases/postgresql93/patches:
	    patch-contrib_postgres__fdw_Makefile

Log Message:
Backport a minor tweak from newer branches that fixes building the
contrib/postgres_fdw extension with PGXS.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/postgresql93/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql93/patches/patch-contrib_postgres__fdw_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1466368810124960
Content-Disposition: inline
Content-Length: 2250
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/databases/postgresql93/distinfo
diff -u pkgsrc/databases/postgresql93/distinfo:1.18 pkgsrc/databases/postgresql93/distinfo:1.19
--- pkgsrc/databases/postgresql93/distinfo:1.18	Mon May 23 14:27:34 2016
+++ pkgsrc/databases/postgresql93/distinfo	Sun Jun 19 20:40:10 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2016/05/23 14:27:34 adam Exp $
+$NetBSD: distinfo,v 1.19 2016/06/19 20:40:10 fhajny Exp $
 
 SHA1 (postgresql-9.3.13.tar.bz2) = 5ee33e9b31c3686bd6c6fa0659f8766f5f70b53c
 RMD160 (postgresql-9.3.13.tar.bz2) = a4269b8eb9c818e5884acbe88c02551551fbbb33
@@ -9,6 +9,7 @@ SHA1 (patch-config_perl.m4) = e035132b1c
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
 SHA1 (patch-contrib_dblink_Makefile) = 11620938ce93109311df90df675b1ad6f0c15212
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
+SHA1 (patch-contrib_postgres__fdw_Makefile) = 07feda488e3acb71405b04d0d745c9920456b32b
 SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2
 SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = deba6bc07ba2e4b8ef8f04f20efb2bdd54cb917e

Added files:

Index: pkgsrc/databases/postgresql93/patches/patch-contrib_postgres__fdw_Makefile
diff -u /dev/null pkgsrc/databases/postgresql93/patches/patch-contrib_postgres__fdw_Makefile:1.1
--- /dev/null	Sun Jun 19 20:40:10 2016
+++ pkgsrc/databases/postgresql93/patches/patch-contrib_postgres__fdw_Makefile	Sun Jun 19 20:40:10 2016
@@ -0,0 +1,22 @@
+$NetBSD: patch-contrib_postgres__fdw_Makefile,v 1.1 2016/06/19 20:40:10 fhajny Exp $
+
+Backport PGXS build fix from newer branches.
+
+--- contrib/postgres_fdw/Makefile.orig	2016-05-09 20:53:56.000000000 +0000
++++ contrib/postgres_fdw/Makefile
+@@ -5,7 +5,6 @@ OBJS = postgres_fdw.o option.o deparse.o
+ 
+ PG_CPPFLAGS = -I$(libpq_srcdir)
+ SHLIB_LINK = $(libpq)
+-SHLIB_PREREQS = submake-libpq
+ 
+ EXTENSION = postgres_fdw
+ DATA = postgres_fdw--1.0.sql
+@@ -20,6 +19,7 @@ PG_CONFIG = pg_config
+ PGXS := $(shell $(PG_CONFIG) --pgxs)
+ include $(PGXS)
+ else
++SHLIB_PREREQS = submake-libpq
+ subdir = contrib/postgres_fdw
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global


--_----------=_1466368810124960--