Attachment #151090 for bug #196366

View | Details | Raw Unified | Return to bug 196366
Collapse All | Expand All





PORTNAME=	${SQLRELAY_PORTNAME}
PORTVERSION=	${SQLRELAY_PORTVERSION}
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	SF


PORTDOCS=	*

TOSTRIP=	bin/sqlr-start \
		bin/sqlr-stop \
		bin/sqlr-listener \
		bin/sqlr-connection \
		bin/sqlr-scaler \

		lib/libmysql50sqlrelay.so.1.0.0 \
		lib/libmysql51sqlrelay.so.1.0.0 \
		lib/libsqlrserver.so.1.0.0 \
		libexec/sqlrelay/sqlrauth_default.so \
		libexec/sqlrelay/sqlrauth_sqlrelay.so \
		libexec/sqlrelay/sqlrconnection_router.so \
		libexec/sqlrelay/sqlrlogger_slowqueries.so \
		libexec/sqlrelay/sqlrlogger_custom_nw.so \
		libexec/sqlrelay/sqlrlogger_custom_sc.so \
		libexec/sqlrelay/sqlrlogger_debug.so \
		libexec/sqlrelay/sqlrlogger_slowqueries.so \
		libexec/sqlrelay/sqlrparser_default.so \
		libexec/sqlrelay/sqlrprotocol_sqlrclient.so \
		libexec/sqlrelay/sqlrpwdenc_crypt.so \
		libexec/sqlrelay/sqlrpwdenc_md5.so \
		libexec/sqlrelay/sqlrpwdenc_rot.so \
		libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
		libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so

.include "${.CURDIR}/Makefile.common"


		-e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \
		-e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \
			${WRKSRC}/init/Makefile
	@${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile
	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
		-e 's#-release \$$\(SQLR_VERSION\)##g;'


Lines 1-7 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/Makefile.common (-1 / +1 lines)
1	# $FreeBSD: head/databases/sqlrelay/Makefile.common 369885 2014-10-03 12:05:43Z tijl $	1	# $FreeBSD: head/databases/sqlrelay/Makefile.common 369885 2014-10-03 12:05:43Z tijl $
2		2
3	SQLRELAY_PORTNAME= sqlrelay	3	SQLRELAY_PORTNAME= sqlrelay
4	SQLRELAY_PORTVERSION= 0.56	4	SQLRELAY_PORTVERSION= 0.58
5		5
6	SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME}	6	SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
7	SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC	7	SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC

Lines 1-2 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/distinfo (-2 / +2 lines)
1	SHA256 (sqlrelay-0.56.tar.gz) = 3dca390fb434d7116fc443e23578c7cf2101be29169ec088640f15775ad8d391	1	SHA256 (sqlrelay-0.58.tar.gz) = f8c55929c58edbf2925eba7d0af3f01c8a5993b23780d4d1755e6bb26b8155a6
2	SIZE (sqlrelay-0.56.tar.gz) = 3717761	2	SIZE (sqlrelay-0.58.tar.gz) = 3719333




--- 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 @@
 exec_prefix= @exec_prefix@
 includedir = @includedir@

 libexecdir = @libexecdir@/sqlrelay
 bindir = @bindir@
 localstatedir = @localstatedir@
@@ -33,7 +33,7 @@
 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\"
 CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\"
 
 # link flags (-s, -static, -melf, -belf, etc.)




--- 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




bin/backupschema
bin/sqlr-cachemanager
bin/sqlr-connection
bin/sqlr-export

bin/sqlrsh
etc/rc.d/sqlrcachemanager
etc/rc.d/sqlrelay
@sample etc/sqlrelay/conf.sample
etc/sqlrelay/sqlrelay.dtd
etc/sqlrelay/sqlrelay.xsd
etc/sqlrelay.xsd
include/sqlrelay/private/bindvar.h
include/sqlrelay/private/column.h
include/sqlrelay/private/dll.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/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.so.1
lib/libmysql3sqlrelay.so.1.0.0

libexec/sqlrelay/sqlrlogger_custom_sc.so
libexec/sqlrelay/sqlrlogger_debug.so
libexec/sqlrelay/sqlrlogger_slowqueries.so
libexec/sqlrelay/sqlrparser_default.so
libexec/sqlrelay/sqlrprotocol_sqlrclient.so
libexec/sqlrelay/sqlrpwdenc_crypt.so
libexec/sqlrelay/sqlrpwdenc_md5.so
libexec/sqlrelay/sqlrpwdenc_rot.so

