- Update devel/rudiments to 0.43 [1]

- Add support for STAGEDIR [1]

- Update databases/sqlrelay to 0.52 (fixes build with new devel/rudiments)
- Remove leading article from COMMENT
- Add support for STAGEDIR
- Remove GTK1 option - no longer available feature
- Rename INTERBASE option to FIREBIRD (globally defined)
- Rename SQLITE2 to SQLITE3 as dependency changed to databases/sqlite3
- Use options substitutions, sort plist

PR:		ports/181880 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 17 insertions, 68 deletions

diff --git a/databases/sqlrelay/files/patch-acsite.m4 b/databases/sqlrelay/files/patch-acsite.m4
index e4e0e744f203..1b31b565fd04 100644
--- a/databases/sqlrelay/files/patch-acsite.m4
+++ b/databases/sqlrelay/files/patch-acsite.m4
@@ -1,22 +1,21 @@
---- ./acsite.m4.orig	Thu Aug  5 08:04:21 2004
-+++ ./acsite.m4	Sat Dec 11 22:01:02 2004
-@@ -396,7 +396,7 @@
- dnl sets the substitution variable PTHREADLIBS
- AC_DEFUN([FW_CHECK_PTHREAD],
- [
--
+--- acsite.m4.orig	2013-09-21 13:33:47.000000000 +0200
++++ acsite.m4	2013-10-28 19:18:27.846799325 +0100
+@@ -680,6 +680,7 @@
+ 	AC_MSG_RESULT(no)
+ fi
+ 
 +if ( test -z "$PTHREADINCLUDES" -a -z "$PTHREADLIBS" ); then
  HAVE_PTHREAD=""
  PTHREADINCLUDES=""
- PTHREADLIBS=""
-@@ -440,7 +440,9 @@
- 		PTHREADLIBS="-pthread"
- 	fi
+ PTHREADLIB=""
+@@ -808,7 +809,9 @@
+ 		fi
+ 	done
  fi
 -
 +else
 +	HAVE_PTHREAD="yes"
 +fi
  FW_INCLUDES(pthreads,[$PTHREADINCLUDES])
- FW_LIBS(pthreads,[$PTHREADLIBS])
+ FW_LIBS(pthreads,[$PTHREADLIB])
  
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index 06b33e5263b3..a57b5ca8dd54 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,15 +1,15 @@
---- config.mk.in.orig	Sun Mar 27 09:48:06 2005
-+++ config.mk.in	Mon May  9 01:51:07 2005
-@@ -16,7 +16,7 @@
+--- config.mk.in.orig	2013-09-22 03:52:29.000000000 +0200
++++ config.mk.in	2013-10-28 18:58:41.039873864 +0100
+@@ -9,7 +9,7 @@
  exec_prefix= @exec_prefix@
  includedir = @includedir@
  libdir = @libdir@
 -javadir = ${exec_prefix}/java
 +javadir = ${exec_prefix}/share/java/classes
- libexecdir = @libexecdir@
+ libexecdir = @libexecdir@/sqlrelay
  bindir = @bindir@
  localstatedir = @localstatedir@
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
  # rudiments library
  RUDIMENTSPATH = @RUDIMENTSPATH@
  RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@
@@ -17,4 +17,4 @@
 +RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto
  RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ 
  
- # perl
+ #iconv
diff --git a/databases/sqlrelay/files/patch-const-char-ptr b/databases/sqlrelay/files/patch-const-char-ptr
deleted file mode 100644
index 8e38b1e4631e..000000000000
--- a/databases/sqlrelay/files/patch-const-char-ptr
+++ /dev/null
@@ -1,26 +0,0 @@
-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;
- 	}
diff --git a/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C b/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C
deleted file mode 100644
index 5804267dd553..000000000000
--- a/databases/sqlrelay/files/patch-src+api+ruby+sqlrelay.C
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/api/ruby/sqlrelay.C.orig	Tue Apr  2 12:46:18 2002
-+++ src/api/ruby/sqlrelay.C	Mon Oct 28 02:51:20 2002
-@@ -4,7 +4,8 @@
- #include <ruby.h>
- #include "../c++/include/sqlrelay/sqlrclient.h"
- 
--#include "rubyincludes.h"
-+#include "rubyincludes1.h"
-+#include "rubyincludes2.h"
- 
- extern "C" {
- 
diff --git a/databases/sqlrelay/files/patch-undeclared-umask b/databases/sqlrelay/files/patch-undeclared-umask
deleted file mode 100644
index 1ce1787ee7fa..000000000000
--- a/databases/sqlrelay/files/patch-undeclared-umask
+++ /dev/null
@@ -1,12 +0,0 @@
-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;