Attachment #159024 for bug #201724

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





PORTNAME=	tora
PORTVERSION=	2.1.3
PORTREVISION=	10
PORTEPOCH=	1
CATEGORIES=	databases
MASTER_SITES=	SF

OPTIONS_DEFINE_i386=	ORACLE
OPTIONS_DEFAULT=	PGSQL MYSQL

USE_QT4=	corelib gui sql xml network moc_build uic_build rcc_build
USES=		autoreconf gmake libtool makeinfo
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}


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

DOCS_USES=	makeinfo
DOCS_INFO=	tora

MYSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
PGSQL_RUN_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
INFO=		tora
.endif

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

ORACLE_BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
ORACLE_RUN_DEPENDS=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
ORACLE_CONFIGURE_ON=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}

.include <bsd.port.options.mk>
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:tu}
.endif

post-patch:
.if ${PORT_OPTIONS:MDOCS}
	@${REINPLACE_CMD} 's|/etc/torarc|${PREFIX}/etc/torarc|' \

Lines 1-6 Link Here

(-)databases/tora/files/patch-config_m4_oracle.m4 (-3 / +3 lines)
1	--- config/m4/oracle.m4.orig 2008-05-14 19:07:34.000000000 +0200	1	--- config/m4/oracle.m4.orig 2009-10-23 16:19:57 UTC
2	+++ config/m4/oracle.m4 2009-05-07 19:15:56.463399933 +0200	2	+++ config/m4/oracle.m4
3	@@ -113,6 +113,11 @@	3	@@ -113,6 +113,11 @@ Please install the instant client sdk pa
4	ora_cflags="$ora_cflags -I$dir"	4	ora_cflags="$ora_cflags -I$dir"
5	echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()	5	echo "adding -I$dir" >&AS_MESSAGE_LOG_FD()
6	fi	6	fi

Lines 1-6 Link Here

(-)databases/tora/files/patch-configure (-3 / +3 lines)
1	--- configure.orig 2008-11-03 21:33:32.000000000 +0100	1	--- configure.orig 2010-09-19 17:15:52 UTC
2	+++ configure 2009-05-07 19:58:09.238375523 +0200	2	+++ configure
3	@@ -25140,6 +25140,11 @@	3	@@ -17436,6 +17436,11 @@ Please install the instant client sdk pa
4	ora_cflags="$ora_cflags -I$dir"	4	ora_cflags="$ora_cflags -I$dir"
5	echo "adding -I$dir" >&5	5	echo "adding -I$dir" >&5
6	fi	6	fi

Lines 1-6 Link Here

(-)databases/tora/files/patch-configure.ac (-3 / +3 lines)
1	--- configure.ac.orig 2008-09-14 23:54:41.000000000 +0200	1	--- configure.ac.orig 2010-06-06 19:50:46 UTC
2	+++ configure.ac 2009-05-07 19:16:01.329388208 +0200	2	+++ configure.ac
3	@@ -54,6 +54,9 @@	3	@@ -57,6 +57,9 @@ TORA_CHECK_QSCINTILLA
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 1-6 Link Here

(-)databases/tora/files/patch-doc_Makefile.am (-3 / +3 lines)
1	--- doc/Makefile.am.orig 2008-07-30 15:50:50.000000000 +0200	1	--- doc/Makefile.am.orig 2009-10-23 16:19:55 UTC
2	+++ doc/Makefile.am 2009-05-10 18:04:15.478423171 +0200	2	+++ doc/Makefile.am
3	@@ -3,19 +3,20 @@	3	@@ -3,19 +3,20 @@ EXTRA_DIST = help
4	dist-hook:	4	dist-hook:
5	rm -rf `find $(distdir) -name .svn`	5	rm -rf `find $(distdir) -name .svn`
6		6

Lines 1-5 Link Here

(-)databases/tora/files/patch-doc_help_tora.texi (-3 / +3 lines)
1	--- doc/help/tora.texi.orig 2008-09-14 23:54:41.000000000 +0200	1	--- doc/help/tora.texi.orig 2010-07-18 10:48:45 UTC
2	+++ doc/help/tora.texi 2009-05-07 21:36:32.058998814 +0200	2	+++ doc/help/tora.texi
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.4.0.	12	This manual is for TOra, version 2.1.3+.
13	@end copying	13	@end copying