man/man1/sqlrsh.1.gz
man/man8/sqlr-cachemanager.8.gz
man/man8/sqlr-connection.8.gz
man/man8/sqlr-ipclean.8.gz
man/man8/sqlr-listener.8.gz
man/man8/sqlr-scaler.8.gz
man/man8/sqlr-start.8.gz
man/man8/sqlr-stop.8.gz
share/examples/sample-mssqlserver-mysql-errors.map
share/examples/sample-oracle-mysql-errors.map
@dir %%ETCDIR%%
@dir /var/sqlrelay/tmp/sockets
@dir /var/sqlrelay/tmp/pids
@dir /var/sqlrelay/tmp/ipc

Return to bug 196366

Lines 3-9 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/Makefile (-11 / +12 lines)
3		3
4	PORTNAME= ${SQLRELAY_PORTNAME}	4	PORTNAME= ${SQLRELAY_PORTNAME}
5	PORTVERSION= ${SQLRELAY_PORTVERSION}	5	PORTVERSION= ${SQLRELAY_PORTVERSION}
6	PORTREVISION= 1
7	CATEGORIES= databases	6	CATEGORIES= databases
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 32-37 Link Here
32	PORTDOCS= *	31	PORTDOCS= *
33		32
34	TOSTRIP= bin/sqlr-start \	33	TOSTRIP= bin/sqlr-start \
		34	bin/sqlr-stop \
35	bin/sqlr-listener \	35	bin/sqlr-listener \
36	bin/sqlr-connection \	36	bin/sqlr-connection \
37	bin/sqlr-scaler \	37	bin/sqlr-scaler \
Lines 53-70 Link Here
53	lib/libmysql50sqlrelay.so.1.0.0 \	53	lib/libmysql50sqlrelay.so.1.0.0 \
54	lib/libmysql51sqlrelay.so.1.0.0 \	54	lib/libmysql51sqlrelay.so.1.0.0 \
55	lib/libsqlrserver.so.1.0.0 \	55	lib/libsqlrserver.so.1.0.0 \
56	libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \	56	libexec/sqlrelay/sqlrauth_default.so \
57	libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \	57	libexec/sqlrelay/sqlrauth_sqlrelay.so \
58	libexec/sqlrelay/sqlrlogger_debug.so \	58	libexec/sqlrelay/sqlrconnection_router.so \
59	libexec/sqlrelay/sqlrlogger_slowqueries.so \
60	libexec/sqlrelay/sqlrlogger_custom_nw.so \	59	libexec/sqlrelay/sqlrlogger_custom_nw.so \
61	libexec/sqlrelay/sqlrlogger_custom_sc.so \	60	libexec/sqlrelay/sqlrlogger_custom_sc.so \
62	libexec/sqlrelay/sqlrpwdenc_rot.so \	61	libexec/sqlrelay/sqlrlogger_debug.so \
63	libexec/sqlrelay/sqlrpwdenc_md5.so \	62	libexec/sqlrelay/sqlrlogger_slowqueries.so \
		63	libexec/sqlrelay/sqlrparser_default.so \
		64	libexec/sqlrelay/sqlrprotocol_sqlrclient.so \
64	libexec/sqlrelay/sqlrpwdenc_crypt.so \	65	libexec/sqlrelay/sqlrpwdenc_crypt.so \
65	libexec/sqlrelay/sqlrauth_default.so \	66	libexec/sqlrelay/sqlrpwdenc_md5.so \
66	libexec/sqlrelay/sqlrauth_sqlrelay.so \	67	libexec/sqlrelay/sqlrpwdenc_rot.so \
67	libexec/sqlrelay/sqlrconnection_router.so	68	libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \
		69	libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so
