11 files changed, 54 insertions, 120 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index feecf4406571..ee3016f1a391 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	3.0
+PORTVERSION=	3.2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,13 +14,14 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple QT-based financial manager
 
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	259
+USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qt-moc=${QT_PREFIX}/bin \
 		--with-qt-libs=${QT_PREFIX}/lib
@@ -89,8 +90,7 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-.for file in accounts accounttypes jobs journals namedtrans preferences \
-	splits transactions
+.for file in accounts jobs journals namedtrans preferences splits transactions
 	${INSTALL_DATA} ${WRKSRC}/contrib/easysetup/${file} ${EXAMPLESDIR}
 .endfor
 .endif
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index edf6596cea22..02ad19f20235 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1,2 +1,2 @@
-MD5 (qhacc-3.0.tar.gz) = d31ddfd0a37b81781a6fd8c1287f093a
-SIZE (qhacc-3.0.tar.gz) = 524020
+MD5 (qhacc-3.2.tar.gz) = 72285666fa719d43516203420faaaa22
+SIZE (qhacc-3.2.tar.gz) = 647439
diff --git a/finance/qhacc/files/patch-Makefile.in b/finance/qhacc/files/patch-Makefile.in
index cf8781e14ced..45f1ac49a03a 100644
--- a/finance/qhacc/files/patch-Makefile.in
+++ b/finance/qhacc/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Sat Jan 31 10:47:17 2004
-+++ Makefile.in	Mon Feb  9 01:03:14 2004
-@@ -158,7 +158,7 @@
+--- Makefile.in.orig	Sun Aug  1 07:28:55 2004
++++ Makefile.in	Thu Aug 12 03:09:51 2004
+@@ -206,7 +206,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -SUBDIRS = lib src plugins contrib docs qm
 +SUBDIRS = lib src plugins
- 
  EXTRA_DIST = AUTHORS NEWS COPYING README ChangeLog THANKS FILE_FORMAT TODO \
  						 INSTALL UPGRADE
+ 
diff --git a/finance/qhacc/files/patch-lib::plugins.h b/finance/qhacc/files/patch-lib::plugins.h
deleted file mode 100644
index 2c8d2791d460..000000000000
--- a/finance/qhacc/files/patch-lib::plugins.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/plugins.h.orig	Thu Dec  4 22:21:26 2003
-+++ lib/plugins.h	Fri Dec  5 13:35:31 2003
-@@ -20,6 +20,7 @@
- #ifndef PLUGINS_H
- #define PLUGINS_H
- 
-+#include <memory>
- #include <vector>
- 
- #include <qstring.h>
diff --git a/finance/qhacc/files/patch-lib::qhacc.cpp b/finance/qhacc/files/patch-lib::qhacc.cpp
index a50451b3b943..6c93fae32782 100644
--- a/finance/qhacc/files/patch-lib::qhacc.cpp
+++ b/finance/qhacc/files/patch-lib::qhacc.cpp
@@ -1,11 +1,11 @@
---- lib/qhacc.cpp.orig	Sun Sep 28 01:08:13 2003
-+++ lib/qhacc.cpp	Sun Nov  2 10:53:38 2003
-@@ -31,7 +31,7 @@
- #include "plugins.h"
- #include "qhacc.moc"
- 
--#include <math.h>
-+#include <cmath>
- 
- #include <qdir.h>
- #include <qfile.h>
+--- lib/qhacc.cpp.orig	Thu Jul  8 07:06:55 2004
++++ lib/qhacc.cpp	Thu Aug 12 03:10:59 2004
+@@ -55,7 +55,7 @@
+ #include "localfileplugin.h"

+ #include "qhacc.moc"

+ 

+-#include <math.h>

++#include <cmath>

+ 

+ //const int QHacc::ROLLOVER=( int )std::pow( ( double )10, QC::DECIMALS );

+ const int QHacc::ROLLOVER=100;

