diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 75c3920412dd..ee30c1743fbf 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -7,7 +7,6 @@ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} -PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sqlrelay @@ -17,12 +16,10 @@ COMMENT= A persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= rudiments.0:${PORTSDIR}/devel/rudiments -BROKEN= Installs file in /etc - USE_REINPLACE= yes USE_GMAKE= yes USE_AUTOCONF_VER= 259 -GNU_CONFIGURE= yes +USE_LIBTOOL_VER= 15 CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \ CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common index 1e2705288d01..ba25a80256f4 100644 --- a/databases/sqlrelay/Makefile.common +++ b/databases/sqlrelay/Makefile.common @@ -1,13 +1,13 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay -SQLRELAY_PORTVERSION= 0.35 +SQLRELAY_PORTVERSION= 0.36.1 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC SQLRELAY_CONFIGURE_ARGS= \ - --localstatedir="${LOCALBASE}" \ + --localstatedir=/var \ --with-rudiments-prefix="${LOCALBASE}" SQLRELAY_CONFIGURE_ENV= \ PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 5049df2a93e7..c52029ef3fd6 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,2 +1,2 @@ -MD5 (sqlrelay-0.35.tar.gz) = 78588e6ef2646c1b7e45f65d36b06381 -SIZE (sqlrelay-0.35.tar.gz) = 1518758 +MD5 (sqlrelay-0.36.1.tar.gz) = 8cd3a20b9f22601d2aab45b499ee96a6 +SIZE (sqlrelay-0.36.1.tar.gz) = 1578613 diff --git a/databases/sqlrelay/files/patch-acsite.m4 b/databases/sqlrelay/files/patch-acsite.m4 index 18fc8eafd648..e4e0e744f203 100644 --- a/databases/sqlrelay/files/patch-acsite.m4 +++ b/databases/sqlrelay/files/patch-acsite.m4 @@ -20,29 +20,3 @@ FW_INCLUDES(pthreads,[$PTHREADINCLUDES]) FW_LIBS(pthreads,[$PTHREADLIBS]) -@@ -1857,8 +1859,8 @@ - - if ( test -n "$PYTHONPATH" ) - then -- -- for i in "2.3" "2.2" "2.1" "2.0" "1.6" "1.5" -+ -+ for i in "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5" - do - if ( test -d "$PYTHONPATH/include/python$i" -a -d "$PYTHONPATH/lib/python$i/config" ) - then -@@ -2149,13 +2151,7 @@ - FW_CHECK_FILE("$JAVAPATH/include/jni.h",[JAVAINCLUDES=\"-I$JAVAPATH/include\"]) - if ( test -n "$JAVAINCLUDES" ) - then -- for i in `ls -d $JAVAPATH/include/*` -- do -- if ( test -d "$i" ) -- then -- JAVAINCLUDES="$JAVAINCLUDES -I$i" -- fi -- done -+ JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`" - fi - fi - diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in index a4f1e5e66c89..03eda37c54be 100644 --- a/databases/sqlrelay/files/patch-config.mk.in +++ b/databases/sqlrelay/files/patch-config.mk.in @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 @@ exec_prefix= @exec_prefix@ includedir = @includedir@ libdir = @libdir@ @@ -9,3 +9,12 @@ libexecdir = @libexecdir@ bindir = @bindir@ localstatedir = @localstatedir@ +@@ -88,7 +88,7 @@ + # rudiments library + RUDIMENTSPATH = @RUDIMENTSPATH@ + RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@ +-RUDIMENTSLIBS = @RUDIMENTSLIBS@ ++RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl + RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ + + # perl diff --git a/databases/sqlrelay/files/patch-init-Makefile b/databases/sqlrelay/files/patch-init-Makefile new file mode 100644 index 000000000000..bee228d80884 --- /dev/null +++ b/databases/sqlrelay/files/patch-init-Makefile @@ -0,0 +1,13 @@ +--- init/Makefile.orig Mon May 9 01:50:51 2005 ++++ init/Makefile Mon May 9 01:56:03 2005 +@@ -44,8 +44,8 @@ + endif + ifeq ($(UNAME),FreeBSD) + $(MKINSTALLDIRS) $(initroot)/usr/local/etc/rc.d +- $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d +- $(INSTALL) -m 644 freebsd/sqlrelay $(initroot)/etc ++ $(INSTALL) -m 755 freebsd/rc.d/sqlrelay $(initroot)/usr/local/etc/rc.d/sqlrelay.sh-sample ++ $(INSTALL) -m 644 freebsd/sqlrelay $(sysconfdir)/sqlrelay-sample + endif + ifeq ($(UNAME),SCO_SV) + $(MKINSTALLDIRS) $(initroot)/etc/init.d diff --git a/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in b/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in new file mode 100644 index 000000000000..cfa24ba9446b --- /dev/null +++ b/databases/sqlrelay/files/patch-init-freebsd-rc.d-sqlrelay.in @@ -0,0 +1,11 @@ +--- init/freebsd/rc.d/sqlrelay.in.orig Fri Jan 28 06:00:16 2005 ++++ init/freebsd/rc.d/sqlrelay.in Mon May 9 01:53:52 2005 +@@ -23,7 +23,7 @@ + + start(){ + echo -n $"Starting SQL Relay: " +- if ( test -r "/etc/sqlrelay" ); then ++ if ( test -r "${sysconfdir}/sqlrelay" ); then + launched=0 + for connid in `grep -v ^# /etc/sqlrelay`; do + echo diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist index dfd5c9fa8738..569e5bae7844 100644 --- a/databases/sqlrelay/pkg-plist +++ b/databases/sqlrelay/pkg-plist @@ -25,9 +25,10 @@ bin/sqlr-scaler bin/sqlr-start bin/sqlr-stop bin/sqlrsh -etc/rc.d/sqlrelay +etc/rc.d/sqlrelay.sh-sample etc/sqlrelay.conf.example etc/sqlrelay.dtd +etc/sqlrelay-sample include/sqlrelay/private/bindvar.h include/sqlrelay/private/column.h include/sqlrelay/private/row.h @@ -41,156 +42,150 @@ include/sqlrelay/sqlrclientwrapper.h @dirrm include/sqlrelay lib/libmysql3sqlrelay.so.0 lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay.la lib/libmysql3sqlrelay.a lib/libmysql40sqlrelay.so.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay.la lib/libmysql40sqlrelay.a lib/libmysql41sqlrelay.so.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay.la lib/libmysql41sqlrelay.a lib/libmysql50sqlrelay.so.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay.la lib/libmysql50sqlrelay.a lib/libsqlrclient.a -lib/libsqlrclient.la lib/libsqlrclient.so lib/libsqlrclient.so.0 lib/libsqlrclientwrapper.a -lib/libsqlrclientwrapper.la lib/libsqlrclientwrapper.so lib/libsqlrclientwrapper.so.0 lib/libpqsqlrelay.a -lib/libpqsqlrelay.la lib/libpqsqlrelay.so lib/libpqsqlrelay.so.0 lib/libsqlrconnection.a -lib/libsqlrconnection.la lib/libsqlrconnection.so lib/libsqlrconnection.so.0 lib/libsqlrconnection_debug.a -lib/libsqlrconnection_debug.la lib/libsqlrconnection_debug.so lib/libsqlrconnection_debug.so.0 lib/libsqlrutil.a -lib/libsqlrutil.la lib/libsqlrutil.so lib/libsqlrutil.so.0 libdata/pkgconfig/sqlrelay-c.pc libdata/pkgconfig/sqlrelay-c++.pc -share/doc/sqlrelay/api/c++/sqlrclient.h.html -share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html -share/doc/sqlrelay/api/java/allclasses-frame.html -share/doc/sqlrelay/api/java/allclasses-noframe.html -share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/SQLRConnection.html -share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/SQLRCursor.html -share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/package-frame.html -share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/package-summary.html -share/doc/sqlrelay/api/java/com/firstworks/sqlrelay/package-tree.html -share/doc/sqlrelay/api/java/constant-values.html -share/doc/sqlrelay/api/java/deprecated-list.html -share/doc/sqlrelay/api/java/help-doc.html -share/doc/sqlrelay/api/java/index-all.html -share/doc/sqlrelay/api/java/index.html -share/doc/sqlrelay/api/java/overview-tree.html -share/doc/sqlrelay/api/java/package-list -share/doc/sqlrelay/api/java/packages.html -share/doc/sqlrelay/api/java/stylesheet.css -share/doc/sqlrelay/api/perl/Connection.html -share/doc/sqlrelay/api/perl/Cursor.html -share/doc/sqlrelay/api/perl/SQLRelay.html -share/doc/sqlrelay/api/perl/perl.html -share/doc/sqlrelay/api/php/doc.html -share/doc/sqlrelay/api/python/PySQLRClient.py.html -share/doc/sqlrelay/api/python/PySQLRDB.py.html -share/doc/sqlrelay/api/ruby/ruby.html -share/doc/sqlrelay/api/ruby/rubydbi.html -share/doc/sqlrelay/clientapis.html -share/doc/sqlrelay/configuring.html -share/doc/sqlrelay/connections.html -share/doc/sqlrelay/css/styles.css -share/doc/sqlrelay/dropin/mysql.html -share/doc/sqlrelay/dropin/postgresql.html -share/doc/sqlrelay/faq.html -share/doc/sqlrelay/gettingstarted/db2.html -share/doc/sqlrelay/gettingstarted/interbase.html -share/doc/sqlrelay/gettingstarted/lago.html -share/doc/sqlrelay/gettingstarted/msql.html -share/doc/sqlrelay/gettingstarted/mssqlserver.html -share/doc/sqlrelay/gettingstarted/mysql.html -share/doc/sqlrelay/gettingstarted/oracle.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/5/805.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/6/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/7/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/7/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8/8i.html -share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8/9i.html -share/doc/sqlrelay/gettingstarted/postgresql.html -share/doc/sqlrelay/gettingstarted/sqlite.html -share/doc/sqlrelay/gettingstarted/sybase.html -share/doc/sqlrelay/gettingstarted/sybase/11.0.3.3.html -share/doc/sqlrelay/gettingstarted/sybase/11.9.2.html -share/doc/sqlrelay/index.html -share/doc/sqlrelay/installing.html -share/doc/sqlrelay/introduction.html -share/doc/sqlrelay/introtowebdb.html -share/doc/sqlrelay/invisible.gif -share/doc/sqlrelay/oraclentier.html -share/doc/sqlrelay/programming/binds.html -share/doc/sqlrelay/programming/c++.html -share/doc/sqlrelay/programming/c.html -share/doc/sqlrelay/programming/java.html -share/doc/sqlrelay/programming/perl.html -share/doc/sqlrelay/programming/perldbi.html -share/doc/sqlrelay/programming/php.html -share/doc/sqlrelay/programming/python.html -share/doc/sqlrelay/programming/pythondb.html -share/doc/sqlrelay/programming/ruby.html -share/doc/sqlrelay/programming/rubydbi.html -share/doc/sqlrelay/programming/zope.html -share/doc/sqlrelay/programming/zope/instance.gif -share/doc/sqlrelay/programming/zope/management.gif -share/doc/sqlrelay/programming/zope/resultset.gif -share/doc/sqlrelay/programming/zope/sqlrelay.gif -share/doc/sqlrelay/programming/zope/test.gif -share/doc/sqlrelay/programming/zope/testzsqlmethod.gif -share/doc/sqlrelay/programming/zope/zsqlmethod.gif -share/doc/sqlrelay/programming/zope/zsqlmethodresultset.gif -share/doc/sqlrelay/running.html -share/doc/sqlrelay/tuning.html -share/doc/sqlrelay/windows.html -@dirrm sqlrelay/cache -@dirrm sqlrelay -@dirrm share/doc/sqlrelay/programming/zope -@dirrm share/doc/sqlrelay/programming -@dirrm share/doc/sqlrelay/gettingstarted/sybase -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/8 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/slackware/7 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/slackware -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/9 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/8 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/7 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/6 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/5 -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux/redhat -@dirrm share/doc/sqlrelay/gettingstarted/oracle/linux -@dirrm share/doc/sqlrelay/gettingstarted/oracle -@dirrm share/doc/sqlrelay/gettingstarted -@dirrm share/doc/sqlrelay/dropin -@dirrm share/doc/sqlrelay/css -@dirrm share/doc/sqlrelay/api/ruby -@dirrm share/doc/sqlrelay/api/python -@dirrm share/doc/sqlrelay/api/php -@dirrm share/doc/sqlrelay/api/perl -@dirrm share/doc/sqlrelay/api/java/com/firstworks/sqlrelay -@dirrm share/doc/sqlrelay/api/java/com/firstworks -@dirrm share/doc/sqlrelay/api/java/com -@dirrm share/doc/sqlrelay/api/java -@dirrm share/doc/sqlrelay/api/c++ -@dirrm share/doc/sqlrelay/api/c -@dirrm share/doc/sqlrelay/api -@dirrm share/doc/sqlrelay -@dirrm etc/sqlrelay +%%DOCSDIR%%/api/c++/sqlrclient.h.html +%%DOCSDIR%%/api/c/sqlrclientwrapper.h.html +%%DOCSDIR%%/api/java/allclasses-frame.html +%%DOCSDIR%%/api/java/allclasses-noframe.html +%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/SQLRConnection.html +%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/SQLRCursor.html +%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-frame.html +%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-summary.html +%%DOCSDIR%%/api/java/com/firstworks/sqlrelay/package-tree.html +%%DOCSDIR%%/api/java/constant-values.html +%%DOCSDIR%%/api/java/deprecated-list.html +%%DOCSDIR%%/api/java/help-doc.html +%%DOCSDIR%%/api/java/index-all.html +%%DOCSDIR%%/api/java/index.html +%%DOCSDIR%%/api/java/overview-tree.html +%%DOCSDIR%%/api/java/package-list +%%DOCSDIR%%/api/java/packages.html +%%DOCSDIR%%/api/java/stylesheet.css +%%DOCSDIR%%/api/perl/Connection.html +%%DOCSDIR%%/api/perl/Cursor.html +%%DOCSDIR%%/api/perl/SQLRelay.html +%%DOCSDIR%%/api/perl/perl.html +%%DOCSDIR%%/api/php/doc.html +%%DOCSDIR%%/api/python/PySQLRClient.py.html +%%DOCSDIR%%/api/python/PySQLRDB.py.html +%%DOCSDIR%%/api/ruby/ruby.html +%%DOCSDIR%%/api/ruby/rubydbi.html +%%DOCSDIR%%/clientapis.html +%%DOCSDIR%%/configuring.html +%%DOCSDIR%%/connections.html +%%DOCSDIR%%/css/styles.css +%%DOCSDIR%%/dropin/mysql.html +%%DOCSDIR%%/dropin/postgresql.html +%%DOCSDIR%%/faq.html +%%DOCSDIR%%/gettingstarted/db2.html +%%DOCSDIR%%/gettingstarted/interbase.html +%%DOCSDIR%%/gettingstarted/lago.html +%%DOCSDIR%%/gettingstarted/msql.html +%%DOCSDIR%%/gettingstarted/mssqlserver.html +%%DOCSDIR%%/gettingstarted/mysql.html +%%DOCSDIR%%/gettingstarted/oracle.html +%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/5/805.html +%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/6/8i.html +%%DOCSDIR%%/gettingstarted/oracle/linux/redhat/7/8i.html +%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/7/8i.html +%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8/8i.html +%%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8/9i.html +%%DOCSDIR%%/gettingstarted/postgresql.html +%%DOCSDIR%%/gettingstarted/sqlite.html +%%DOCSDIR%%/gettingstarted/sybase.html +%%DOCSDIR%%/gettingstarted/sybase/11.0.3.3.html +%%DOCSDIR%%/gettingstarted/sybase/11.9.2.html +%%DOCSDIR%%/index.html +%%DOCSDIR%%/installing.html +%%DOCSDIR%%/introduction.html +%%DOCSDIR%%/introtowebdb.html +%%DOCSDIR%%/invisible.gif +%%DOCSDIR%%/oraclentier.html +%%DOCSDIR%%/programming/binds.html +%%DOCSDIR%%/programming/c++.html +%%DOCSDIR%%/programming/c.html +%%DOCSDIR%%/programming/java.html +%%DOCSDIR%%/programming/perl.html +%%DOCSDIR%%/programming/perldbi.html +%%DOCSDIR%%/programming/php.html +%%DOCSDIR%%/programming/python.html +%%DOCSDIR%%/programming/pythondb.html +%%DOCSDIR%%/programming/ruby.html +%%DOCSDIR%%/programming/rubydbi.html +%%DOCSDIR%%/programming/zope.html +%%DOCSDIR%%/programming/zope/instance.gif +%%DOCSDIR%%/programming/zope/management.gif +%%DOCSDIR%%/programming/zope/resultset.gif +%%DOCSDIR%%/programming/zope/sqlrelay.gif +%%DOCSDIR%%/programming/zope/test.gif +%%DOCSDIR%%/programming/zope/testzsqlmethod.gif +%%DOCSDIR%%/programming/zope/zsqlmethod.gif +%%DOCSDIR%%/programming/zope/zsqlmethodresultset.gif +%%DOCSDIR%%/running.html +%%DOCSDIR%%/tuning.html +%%DOCSDIR%%/windows.html +@unexec rmdir /var/sqlrelay/cache +@unexec rmdir /var/sqlrelay/debug +@unexec rmdir /var/sqlrelay/tmp/ipc +@unexec rmdir /var/sqlrelay/tmp/pids +@unexec rmdir /var/sqlrelay/tmp/sockets +@unexec rmdir /var/sqlrelay/tmp +@unexec rmdir /var/sqlrelay +@dirrm %%DOCSDIR%%/programming/zope +@dirrm %%DOCSDIR%%/programming +@dirrm %%DOCSDIR%%/gettingstarted/sybase +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware/8 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware/7 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/slackware +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/9 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/8 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/7 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/6 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat/5 +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux/redhat +@dirrm %%DOCSDIR%%/gettingstarted/oracle/linux +@dirrm %%DOCSDIR%%/gettingstarted/oracle +@dirrm %%DOCSDIR%%/gettingstarted +@dirrm %%DOCSDIR%%/dropin +@dirrm %%DOCSDIR%%/css +@dirrm %%DOCSDIR%%/api/ruby +@dirrm %%DOCSDIR%%/api/python +@dirrm %%DOCSDIR%%/api/php +@dirrm %%DOCSDIR%%/api/perl +@dirrm %%DOCSDIR%%/api/java/com/firstworks/sqlrelay +@dirrm %%DOCSDIR%%/api/java/com/firstworks +@dirrm %%DOCSDIR%%/api/java/com +@dirrm %%DOCSDIR%%/api/java +@dirrm %%DOCSDIR%%/api/c++ +@dirrm %%DOCSDIR%%/api/c +@dirrm %%DOCSDIR%%/api +@dirrm %%DOCSDIR%%