- Update to 0.36

PR:		ports/134341
Submitted by:	Charlie Kester <corky1951@comcast.net> (maintainer)
Approved by:	miwi (mentor implicit)

9 files changed, 40 insertions, 129 deletions

diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index b819ba48981b..0794ca8c8fb4 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtstalker
-PORTVERSION=	0.28
-PORTREVISION=	3
+PORTVERSION=	0.36
 CATEGORIES=	finance kde
 MASTER_SITES=	SF
 
@@ -15,14 +14,17 @@ MAINTAINER=	corky1951@comcast.net
 COMMENT=	Commodity and stock market charting and technical analysis
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS=	db2:${PORTSDIR}/databases/db2
+LIB_DEPENDS=	db-4.3:${PORTSDIR}/databases/db43 \
+		ta_lib:${PORTSDIR}/devel/ta-lib
+
+MAKE_JOBS_UNSAFE=yes
 
 USE_QT_VER=3
 USE_LDCONFIG=	yes
 
 MAKE_ENV=	QTDIR="${QT_PREFIX}"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 QMAKE?=		${LOCALBASE}/bin/qmake
 # XXX - this test is too simple but it is a good start
@@ -32,12 +34,12 @@ QMAKESPEC?=	freebsd-icc
 QMAKESPEC?=	freebsd-g++
 .endif
 
-VERSION_PLUGIN=	0.27
+VERSION_PLUGIN=	0.36
 
 # docs
 DOC_FILES=	\
 		BUGS \
-		CHANGELOG \
+		CHANGELOG-${PORTVERSION} \
 		TODO
 
 .ifndef(NOPORTDOCS)
@@ -45,6 +47,11 @@ PORTDOCS+=	\
 		*
 .endif
 
+.ifndef(NOPORTEXAMPLES)
+PORTEXAMPLES+=	\
+		*
+.endif
+
 PLIST_SUB+=	\
 		VERSION_PLUGIN="${VERSION_PLUGIN}"
 
@@ -53,30 +60,34 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f -name "*pro" | \
 		${XARGS} -x -n 5 \
 		${REINPLACE_CMD} -E \
-		-e 's|/usr/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|'
+		-e 's|${LOCALBASE}/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|'
 # where to find plugins
 	@${REINPLACE_CMD} -E \
-		-e 's|/usr/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|' \
+		-e 's|${LOCALBASE}/lib/qtstalker/|${PREFIX}/lib/${PORTNAME}/|' \
 		${WRKSRC}/lib/Config.cpp \
 # where to both find and install docs
 	@${REINPLACE_CMD} -E \
-		-e 's|/usr/share/doc/qtstalker/html|${DOCSDIR}|' \
+		-e 's|${LOCALBASE}/share/doc/qtstalker/html|${DOCSDIR}/html|' \
 		${WRKSRC}/lib/Config.cpp \
 		${WRKSRC}/docs/docs.pro
+# where to find examples
+	@${REINPLACE_CMD} -e \
+		's|${LOCALBASE}/share/qtstalker/indicator|${EXAMPLESDIR}/indicator|' \
+		${WRKSRC}/docs/docs.pro
 # where to install program
 	@${REINPLACE_CMD} -E \
-		-e 's|/usr/bin|${PREFIX}/bin|' \
+		-e 's|${LOCALBASE}/bin|${PREFIX}/bin|' \
 		${WRKSRC}/src/src.pro
 # where to install libs
 	@${REINPLACE_CMD} -E \
-		-e 's|/usr/lib|${PREFIX}/lib|' \
+		-e 's|${LOCALBASE}/lib|${PREFIX}/lib|' \
 		${WRKSRC}/lib/lib.pro
-# correctly use database/db2
+# correctly use database/db43
 	@${REINPLACE_CMD} -E \
-		-e 's|<db.h>|<db2/db.h>|' \
+		-e 's|<db.h>|<db43/db.h>|' \
 		${WRKSRC}/lib/DbPlugin.h
 	@${REINPLACE_CMD} -E \
-		-e 's|-ldb$$|-ldb2|' \
+		-e 's|-ldb$$|-ldb-4.3|' \
 		${WRKSRC}/lib/lib.pro
 
 do-configure:
@@ -98,14 +109,20 @@ pre-install:
 	@${REINPLACE_CMD} -E \
 		-e 's|\(INSTALL_FILE\)|(BSD_INSTALL_PROGRAM)|' \
 		${WRKSRC}/src/${MAKEFILE}