diff --git a/finance/qhacc/files/patch-lib::qhacc.h b/finance/qhacc/files/patch-lib::qhacc.h
deleted file mode 100644
index 040297b311d3..000000000000
--- a/finance/qhacc/files/patch-lib::qhacc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/qhacc.h.orig	Thu Dec  4 22:21:26 2003
-+++ lib/qhacc.h	Fri Dec  5 13:24:01 2003
-@@ -23,6 +23,7 @@
- #include "tableops.h"
- #include "resultset.h"
- 
-+#include <memory>
- #include <vector>
- 
- #include <qfont.h>
diff --git a/finance/qhacc/files/patch-lib::qhacctable.h b/finance/qhacc/files/patch-lib::qhacctable.h
deleted file mode 100644
index 578371289882..000000000000
--- a/finance/qhacc/files/patch-lib::qhacctable.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/qhacctable.h.orig	Thu Dec  4 22:21:26 2003
-+++ lib/qhacctable.h	Fri Dec  5 13:27:08 2003
-@@ -23,6 +23,7 @@
- #include "tableops.h"
- #include "resultset.h"
- 
-+#include <memory>
- #include <vector>
- 
- #include <qlist.h>
diff --git a/finance/qhacc/files/patch-ltmain.sh b/finance/qhacc/files/patch-ltmain.sh
deleted file mode 100644
index a2ba9330ef4d..000000000000
--- a/finance/qhacc/files/patch-ltmain.sh
+++ /dev/null
@@ -1,33 +0,0 @@
---- ltmain.sh.orig	Thu Mar 13 01:25:30 2003
-+++ ltmain.sh	Mon Aug 18 02:14:24 2003
-@@ -1043,7 +1043,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -2441,7 +2441,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4210,10 +4210,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/finance/qhacc/files/patch-plugins::mysql::Makefile.in b/finance/qhacc/files/patch-plugins::mysql::Makefile.in
index a9da0f468e9a..deb83f3d0536 100644
--- a/finance/qhacc/files/patch-plugins::mysql::Makefile.in
+++ b/finance/qhacc/files/patch-plugins::mysql::Makefile.in
@@ -1,6 +1,6 @@
---- plugins/mysql/Makefile.in.orig	Fri Dec  5 00:32:03 2003
-+++ plugins/mysql/Makefile.in	Fri Dec  5 23:04:22 2003
-@@ -77,8 +77,8 @@
+--- plugins/mysql/Makefile.in.orig	Sun Aug  1 07:28:58 2004
++++ plugins/mysql/Makefile.in	Thu Aug 12 14:39:19 2004
+@@ -129,8 +129,8 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MAKEINFO = @MAKEINFO@
@@ -11,21 +11,19 @@
  MYSQL_FALSE = @MYSQL_FALSE@
  MYSQL_TRUE = @MYSQL_TRUE@
  OBJEXT = @OBJEXT@
-@@ -167,13 +167,13 @@
- 
+@@ -225,11 +225,11 @@
+ @MYSQL_TRUE@exportdir = $(pidir)/export
+ @MYSQL_TRUE@libmysqlio_la_SOURCES = mysqlplugin.cpp mysqlplugin.h
  @MYSQL_TRUE@RELEASE = 2:0:0
- 
 -@MYSQL_TRUE@libmysqlio_la_LIBADD = -l$(QHACCQT) -lnativedbio
-+@MYSQL_TRUE@libmysqlio_la_LIBADD = -l$(QHACCQT) -lmysqlclient -lnativedbio
- 
 -@MYSQL_TRUE@INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(top_srcdir)/lib
 -@MYSQL_TRUE@AM_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(MYSQLLIBS)
++@MYSQL_TRUE@libmysqlio_la_LIBADD = -l$(QHACCQT) -lmysqlclient -lnativedbio
 +@MYSQL_TRUE@INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(MYSQLINCDIR) -I$(top_srcdir)/lib
 +@MYSQL_TRUE@AM_LDFLAGS = -L$(QTLIBDIR) -L$(MYSQLLIBDIR) -L$(top_builddir)/lib
  @MYSQL_TRUE@LDADD = 
