diff options
Diffstat (limited to 'databases/postgres-xl/files')
5 files changed, 191 insertions, 0 deletions
diff --git a/databases/postgres-xl/files/patch-contrib_pgxc__ctl_make__signature b/databases/postgres-xl/files/patch-contrib_pgxc__ctl_make__signature new file mode 100644 index 000000000000..f36db344513d --- /dev/null +++ b/databases/postgres-xl/files/patch-contrib_pgxc__ctl_make__signature @@ -0,0 +1,115 @@ +--- contrib/pgxc_ctl/make_signature.orig 2017-04-19 15:17:02 UTC ++++ contrib/pgxc_ctl/make_signature +@@ -53,14 +53,20 @@ EOF + + + cp pgxc_ctl_bash_2 pgxc_ctl_bash.c.wk +-ex pgxc_ctl_bash.c.wk <<EOF +-%s/"/\\\"/ge +-w +-%s/^\(.*\)$/"\1",/e +-%s/^"#ifdef XCP",$/#ifdef XCP/e +-%s/^"#endif",$/#endif/e +-wq +-EOF ++ ++sed -i '' -e 's/"/\\\"/g' pgxc_ctl_bash.c.wk ++sed -i '' -e 's/^\(.*\)$/"\1",/' pgxc_ctl_bash.c.wk ++sed -i '' -e 's/^"#ifdef XCP",$/#ifdef XCP/' pgxc_ctl_bash.c.wk ++sed -i '' -e 's/^"#endif",$/#endif/' pgxc_ctl_bash.c.wk ++ ++#ex pgxc_ctl_bash.c.wk <<EOF ++#%s/"/\\\"/ge ++#w ++#%s/^\(.*\)$/"\1",/e ++#%s/^"#ifdef XCP",$/#ifdef XCP/e ++#%s/^"#endif",$/#endif/e ++#wq ++#EOF + + cat > pgxc_ctl_bash.c <<EOF + /* +@@ -110,14 +116,19 @@ rm pgxc_ctl_bash.c.wk + + cp pgxc_ctl_conf_part_full pgxc_ctl_conf_part.wk + +-ex pgxc_ctl_conf_part.wk <<EOF +-%s/"/\\\"/ge +-w +-%s/^\(.*\)$/"\1",/e +-%s/^"#ifdef XCP",$/#ifdef XCP/e +-%s/^"#endif",$/#endif/e +-wq +-EOF ++sed -i '' -e 's/"/\\\"/g' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^\(.*\)$/"\1",/' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^"#ifdef XCP",$/#ifdef XCP/' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^"#endif",$/#endif/' pgxc_ctl_conf_part.wk ++ ++#ex pgxc_ctl_conf_part.wk <<EOF ++#%s/"/\\\"/ge ++#w ++#%s/^\(.*\)$/"\1",/e ++#%s/^"#ifdef XCP",$/#ifdef XCP/e ++#%s/^"#endif",$/#endif/e ++#wq ++#EOF + + cat >> pgxc_ctl_bash.c <<EOF + /* +@@ -141,14 +152,19 @@ rm pgxc_ctl_conf_part.wk + + cp pgxc_ctl_conf_part_minimal pgxc_ctl_conf_part.wk + +-ex pgxc_ctl_conf_part.wk <<EOF +-%s/"/\\\"/ge +-w +-%s/^\(.*\)$/"\1",/e +-%s/^"#ifdef XCP",$/#ifdef XCP/e +-%s/^"#endif",$/#endif/e +-wq +-EOF ++sed -i '' -e 's/"/\\\"/g' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^\(.*\)$/"\1",/' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^"#ifdef XCP",$/#ifdef XCP/' pgxc_ctl_conf_part.wk ++sed -i '' -e 's/^"#endif",$/#endif/' pgxc_ctl_conf_part.wk ++ ++#ex pgxc_ctl_conf_part.wk <<EOF ++#%s/"/\\\"/ge ++#w ++#%s/^\(.*\)$/"\1",/e ++#%s/^"#ifdef XCP",$/#ifdef XCP/e ++#%s/^"#endif",$/#endif/e ++#wq ++#EOF + + cat >> pgxc_ctl_bash.c <<EOF + /* +@@ -172,14 +188,19 @@ rm pgxc_ctl_conf_part.wk + + cp pgxc_ctl_conf_part_empty pgxc_ctl_conf_empty.wk + +-ex pgxc_ctl_conf_empty.wk <<EOF +-%s/"/\\\"/ge +-w +-%s/^\(.*\)$/"\1",/e +-%s/^"#ifdef XCP",$/#ifdef XCP/e +-%s/^"#endif",$/#endif/e +-wq +-EOF ++sed -i '' -e 's/"/\\\"/g' pgxc_ctl_conf_empty.wk ++sed -i '' -e 's/^\(.*\)$/"\1",/' pgxc_ctl_conf_empty.wk ++sed -i '' -e 's/^"#ifdef XCP",$/#ifdef XCP/' pgxc_ctl_conf_empty.wk ++sed -i '' -e 's/^"#endif",$/#endif/' pgxc_ctl_conf_empty.wk ++ ++#ex pgxc_ctl_conf_empty.wk <<EOF ++#%s/"/\\\"/ge ++#w ++#%s/^\(.*\)$/"\1",/e ++#%s/^"#ifdef XCP",$/#ifdef XCP/e ++#%s/^"#endif",$/#endif/e ++#wq ++#EOF + + cat >> pgxc_ctl_bash.c <<EOF + /* diff --git a/databases/postgres-xl/files/patch-contrib_pgxc__monitor_pgxc__monitor.c b/databases/postgres-xl/files/patch-contrib_pgxc__monitor_pgxc__monitor.c new file mode 100644 index 000000000000..6ad9cf614cd8 --- /dev/null +++ b/databases/postgres-xl/files/patch-contrib_pgxc__monitor_pgxc__monitor.c @@ -0,0 +1,10 @@ +--- contrib/pgxc_monitor/pgxc_monitor.c.orig 2017-04-19 15:17:02 UTC ++++ contrib/pgxc_monitor/pgxc_monitor.c +@@ -49,6 +49,7 @@ + + #include <stdlib.h> + #include <getopt.h> ++#include <sys/wait.h> + + /* Define all the node types */ + typedef enum diff --git a/databases/postgres-xl/files/patch-doc-Makefile b/databases/postgres-xl/files/patch-doc-Makefile new file mode 100644 index 000000000000..0d0adb929fb7 --- /dev/null +++ b/databases/postgres-xl/files/patch-doc-Makefile @@ -0,0 +1,9 @@ +--- doc/Makefile.orig 2017-04-19 15:17:02 UTC ++++ doc/Makefile +@@ -12,5 +12,5 @@ subdir = doc + top_builddir = .. + include $(top_builddir)/src/Makefile.global + +-all distprep html man install installdirs uninstall clean distclean maintainer-clean: ++all distprep man install installdirs uninstall clean distclean maintainer-clean: + $(MAKE) -C src $@ diff --git a/databases/postgres-xl/files/patch-doc-src-sgml-Makefile b/databases/postgres-xl/files/patch-doc-src-sgml-Makefile new file mode 100644 index 000000000000..0523b73cd52b --- /dev/null +++ b/databases/postgres-xl/files/patch-doc-src-sgml-Makefile @@ -0,0 +1,46 @@ +--- doc/src/sgml/Makefile.orig 2017-04-19 15:17:02 UTC ++++ doc/src/sgml/Makefile +@@ -15,7 +15,7 @@ + + # Make "html" the default target, since that is what most people tend + # to want to use. +-html: ++man: + + NO_TEMP_INSTALL=yes + +@@ -24,7 +24,7 @@ top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + + +-all: html man ++all: man + + distprep: html distprep-man + +@@ -81,8 +81,6 @@ override SPFLAGS += -wall -wno-unused-pa + ## Man pages + ## + +-man distprep-man: man-stamp +- + man-stamp: stylesheet-man.xsl postgres.xml + $(XMLLINT) --noout --valid postgres.xml + $(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^ +@@ -326,14 +324,14 @@ check: postgres.sgml $(ALMOSTALLSGML) ch + ## Install + ## + +-install: install-html ++install: install-man + + ifneq ($(PORTNAME), sco) + install: install-man + endif + + installdirs: +- $(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) ++ $(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum)) + + # If the install used a man directory shared with other applications, this will remove all files. + uninstall: diff --git a/databases/postgres-xl/files/patch-src_Makefile.shlib b/databases/postgres-xl/files/patch-src_Makefile.shlib new file mode 100644 index 000000000000..bad3dbfb495a --- /dev/null +++ b/databases/postgres-xl/files/patch-src_Makefile.shlib @@ -0,0 +1,11 @@ +--- src/Makefile.shlib.orig 2017-04-19 15:17:03 UTC ++++ src/Makefile.shlib +@@ -81,7 +81,7 @@ shlib_bare = lib$(NAME)$(DLSUFFIX) + # Testing the soname variable is a reliable way to determine whether a + # linkable library is being built. + soname = $(shlib_major) +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + else + # Naming convention for dynamically loadable modules + shlib = $(NAME)$(DLSUFFIX) |