-.ifdef(NOPORTDOCS)
+.if defined(NOPORTDOCS)
 # disable docs installation
 	@${REINPLACE_CMD} -E \
 		-e 's|^.+cd[[:space:]]+docs[[:space:]]+.+$$|#|' \
-		${WRKSRC}/${MAKEFILE}
+		${WRKSRC}/Makefile
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${REINPLACE_CMD} -e '37,46d' ${WRKSRC}/docs/docs.pro
 .endif
 
 post-install:
+# install minimal rcfile with helpfiles path needed by help window
+	@${MKDIR} ${PREFIX}/share/qt/etc
+	@${INSTALL_DATA} ${FILESDIR}/qtstalkerrc ${PREFIX}/share/qt/etc
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 # additional docs
diff --git a/finance/qtstalker/distinfo b/finance/qtstalker/distinfo
index 94c2a4d5565b..ee31872523ae 100644
--- a/finance/qtstalker/distinfo
+++ b/finance/qtstalker/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtstalker-0.28.tar.gz) = bce9d9201a1e4bccbb852439fd8241b4
-SHA256 (qtstalker-0.28.tar.gz) = 2b0f13b6b6c1752f0a1d6e7ef2067289df9a146036c0ab725fdd4612870f2143
-SIZE (qtstalker-0.28.tar.gz) = 1502923
+MD5 (qtstalker-0.36.tar.gz) = 599589c4e84e828bd888fce6be81dab3
+SHA256 (qtstalker-0.36.tar.gz) = c70716d1241b2968ab331f345ee97be6f866275f2992da222e973505f07d1879
+SIZE (qtstalker-0.36.tar.gz) = 1402092
diff --git a/finance/qtstalker/files/patch-plugins::indicator::ATR::ATR.cpp b/finance/qtstalker/files/patch-plugins::indicator::ATR::ATR.cpp
deleted file mode 100644
index e8f79007ec40..000000000000
--- a/finance/qtstalker/files/patch-plugins::indicator::ATR::ATR.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/indicator/ATR/ATR.cpp.orig	Wed Jan 19 03:26:19 2005
-+++ plugins/indicator/ATR/ATR.cpp	Wed Jan 19 03:27:15 2005
-@@ -21,6 +21,7 @@
- 
- #include "ATR.h"
- #include "PrefDialog.h"
-+#include <math.h>
- #include <qdict.h>
- #include <qobject.h>
- 
diff --git a/finance/qtstalker/files/patch-plugins::indicator::BB::BB.cpp b/finance/qtstalker/files/patch-plugins::indicator::BB::BB.cpp
deleted file mode 100644
index cf73c7b3f282..000000000000
--- a/finance/qtstalker/files/patch-plugins::indicator::BB::BB.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/indicator/BB/BB.cpp.orig	Wed Jan 19 03:28:14 2005
-+++ plugins/indicator/BB/BB.cpp	Wed Jan 19 03:28:24 2005
-@@ -21,6 +21,7 @@
- 
- #include "BB.h"
- #include "PrefDialog.h"
-+#include <math.h>
- #include <qdict.h>
- #include <qobject.h>
- 
diff --git a/finance/qtstalker/files/patch-plugins::indicator::UO::UO.cpp b/finance/qtstalker/files/patch-plugins::indicator::UO::UO.cpp
deleted file mode 100644
index 5905ab381b2b..000000000000
--- a/finance/qtstalker/files/patch-plugins::indicator::UO::UO.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/indicator/UO/UO.cpp.orig	Wed Jan 19 03:40:55 2005
-+++ plugins/indicator/UO/UO.cpp	Wed Jan 19 03:41:05 2005
-@@ -21,6 +21,7 @@
- 
- #include "UO.h"
- #include "PrefDialog.h"
-+#include <math.h>
- #include <qdict.h>
- #include <qobject.h>
- 
diff --git a/finance/qtstalker/files/patch-plugins::indicator::VFI::VFI.cpp b/finance/qtstalker/files/patch-plugins::indicator::VFI::VFI.cpp
deleted file mode 100644
index 4caa5602f5c9..000000000000
--- a/finance/qtstalker/files/patch-plugins::indicator::VFI::VFI.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/indicator/VFI/VFI.cpp.orig	Wed Jan 19 03:42:07 2005
-+++ plugins/indicator/VFI/VFI.cpp	Wed Jan 19 03:42:15 2005
-@@ -21,6 +21,7 @@
- 
- #include "VFI.h"
- #include "PrefDialog.h"
-+#include <math.h>
- #include <qdict.h>
- #include <qobject.h>
- 
diff --git a/finance/qtstalker/files/patch-plugins::indicator::VOLR::VOLR.cpp b/finance/qtstalker/files/patch-plugins::indicator::VOLR::VOLR.cpp
deleted file mode 100644
index 1898ff831503..000000000000
--- a/finance/qtstalker/files/patch-plugins::indicator::VOLR::VOLR.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/indicator/VOLR/VOLR.cpp.orig	Wed Jan 19 03:43:08 2005
-+++ plugins/indicator/VOLR/VOLR.cpp	Wed Jan 19 03:43:24 2005
-@@ -21,6 +21,7 @@
- 
- #include "VOLR.h"
- #include "PrefDialog.h"
-+#include <math.h>
- #include <qdict.h>
- #include <qobject.h>
- 
diff --git a/finance/qtstalker/files/qtstalkerrc b/finance/qtstalker/files/qtstalkerrc
new file mode 100644
index 000000000000..2f87dc513ff0
--- /dev/null
+++ b/finance/qtstalker/files/qtstalkerrc
@@ -0,0 +1,2 @@
+[General]
+HelpFilePath=/usr/local/share/doc/qtstalker/html
diff --git a/finance/qtstalker/pkg-plist b/finance/qtstalker/pkg-plist
index 3754bd5a6d10..41a06bc8a6e1 100644
--- a/finance/qtstalker/pkg-plist
+++ b/finance/qtstalker/pkg-plist
@@ -3,69 +3,11 @@ lib/libqtstalker.so
 lib/libqtstalker.so.0
 lib/libqtstalker.so.%%VERSION_PLUGIN%%
 lib/libqtstalker.so.%%VERSION_PLUGIN%%.0