- 
 -@MYSQL_TRUE@AM_CXXFLAGS = -O2 -Wall -g -Wnon-virtual-dtor -Wno-long-long -Wundef -W -Wpointer-arith -Wwrite-strings -Wcast-align -Wconversion -fPIC $(MYSQLFLAGS)
 +@MYSQL_TRUE@AM_CXXFLAGS = -O2 -Wall -g -Wnon-virtual-dtor -Wno-long-long -Wundef -W -Wpointer-arith -Wwrite-strings -Wcast-align -Wconversion -fPIC
- 
  @MYSQL_TRUE@libmysqlio_la_LDFLAGS = -version-info $(RELEASE)
- subdir = plugins/mysql
+ all: all-am
+ 
diff --git a/finance/qhacc/files/patch-src::Makefile.in b/finance/qhacc/files/patch-src::Makefile.in
index c8af8c4601c1..e626cdd8721c 100644
--- a/finance/qhacc/files/patch-src::Makefile.in
+++ b/finance/qhacc/files/patch-src::Makefile.in
@@ -1,16 +1,15 @@
---- src/Makefile.in.orig	Sat Feb 14 22:19:19 2004
-+++ src/Makefile.in	Fri Feb 20 13:31:57 2004
-@@ -177,10 +177,10 @@
+--- src/Makefile.in.orig	Sun Aug  1 07:29:01 2004
++++ src/Makefile.in	Thu Aug 12 14:42:06 2004
+@@ -255,9 +255,9 @@
+ noinst_HEADERS = qhaccview.h qhaccrecwin.h qhaccdialogs.h qhaccacctchsr.h transeditor.h qhaccwidget.h qhaccgrwin.h qhaccsubsetwin.h qhaccjrnlchsr.h qhacccli.h qhacclineedits.h splitdialog.h copystore.h guiconstants.h qhacclistview.h qhaccacctbox.h qhaccacctboxchsr.h qhaccacctdlg.h qhaccprefdlg.h
  EXTRA_DIST = lupdate.info
- 
  SUBDIRS = pixmaps
 -INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(top_srcdir)/lib
-+INCLUDES = -I$(top_srcdir)/lib $(all_includes) -I$(QTINCDIR)
- 
 -qhacc_gui_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS) -L.
 -qhacc_cli_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS) -L.
-+qhacc_gui_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS)
-+qhacc_cli_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS)
++INCLUDES = -I$(top_srcdir)/lib $(all_includes) -I$(QTINCDIR)
++qhacc_gui_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS) 
++qhacc_cli_LDFLAGS = -L$(top_builddir)/lib -L. -L$(QTLIBDIR) $(LDFLAGS) 
  
+ #qhacc_gui_LDADD =	-l$(QHACCQT) -lqhacc -lqhaccutils -lmpatrol -lbfd -liberty
  qhacc_gui_LDADD = -l$(QHACCQT) -lqhacc -lqhaccutils
- qhacc_cli_LDADD = -l$(QHACCQT) -lqhacc -lqhaccutils -lqhaccext 
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index c5ce8a5b6d6b..68bf6315543a 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -3,6 +3,7 @@ bin/qhacc-cli
 bin/qhacc-config
 bin/qhacc-gui
 include/localfileplugin.h
+include/plugininfo.h
 include/plugins.h
 include/qhacc.h
 include/qhaccconstants.h
@@ -19,7 +20,7 @@ lib/libacct.so
 lib/libacct.so.1
 lib/libarcio.a
 lib/libarcio.so
-lib/libarcio.so.1
+lib/libarcio.so.2
 lib/libaves.a
 lib/libaves.so
 lib/libaves.so.1
@@ -31,10 +32,10 @@ lib/libbudget.so
 lib/libbudget.so.1
 lib/libcliimpio.a
 lib/libcliimpio.so
-lib/libcliimpio.so.1
+lib/libcliimpio.so.2
 lib/libdbbase.a
 lib/libdbbase.so
-lib/libdbbase.so.3
+lib/libdbbase.so.4
 lib/libdeltas.a
 lib/libdeltas.so
 lib/libdeltas.so.1
