diff options
Diffstat (limited to 'databases/sqlrelay/files')
| -rw-r--r-- | databases/sqlrelay/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-config.mk.in | 6 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-etc_Makefile | 28 |
3 files changed, 22 insertions, 24 deletions
diff --git a/databases/sqlrelay/files/patch-Makefile b/databases/sqlrelay/files/patch-Makefile index e5b34a14f234..d6de7352b485 100644 --- a/databases/sqlrelay/files/patch-Makefile +++ b/databases/sqlrelay/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2015-08-05 21:07:34 UTC +--- Makefile.orig 2016-01-17 07:20:04 UTC +++ Makefile @@ -30,16 +30,13 @@ install-doc: cd doc $(AND) $(MAKE) install @@ -10,10 +10,10 @@ install-pkgconfig: - $(MKINSTALLDIRS) $(libdir)/pkgconfig -- $(CP) sqlrelay-c.pc $(libdir)/pkgconfig -- $(CHMOD) 0644 $(libdir)/pkgconfig/sqlrelay-c.pc -- $(CP) sqlrelay-c++.pc $(libdir)/pkgconfig -- $(CHMOD) 0644 $(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 + $(CP) sqlrelay-c.pc $(prefix)/libdata/pkgconfig/sqlrelay-c.pc + $(CHMOD) 0644 $(prefix)/libdata/pkgconfig/sqlrelay-c.pc @@ -29,4 +29,4 @@ - $(RMTREE) $(licensedir) uninstall-pkgconfig: - $(RM) $(libdir)/pkgconfig/sqlrelay-c.pc \ + $(RM) $(libdir)/pkgconfig/$(SQLRELAY)-c.pc \ diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in index 305ecb069242..93698b9d6f47 100644 --- a/databases/sqlrelay/files/patch-config.mk.in +++ b/databases/sqlrelay/files/patch-config.mk.in @@ -1,11 +1,11 @@ ---- config.mk.in.orig 2015-05-07 19:42:23 UTC +--- config.mk.in.orig 2016-03-24 00:59:48 UTC +++ config.mk.in -@@ -8,7 +8,7 @@ prefix = @prefix@ +@@ -11,7 +11,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 + libexecdir = @libexecdir@/$(SQLRELAY) bindir = @bindir@ diff --git a/databases/sqlrelay/files/patch-etc_Makefile b/databases/sqlrelay/files/patch-etc_Makefile index 28f26beab443..97b0525ba692 100644 --- a/databases/sqlrelay/files/patch-etc_Makefile +++ b/databases/sqlrelay/files/patch-etc_Makefile @@ -1,23 +1,21 @@ ---- etc/Makefile.orig 2015-05-07 19:44:34 UTC +--- etc/Makefile.orig 2016-01-28 19:28:21 UTC +++ etc/Makefile -@@ -4,13 +4,13 @@ include ../config.mk +@@ -3,11 +3,13 @@ top_builddir = .. + 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).conf.d +- $(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd +- $(MKINSTALLDIRS) $(EXAMPLEDIR) +- $(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf +- $(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf + $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay -+ $(CP) sqlrelay.conf.example $(sysconfdir)//sqlrelay/conf.sample ++ $(CP) sqlrelay.conf $(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 ++ $(CP) sqlrelay.conf $(EXAMPLEDIR)/sqlrelay.conf ++ $(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf + uninstall: + $(RM) $(EXAMPLEDIR)/$(SQLRELAY).conf \ |