68		70
69	.include "${.CURDIR}/Makefile.common"	71	.include "${.CURDIR}/Makefile.common"
70		72
Lines 126-132 Link Here
126	-e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \	128	-e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \
127	-e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \	129	-e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \
128	${WRKSRC}/init/Makefile	130	${WRKSRC}/init/Makefile
129	@${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile
130	${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -E \	131	${FIND} ${WRKSRC} -name Makefile \| ${XARGS} ${REINPLACE_CMD} -E \
131	-e 's#-release \$$\(SQLR_VERSION\)##g;'	132	-e 's#-release \$$\(SQLR_VERSION\)##g;'
132		133

Lines 1-5 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/files/patch-config.mk.in (-2 / +11 lines)
1	--- config.mk.in.orig 2013-09-22 03:52:29.000000000 +0200	1	--- config.mk.in.orig 2014-12-28 09:10:48.000000000 +0100
2	+++ config.mk.in 2013-10-28 18:58:41.039873864 +0100	2	+++ config.mk.in 2014-12-29 20:44:27.000000000 +0100
3	@@ -9,7 +9,7 @@	3	@@ -9,7 +9,7 @@
4	exec_prefix= @exec_prefix@	4	exec_prefix= @exec_prefix@
5	includedir = @includedir@	5	includedir = @includedir@
Lines 9-11 Link Here
9	libexecdir = @libexecdir@/sqlrelay	9	libexecdir = @libexecdir@/sqlrelay
10	bindir = @bindir@	10	bindir = @bindir@
11	localstatedir = @localstatedir@	11	localstatedir = @localstatedir@
		12	@@ -33,7 +33,7 @@
		13	TMPDIRCPPFLAG = -DTMP_DIR=\"$(tmpdir)\"
		14	DEBUGDIRCPPFLAG = -DDEBUG_DIR=\"$(debugdir)\"
		15	LOGDIRCPPFLAG = -DLOG_DIR=\"$(logdir)\"
		16	-CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay.conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay.conf.d\"
		17	+CONFIGFILECPPFLAG = -DDEFAULT_CONFIG_FILE=\"$(sysconfdir)/sqlrelay/conf\" -DDEFAULT_CONFIG_DIR=\"$(sysconfdir)/sqlrelay\"
		18	CACHEDIRCPPFLAG = -DCACHE_DIR=\"$(cachedir)\"
		19
		20	# link flags (-s, -static, -melf, -belf, etc.)

Line 0 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/files/patch-etc-Makefile (+18 lines)
	1	--- etc/Makefile.orig 2014-12-29 21:02:52.000000000 +0100
	2	+++ etc/Makefile 2014-12-29 21:03:40.000000000 +0100
	3	@@ -6,11 +6,10 @@
	4
	5	install:
	6	$(MKINSTALLDIRS) $(sysconfdir)
	7	- $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
	8	- $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)
	9	- $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)
	10	- $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)
	11	- $(INSTALL) -m 644 sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
	12	+ $(MKINSTALLDIRS) $(sysconfdir)/sqlrelay
	13	+ $(INSTALL) -m 644 sqlrelay.conf.example $(sysconfdir)/sqlrelay/conf.sample
	14	+ $(INSTALL) -m 644 sqlrelay.dtd $(sysconfdir)/sqlrelay/
	15	+ $(INSTALL) -m 644 sqlrelay.xsd $(sysconfdir)/sqlrelay/
	16
	17	uninstall:
	18	$(RM) $(sysconfdir)/sqlrelay.conf.example

Lines 1-4 Link Here

(-)/usr/home/pi/myp/databases/sqlrelay/pkg-plist (-7 / +16 lines)
1	bin/backupschema
2	bin/sqlr-cachemanager	1	bin/sqlr-cachemanager
3	bin/sqlr-connection	2	bin/sqlr-connection
4	bin/sqlr-export	3	bin/sqlr-export
Lines 17-26 Link Here
17	bin/sqlrsh	16	bin/sqlrsh
18	etc/rc.d/sqlrcachemanager	17	etc/rc.d/sqlrcachemanager
19	etc/rc.d/sqlrelay	18	etc/rc.d/sqlrelay
20	etc/sqlrelay	19	@sample etc/sqlrelay/conf.sample
21	etc/sqlrelay.conf.example	20	etc/sqlrelay/sqlrelay.dtd
22	etc/sqlrelay.dtd	21	etc/sqlrelay/sqlrelay.xsd
23	etc/sqlrelay.xsd
24	include/sqlrelay/private/bindvar.h	22	include/sqlrelay/private/bindvar.h
25	include/sqlrelay/private/column.h	23	include/sqlrelay/private/column.h
26	include/sqlrelay/private/dll.h	24	include/sqlrelay/private/dll.h
Lines 30-39 Link Here
30	include/sqlrelay/private/sqlrcursor.h	28	include/sqlrelay/private/sqlrcursor.h
31	include/sqlrelay/private/sqlrdefines.h	29	include/sqlrelay/private/sqlrdefines.h
32	include/sqlrelay/private/sqlrincludes.h	30	include/sqlrelay/private/sqlrincludes.h
		31	include/sqlrelay/private/sqlrlistener.h
		32	include/sqlrelay/private/sqlrserverconnection.h
		33	include/sqlrelay/private/sqlrservercontroller.h
		34	include/sqlrelay/private/sqlrservercursor.h
		35	include/sqlrelay/private/sqlrserverdll.h
		36	include/sqlrelay/private/sqlrserverincludes.h
		37	include/sqlrelay/private/sqlrshmdata.h
		38	include/sqlrelay/private/sqlrutildll.h
