Attachment #95924 for bug #134429

View | Details | Raw Unified | Return to bug 134429
Collapse All | Expand All




#

PORTNAME=	tora
DISTVERSION=	2.0.0
PORTEPOCH=	1
CATEGORIES=	databases
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	cm@therek.net
COMMENT=	Toolkit for Oracle

BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client \
		cppunit-config:${PORTSDIR}/devel/cppunit
LIB_DEPENDS=	qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla \
		pcre.0:${PORTSDIR}/devel/pcre
RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client

.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
.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
.endif

ORACLE_HOME?=	${LOCALBASE}/oracle8-client
ORACLE_VER=	8i	# Client version

USE_BZIP2=	yes
USE_AUTOTOOLS=	aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15
USE_QT_VER=	4
QT_COMPONENTS=	gui corelib sql xml network moc_build uic_build rcc_build
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
CONFIGURE_ARGS=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"

.if defined(WITHOUT_KDE)
CONFIGURE_ARGS+=	--without-kde
.else
USE_KDELIBS_VER=3
.endif

.if !defined(NOPORTDOCS)
PORTDOCS=	AUTHORS BUGS ChangeLog INSTALL NEWS README README.CODESTYLE\
		README.LICENSE TODO
INFO=		tora
.endif

PREFIX2FIX=	doc/help/preferences.texi doc/help/preferences.html

run-autotools:
	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)