-lib/qtstalker/chart/libBar.%%VERSION_PLUGIN%%.so
-lib/qtstalker/chart/libCandle.%%VERSION_PLUGIN%%.so
-lib/qtstalker/chart/libEP.%%VERSION_PLUGIN%%.so
-lib/qtstalker/chart/libLine.%%VERSION_PLUGIN%%.so
-lib/qtstalker/chart/libPF.%%VERSION_PLUGIN%%.so
-lib/qtstalker/chart/libSwing.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libBuyArrow.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libFiboLine.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libHorizontalLine.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libSellArrow.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libText.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libTrendLine.%%VERSION_PLUGIN%%.so
-lib/qtstalker/co/libVerticalLine.%%VERSION_PLUGIN%%.so
-lib/qtstalker/db/libCC.%%VERSION_PLUGIN%%.so
-lib/qtstalker/db/libFutures.%%VERSION_PLUGIN%%.so
-lib/qtstalker/db/libIndex.%%VERSION_PLUGIN%%.so
-lib/qtstalker/db/libSpread.%%VERSION_PLUGIN%%.so
-lib/qtstalker/db/libStocks.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libAD.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libATR.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libBB.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libCCI.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libCOMP.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libCOUNTER.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libCUS.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libDMI.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libDPO.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libENV.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libFI.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMA.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMACD.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMAOSC.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMATH.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMF.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libMOM.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libOVRLY.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libPC.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libPER.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libPP.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libREF.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libROC.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libRSI.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libSAR.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libSD.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libSTOCH.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libSZ.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libTHERM.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libTRIX.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libUO.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libVFI.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libVOL.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libVOLR.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libVT.%%VERSION_PLUGIN%%.so
-lib/qtstalker/indicator/libWILLR.%%VERSION_PLUGIN%%.so
 lib/qtstalker/quote/libCME.%%VERSION_PLUGIN%%.so
-lib/qtstalker/quote/libCOT.%%VERSION_PLUGIN%%.so
 lib/qtstalker/quote/libCSV.%%VERSION_PLUGIN%%.so
 lib/qtstalker/quote/libNYBOT.%%VERSION_PLUGIN%%.so
-lib/qtstalker/quote/libQtstalkerFormat.%%VERSION_PLUGIN%%.so
 lib/qtstalker/quote/libYahoo.%%VERSION_PLUGIN%%.so
+share/qt/etc/qtstalkerrc
 @dirrm lib/qtstalker/quote
-@dirrm lib/qtstalker/indicator
-@dirrm lib/qtstalker/db
-@dirrm lib/qtstalker/co
-@dirrm lib/qtstalker/chart
 @dirrm lib/qtstalker
+@dirrmtry share/qt/etc