Date: Fri, 2 Jul 2010 18:33:10 GMT From: Cezary Morga <cm@therek.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/148328: [maintainer update] Update databases/tora to 2.1.2 Message-ID: <201007021833.o62IXAES005302@www.freebsd.org> Resent-Message-ID: <201007021840.o62Ie1wY074065@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148328
>Category: ports
>Synopsis: [maintainer update] Update databases/tora to 2.1.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 02 18:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Cezary Morga
>Release:
>Organization:
>Environment:
>Description:
- Update databases/tora to 2.1.2
- Add OPTIONS for SQL backends
- Disable Oracle support by default (so TOra can be compiled for amd64 with other SQL backends)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN databases/tora.orig/Makefile databases/tora/Makefile
--- databases/tora.orig/Makefile 2010-03-29 13:16:38.000000000 +0200
+++ databases/tora/Makefile 2010-07-02 20:27:28.000000000 +0200
@@ -6,8 +6,7 @@
#
PORTNAME= tora
-DISTVERSION= 2.0.0
-PORTREVISION= 1
+DISTVERSION= 2.1.2
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= SF
@@ -15,23 +14,19 @@
MAINTAINER= cm@therek.net
COMMENT= Toolkit for Oracle
-BUILD_DEPENDS= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client \
- cppunit-config:${PORTSDIR}/devel/cppunit
+BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit
LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 \
pcre.0:${PORTSDIR}/devel/pcre
-RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
-ORACLE_HOME?= ${LOCALBASE}/oracle8-client
-ORACLE_VER= 8i # Client version
+OPTIONS= ORACLE "Build with Oracle support (i386 only)" off \
+ PGSQL "Build with PostgreSQL support" on \
+ MYSQL "Build with MySQL support" on
-ONLY_FOR_ARCHS= i386
USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:22
USE_QT_VER= 4
QT_COMPONENTS= gui corelib sql xml network linguist moc_build uic_build rcc_build
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
-CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html
@@ -42,13 +37,20 @@
.endif
.if !defined(WITHOUT_MYSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
-RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
+RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
.endif
.if !defined(WITHOUT_PGSQL)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
-RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
+RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
+.endif
+
+.if !defined(WITHOUT_ORACLE)
+BUILD_DEPENDS+= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
+RUN_DEPENDS+= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
+
+ORACLE_HOME?= ${LOCALBASE}/oracle8-client
+ORACLE_VER= 8i # Client version
+CONFIGURE_ARGS+= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
.endif
run-autotools:
@@ -67,7 +69,4 @@
${PREFIX2FIX:S|^|${WRKSRC}/|}
.endif
-pre-build:
- cd ${WRKSRC}/src && ${MAKE} clean-local
-
.include <bsd.port.post.mk>
diff -ruN databases/tora.orig/distinfo databases/tora/distinfo
--- databases/tora.orig/distinfo 2009-05-22 12:13:20.000000000 +0200
+++ databases/tora/distinfo 2010-04-22 13:48:08.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (tora-2.0.0.tar.gz) = e90e0d3dbec98e89e9c292d603318003
-SHA256 (tora-2.0.0.tar.gz) = 9f1133b58e616205fc39591c71e38dd39c93699d536891eeb8a1177f32663eae
-SIZE (tora-2.0.0.tar.gz) = 6726940
+MD5 (tora-2.1.2.tar.gz) = 2b49bbe9f4dc83ce33a22e888575ea73
+SHA256 (tora-2.1.2.tar.gz) = 26eb8bf379be3f5d677b338a9bf422f705da2cb3455114a1838bc9929522b911
+SIZE (tora-2.1.2.tar.gz) = 12053942
diff -ruN databases/tora.orig/pkg-descr databases/tora/pkg-descr
--- databases/tora.orig/pkg-descr 2006-03-22 21:48:37.000000000 +0100
+++ databases/tora/pkg-descr 2010-07-01 13:27:05.000000000 +0200
@@ -1,5 +1,12 @@
-TOra is a Toolkit for Oracle which aims to help the DBA or developer of
-database application. Features PL/SQL debugger, SQL worksheet with syntax
+TOra is an open-source multi-platform database management GUI that
+supports accessing most of the common database platforms in use,
+including Oracle, MySQL, and Postgres, as well as limited support
+for any target that can be accessed through Qt's ODBC support.
+
+In addition to regular query and data browsing functionality, it
+includes several additional tools useful for database administrators
+and developers - which aims to help the DBA or developer of database
+application. Features PL/SQL debugger, SQL worksheet with syntax
highlighting, DB browser and a comprehensive set of DBA tools.
-WWW: http://tora.sourceforge.net/
+WWW: http://torasql.com/
diff -ruN databases/tora.orig/pkg-plist databases/tora/pkg-plist
--- databases/tora.orig/pkg-plist 2009-05-22 12:13:20.000000000 +0200
+++ databases/tora/pkg-plist 2010-04-23 21:40:24.000000000 +0200
@@ -3,13 +3,7 @@
lib/tora_it.qm
lib/tora_se.qm
lib/tora_toad.qm
-%%PORTDOCS%%%%DOCSDIR%%/help/Explain-plan.html
-%%PORTDOCS%%%%DOCSDIR%%/help/Getting-bind-parameters.html
%%PORTDOCS%%%%DOCSDIR%%/help/Index_002dlist.html
-%%PORTDOCS%%%%DOCSDIR%%/help/Memo-editor.html
-%%PORTDOCS%%%%DOCSDIR%%/help/Object-description.html
-%%PORTDOCS%%%%DOCSDIR%%/help/SGA-Statement.html
-%%PORTDOCS%%%%DOCSDIR%%/help/What-privileges-do-you-need-to-run-TOra.html
%%PORTDOCS%%%%DOCSDIR%%/help/additionalhelp.html
%%PORTDOCS%%%%DOCSDIR%%/help/alert.html
%%PORTDOCS%%%%DOCSDIR%%/help/analyze.html
@@ -20,10 +14,12 @@
%%PORTDOCS%%%%DOCSDIR%%/help/current.html
%%PORTDOCS%%%%DOCSDIR%%/help/database.html
%%PORTDOCS%%%%DOCSDIR%%/help/debugger.html
+%%PORTDOCS%%%%DOCSDIR%%/help/editor.html
%%PORTDOCS%%%%DOCSDIR%%/help/editors.html
+%%PORTDOCS%%%%DOCSDIR%%/help/explainplan.html
%%PORTDOCS%%%%DOCSDIR%%/help/extendingtora.html
%%PORTDOCS%%%%DOCSDIR%%/help/externalapi.html
-%%PORTDOCS%%%%DOCSDIR%%/help/fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/help/gettingbindparameters.html
%%PORTDOCS%%%%DOCSDIR%%/help/globalsettings.html
%%PORTDOCS%%%%DOCSDIR%%/help/help.html
%%PORTDOCS%%%%DOCSDIR%%/help/history.html
@@ -44,6 +40,8 @@
%%PORTDOCS%%%%DOCSDIR%%/help/images/describe.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/difference.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/editmenu.png
+%%PORTDOCS%%%%DOCSDIR%%/help/images/editor.png
+%%PORTDOCS%%%%DOCSDIR%%/help/images/editor_syntax.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/filemenu.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/fonts.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/getparam.png
@@ -53,6 +51,7 @@
%%PORTDOCS%%%%DOCSDIR%%/help/images/largelogo.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/lists.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/memo.png
+%%PORTDOCS%%%%DOCSDIR%%/help/images/mysql.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/newconnection.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/oracle.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/output.png
@@ -86,7 +85,9 @@
%%PORTDOCS%%%%DOCSDIR%%/help/index.html
%%PORTDOCS%%%%DOCSDIR%%/help/invalid.html
%%PORTDOCS%%%%DOCSDIR%%/help/lists.html
+%%PORTDOCS%%%%DOCSDIR%%/help/memoeditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/newconnection.html
+%%PORTDOCS%%%%DOCSDIR%%/help/objectdescription.html
%%PORTDOCS%%%%DOCSDIR%%/help/output.html
%%PORTDOCS%%%%DOCSDIR%%/help/plsqleditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/preferences.html
@@ -95,6 +96,7 @@
%%PORTDOCS%%%%DOCSDIR%%/help/searchreplace.html
%%PORTDOCS%%%%DOCSDIR%%/help/security.html
%%PORTDOCS%%%%DOCSDIR%%/help/session.html
+%%PORTDOCS%%%%DOCSDIR%%/help/sgastatement.html
%%PORTDOCS%%%%DOCSDIR%%/help/sqledit.html
%%PORTDOCS%%%%DOCSDIR%%/help/storage.html
%%PORTDOCS%%%%DOCSDIR%%/help/template.html
@@ -104,6 +106,7 @@
%%PORTDOCS%%%%DOCSDIR%%/help/trace.html
%%PORTDOCS%%%%DOCSDIR%%/help/tuning.html
%%PORTDOCS%%%%DOCSDIR%%/help/unittest.html
+%%PORTDOCS%%%%DOCSDIR%%/help/whatprivileges.html
%%PORTDOCS%%%%DOCSDIR%%/help/window.html
%%PORTDOCS%%%%DOCSDIR%%/help/worksheet.html
%%PORTDOCS%%%%DOCSDIR%%/help/workspace.html
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007021833.o62IXAES005302>