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

PR:		66646
Submitted by:	Thierry Thomas <thierry@pompo.net>
This commit is contained in:
Dmitry Sivachenko 2004-05-28 12:43:39 +00:00
parent aec80564cb
commit c4ab29bf66
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=110182
6 changed files with 27 additions and 30 deletions

View File

@ -21,7 +21,9 @@ USE_ICONV= yes
USE_REINPLACE= yes USE_REINPLACE= yes
USE_GMAKE= yes USE_GMAKE= yes
GNU_CONFIGURE= 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} \ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
--without-java-prefix \ --without-java-prefix \
--without-perl-prefix \ --without-perl-prefix \
@ -29,6 +31,7 @@ CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \
--without-python-prefix \ --without-python-prefix \
--without-ruby-prefix \ --without-ruby-prefix \
--without-zope-prefix --without-zope-prefix
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAKE_ARGS= VERSION="${PORTVERSION:R}" MAKE_ARGS= VERSION="${PORTVERSION:R}"
INSTALLS_SHLIB= yes INSTALLS_SHLIB= yes
@ -69,7 +72,7 @@ IF_SQLITE= "@comment "
.endif .endif
.if defined(WITH_MYSQL) && ${WITH_MYSQL:L} != no .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}" CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}"
IF_MYSQL= "" IF_MYSQL= ""
.else .else
@ -149,17 +152,6 @@ MAN8= sqlr-connection.8 sqlr-cachemanager.8 sqlr-ipclean.8 \
# --with-interbase-prefix Location of Interbase # --with-interbase-prefix Location of Interbase
# --with-db2-prefix Location of DB2 # --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: post-patch:
${REINPLACE_CMD} -E \ ${REINPLACE_CMD} -E \
-e 's,/usr/local[[:>:]],${PREFIX},g;' \ -e 's,/usr/local[[:>:]],${PREFIX},g;' \
@ -172,4 +164,4 @@ post-patch:
${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \
-e 's#-release \$$\(SQLR_VERSION\)##g;' -e 's#-release \$$\(SQLR_VERSION\)##g;'
.include <bsd.port.post.mk> .include <bsd.port.mk>

View File

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
SQLRELAY_PORTNAME= sqlrelay SQLRELAY_PORTNAME= sqlrelay
SQLRELAY_PORTVERSION= 0.34.2 SQLRELAY_PORTVERSION= 0.34.3
SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME}
SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC

View File

@ -1,2 +1,2 @@
MD5 (sqlrelay-0.34.2.tar.gz) = b40c66273d733be9ef186d1bd1798945 MD5 (sqlrelay-0.34.3.tar.gz) = dcfae19e69a406ea308f76af299f76f2
SIZE (sqlrelay-0.34.2.tar.gz) = 1423776 SIZE (sqlrelay-0.34.3.tar.gz) = 1398753

View File

@ -1,18 +1,11 @@
--- config.mk.in.orig Tue Dec 16 19:05:34 2003 --- config.mk.in.orig Tue Dec 30 20:17:23 2003
+++ config.mk.in Wed May 26 16:34:41 2004 +++ config.mk.in Fri May 28 15:59:37 2004
@@ -14,13 +14,13 @@ @@ -14,7 +14,7 @@
exec_prefix= @exec_prefix@ exec_prefix= @exec_prefix@
incdir = @includedir@ includedir = @includedir@
libdir = @libdir@ libdir = @libdir@
-javadir = ${exec_prefix}/java -javadir = ${exec_prefix}/java
+javadir = ${exec_prefix}/share/java/classes +javadir = ${exec_prefix}/share/java/classes
libexecdir = @libexecdir@ libexecdir = @libexecdir@
bindir = @bindir@ bindir = @bindir@
localstatedir = @localstatedir@ 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

View File

@ -1,5 +1,16 @@
--- configure.orig Tue Dec 16 19:06:16 2003 --- configure.orig Mon Dec 22 02:27:22 2003
+++ configure Wed May 26 17:56:40 2004 +++ 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 @@ @@ -37573,13 +37573,7 @@
if ( test -n "$JAVAINCLUDES" ) if ( test -n "$JAVAINCLUDES" )

View File

@ -25,6 +25,7 @@ bin/sqlr-scaler
bin/sqlr-start bin/sqlr-start
bin/sqlr-stop bin/sqlr-stop
bin/sqlrsh bin/sqlrsh
etc/rc.d/sqlrelay
etc/sqlrelay.conf.example etc/sqlrelay.conf.example
etc/sqlrelay.dtd etc/sqlrelay.dtd
include/sqlrelay/private/bindvar.h include/sqlrelay/private/bindvar.h