@@ -46,10 +47,10 @@ lib/libdoublelinegraph.so
 lib/libdoublelinegraph.so.1
 lib/libextprgio.a
 lib/libextprgio.so
-lib/libextprgio.so.1
+lib/libextprgio.so.2
 lib/libfiledbio.a
 lib/libfiledbio.so
-lib/libfiledbio.so.3
+lib/libfiledbio.so.4
 lib/libgraphbase.a
 lib/libgraphbase.so
 lib/libgraphbase.so.1
@@ -58,7 +59,7 @@ lib/libjournal.so
 lib/libjournal.so.1
 %%SQLITE%%lib/liblfsqliteio.a
 %%SQLITE%%lib/liblfsqliteio.so
-%%SQLITE%%lib/liblfsqliteio.so.1
+%%SQLITE%%lib/liblfsqliteio.so.2
 %%MYSQL%%lib/libmysqlio.a
 %%MYSQL%%lib/libmysqlio.so
 %%MYSQL%%lib/libmysqlio.so.2
@@ -70,13 +71,13 @@ lib/libmonthlygraph.so
 lib/libmonthlygraph.so.1
 lib/libnativedbio.a
 lib/libnativedbio.so
-lib/libnativedbio.so.3
+lib/libnativedbio.so.4
 lib/libpayee.a
 lib/libpayee.so
 lib/libpayee.so.1
 %%PGSQL%%lib/libpsqlio.a
 %%PGSQL%%lib/libpsqlio.so
-%%PGSQL%%lib/libpsqlio.so.1
+%%PGSQL%%lib/libpsqlio.so.2
 lib/libpiegraph.a
 lib/libpiegraph.so
 lib/libpiegraph.so.1
@@ -85,16 +86,16 @@ lib/libprofitloss.so
 lib/libprofitloss.so.1
 lib/libqhacc.a
 lib/libqhacc.so
-lib/libqhacc.so.3
+lib/libqhacc.so.4
 lib/libqhaccext.a
 lib/libqhaccext.so
-lib/libqhaccext.so.3
+lib/libqhaccext.so.4
 lib/libqhaccutils.a
 lib/libqhaccutils.so
-lib/libqhaccutils.so.3
+lib/libqhaccutils.so.4
 lib/libqifio.a
 lib/libqifio.so
-lib/libqifio.so.1
+lib/libqifio.so.2
 lib/libsinglebargraph.a
 lib/libsinglebargraph.so
 lib/libsinglebargraph.so.1
@@ -103,7 +104,7 @@ lib/libsinglelinegraph.so
 lib/libsinglelinegraph.so.1
 %%SQLITE%%lib/libsqliteio.a
 %%SQLITE%%lib/libsqliteio.so
-%%SQLITE%%lib/libsqliteio.so.1
+%%SQLITE%%lib/libsqliteio.so.2
 lib/libtbal.a
 lib/libtbal.so
 lib/libtbal.so.1
@@ -112,10 +113,10 @@ lib/libtrans.so
 lib/libtrans.so.1
 lib/libupgradeio.a
 lib/libupgradeio.so
-lib/libupgradeio.so.1
+lib/libupgradeio.so.2
 lib/libxmlio.a
 lib/libxmlio.so
-lib/libxmlio.so.1
+lib/libxmlio.so.2
 lib/qhacc/plugins/db/libextprgio.so
 %%SQLITE%%lib/qhacc/plugins/db/liblfsqliteio.so
 %%MYSQL%%lib/qhacc/plugins/db/libmysqlio.so
@@ -166,7 +167,6 @@ lib/qhacc/qhacc_es_ES.qm
 %%PORTDOCS%%%%DOCSDIR%%/primer.html
 %%PORTDOCS%%%%DOCSDIR%%/using.html
 %%PORTDOCS%%%%EXAMPLESDIR%%/accounts
-%%PORTDOCS%%%%EXAMPLESDIR%%/accounttypes
 %%PORTDOCS%%%%EXAMPLESDIR%%/jobs
 %%PORTDOCS%%%%EXAMPLESDIR%%/journals
 %%PORTDOCS%%%%EXAMPLESDIR%%/namedtrans