- Update to 3.3.

PR:		ports/78312
Submitted by:	Ports Fury
Approved by:	pav (mentor)

3 files changed, 44 insertions, 10 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index fa4ca01c820c..be361e31add7 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,6 +35,10 @@ QTCFGLIBS+=	${PTHREAD_LIBS}
 USE_MYSQL=	yes
 .endif
 
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
@@ -45,7 +49,6 @@ PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if defined(WITH_PGSQL)
-USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--enable-psql
 PLIST_SUB+=	PGSQL=""
 .else
@@ -62,6 +65,21 @@ PLIST_SUB+=	SQLITE=""
 PLIST_SUB+=	SQLITE="@comment "
 .endif
 
+.if defined(WITH_GPGME)
+LIB_DEPENDS+=	gpgme.14:${PORTSDIR}/security/gpgme
+CONFIGURE_ARGS+=	--enable-gpg
+PLIST_SUB+=	GPGME=""
+.else
+PLIST_SUB+=	GPGME="@comment "
+.endif
+
+.if defined(WITH_GENERATOR)
+CONFIGURE_ARGS+=	--enable-generator
+PLIST_SUB+=	GENERATOR=""
+.else
+PLIST_SUB+=	GENERATOR="@comment "
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "QHacc has the following tunable option(s):"
@@ -69,6 +87,8 @@ pre-everything::
 	@${ECHO_MSG} "	WITH_MYSQL=yes		Turns on MySQL support"
 	@${ECHO_MSG} "	WITH_PGSQL=yes		Turns on PostgreSQL support"
 	@${ECHO_MSG} "	WITH_SQLITE=yes		Turns on SQLite support"
+	@${ECHO_MSG} "	WITH_GPGME=yes		Turns on GnuPG support"
+	@${ECHO_MSG} "	WITH_GENERATOR=yes	Turns on random-data generator support"
 	@${ECHO_MSG}
 
 post-patch:
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index 447495098356..2c6cac23eb9e 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1,2 +1,2 @@
-MD5 (qhacc-3.2.3.tar.gz) = 8116e70d37cb6b0abadf38b6c170ca2d
-SIZE (qhacc-3.2.3.tar.gz) = 666835
+MD5 (qhacc-3.3.tar.gz) = ba4d15ac705735921bfa4e8621c42819
+SIZE (qhacc-3.3.tar.gz) = 673490
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 68176fce7936..e4ae14743976 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -35,7 +35,7 @@ lib/libcliimpio.so
 lib/libcliimpio.so.2
 lib/libdbbase.a
 lib/libdbbase.so
-lib/libdbbase.so.5
+lib/libdbbase.so.6
 lib/libdeltas.a
 lib/libdeltas.so
 lib/libdeltas.so.1
@@ -50,7 +50,13 @@ lib/libextprgio.so
 lib/libextprgio.so.2
 lib/libfiledbio.a
 lib/libfiledbio.so
-lib/libfiledbio.so.5
+lib/libfiledbio.so.6
+%%GENERATOR%%lib/libgenio.a
+%%GENERATOR%%lib/libgenio.so
+%%GENERATOR%%lib/libgenio.so.1
+%%GPGME%%lib/libgpgio.a
+%%GPGME%%lib/libgpgio.so
+%%GPGME%%lib/libgpgio.so.2
 lib/libgraphbase.a
 lib/libgraphbase.so
 lib/libgraphbase.so.1
@@ -71,7 +77,7 @@ lib/libmonthlygraph.so
 lib/libmonthlygraph.so.1
 lib/libnativedbio.a
 lib/libnativedbio.so
-lib/libnativedbio.so.5
+lib/libnativedbio.so.6
 lib/libpayee.a
 lib/libpayee.so
 lib/libpayee.so.1
@@ -86,16 +92,19 @@ lib/libprofitloss.so
 lib/libprofitloss.so.1
 lib/libqhacc.a
 lib/libqhacc.so
-lib/libqhacc.so.5
+lib/libqhacc.so.6
 lib/libqhaccext.a
 lib/libqhaccext.so
-lib/libqhaccext.so.5
+lib/libqhaccext.so.6
 lib/libqhaccutils.a
 lib/libqhaccutils.so
-lib/libqhaccutils.so.5
+lib/libqhaccutils.so.6
 lib/libqifio.a
 lib/libqifio.so
 lib/libqifio.so.2
+lib/libshares.a
+lib/libshares.so
+lib/libshares.so.1
 lib/libsinglebargraph.a
 lib/libsinglebargraph.so
 lib/libsinglebargraph.so.1
@@ -118,6 +127,7 @@ lib/libxmlio.a
 lib/libxmlio.so
 lib/libxmlio.so.2
 lib/plugins/db/libextprgio.so
+%%GPGME%%lib/plugins/db/libgpgio.so
 %%SQLITE%%lib/plugins/db/liblfsqliteio.so
 %%MYSQL%%lib/plugins/db/libmysqlio.so
 %%PGSQL%%lib/plugins/db/libpsqlio.so
@@ -126,6 +136,8 @@ lib/plugins/db/libupgradeio.so
 lib/plugins/db/libxmlio.so
 lib/plugins/export/libarcio.so
 lib/plugins/export/libextprgio.so
+%%GENERATOR%%lib/plugins/export/libgenio.so
+%%GPGME%%lib/plugins/export/libgpgio.so
 %%SQLITE%%lib/plugins/export/liblfsqliteio.so
 %%MYSQL%%lib/plugins/export/libmysqlio.so
 %%PGSQL%%lib/plugins/export/libpsqlio.so
@@ -139,6 +151,7 @@ lib/plugins/graph/libsinglelinegraph.so
 lib/plugins/import/libarcio.so
 lib/plugins/import/libcliimpio.so
 lib/plugins/import/libextprgio.so
+%%GPGME%%lib/plugins/import/libgpgio.so
 %%SQLITE%%lib/plugins/import/liblfsqliteio.so
 %%MYSQL%%lib/plugins/import/libmysqlio.so
 %%PGSQL%%lib/plugins/import/libpsqlio.so
@@ -154,6 +167,7 @@ lib/plugins/report/libjournal.so
 lib/plugins/report/libmbudget.so
 lib/plugins/report/libpayee.so
 lib/plugins/report/libprofitloss.so
+lib/plugins/report/libshares.so
 lib/plugins/report/libtbal.so
 lib/plugins/report/libtrans.so
 %%PORTDOCS%%%%DOCSDIR%%/advanced.html