From 8e21b4e2b7fe9d38985cc9fab266808083aa4158 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 11 May 2015 13:09:23 +0000
Subject: main/postgresql-bdr*: move from testing

the conflict should be resolved now
---
 testing/postgresql-bdr/postgresql-bdr-osxflags.patch | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 testing/postgresql-bdr/postgresql-bdr-osxflags.patch

(limited to 'testing/postgresql-bdr/postgresql-bdr-osxflags.patch')

diff --git a/testing/postgresql-bdr/postgresql-bdr-osxflags.patch b/testing/postgresql-bdr/postgresql-bdr-osxflags.patch
deleted file mode 100644
index fd3d9c14b..000000000
--- a/testing/postgresql-bdr/postgresql-bdr-osxflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/src/sgml/Makefile
-+++ b/doc/src/sgml/Makefile
-@@ -245,7 +245,7 @@
- # if we try to do "make all" in a VPATH build without the explicit
- # $(srcdir) on the postgres.sgml dependency in this rule.  GNU make bug?
- postgres.xml: $(srcdir)/postgres.sgml $(ALMOSTALLSGML)
--	$(OSX) -D. -x lower -i include-xslt-index $< >postgres.xmltmp
-+	$(OSX) $(OSXFLAGS) -D. -x lower -i include-xslt-index $< >postgres.xmltmp
- 	$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \
- 	           -e '$$_ .= qq{<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
- 	  <postgres.xmltmp > $@
-- 
cgit v1.2.3