Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile (revision 110181) +++ head/databases/sqlrelay/Makefile (revision 110182) @@ -1,175 +1,167 @@ # New ports collection makefile for: SQL Relay # Date created: 2 July 2001 # Whom: Akinori MUSHA aka knu # # $FreeBSD$ # PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sqlrelay MAINTAINER= ports@FreeBSD.org COMMENT= A persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= rudiments.0:${PORTSDIR}/devel/rudiments \ xml2.5:${PORTSDIR}/textproc/libxml2 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 \ --without-php-prefix \ --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 POSTGRESQL_PORT?= databases/postgresql7 .include "${.CURDIR}/Makefile.common" .if defined(PACKAGE_BUILDING) || defined(BATCH) WITH_SQLITE?= no WITH_MYSQL?= yes WITH_MSQL?= no WITH_POSTGRESQL?= no WITH_ODBC?= no WITH_FREETDS?= no WITH_GTK?= no WITH_INTERBASE?= no .else WITH_SQLITE?= no WITH_MYSQL?= yes WITH_MSQL?= no WITH_POSTGRESQL?= no WITH_ODBC?= no WITH_FREETDS?= no WITH_GTK?= no WITH_INTERBASE?= no .endif .if defined(WITH_SQLITE) && ${WITH_SQLITE:L} != no LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm \ sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" IF_SQLITE= "" .else CONFIGURE_ARGS+= --without-gdbm-prefix \ --without-sqlite-prefix 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 CONFIGURE_ARGS+= --without-mysql-prefix IF_MYSQL= "@comment " .endif .if defined(WITH_INTERBASE) && ${WITH_INTERBASE:L} != no LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+= --with-interbase-prefix="${LOCALBASE}/firebird" IF_INTERBASE= "" .else CONFIGURE_ARGS+= --without-interbase-prefix IF_INTERBASE= "@comment " .endif .if defined(WITH_MSQL) && ${WITH_MSQL:L} != no LIB_DEPENDS+= msql.1:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql-prefix="${LOCALBASE}" IF_MSQL= "" .else CONFIGURE_ARGS+= --without-msql-prefix IF_MSQL= "@comment " .endif .if defined(WITH_POSTGRESQL) && ${WITH_POSTGRESQL:L} != no LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" IF_POSTGRESQL= "" .else CONFIGURE_ARGS+= --without-postgresql-prefix IF_POSTGRESQL= "@comment " .endif .if defined(WITH_ODBC) && ${WITH_ODBC:L} != no LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" IF_ODBC= "" .else CONFIGURE_ARGS+= --without-odbc-prefix IF_ODBC= "@comment " .endif .if defined(WITH_FREETDS) && ${WITH_FREETDS:L} != no LIB_DEPENDS+= tds.3:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" IF_FREETDS= "" .else CONFIGURE_ARGS+= --without-freetds-prefix IF_FREETDS= "@comment " .endif .if defined(WITH_GTK) && ${WITH_GTK:L} != no USE_GNOME= gtk12 CONFIGURE_ARGS+= --with-gtk-prefix="${X11BASE}" IF_GTK= "" .else CONFIGURE_ARGS+= --without-gtk-prefix IF_GTK= "@comment " .endif PLIST_SUB= IF_SQLITE=${IF_SQLITE} \ IF_MYSQL=${IF_MYSQL} \ IF_MSQL=${IF_MSQL} \ IF_POSTGRESQL=${IF_POSTGRESQL} \ IF_ODBC=${IF_ODBC} \ IF_FREETDS=${IF_FREETDS} \ IF_INTERBASE=${IF_INTERBASE} \ IF_GTK=${IF_GTK} MAN1= fields.1 query.1 query.py.1 sqlr-config-gtk.1 sqlrsh.1 MAN8= sqlr-connection.8 sqlr-cachemanager.8 sqlr-ipclean.8 \ sqlr-listener.8 sqlr-scaler.8 sqlr-start.8 sqlr-stop.8 # --with-sybase-prefix Location of Sybase # --with-oracle-home Location of Oracle # --with-interbase-prefix Location of Interbase # --with-db2-prefix Location of DB2 -.include - -.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;' \ -e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \ ${WRKSRC}/configure ${REINPLACE_CMD} -E \ -e 's,\.so\.\$$\(SQLR_VERSION\),\.so\.$$(basename $$(SQLR_VERSION)),g;' \ ${WRKSRC}/src/api/c/src/Makefile \ ${WRKSRC}/src/api/c++/src/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' -.include +.include Property changes on: head/databases/sqlrelay/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property Index: head/databases/sqlrelay/Makefile.common =================================================================== --- head/databases/sqlrelay/Makefile.common (revision 110181) +++ head/databases/sqlrelay/Makefile.common (revision 110182) @@ -1,14 +1,14 @@ # $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 SQLRELAY_CONFIGURE_ARGS= \ --localstatedir="${LOCALBASE}" \ --with-rudiments-prefix="${LOCALBASE}" \ --with-libstdcpp-path="/usr/lib" \ --with-libxml-prefix="${WRKDIR}/prefixes/libxml" \ --with-libiconv-prefix="${LOCALBASE}" Property changes on: head/databases/sqlrelay/Makefile.common ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/databases/sqlrelay/distinfo =================================================================== --- head/databases/sqlrelay/distinfo (revision 110181) +++ head/databases/sqlrelay/distinfo (revision 110182) @@ -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 Property changes on: head/databases/sqlrelay/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/databases/sqlrelay/files/patch-config.mk.in =================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in (revision 110181) +++ head/databases/sqlrelay/files/patch-config.mk.in (revision 110182) @@ -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 Property changes on: head/databases/sqlrelay/files/patch-config.mk.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/databases/sqlrelay/files/patch-configure =================================================================== --- head/databases/sqlrelay/files/patch-configure (revision 110181) +++ head/databases/sqlrelay/files/patch-configure (revision 110182) @@ -1,63 +1,74 @@ ---- 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" ) 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 @@ -37958,14 +37952,14 @@ if ( test -n "$GTKPATH" ) then -if ( test -r ""$GTKPATH/bin/gtk-config"" ) +if ( test -r ""$GTKPATH/bin/gtk12-config"" ) then - eval "GTKCONFIG=\"$GTKPATH/bin/gtk-config\"" + eval "GTKCONFIG=\"$GTKPATH/bin/gtk12-config\"" fi else - # Extract the first word of ""gtk-config"", so it can be a program name with args. -set dummy "gtk-config"; ac_word=$2 + # Extract the first word of ""gtk12-config"", so it can be a program name with args. +set dummy "gtk12-config"; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_GTKCONFIG+set}" = set; then @@ -37981,7 +37975,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GTKCONFIG=""gtk-config"" + ac_cv_prog_GTKCONFIG=""gtk12-config"" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -38003,7 +37997,7 @@ then for i in "/usr/bin" "/usr/local/bin" "/usr/pkg/bin" "/usr/local/gtk/bin" "/usr/local/gtk+/bin" "/opt/sfw/bin" do - for j in "gtk-config" "gtk12-config" "gtk10-config" + for j in "gtk12-config" "gtk12-config" "gtk10-config" do if ( test -r ""$i/$j"" ) @@ -41269,7 +41263,7 @@ #define SQLR_VERSION "$SQLR_VERSION" _ACEOF -SONAME_VERSION_INFO="1:0:0" +SONAME_VERSION_INFO="0:0:0" Property changes on: head/databases/sqlrelay/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/databases/sqlrelay/pkg-plist =================================================================== --- head/databases/sqlrelay/pkg-plist (revision 110181) +++ head/databases/sqlrelay/pkg-plist (revision 110182) @@ -1,177 +1,178 @@ bin/backupschema bin/fields bin/query bin/sqlr-cachemanager bin/sqlrclient-config bin/sqlrclientwrapper-config %%IF_GTK%%bin/sqlr-config-gtk %%IF_FREETDS%%bin/sqlr-connection-freetds %%IF_FREETDS%%bin/sqlr-connection-freetds-debug %%IF_MSQL%%bin/sqlr-connection-msql %%IF_MSQL%%bin/sqlr-connection-msql-debug %%IF_MYSQL%%bin/sqlr-connection-mysql %%IF_MYSQL%%bin/sqlr-connection-mysql-debug %%IF_ODBC%%bin/sqlr-connection-odbc %%IF_ODBC%%bin/sqlr-connection-odbc-debug %%IF_POSTGRESQL%%bin/sqlr-connection-postgresql %%IF_POSTGRESQL%%bin/sqlr-connection-postgresql-debug %%IF_SQLITE%%bin/sqlr-connection-sqlite %%IF_SQLITE%%bin/sqlr-connection-sqlite-debug %%IF_INTERBASE%%bin/sqlr-connection-interbase %%IF_INTERBASE%%bin/sqlr-connection-interbase-debug bin/sqlr-listener bin/sqlr-listener-debug 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 include/sqlrelay/private/column.h include/sqlrelay/private/row.h include/sqlrelay/private/sqlrconnection.h include/sqlrelay/private/sqlrcursor.h include/sqlrelay/private/sqlrdefines.h include/sqlrelay/private/sqlrincludes.h include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h @dirrm include/sqlrelay/private @dirrm include/sqlrelay 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 lib/sqlrelay/pkgIndex.tcl lib/sqlrelay/sqlrelay.so 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/SQLRConnection.html share/doc/sqlrelay/api/perl/SQLRCursor.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/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/redhat/7/9i.html share/doc/sqlrelay/gettingstarted/oracle/linux/redhat/9/9iR2.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 @dirrm lib/sqlrelay @dirrm sqlrelay/tmp @dirrm sqlrelay/debug @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/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 Property changes on: head/databases/sqlrelay/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property