Lines 1-6 Link Here

(-)databases/tora/files/patch-src_Makefile.am (-4 / +4 lines)
1	--- src/Makefile.am.orig 2010-09-19 20:07:44.000000000 +0200	1	--- src/Makefile.am.orig 2010-09-19 18:07:44 UTC
2	+++ src/Makefile.am 2010-11-01 23:01:57.000000000 +0100	2	+++ src/Makefile.am
3	@@ -37,7 +37,7 @@	3	@@ -37,7 +37,7 @@ AM_LDFLAGS = $(PCRE_LIBS) \
4	# fix for annoying automake naming problems.	4	# fix for annoying automake naming problems.
5	tora_CXXFLAGS = $(AM_CXXFLAGS)	5	tora_CXXFLAGS = $(AM_CXXFLAGS)
6		6
Lines 9-15 Link Here
9		9
10	if HAVE_ORACLE	10	if HAVE_ORACLE
11	EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \	11	EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \
12	@@ -439,6 +439,7 @@	12	@@ -439,6 +439,7 @@ BUILT_SOURCES = \
13	moc_tobrowserdblinkswidget.cpp \	13	moc_tobrowserdblinkswidget.cpp \
14	moc_tobrowserdirectorieswidget.cpp \	14	moc_tobrowserdirectorieswidget.cpp \
15	moc_toresultgrants.cpp \	15	moc_toresultgrants.cpp \

Lines 1-4 Link Here

(-)databases/tora/files/patch-src_toextract.cpp (-1 / +1 lines)
1	--- src/toextract.cpp.orig 2010-02-02 18:25:43.000000000 +0000	1	--- src/toextract.cpp.orig 2010-02-02 18:25:43 UTC
2	+++ src/toextract.cpp	2	+++ src/toextract.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	*	4	*

Lines 1-6 Link Here

(-)databases/tora/files/patch-src_toextract.h (-4 / +6 lines)
1	--- src/toextract.h 2010-02-02 13:25:43.000000000 -0500	1	--- src/toextract.h.orig 2010-02-02 18:25:43 UTC
2	+++ src/toextract.h 2015-03-08 20:14:45.000000000 -0400	2	+++ src/toextract.h
3	@@ -783,5 +783,5 @@	3	@@ -782,13 +782,13 @@ public:
		4	}
