Index: head/databases/py-sqlrelay/Makefile =================================================================== --- head/databases/py-sqlrelay/Makefile (revision 369884) +++ head/databases/py-sqlrelay/Makefile (revision 369885) @@ -1,46 +1,39 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= # none PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= # none MAINTAINER= ports@FreeBSD.org COMMENT= Python modules to access to SQL Relay EXTRACT_DEPENDS= ${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch LIB_DEPENDS= libsqlrclient.so:${SQLRELAY_PORTDIR} -USE_PYTHON= yes -USES= perl5 gmake +USES= gmake perl5 python USE_PERL5= build patch WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/src/api/python INSTALL_WRKSRC= ${BUILD_WRKSRC} GNU_CONFIGURE= yes -CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ - PTHREADLIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --with-python-prefix="${LOCALBASE}" .include "${.CURDIR}/../sqlrelay/Makefile.common" -.include - do-extract: ${MKDIR} ${WRKDIR} ${LN} -fs `${SQLRELAY_WRKSRC_CMD}` ${WRKSRC} - ${RM} -f ${WRKSRC}/config.cache post-patch: ${PERL} -i -p \ -e 's,"2\.4" "2\.3" "2\.2" "2\.1",${PYTHON_VERSION:S/^python//},g;' \ ${WRKSRC}/configure - ${CP} ${TEMPLATES}/config.sub ${WRKSRC} - ${CP} ${TEMPLATES}/config.guess ${WRKSRC} -.include +.include Index: head/databases/sqlrelay/Makefile =================================================================== --- head/databases/sqlrelay/Makefile (revision 369884) +++ head/databases/sqlrelay/Makefile (revision 369885) @@ -1,145 +1,141 @@ # Created by: Akinori MUSHA aka knu # $FreeBSD$ PORTNAME= ${SQLRELAY_PORTNAME} PORTVERSION= ${SQLRELAY_PORTVERSION} +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= SF MAINTAINER= pi@FreeBSD.org COMMENT= Persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= librudiments.so:${PORTSDIR}/devel/rudiments WANT_GNOME= yes -USES= gmake autoreconf libtool +USES= gmake libtool CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ --disable-tcl \ --disable-java \ --disable-msql \ --disable-perl \ --disable-php \ --disable-python \ --disable-ruby \ --disable-erlang \ --disable-zope MAKE_JOBS_UNSAFE=yes USE_LDCONFIG= yes PORTDOCS= * TOSTRIP= bin/sqlr-start \ bin/sqlr-listener \ bin/sqlr-connection \ bin/sqlr-scaler \ bin/sqlr-cachemanager \ bin/sqlr-fields \ bin/sqlr-query \ bin/sqlr-export \ bin/sqlr-import \ bin/sqlr-pwdenc \ bin/sqlr-status \ bin/sqlrsh \ - lib/libsqlrutil.so.0.0.0 \ - lib/libsqlrclient.so.0.0.0 \ - lib/libsqlrclientwrapper.so.0.0.0 \ - lib/libpqsqlrelay.so.0.0.0 \ - lib/libmysql3sqlrelay.so.0.0.0 \ - lib/libmysql40sqlrelay.so.0.0.0 \ - lib/libmysql41sqlrelay.so.0.0.0 \ - lib/libmysql50sqlrelay.so.0.0.0 \ - lib/libmysql51sqlrelay.so.0.0.0 \ - lib/libsqlrserver.so.0.0.0 \ + lib/libsqlrutil.so.1.0.0 \ + lib/libsqlrclient.so.1.0.0 \ + lib/libsqlrclientwrapper.so.1.0.0 \ + lib/libpqsqlrelay.so.1.0.0 \ + lib/libmysql3sqlrelay.so.1.0.0 \ + lib/libmysql40sqlrelay.so.1.0.0 \ + lib/libmysql41sqlrelay.so.1.0.0 \ + lib/libmysql50sqlrelay.so.1.0.0 \ + lib/libmysql51sqlrelay.so.1.0.0 \ + lib/libsqlrserver.so.1.0.0 \ libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so \ libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so \ libexec/sqlrelay/sqlrlogger_debug.so \ libexec/sqlrelay/sqlrlogger_slowqueries.so \ libexec/sqlrelay/sqlrlogger_custom_nw.so \ libexec/sqlrelay/sqlrlogger_custom_sc.so \ libexec/sqlrelay/sqlrpwdenc_rot.so \ libexec/sqlrelay/sqlrpwdenc_md5.so \ libexec/sqlrelay/sqlrpwdenc_crypt.so \ libexec/sqlrelay/sqlrauth_default.so \ libexec/sqlrelay/sqlrauth_sqlrelay.so \ libexec/sqlrelay/sqlrconnection_router.so .include "${.CURDIR}/Makefile.common" OPTIONS_DEFINE= MYSQL ODBC ORACLE PGSQL SQLITE3 FREETDS FIREBIRD DOCS OPTIONS_SUB= yes ORACLE_CONFIGURE_ENABLE= oracle .include .if ${PORT_OPTIONS:MSQLITE3} LIB_DEPENDS+= libgdbm.so:${PORTSDIR}/databases/gdbm \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 CONFIGURE_ARGS+= --with-gdbm-prefix="${LOCALBASE}" \ --with-sqlite-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --without-gdbm-prefix \ --disable-sqlite .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql-prefix="${LOCALBASE}" TOSTRIP+= libexec/sqlrelay/sqlrconnection_mysql.so .else CONFIGURE_ARGS+= --disable-mysql .endif .if ${PORT_OPTIONS:MFIREBIRD} USE_FIREBIRD= yes CONFIGURE_ARGS+= --with-firebird-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-firebird .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-postgresql .endif .if ${PORT_OPTIONS:MODBC} LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC CONFIGURE_ARGS+= --with-odbc-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-odbc .endif .if ${PORT_OPTIONS:MFREETDS} LIB_DEPENDS+= libtds.so:${PORTSDIR}/databases/freetds CONFIGURE_ARGS+= --with-freetds-prefix="${LOCALBASE}" .else CONFIGURE_ARGS+= --disable-freetds .endif post-patch: ${REINPLACE_CMD} -E \ -e 's,\$$\(initroot\),\$$\(initroot\)${PREFIX},g' \ -e 's,/etc/rc.conf,/etc/defaults/rc.conf,g' \ ${WRKSRC}/init/Makefile - ${REINPLACE_CMD} -E \ - -e 's,/usr/local[[:>:]],${PREFIX},g;' \ - -e 's,[[:<:]]gtk-config[[:>:]],${GTK_CONFIG:T},g;' \ - ${WRKSRC}/acsite.m4 @${REINPLACE_CMD} -e '/EXAMPLEDIR/d' ${WRKSRC}/etc/Makefile ${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -E \ -e 's#-release \$$\(SQLR_VERSION\)##g;' post-configure: @${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk post-stage: .for f in ${TOSTRIP} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f} .endfor .include Index: head/databases/sqlrelay/Makefile.common =================================================================== --- head/databases/sqlrelay/Makefile.common (revision 369884) +++ head/databases/sqlrelay/Makefile.common (revision 369885) @@ -1,14 +1,11 @@ # $FreeBSD$ SQLRELAY_PORTNAME= sqlrelay SQLRELAY_PORTVERSION= 0.56 SQLRELAY_PORTDIR= ${PORTSDIR}/databases/${SQLRELAY_PORTNAME} SQLRELAY_WRKSRC_CMD= cd ${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC SQLRELAY_CONFIGURE_ARGS= \ --localstatedir=/var \ --with-rudiments-prefix="${LOCALBASE}" -SQLRELAY_CONFIGURE_ENV= \ - PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ - PTHREADLIBS="${PTHREAD_LIBS}" Index: head/databases/sqlrelay/files/patch-configure.in =================================================================== --- head/databases/sqlrelay/files/patch-configure.in (revision 369884) +++ head/databases/sqlrelay/files/patch-configure.in (nonexistent) @@ -1,11 +0,0 @@ ---- configure.in.orig Thu Aug 5 09:58:10 2004 -+++ configure.in Sat Sep 11 21:58:57 2004 -@@ -671,7 +671,7 @@ - dnl if interfaces added, removed, or changed, c:r:a -> c+1:0:a - dnl if interfaces added, c:r:a -> c:r:a+1 - dnl if interfaces removed, c:r:a -> c:r:0 --SONAME_VERSION_INFO="1:0:0" -+SONAME_VERSION_INFO="0:0:0" - AC_SUBST(SONAME_VERSION_INFO) - AC_SUBST(STATICLINK) - AC_PREFIX_DEFAULT(/usr/local/firstworks) Property changes on: head/databases/sqlrelay/files/patch-configure.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlrelay/files/patch-acsite.m4 =================================================================== --- head/databases/sqlrelay/files/patch-acsite.m4 (revision 369884) +++ head/databases/sqlrelay/files/patch-acsite.m4 (nonexistent) @@ -1,21 +0,0 @@ ---- 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="" - PTHREADLIB="" -@@ -808,7 +809,9 @@ - fi - done - fi -- -+else -+ HAVE_PTHREAD="yes" -+fi - FW_INCLUDES(pthreads,[$PTHREADINCLUDES]) - FW_LIBS(pthreads,[$PTHREADLIB]) - Property changes on: head/databases/sqlrelay/files/patch-acsite.m4 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/sqlrelay/files/patch-config.mk.in =================================================================== --- head/databases/sqlrelay/files/patch-config.mk.in (revision 369884) +++ head/databases/sqlrelay/files/patch-config.mk.in (revision 369885) @@ -1,20 +1,11 @@ --- 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@/sqlrelay bindir = @bindir@ localstatedir = @localstatedir@ -@@ -89,7 +89,7 @@ - # rudiments library - RUDIMENTSPATH = @RUDIMENTSPATH@ - RUDIMENTSINCLUDES = @RUDIMENTSINCLUDES@ --RUDIMENTSLIBS = @RUDIMENTSLIBS@ -+RUDIMENTSLIBS = @RUDIMENTSLIBS@ -lssl -lcrypto -lpthread - RUDIMENTSLIBSPATH = @RUDIMENTSLIBSPATH@ - - #iconv Index: head/databases/sqlrelay/pkg-plist =================================================================== --- head/databases/sqlrelay/pkg-plist (revision 369884) +++ head/databases/sqlrelay/pkg-plist (revision 369885) @@ -1,115 +1,117 @@ bin/backupschema bin/sqlr-cachemanager bin/sqlr-connection bin/sqlr-export bin/sqlr-fields bin/sqlr-import bin/sqlr-listener bin/sqlr-pwdenc bin/sqlr-query bin/sqlr-scaler bin/sqlr-start bin/sqlr-status bin/sqlr-stop bin/sqlrclient-config bin/sqlrclientwrapper-config bin/sqlrserver-config bin/sqlrsh etc/rc.d/sqlrcachemanager etc/rc.d/sqlrelay etc/sqlrelay etc/sqlrelay.conf.example etc/sqlrelay.dtd etc/sqlrelay.xsd include/sqlrelay/private/bindvar.h include/sqlrelay/private/column.h include/sqlrelay/private/dll.h include/sqlrelay/private/row.h include/sqlrelay/private/sqlrclientwrapper.h include/sqlrelay/private/sqlrconnection.h include/sqlrelay/private/sqlrcursor.h include/sqlrelay/private/sqlrdefines.h include/sqlrelay/private/sqlrincludes.h include/sqlrelay/private/wrapperdll.h include/sqlrelay/sqlrclient.h include/sqlrelay/sqlrclientwrapper.h include/sqlrelay/sqlrpwdenc.h lib/libmysql3sqlrelay.so -lib/libmysql3sqlrelay.so.0 -lib/libmysql3sqlrelay.so.0.0.0 +lib/libmysql3sqlrelay.so.1 +lib/libmysql3sqlrelay.so.1.0.0 lib/libmysql40sqlrelay.so -lib/libmysql40sqlrelay.so.0 -lib/libmysql40sqlrelay.so.0.0.0 +lib/libmysql40sqlrelay.so.1 +lib/libmysql40sqlrelay.so.1.0.0 lib/libmysql41sqlrelay.so -lib/libmysql41sqlrelay.so.0 -lib/libmysql41sqlrelay.so.0.0.0 +lib/libmysql41sqlrelay.so.1 +lib/libmysql41sqlrelay.so.1.0.0 lib/libmysql50sqlrelay.so -lib/libmysql50sqlrelay.so.0 -lib/libmysql50sqlrelay.so.0.0.0 +lib/libmysql50sqlrelay.so.1 +lib/libmysql50sqlrelay.so.1.0.0 lib/libmysql51sqlrelay.so -lib/libmysql51sqlrelay.so.0 -lib/libmysql51sqlrelay.so.0.0.0 +lib/libmysql51sqlrelay.so.1 +lib/libmysql51sqlrelay.so.1.0.0 lib/libpqsqlrelay.so -lib/libpqsqlrelay.so.0 -lib/libpqsqlrelay.so.0.0.0 +lib/libpqsqlrelay.so.1 +lib/libpqsqlrelay.so.1.0.0 lib/libsqlrclient.a lib/libsqlrclient.so -lib/libsqlrclient.so.0 -lib/libsqlrclient.so.0.0.0 +lib/libsqlrclient.so.1 +lib/libsqlrclient.so.1.0.0 lib/libsqlrclientwrapper.a lib/libsqlrclientwrapper.so -lib/libsqlrclientwrapper.so.0 -lib/libsqlrclientwrapper.so.0.0.0 +lib/libsqlrclientwrapper.so.1 +lib/libsqlrclientwrapper.so.1.0.0 +%%ODBC%%lib/libsqlrodbc.a %%ODBC%%lib/libsqlrodbc.so -%%ODBC%%lib/libsqlrodbc.so.0 +%%ODBC%%lib/libsqlrodbc.so.1 +%%ODBC%%lib/libsqlrodbc.so.1.0.0 lib/libsqlrserver.a lib/libsqlrserver.so -lib/libsqlrserver.so.0 -lib/libsqlrserver.so.0.0.0 +lib/libsqlrserver.so.1 +lib/libsqlrserver.so.1.0.0 lib/libsqlrutil.a lib/libsqlrutil.so -lib/libsqlrutil.so.0 -lib/libsqlrutil.so.0.0.0 +lib/libsqlrutil.so.1 +lib/libsqlrutil.so.1.0.0 libdata/pkgconfig/sqlrelay-c++.pc libdata/pkgconfig/sqlrelay-c.pc %%FIREBIRD%%libexec/sqlrelay/sqlrconnection_firebird.so %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so libexec/sqlrelay/sqlrauth_default.so libexec/sqlrelay/sqlrauth_sqlrelay.so libexec/sqlrelay/sqlrconnection_router.so libexec/sqlrelay/sqlrlogger_custom_nw.so libexec/sqlrelay/sqlrlogger_custom_sc.so libexec/sqlrelay/sqlrlogger_debug.so libexec/sqlrelay/sqlrlogger_slowqueries.so libexec/sqlrelay/sqlrpwdenc_crypt.so libexec/sqlrelay/sqlrpwdenc_md5.so libexec/sqlrelay/sqlrpwdenc_rot.so libexec/sqlrelay/sqlrquery_sqlrcmdcstat.so libexec/sqlrelay/sqlrquery_sqlrcmdgstat.so man/man1/sqlr-fields.1.gz man/man1/sqlr-query.1.gz man/man1/sqlrsh.1.gz man/man8/sqlr-cachemanager.8.gz man/man8/sqlr-connection.8.gz man/man8/sqlr-ipclean.8.gz man/man8/sqlr-listener.8.gz man/man8/sqlr-scaler.8.gz man/man8/sqlr-start.8.gz man/man8/sqlr-stop.8.gz share/examples/sample-mssqlserver-mysql-errors.map share/examples/sample-oracle-mysql-errors.map @dirrm libexec/sqlrelay @dirrm include/sqlrelay/private @dirrm include/sqlrelay @dirrmtry /var/sqlrelay/tmp/sockets @dirrmtry /var/sqlrelay/tmp/pids @dirrmtry /var/sqlrelay/tmp/ipc @dirrmtry /var/sqlrelay/tmp @dirrmtry /var/sqlrelay/log @dirrmtry /var/sqlrelay/debug @dirrmtry /var/sqlrelay/cache @dirrmtry /var/sqlrelay