diff options
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/sqlrelay/Makefile | 36 | ||||
| -rw-r--r-- | databases/sqlrelay/Makefile.common | 2 | ||||
| -rw-r--r-- | databases/sqlrelay/distinfo | 4 | ||||
| -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 | ||||
| -rw-r--r-- | databases/sqlrelay/pkg-plist | 77 |
7 files changed, 80 insertions, 85 deletions
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index c86ee1980728..a54b23cbf0b6 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -14,20 +14,19 @@ LICENSE= LGPL20 LIB_DEPENDS= librudiments.so:devel/rudiments WANT_GNOME= yes -USES= gmake libtool +USES= gmake libtool python CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ - --disable-msql \ --disable-nodejs \ --disable-perl \ --disable-php \ --disable-python \ + --disable-python3 \ --disable-ruby \ - --disable-erlang \ - --disable-zope + --disable-erlang MAKE_JOBS_UNSAFE=yes USE_LDCONFIG= yes @@ -46,21 +45,25 @@ TOSTRIP= bin/sqlr-start \ bin/sqlr-pwdenc \ bin/sqlr-status \ bin/sqlrsh \ - lib/libsqlrodbc-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libsqlrutil-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libsqlrclient-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libsqlrclientwrapper-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libpqsqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libmysql3sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libmysql40sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libmysql41sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libmysql50sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libmysql51sqlrelay-${SQLRELAY_PORTVERSION}.so.1.0.0 \ - lib/libsqlrserver-${SQLRELAY_PORTVERSION}.so.1.0.0 \ + lib/libsqlrodbc.so.2.0.0 \ + lib/libsqlrutil.so.2.0.0 \ + lib/libsqlrclient.so.2.0.0 \ + lib/libsqlrclientwrapper.so.2.0.0 \ + lib/libpqsqlrelay.so.2.0.0 \ + lib/libmysql3sqlrelay.so.2.0.0 \ + lib/libmysql40sqlrelay.so.2.0.0 \ + lib/libmysql41sqlrelay.so.2.0.0 \ + lib/libmysql50sqlrelay.so.2.0.0 \ + lib/libmysql51sqlrelay.so.2.0.0 \ + lib/libsqlrserver.so.2.0.0 \ libexec/sqlrelay/sqlrauth_database.so \ + libexec/sqlrelay/sqlrauth_krb_userlist.so \ + libexec/sqlrelay/sqlrauth_proxied.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ + libexec/sqlrelay/sqlrauth_tls_userlist.so \ libexec/sqlrelay/sqlrauth_userlist.so \ libexec/sqlrelay/sqlrconfig_xml.so \ + libexec/sqlrelay/sqlrconfig_xmldom.so \ libexec/sqlrelay/sqlrconnection_router.so \ libexec/sqlrelay/sqlrfilter_patterns.so \ libexec/sqlrelay/sqlrfilter_regex.so \ @@ -95,8 +98,7 @@ CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_sqlite.so .else -CONFIGURE_ARGS+= --without-gdbm-prefix \ - --disable-sqlite +CONFIGURE_ARGS+= --disable-sqlite .endif .if ${PORT_OPTIONS:MMYSQL} diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index f369757e64ae..b8ce7b5d06fa 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,7 +1,7 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.64 +SQLRELAY_PORTVERSION= 0.65.0 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index bada34a99fca..966c6dbe102f 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,2 +1,2 @@ -SHA256 (sqlrelay-0.64.tar.gz) = 0dfa6e187e6a248a3626e0814817ec56cec6d048352b7900da97363b412ef1d3 -SIZE (sqlrelay-0.64.tar.gz) = 3450843 +SHA256 (sqlrelay-0.65.0.tar.gz) = ada267a55ac1bcaaf3ec73af2d14c42671f270c00fb426ee1074c746b1181f34 +SIZE (sqlrelay-0.65.0.tar.gz) = 3970412 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 \ diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index 8ec8e82c40ab..91b028177cce 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -1,11 +1,9 @@ bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export -bin/sqlr-fields bin/sqlr-import bin/sqlr-listener bin/sqlr-pwdenc -bin/sqlr-query bin/sqlr-scaler bin/sqlr-start bin/sqlr-status @@ -17,72 +15,68 @@ bin/sqlrsh etc/rc.d/sqlrcachemanager etc/rc.d/sqlrelay @sample etc/sqlrelay/conf.sample -etc/sqlrelay/sqlrelay.dtd etc/sqlrelay/sqlrelay.xsd -include/sqlrelay/private/bindvar.h -include/sqlrelay/private/column.h -include/sqlrelay/private/dll.h -include/sqlrelay/private/listformat.h -include/sqlrelay/private/row.h +include/sqlrelay/private/sqlrclientincludes.h include/sqlrelay/private/sqlrclientwrapper.h +include/sqlrelay/private/sqlrclientwrapperincludes.h include/sqlrelay/private/sqlrconnection.h include/sqlrelay/private/sqlrcursor.h -include/sqlrelay/private/sqlrdefines.h -include/sqlrelay/private/sqlrincludes.h include/sqlrelay/private/sqlrlistener.h include/sqlrelay/private/sqlrserverconnection.h include/sqlrelay/private/sqlrservercontroller.h include/sqlrelay/private/sqlrservercursor.h -include/sqlrelay/private/sqlrserverdll.h include/sqlrelay/private/sqlrserverincludes.h +include/sqlrelay/private/sqlrutilincludes.h include/sqlrelay/private/sqlrshmdata.h -include/sqlrelay/private/sqlrutildll.h -include/sqlrelay/private/wrapperdll.h include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrserver.h include/sqlrelay/sqlrutil.h lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay-0.64.so.1 -lib/libmysql3sqlrelay-0.64.so.1.0.0 +lib/libmysql3sqlrelay.so.2 +lib/libmysql3sqlrelay.so.2.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay-0.64.so.1 -lib/libmysql40sqlrelay-0.64.so.1.0.0 +lib/libmysql40sqlrelay.so.2 +lib/libmysql40sqlrelay.so.2.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay-0.64.so.1 -lib/libmysql41sqlrelay-0.64.so.1.0.0 +lib/libmysql41sqlrelay.so.2 +lib/libmysql41sqlrelay.so.2.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay-0.64.so.1 -lib/libmysql50sqlrelay-0.64.so.1.0.0 +lib/libmysql50sqlrelay.so.2 +lib/libmysql50sqlrelay.so.2.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay-0.64.so.1 -lib/libmysql51sqlrelay-0.64.so.1.0.0 +lib/libmysql51sqlrelay.so.2 +lib/libmysql51sqlrelay.so.2.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay-0.64.so.1 -lib/libpqsqlrelay-0.64.so.1.0.0 +lib/libpqsqlrelay.so.2 +lib/libpqsqlrelay.so.2.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient-0.64.so.1 -lib/libsqlrclient-0.64.so.1.0.0 +lib/libsqlrclient.so.2 +lib/libsqlrclient.so.2.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper-0.64.so.1 -lib/libsqlrclientwrapper-0.64.so.1.0.0 +lib/libsqlrclientwrapper.so.2 +lib/libsqlrclientwrapper.so.2.0.0 %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc-0.64.so.1 -%%ODBC%%lib/libsqlrodbc-0.64.so.1.0.0 +%%ODBC%%lib/libsqlrodbc.so.2 +%%ODBC%%lib/libsqlrodbc.so.2.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver-0.64.so.1 -lib/libsqlrserver-0.64.so.1.0.0 +lib/libsqlrserver.so.2 +lib/libsqlrserver.so.2.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil-0.64.so.1 -lib/libsqlrutil-0.64.so.1.0.0 +lib/libsqlrutil.so.2 +lib/libsqlrutil.so.2.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc libexec/sqlrelay/sqlrauth_database.so +libexec/sqlrelay/sqlrauth_krb_userlist.so +libexec/sqlrelay/sqlrauth_proxied.so +libexec/sqlrelay/sqlrauth_tls_userlist.so libexec/sqlrelay/sqlrauth_userlist.so +libexec/sqlrelay/sqlrconfig_xmldom.so libexec/sqlrelay/sqlrfilter_patterns.so libexec/sqlrelay/sqlrfilter_regex.so libexec/sqlrelay/sqlrfilter_string.so @@ -95,7 +89,6 @@ libexec/sqlrelay/sqlrtranslation_normalize.so %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so libexec/sqlrelay/sqlrauth_sqlrelay.so -libexec/sqlrelay/sqlrconfig_xml.so libexec/sqlrelay/sqlrconnection_router.so libexec/sqlrelay/sqlrlogger_custom_nw.so libexec/sqlrelay/sqlrlogger_custom_sc.so @@ -108,18 +101,20 @@ libexec/sqlrelay/sqlrpwdenc_md5.so libexec/sqlrelay/sqlrpwdenc_rot.so libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so -man/man1/sqlr-fields.1.gz -man/man1/sqlr-query.1.gz +man/man1/sqlr-export.1.gz +man/man1/sqlr-import.1.gz man/man1/sqlrsh.1.gz man/man8/sqlr-cachemanager.8.gz man/man8/sqlr-connection.8.gz man/man8/sqlr-listener.8.gz +man/man8/sqlr-pwdenc.8.gz man/man8/sqlr-scaler.8.gz man/man8/sqlr-start.8.gz +man/man8/sqlr-status.8.gz man/man8/sqlr-stop.8.gz -share/examples/sample-mssqlserver-mysql-errors.map -share/examples/sample-oracle-mysql-errors.map -share/examples/sqlrelay.conf +%%DATADIR%%/examples/sqlrelay.conf +%%DATADIR%%/examples/sample-mssqlserver-mysql-errors.map +%%DATADIR%%/examples/sample-oracle-mysql-errors.map @dir %%ETCDIR%% @dir /var/sqlrelay/tmp/sockets @dir /var/sqlrelay/tmp/pids |