Update to version 0.34.3. Merger some changes from the PR.

PR:		66646
Submitted by:	Thierry Thomas <thierry@pompo.net>

6 files changed, 27 insertions, 30 deletions

diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 650895175238..620b5b2b7989 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -21,7 +21,9 @@ USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		PTHREADINCLUDES="${PTHREAD_CFLAGS}" \
+		PTHREADLIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--without-java-prefix \
 		--without-perl-prefix \
@@ -29,6 +31,7 @@ CONFIGURE_ARGS=	${SQLRELAY_CONFIGURE_ARGS} \
 		--without-python-prefix \
 		--without-ruby-prefix \
 		--without-zope-prefix
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ARGS=	VERSION="${PORTVERSION:R}"
 INSTALLS_SHLIB=	yes
 
@@ -69,7 +72,7 @@ IF_SQLITE=	"@comment "
 .endif
 
 .if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no
-LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-prefix="${LOCALBASE}"
 IF_MYSQL=	""
 .else
@@ -149,17 +152,6 @@ MAN8=		sqlr-connection.8 sqlr-cachemanager.8 sqlr-ipclean.8 \
 #  --with-interbase-prefix       Location of Interbase
 #  --with-db2-prefix             Location of DB2
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Broken pkg-plist"
-.endif
-
-#post-extract:
-#	${MKDIR} ${WRKDIR}/prefixes/libxml
-#	${LN} -s ${LOCALBASE}/include/libxml2 ${WRKDIR}/prefixes/libxml/include
-#	${LN} -s ${LOCALBASE}/lib ${WRKDIR}/prefixes/libxml/lib
-
 post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's,/usr/local[[:>:]],${PREFIX},g;' \
@@ -172,4 +164,4 @@ post-patch:
 	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
 		-e 's#-release \$$\(SQLR_VERSION\)##g;'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 34338f85a12b..56a8ab93d50c 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	0.34.2
+SQLRELAY_PORTVERSION=	0.34.3
 
 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 0fca3c9a697a..c5521978a241 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,2 +1,2 @@
-MD5 (sqlrelay-0.34.2.tar.gz) = b40c66273d733be9ef186d1bd1798945
-SIZE (sqlrelay-0.34.2.tar.gz) = 1423776
+MD5 (sqlrelay-0.34.3.tar.gz) = dcfae19e69a406ea308f76af299f76f2
+SIZE (sqlrelay-0.34.3.tar.gz) = 1398753
diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in
index f08d7a46e42c..a4f1e5e66c89 100644
--- a/databases/sqlrelay/files/patch-config.mk.in
+++ b/databases/sqlrelay/files/patch-config.mk.in
@@ -1,18 +1,11 @@
---- config.mk.in.orig	Tue Dec 16 19:05:34 2003
-+++ config.mk.in	Wed May 26 16:34:41 2004
-@@ -14,13 +14,13 @@
+--- config.mk.in.orig	Tue Dec 30 20:17:23 2003
++++ config.mk.in	Fri May 28 15:59:37 2004
+@@ -14,7 +14,7 @@
  exec_prefix= @exec_prefix@
- incdir = @includedir@
+ includedir = @includedir@
  libdir = @libdir@
 -javadir = ${exec_prefix}/java
 +javadir = ${exec_prefix}/share/java/classes
  libexecdir = @libexecdir@
  bindir = @bindir@
  localstatedir = @localstatedir@
- sysconfdir = @sysconfdir@
- mandir = @mandir@
--docdir = ${prefix}/doc/sqlrelay
-+docdir = ${prefix}/share/doc/sqlrelay
- tmpdir = ${localstatedir}/sqlrelay/tmp
- cachedir = ${localstatedir}/sqlrelay/cache
- debugdir = ${localstatedir}/sqlrelay/debug
diff --git a/databases/sqlrelay/files/patch-configure b/databases/sqlrelay/files/patch-configure
index 9ab39e3cb629..9f8f13df443f 100644
--- a/databases/sqlrelay/files/patch-configure
+++ b/databases/sqlrelay/files/patch-configure
@@ -1,5 +1,16 @@
---- configure.orig	Tue Dec 16 19:06:16 2003
-+++ configure	Wed May 26 17:56:40 2004
+--- configure.orig	Mon Dec 22 02:27:22 2003
++++ configure	Fri May 28 16:00:26 2004
+@@ -19395,8 +19395,8 @@
+ 
+ 
+ HAVE_PTHREAD=""
+-PTHREADINCLUDES=""
+-PTHREADLIBS=""
++#PTHREADINCLUDES=""
++#PTHREADLIBS=""
+ 
+ if ( test "$cross_compiling" = "yes" )
+ then
 @@ -37573,13 +37573,7 @@
  
  			if ( test -n "$JAVAINCLUDES" )
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index fe0bdb7d4fba..158179134bb4 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -25,6 +25,7 @@ bin/sqlr-scaler
 bin/sqlr-start
 bin/sqlr-stop
 bin/sqlrsh
+etc/rc.d/sqlrelay
 etc/sqlrelay.conf.example
 etc/sqlrelay.dtd
 include/sqlrelay/private/bindvar.h