4 files changed, 46 insertions, 37 deletions
diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile
index 7deaacf1aa36..9a4135433cc1 100644
--- a/databases/sqlrelay/files/patch-Makefile
+++ b/databases/sqlrelay/files/patch-Makefile
@@ -1,15 +1,19 @@
---- Makefile.orig	Thu Aug  5 18:46:10 2004
-+++ Makefile	Mon Feb 14 10:26:16 2005
-@@ -26,9 +26,9 @@
- 	$(MAKE) -C init install
- 	$(MAKE) -C man install
- 	$(MAKE) -C doc install
+--- Makefile.orig	2015-03-31 20:50:58 UTC
++++ Makefile
+@@ -30,11 +30,11 @@ install-doc:
+ 	cd doc $(AND) $(MAKE) install
+ 
+ install-pkgconfig:
 -	$(MKINSTALLDIRS) $(libdir)/pkgconfig
--	$(INSTALL) -m 0644 sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc
--	$(INSTALL) -m 0644 sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc
+-	$(CP) sqlrelay-c.pc $(libdir)/pkgconfig/sqlrelay-c.pc
+-	$(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc
+-	$(CP) sqlrelay-c++.pc $(libdir)/pkgconfig/sqlrelay-c++.pc
+-	$(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c++.pc
 +	$(MKINSTALLDIRS) $(prefix)/libdata/pkgconfig
-+	$(INSTALL) -m 0644 sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
-+	$(INSTALL) -m 0644 sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
++	$(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
++	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc
++	$(CP) sqlrelay-c++.pc $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
++	$(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c++.pc
  
- uninstall:
- 	$(MAKE) -C src uninstall
+ uninstall: $(UNINSTALLSUBDIRS)
+ 	$(RMTREE) $(libexecdir)
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index 34398fdedfb5..5b21b1787ba8 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,20 +1,20 @@
---- config.mk.in.orig	2014-12-28 09:10:48.000000000 +0100
-+++ config.mk.in	2014-12-29 20:44:27.000000000 +0100
-@@ -9,7 +9,7 @@
+--- config.mk.in.orig	2015-05-07 19:42:23 UTC
++++ config.mk.in
+@@ -8,7 +8,7 @@ prefix = @prefix@
  exec_prefix= @exec_prefix@
  includedir = @includedir@
  libdir = @libdir@
 -javadir = ${exec_prefix}/java
 +javadir = ${exec_prefix}/share/java/classes
+ dotnetdir = $(libdir)
  libexecdir = @libexecdir@/sqlrelay
  bindir = @bindir@
- localstatedir = @localstatedir@
-@@ -33,7 +33,7 @@
+@@ -59,7 +59,7 @@ OBJ = lo
  TMPDIRCPPFLAG = -DTMP_DIR=\"$(tmpdir)\"
  DEBUGDIRCPPFLAG = -DDEBUG_DIR=\"$(debugdir)\"
  LOGDIRCPPFLAG = -DLOG_DIR=\"$(logdir)\"
 -CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay.conf.d\"
-+CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay/conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\"
++CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\"
  CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\"
  
- # link flags (-s, -static, -melf, -belf, etc.)
+ 
diff --git a/databases/sqlrelay/files/patch-etc-Makefile b/databases/sqlrelay/files/patch-etc-Makefile
deleted file mode 100644
index dc8d400f9e2d..000000000000
--- a/databases/sqlrelay/files/patch-etc-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/Makefile.orig	2014-12-29 21:02:52.000000000 +0100
-+++ etc/Makefile	2014-12-29 21:03:40.000000000 +0100
-@@ -6,11 +6,10 @@
- 
- install:
- 	$(MKINSTALLDIRS) $(sysconfdir)
--	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
--	$(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)
--	$(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
-+	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay
-+	$(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)/sqlrelay/conf.sample
-+	$(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)/sqlrelay/
-+	$(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)/sqlrelay/
- 
- uninstall:
- 	$(RM) $(sysconfdir)/sqlrelay.conf.example
diff --git a/databases/sqlrelay/files/patch-etc_Makefile b/databases/sqlrelay/files/patch-etc_Makefile
new file mode 100644
index 000000000000..28f26beab443
--- /dev/null
+++ b/databases/sqlrelay/files/patch-etc_Makefile
@@ -0,0 +1,23 @@
+--- etc/Makefile.orig	2015-05-07 19:44:34 UTC
++++ etc/Makefile
+@@ -4,13 +4,13 @@ include ../config.mk
+ 
+ install:
+ 	$(MKINSTALLDIRS) $(sysconfdir)
+-	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
+-	$(CP) sqlrelay.conf.example $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example
+-	$(CP) sqlrelay.dtd $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd
+-	$(CP) sqlrelay.xsd $(sysconfdir)
+-	$(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd
++	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay
++	$(CP) sqlrelay.conf.example $(sysconfdir)//sqlrelay/conf.sample
++	$(CHMOD) 644 $(sysconfdir)/sqlrelay/conf.sample
++	$(CP) sqlrelay.dtd $(sysconfdir)/sqlrelay/
++	$(CHMOD) 644 $(sysconfdir)/sqlrelay/sqlrelay.dtd
++	$(CP) sqlrelay.xsd $(sysconfdir)/sqlrelay/
++	$(CHMOD) 644 $(sysconfdir)/sqlrelay/sqlrelay.xsd
+ 	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
+ 	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf
+