33	include/sqlrelay/private/wrapperdll.h	39	include/sqlrelay/private/wrapperdll.h
34	include/sqlrelay/sqlrclient.h	40	include/sqlrelay/sqlrclient.h
35	include/sqlrelay/sqlrclientwrapper.h	41	include/sqlrelay/sqlrclientwrapper.h
36	include/sqlrelay/sqlrpwdenc.h	42	include/sqlrelay/sqlrserver.h
		43	include/sqlrelay/sqlrutil.h
37	lib/libmysql3sqlrelay.so	44	lib/libmysql3sqlrelay.so
38	lib/libmysql3sqlrelay.so.1	45	lib/libmysql3sqlrelay.so.1
39	lib/libmysql3sqlrelay.so.1.0.0	46	lib/libmysql3sqlrelay.so.1.0.0
Lines 87-92 Link Here
87	libexec/sqlrelay/sqlrlogger_custom_sc.so	94	libexec/sqlrelay/sqlrlogger_custom_sc.so
88	libexec/sqlrelay/sqlrlogger_debug.so	95	libexec/sqlrelay/sqlrlogger_debug.so
89	libexec/sqlrelay/sqlrlogger_slowqueries.so	96	libexec/sqlrelay/sqlrlogger_slowqueries.so
		97	libexec/sqlrelay/sqlrparser_default.so
		98	libexec/sqlrelay/sqlrprotocol_sqlrclient.so
90	libexec/sqlrelay/sqlrpwdenc_crypt.so	99	libexec/sqlrelay/sqlrpwdenc_crypt.so
91	libexec/sqlrelay/sqlrpwdenc_md5.so	100	libexec/sqlrelay/sqlrpwdenc_md5.so
92	libexec/sqlrelay/sqlrpwdenc_rot.so	101	libexec/sqlrelay/sqlrpwdenc_rot.so
Lines 97-109 Link Here
97	man/man1/sqlrsh.1.gz	106	man/man1/sqlrsh.1.gz
98	man/man8/sqlr-cachemanager.8.gz	107	man/man8/sqlr-cachemanager.8.gz
99	man/man8/sqlr-connection.8.gz	108	man/man8/sqlr-connection.8.gz
100	man/man8/sqlr-ipclean.8.gz
101	man/man8/sqlr-listener.8.gz	109	man/man8/sqlr-listener.8.gz
102	man/man8/sqlr-scaler.8.gz	110	man/man8/sqlr-scaler.8.gz
103	man/man8/sqlr-start.8.gz	111	man/man8/sqlr-start.8.gz
104	man/man8/sqlr-stop.8.gz	112	man/man8/sqlr-stop.8.gz
105	share/examples/sample-mssqlserver-mysql-errors.map	113	share/examples/sample-mssqlserver-mysql-errors.map
106	share/examples/sample-oracle-mysql-errors.map	114	share/examples/sample-oracle-mysql-errors.map
		115	@dir %%ETCDIR%%
107	@dir /var/sqlrelay/tmp/sockets	116	@dir /var/sqlrelay/tmp/sockets
108	@dir /var/sqlrelay/tmp/pids	117	@dir /var/sqlrelay/tmp/pids
109	@dir /var/sqlrelay/tmp/ipc	118	@dir /var/sqlrelay/tmp/ipc