pre-configure:
	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|'	\
		${WRKSRC}/config/m4/qtkde.m4
	${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|'	\
		${PREFIX2FIX:S|^|${WRKSRC}/|}
.if defined(NOPORTDOCS)
	${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am
.else
	${REINPLACE_CMD} -e 's|/etc/torarc|${PREFIX}/etc/torarc|'	\
		${PREFIX2FIX:S|^|${WRKSRC}/|}
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)databases/tora/distinfo (-3 / +3 lines)
1	MD5 (tora-1.3.22.tar.bz2) = 9e716ca6e8be710764823e4deca81227	1	MD5 (tora-2.0.0.tar.gz) = e90e0d3dbec98e89e9c292d603318003
2	SHA256 (tora-1.3.22.tar.bz2) = 858c3a3a507d2dd0847168779826924b7bdb852fc868c3ec37130999b8cc108e	2	SHA256 (tora-2.0.0.tar.gz) = 9f1133b58e616205fc39591c71e38dd39c93699d536891eeb8a1177f32663eae
3	SIZE (tora-1.3.22.tar.bz2) = 2922439	3	SIZE (tora-2.0.0.tar.gz) = 6726940




--- config/m4/oracle.m4.orig	2008-05-14 19:07:34.000000000 +0200
+++ config/m4/oracle.m4	2009-05-07 19:15:56.463399933 +0200
@@ -113,6 +113,11 @@
         ora_cflags="$ora_cflags -I$dir"
         echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
       fi
+      echo "trying ociextp.h $dir/ociextp.h" >&AS_MESSAGE_LOG_FD()
+      if test -r $dir/ociextp.h; then
+        ora_cflags="$ora_cflags -I$dir"
+        echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
+      fi
     done
 
     ora_check_lib="




--- configure.orig	2008-11-03 21:33:32.000000000 +0100
+++ configure	2009-05-07 19:58:09.238375523 +0200
@@ -25140,6 +25140,11 @@
         ora_cflags="$ora_cflags -I$dir"
         echo "adding -I$dir" >&5
       fi
+      echo "trying ociextp.h $dir/ociextp.h" >&5
+      if test -r $dir/ociextp.h; then
+        ora_cflags="$ora_cflags -I$dir"
+        echo "adding -I$dir" >&5
+      fi
     done
 
     ora_check_lib="

Lines 1-6 Link Here

(-)databases/tora/files/patch-configure.ac (-5 / +4 lines)
1	--- configure.ac.orig 2008-03-09 21:03:43.000000000 +0100	1	--- configure.ac.orig 2008-09-14 23:54:41.000000000 +0200
2	+++ configure.ac 2008-04-05 14:34:02.000000000 +0200	2	+++ configure.ac 2009-05-07 19:16:01.329388208 +0200
3	@@ -53,6 +53,9 @@	3	@@ -54,6 +54,9 @@
4	AX_PATH_LIB_PCRE	4	AX_PATH_LIB_PCRE
5	AM_PATH_CPPUNIT([1.10.2], found_cppunit=yes)	5	AM_PATH_CPPUNIT([1.10.2], found_cppunit=yes)
6	AM_CONDITIONAL([CPPUNIT], [test "x$found_cppunit" = "xyes"])	6	AM_CONDITIONAL([CPPUNIT], [test "x$found_cppunit" = "xyes"])
Lines 9-13 Link Here
9	+AC_SUBST(LIBCOMPAT)	9	+AC_SUBST(LIBCOMPAT)
10		10
11	# Makefile.am uses these	11	# Makefile.am uses these
12	AM_CONDITIONAL(ENABLE_MONO, test "$enable_mono" = yes)	12	AM_CONDITIONAL(HAVE_ORACLE, test "$enable_oracle" = yes)
13




--- doc/Makefile.am.orig	2008-07-30 15:50:50.000000000 +0200
+++ doc/Makefile.am	2009-05-10 18:04:15.478423171 +0200
@@ -3,19 +3,20 @@
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`

 	rm -rf $(tora_docdir)/help
-	cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help 
+	$(mkdir_p) $(tora_docdir)/help
+	cp -Rp $(top_builddir)/doc/help/tora/ $(tora_docdir)/help
 	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html
-	cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help
+	cp -Rp $(top_srcdir)/doc/help/images $(tora_docdir)/help
 #	cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help
+	cp -R $(top_srcdir)/doc/help/api $(tora_docdir)/help
 
 manualdir = $(top_builddir)/doc/help
 

Lines 1-5 Link Here

(-)databases/tora/files/patch-doc_help_tora.texi (-3 / +3 lines)
1	--- ./doc/help/tora.texi.orig 2007-01-10 18:13:02.000000000 +0100	1	--- doc/help/tora.texi.orig 2008-09-14 23:54:41.000000000 +0200
2	+++ ./doc/help/tora.texi 2008-07-06 12:52:31.000000000 +0200	2	+++ doc/help/tora.texi 2009-05-07 21:36:32.058998814 +0200
3	@@ -7,6 +7,10 @@	3	@@ -7,6 +7,10 @@
4	@c @image{images/tora_manual}	4	@c @image{images/tora_manual}
5	@c %**end of header	5	@c %**end of header
Lines 9-13 Link Here
9	+@end direntry	9	+@end direntry
10	+	10	+
11	@copying	11	@copying
12	This manual is for TOra, version 1.3.22.	12	This manual is for TOra, version 1.4.0.
13	@end copying	13	@end copying




--- src/Makefile.am.orig	2008-11-03 21:32:20.000000000 +0100
+++ src/Makefile.am	2009-05-07 19:59:17.554226281 +0200
@@ -35,7 +35,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL)
 AM_CPPFLAGS += $(PCRE_CFLAGS) \
-	-DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
+	-DDEFAULT_PLUGIN_DIR=\"$(docdir)\" \
 	-DTOVERSION=\"$(PACKAGE_VERSION)\" \
 	$(ORACLE_CXXFLAGS) \
 	$(QSCINTILLA_CXXFLAGS)
@@ -42,7 +42,7 @@
 # fix for annoying automake naming problems.
 tora_CXXFLAGS  = $(AM_CXXFLAGS)
 
-tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@)
+tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@) $(LIBCOMPAT)
 
 if HAVE_ORACLE
 EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \

Line 0 Link Here

(-)databases/tora/files/patch-src_tooracleconnection.cpp (+10 lines)
	1	--- src/tooracleconnection.cpp.orig 2008-10-29 16:59:11.000000000 +0100
	2	+++ src/tooracleconnection.cpp 2009-05-07 19:16:09.390371657 +0200
	3	@@ -57,7 +57,6 @@
	4
	5	#define OTL_STL
	6	#define OTL_EXCEPTION_ENABLE_ERROR_OFFSET
	7	-#define OTL_ORA_UTF8
	8	#define OTL_ORA_UNICODE
	9	#define OTL_ORA_TIMESTAMP
	10	#define OTL_ANSI_CPP




bin/chex
bin/tora
lib/tora_fr.qm
lib/tora_it.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/Index.html
%%PORTDOCS%%%%DOCSDIR%%/help/Memo-editor.html
%%PORTDOCS%%%%DOCSDIR%%/help/Object-description.html
%%PORTDOCS%%%%DOCSDIR%%/help/SGA-Statement.html
%%PORTDOCS%%%%DOCSDIR%%/help/Using-charts.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
%%PORTDOCS%%%%DOCSDIR%%/help/api.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/TODock.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/TOFileDialog.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/TOMessageBox.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/TOPrinter.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/all-globals.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-TODock.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-TOFileDialog.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-TOMessageBox.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-TOPrinter.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toBackground.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toBarChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toBusy.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toChangeConnection.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnection.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnectionProvider.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnectionSub.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnectionWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnection__cacheObjects.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnection__connectionImpl.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnection__exception.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toConnection__objectName.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toDatatype.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toEditWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toEditWidget__editHandler.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toExtract.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toExtract__columnInfo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toExtract__datatype.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toExtract__extractor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toFilesize.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHelp.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHelpBrowser.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHelpContext.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHelpTool.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHighlightedText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toHtml.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toLegendChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toLineChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toListView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toLock.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toLocker.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toMain.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toMainWindow.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toMarkedText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toMemoEditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toMultiLineEdit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toNoBlockQuery.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toNoBlockQuery__queryTask.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toParamGet.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toParamGetButton.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toPieChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toPieConnector.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toPopupButton.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toQValue.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toQValue__queryValue.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toQuery.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toQuery__queryDescribe.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toQuery__queryImpl.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResult.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultBar.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultCols.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultColsComment.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultCols__resultCols.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultCols__resultColsEdit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultCombo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultConstraint.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultContent.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultContentEditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultContentEditor__contentItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultContentMemo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultContentSingle.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultDepend.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultField.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultFilter.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultIndexes.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultLabel.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultLine.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultListFormat.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultLong.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultObject.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultPie.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultPlan.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultReferences.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultResources.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultStats.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewCheck.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewCheck__keyData.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewItem__keyData.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewMLCheck.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toResultViewMLine.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSGAStatement.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSMTP.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQL.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse__editorTokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse__settings.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse__statement.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse__stringTokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQLParse__tokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQL__definition.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSQL__version.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSemaphore.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSettingTab.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSyntaxAnalyzer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSyntaxAnalyzer__highlightInfo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toSyntaxAnalyzer__posibleHit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTabBar.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTabBar__barTab.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTabWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTask.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplate.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplateItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplateProvider.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplateSQL.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplateSQLObject.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTemplateText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTextView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toThread.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toThread__taskRunner.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTimer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toTool.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toToolWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/full-list-toVisualize.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/header-list.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/hier.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/index-long.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/index.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toBackground.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toBarChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toBusy.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toChangeConnection.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnection.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnectionProvider.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnectionSub.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnectionWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnection__cacheObjects.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnection__connectionImpl.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnection__exception.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toConnection__objectName.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toDatatype.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toEditWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toEditWidget__editHandler.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toExtract.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toExtract__columnInfo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toExtract__datatype.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toExtract__extractor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toFilesize.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHelp.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHelpBrowser.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHelpContext.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHelpTool.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHighlightedText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toHtml.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toLegendChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toLineChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toListView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toLock.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toLocker.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toMain.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toMainWindow.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toMarkedText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toMemoEditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toMultiLineEdit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toNoBlockQuery.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toNoBlockQuery__queryTask.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toParamGet.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toParamGetButton.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toPieChart.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toPieConnector.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toPopupButton.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toQValue.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toQValue__queryValue.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toQuery.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toQuery__queryDescribe.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toQuery__queryImpl.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResult.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultBar.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultCols.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultColsComment.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultCols__resultCols.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultCols__resultColsEdit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultCombo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultConstraint.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultContent.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultContentEditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultContentEditor__contentItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultContentMemo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultContentSingle.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultDepend.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultField.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultFilter.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultIndexes.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultLabel.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultLine.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultListFormat.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultLong.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultObject.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultPie.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultPlan.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultReferences.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultResources.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultStats.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewCheck.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewCheck__keyData.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewItem__keyData.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewMLCheck.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toResultViewMLine.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSGAStatement.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSMTP.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQL.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse__editorTokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse__settings.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse__statement.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse__stringTokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQLParse__tokenizer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQL__definition.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSQL__version.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSemaphore.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSettingTab.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSyntaxAnalyzer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSyntaxAnalyzer__highlightInfo.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toSyntaxAnalyzer__posibleHit.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTabBar.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTabBar__barTab.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTabWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTask.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplate.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplateItem.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplateProvider.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplateSQL.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplateSQLObject.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTemplateText.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTextView.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toThread.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toThread__taskRunner.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTimer.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toTool.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toToolWidget.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toVisualize.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tobackground_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tobarchart_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tochangeconnection_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toconf_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toconnection_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/todatatype_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/todefaultkeywords_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toeditwidget_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toextract_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tofilesize_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tohelp_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tohelpbrowser_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tohighlightedtext_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tohtml_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tolegendchart_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tolinechart_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tomain_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tomainwindow_kde_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tomarkedtext_2_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tomarkedtext_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tomemoeditor_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tonoblockquery_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toparamget_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/topiechart_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toqvalue_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toreport_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresult_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultbar_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultcols_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultcombo_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultconstraint_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultcontent_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultdepend_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultfield_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultindexes_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultitem_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultlabel_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultline_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultlong_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultpie_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultplan_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultreferences_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultresources_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultstats_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/toresultview_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tosgastatement_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tosmtp_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tosql_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tosqlparse_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/totabwidget_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/totemplate_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/totextview_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tothread_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/totool_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/tovisualize_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/api/utils_h.html
%%PORTDOCS%%%%DOCSDIR%%/help/browser.html
%%PORTDOCS%%%%DOCSDIR%%/help/charts.html
%%PORTDOCS%%%%DOCSDIR%%/help/common.html
%%PORTDOCS%%%%DOCSDIR%%/help/current.html
%%PORTDOCS%%%%DOCSDIR%%/help/database.html

%%PORTDOCS%%%%DOCSDIR%%/help/extendingtora.html
%%PORTDOCS%%%%DOCSDIR%%/help/externalapi.html
%%PORTDOCS%%%%DOCSDIR%%/help/fonts.html
%%PORTDOCS%%%%DOCSDIR%%/help/globalsettings.html
%%PORTDOCS%%%%DOCSDIR%%/help/help.html
%%PORTDOCS%%%%DOCSDIR%%/help/history.html
%%PORTDOCS%%%%DOCSDIR%%/help/images/CMakeLists.txt
%%PORTDOCS%%%%DOCSDIR%%/help/images/additionalhelp.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/addwatch.png
%%PORTDOCS%%%%DOCSDIR%%/help/images/alert.png

%%PORTDOCS%%%%DOCSDIR%%/help/lists.html
%%PORTDOCS%%%%DOCSDIR%%/help/newconnection.html
%%PORTDOCS%%%%DOCSDIR%%/help/output.html
%%PORTDOCS%%%%DOCSDIR%%/help/plsqleditor.html
%%PORTDOCS%%%%DOCSDIR%%/help/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/help/rollback.html
%%PORTDOCS%%%%DOCSDIR%%/help/script.html

%%PORTDOCS%%%%DOCSDIR%%/help/toolsetting.html
%%PORTDOCS%%%%DOCSDIR%%/help/trace.html
%%PORTDOCS%%%%DOCSDIR%%/help/tuning.html
%%PORTDOCS%%%%DOCSDIR%%/help/unittest.html
%%PORTDOCS%%%%DOCSDIR%%/help/window.html
%%PORTDOCS%%%%DOCSDIR%%/help/worksheet.html
%%PORTDOCS%%%%DOCSDIR%%/help/workspace.html
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/help/images
%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/help
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 134429

Lines 6-77 Link Here

(-)databases/tora/Makefile (-32 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= tora	8	PORTNAME= tora
9	DISTVERSION= 1.3.22	9	DISTVERSION= 2.0.0
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= cm@therek.net
16	COMMENT= Toolkit for Oracle	15	COMMENT= Toolkit for Oracle
17		16
18	BUILD_DEPENDS= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client \	17	BUILD_DEPENDS= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client \
19	cppunit-config:${PORTSDIR}/devel/cppunit	18	cppunit-config:${PORTSDIR}/devel/cppunit
20	LIB_DEPENDS= qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla \	19	LIB_DEPENDS= qscintilla.7:${PORTSDIR}/x11-toolkits/qscintilla \
21	pcre.0:${PORTSDIR}/devel/pcre	20	pcre.0:${PORTSDIR}/devel/pcre
22	RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client	21	RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
23		22
24	.if !defined(WITHOUT_MYSQL)	23	.if !defined(WITHOUT_MYSQL)
25	BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin	24	BUILD_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
26	RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin	25	RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
27	.endif	26	.endif
28		27
29	.if !defined(WITHOUT_PGSQL)	28	.if !defined(WITHOUT_PGSQL)
30	BUILD_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin	29	BUILD_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
31	RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin	30	RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
32	.endif	31	.endif
33		32
34	ORACLE_HOME?= ${LOCALBASE}/oracle8-client	33	ORACLE_HOME?= ${LOCALBASE}/oracle8-client
35	ORACLE_VER= 8i # Client version	34	ORACLE_VER= 8i # Client version
36		35
37	USE_BZIP2= yes
38	USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15	36	USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15
39	USE_QT_VER= 3	37	USE_QT_VER= 4
40	USE_PERL5_BUILD=yes	38	QT_COMPONENTS= gui corelib sql xml network moc_build uic_build rcc_build
		39	GNU_CONFIGURE= yes
41	USE_GMAKE= yes	40	USE_GMAKE= yes
42	CONFIGURE_ARGS= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}	41	CONFIGURE_ARGS= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
43	USE_LDCONFIG= yes	42	CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib"
44
45	.if defined(WITHOUT_KDE)
46	CONFIGURE_ARGS+= --without-kde
47	.else
48	USE_KDELIBS_VER=3
49	.endif
50		43
51	.if !defined(NOPORTDOCS)	44	.if !defined(NOPORTDOCS)
52	PORTDOCS= AUTHORS BUGS ChangeLog INSTALL NEWS README README.CODESTYLE\
53	README.LICENSE TODO
54	INFO= tora	45	INFO= tora
55	.endif	46	.endif
56		47
57	PREFIX2FIX= doc/help/preferences.texi src/toconfiguration.h	48	PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html
58		49
59	run-autotools:	50	run-autotools:
60	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)	51	(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ./autogen.sh)
61		52
62	pre-configure:	53	pre-configure:
63	${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|' \
64	${WRKSRC}/config/m4/qtkde.m4
65	${REINPLACE_CMD} -e 's\|/etc/torarc\|${PREFIX}/etc/torarc\|' \
66	${PREFIX2FIX:S\|^\|${WRKSRC}/\|}
67	.if defined(NOPORTDOCS)	54	.if defined(NOPORTDOCS)
68	${REINPLACE_CMD} -e 's\|test doc\|test\|' ${WRKSRC}/Makefile.am	55	${REINPLACE_CMD} -e 's\|test doc\|test\|' ${WRKSRC}/Makefile.am
69	.endif	56	.else
70		57	${REINPLACE_CMD} -e 's\|/etc/torarc\|${PREFIX}/etc/torarc\|' \
71	post-install:	58	${PREFIX2FIX:S\|^\|${WRKSRC}/\|}
72	.if !defined(NOPORTDOCS)
73	${MKDIR} ${DOCSDIR}
74	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${DOCSDIR}
75	.endif	59	.endif
76		60
77	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Line 0 Link Here

(-)databases/tora/files/patch-config_m4_oracle.m4 (+14 lines)
	1	--- config/m4/oracle.m4.orig 2008-05-14 19:07:34.000000000 +0200
	2	+++ config/m4/oracle.m4 2009-05-07 19:15:56.463399933 +0200
	3	@@ -113,6 +113,11 @@
	4	ora_cflags="$ora_cflags -I$dir"
	5	echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
	6	fi
	7	+ echo "trying ociextp.h $dir/ociextp.h" >&AS_MESSAGE_LOG_FD()
	8	+ if test -r $dir/ociextp.h; then
	9	+ ora_cflags="$ora_cflags -I$dir"
	10	+ echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
	11	+ fi
	12	done
	13
	14	ora_check_lib="

Line 0 Link Here

(-)databases/tora/files/patch-configure (+14 lines)
	1	--- configure.orig 2008-11-03 21:33:32.000000000 +0100
	2	+++ configure 2009-05-07 19:58:09.238375523 +0200
	3	@@ -25140,6 +25140,11 @@
	4	ora_cflags="$ora_cflags -I$dir"
	5	echo "adding -I$dir" >&5
	6	fi
	7	+ echo "trying ociextp.h $dir/ociextp.h" >&5
	8	+ if test -r $dir/ociextp.h; then
	9	+ ora_cflags="$ora_cflags -I$dir"
	10	+ echo "adding -I$dir" >&5
	11	+ fi
	12	done
	13
	14	ora_check_lib="

Lines 1-5 Link Here

(-)databases/tora/files/patch-doc_Makefile.am (-6 / +5 lines)
1	--- ./doc/Makefile.am.orig 2008-03-09 21:03:36.000000000 +0100	1	--- doc/Makefile.am.orig 2008-07-30 15:50:50.000000000 +0200
2	+++ ./doc/Makefile.am 2008-03-27 22:53:58.000000000 +0100	2	+++ doc/Makefile.am 2009-05-10 18:04:15.478423171 +0200
3	@@ -3,19 +3,20 @@	3	@@ -3,19 +3,20 @@
4	dist-hook:	4	dist-hook:
5	rm -rf `find $(distdir) -name .svn`	5	rm -rf `find $(distdir) -name .svn`
Lines 11-22 Link Here
11	rm -rf $(tora_docdir)/help	11	rm -rf $(tora_docdir)/help
12	- cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help	12	- cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help
13	+ $(mkdir_p) $(tora_docdir)/help	13	+ $(mkdir_p) $(tora_docdir)/help
14	+ cp -R $(top_builddir)/doc/help/tora/* $(tora_docdir)/help	14	+ cp -Rp $(top_builddir)/doc/help/tora/ $(tora_docdir)/help
15	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html	15	cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html
16	- cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help	16	- cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help
17	- cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help	17	+ cp -Rp $(top_srcdir)/doc/help/images $(tora_docdir)/help
18	+ cp -R $(top_srcdir)/doc/help/images $(tora_docdir)/help	18	# cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help
19	+ cp -R $(top_srcdir)/doc/help/api $(tora_docdir)/help
20		19
21	manualdir = $(top_builddir)/doc/help	20	manualdir = $(top_builddir)/doc/help
22		21

Lines 1-20 Link Here

(-)databases/tora/files/patch-src_Makefile.am (-15 / +6 lines)
1	--- ./src/Makefile.am.orig 2008-03-09 21:03:09.000000000 +0100	1	--- src/Makefile.am.orig 2008-11-03 21:32:20.000000000 +0100
2	+++ ./src/Makefile.am 2008-03-27 22:11:51.000000000 +0100	2	+++ src/Makefile.am 2009-05-07 19:59:17.554226281 +0200
3	@@ -16,7 +16,7 @@	3	@@ -35,7 +35,7 @@
4
5	AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL)
6	AM_CPPFLAGS += $(PCRE_CFLAGS) \
7	- -DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \
8	+ -DDEFAULT_PLUGIN_DIR=\"$(docdir)\" \
9	-DTOVERSION=\"$(PACKAGE_VERSION)\" \
10	$(ORACLE_CXXFLAGS) \
11	$(QSCINTILLA_CXXFLAGS)
12	@@ -42,7 +42,7 @@
13	# fix for annoying automake naming problems.	4	# fix for annoying automake naming problems.
14	tora_CXXFLAGS = $(AM_CXXFLAGS)	5	tora_CXXFLAGS = $(AM_CXXFLAGS)
15		6
16	-tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@)	7	-tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@)
17	+tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@) $(LIBCOMPAT)	8	+tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@) $(LIBCOMPAT)
18		9
19	if HAVE_ORACLE	10	if HAVE_ORACLE
20	EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp \	11	EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \