Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Jun 2013 11:59:11 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r320195 - in head/databases/sqlrelay: . files
Message-ID:  <201306071159.r57BxBIC084698@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Fri Jun  7 11:59:11 2013
New Revision: 320195
URL: http://svnweb.freebsd.org/changeset/ports/320195

Log:
  - Fix build compile errors
  - Remove BROKEN
  
  Approved by:	culot / jpaetzel (mentors, implicit)

Added:
  head/databases/sqlrelay/files/patch-const-char-ptr   (contents, props changed)
  head/databases/sqlrelay/files/patch-undeclared-umask   (contents, props changed)
Modified:
  head/databases/sqlrelay/Makefile

Modified: head/databases/sqlrelay/Makefile
==============================================================================
--- head/databases/sqlrelay/Makefile	Fri Jun  7 11:57:44 2013	(r320194)
+++ head/databases/sqlrelay/Makefile	Fri Jun  7 11:59:11 2013	(r320195)
@@ -11,8 +11,6 @@ COMMENT=	A persistent DB connection pool
 
 LIB_DEPENDS=	rudiments.1:${PORTSDIR}/devel/rudiments
 
-BROKEN=		does not compile
-
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf libtool

Added: head/databases/sqlrelay/files/patch-const-char-ptr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlrelay/files/patch-const-char-ptr	Fri Jun  7 11:59:11 2013	(r320195)
@@ -0,0 +1,26 @@
+diff --git src/connection/sqlrcursor/queryparse.C src/connection/sqlrcursor/queryparse.C
+index 989cc50..fed0738 100644
+--- src/connection/sqlrcursor/queryparse.C
++++ src/connection/sqlrcursor/queryparse.C
+@@ -61,7 +61,7 @@ void sqlrcursor_svr::checkForTempTable(const char *query, uint32_t length) {
+ 	// see if the query matches the pattern for a temporary query that
+ 	// creates a temporary table
+ 	if (createtemp.match(ptr)) {
+-		ptr=createtemp.getSubstringEnd(0);
++		ptr=(char *)createtemp.getSubstringEnd(0);
+ 	} else {
+ 		return;
+ 	}
+diff --git src/connections/router/routerconnection.C src/connections/router/routerconnection.C
+index b8b4b34..f67fb4b 100644
+--- src/connections/router/routerconnection.C
++++ src/connections/router/routerconnection.C
+@@ -632,7 +632,7 @@ void routercursor::checkForTempTable(const char *query, uint32_t length) {
+ 
+ 	// look for "create global temporary table "
+ 	if (createoratemp.match(ptr)) {
+-		ptr=createoratemp.getSubstringEnd(0);
++		ptr=(char *)createoratemp.getSubstringEnd(0);
+ 	} else {
+ 		return;
+ 	}

Added: head/databases/sqlrelay/files/patch-undeclared-umask
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/sqlrelay/files/patch-undeclared-umask	Fri Jun  7 11:59:11 2013	(r320195)
@@ -0,0 +1,12 @@
+diff --git src/util/debugfile.C src/util/debugfile.C
+index 12237ee..965edf7 100644
+--- src/util/debugfile.C
++++ src/util/debugfile.C
+@@ -5,6 +5,7 @@
+ #include <rudiments/stringbuffer.h>
+ #include <rudiments/process.h>
+ #include <config.h>
++#include <sys/stat.h>
+ 
+ debugfile::debugfile() {
+ 	dbgfile=NULL;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306071159.r57BxBIC084698>