4	/** Implement sort order based only on Order field.	5	/** Implement sort order based only on Order field.
5	*/	6	*/
6	- bool operator <(const columnInfo &inf)	7	- bool operator <(const columnInfo &inf)
Lines 7-13 Link Here
7	+ bool operator <(const columnInfo &inf) const	8	+ bool operator <(const columnInfo &inf) const
8	{	9	{
9	return Order < inf.Order;	10	return Order < inf.Order;
10	@@ -789,5 +789,5 @@	11	}
11	/** Implement sort order based only on Order field.	12	/** Implement sort order based only on Order field.
12	*/	13	*/
13	- bool operator ==(const columnInfo &inf)	14	- bool operator ==(const columnInfo &inf)
Lines 14-16 Link Here
14	+ bool operator ==(const columnInfo &inf) const	15	+ bool operator ==(const columnInfo &inf) const
15	{	16	{
16	return Order == inf.Order;	17	return Order == inf.Order;
		18	}

Lines 1-6 Link Here

(-)databases/tora/files/patch-src_tooracleconnection.cpp (-3 / +3 lines)
1	--- src/tooracleconnection.cpp.orig 2008-10-29 16:59:11.000000000 +0100	1	--- src/tooracleconnection.cpp.orig 2010-09-19 09:27:38 UTC
2	+++ src/tooracleconnection.cpp 2009-05-07 19:16:09.390371657 +0200	2	+++ src/tooracleconnection.cpp
3	@@ -57,7 +57,6 @@	3	@@ -58,7 +58,6 @@
4		4
5	#define OTL_STL	5	#define OTL_STL
6	#define OTL_EXCEPTION_ENABLE_ERROR_OFFSET	6	#define OTL_EXCEPTION_ENABLE_ERROR_OFFSET

Lines 1-5 Link Here

(-)databases/tora/files/patch-src_topiechart.h (-2 / +2 lines)
1	--- ./src/topiechart.h.orig 2009-10-23 18:19:33.000000000 +0200	1	--- src/topiechart.h.orig 2009-10-23 16:19:33 UTC
2	+++ ./src/topiechart.h 2014-07-21 19:25:58.000000000 +0200	2	+++ src/topiechart.h
3	@@ -44,6 +44,7 @@	3	@@ -44,6 +44,7 @@
4		4
5	#include "config.h"	5	#include "config.h"

Lines 1-4 Link Here

(-)databases/tora/files/patch-src_toreport.cpp (-1 / +1 lines)
1	--- src/toreport.cpp.orig 2010-01-14 16:39:02.000000000 +0000	1	--- src/toreport.cpp.orig 2010-01-14 16:39:02 UTC
2	+++ src/toreport.cpp	2	+++ src/toreport.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	*	4	*

Return to bug 201724

Lines 3-9 Link Here

(-)databases/tora/Makefile (-21 / +12 lines)
3		3
4	PORTNAME= tora	4	PORTNAME= tora
5	PORTVERSION= 2.1.3	5	PORTVERSION= 2.1.3
6	PORTREVISION= 9	6	PORTREVISION= 10
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= databases	8	CATEGORIES= databases
9	MASTER_SITES= SF	9	MASTER_SITES= SF
Lines 21-27 Link Here
21	OPTIONS_DEFINE_i386= ORACLE	21	OPTIONS_DEFINE_i386= ORACLE
22	OPTIONS_DEFAULT= PGSQL MYSQL	22	OPTIONS_DEFAULT= PGSQL MYSQL
23		23
24	USE_QT4= gui corelib sql xml network linguist moc_build uic_build rcc_build	24	USE_QT4= corelib gui sql xml network moc_build uic_build rcc_build
25	USES= autoreconf gmake libtool makeinfo	25	USES= autoreconf gmake libtool makeinfo
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS= --with-pcre=${LOCALBASE}	27	CONFIGURE_ARGS= --with-pcre=${LOCALBASE}
Lines 30-59 Link Here
30		30
31	PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html	31	PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html
32		32
33	.include <bsd.port.options.mk>	33	DOCS_USES= makeinfo
		34	DOCS_INFO= tora
34		35
35	.if ${PORT_OPTIONS:MDOCS}	36	MYSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
36	USES+= makeinfo	37	PGSQL_RUN_DEPENDS= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin
37	INFO= tora
38	.endif
39		38
40	.if ${PORT_OPTIONS:MMYSQL}	39	ORACLE_HOME?= ${LOCALBASE}/oracle8-client
41	RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin	40	ORACLE_VER= 8i # Client version
42	.endif
43		41
44	.if ${PORT_OPTIONS:MPGSQL}	42	ORACLE_BUILD_DEPENDS= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
45	RUN_DEPENDS+= ${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin	43	ORACLE_RUN_DEPENDS= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
46	.endif	44	ORACLE_CONFIGURE_ON= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
47		45
48	.if ${PORT_OPTIONS:MORACLE}	46	.include <bsd.port.options.mk>
49	BUILD_DEPENDS+= ${ORACLE_HOME}/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
50	RUN_DEPENDS+= ${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/oracle8-client
51		47
52	ORACLE_HOME?= ${LOCALBASE}/oracle8-client
53	ORACLE_VER= 8i # Client version
54	CONFIGURE_ARGS+= --with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
55	.endif
56
57	post-patch:	48	post-patch:
58	.if ${PORT_OPTIONS:MDOCS}	49	.if ${PORT_OPTIONS:MDOCS}
59	@${REINPLACE_CMD} 's\|/etc/torarc\|${PREFIX}/etc/torarc\|' \	50	@${REINPLACE_CMD} 's\|/etc/torarc\|${PREFIX}/etc/torarc\|' \