7 files changed, 81 insertions, 231 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index be622a88501b..63c44f47eaa0 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.3
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,6 @@ 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 \
@@ -39,9 +38,7 @@ USE_MYSQL=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=	--enable-mysql \
-		--with-mysql-libs="${LOCALBASE}/lib/mysql" \
-		--with-mysql-includes="${LOCALBASE}/include/mysql"
+CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=	MYSQL=""
 .else
 PLIST_SUB+=	MYSQL="@comment "
@@ -57,7 +54,7 @@ PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(WITH_SQLITE)
-LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--enable-sqlite \
 		--with-sqlite-libs="${LOCALBASE}/lib" \
 		--with-sqlite-includes="${LOCALBASE}/include"
@@ -81,11 +78,11 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's| -O2||g ; \
 		 s| -g||g ; \
-		 s| -pedantic||g ; \
-		 s|$$(prefix)/plugins|$$(pkglibdir)/plugins|g'
+		 s| -pedantic||g'
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${PREFIX}/lib/qhacc
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index 8d6d7d113d01..8ae5692c5510 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1,2 +1,2 @@
-MD5 (qhacc-3.2.1.tar.gz) = 0587f6f0279c84af2942ef7720aa6f33
-SIZE (qhacc-3.2.1.tar.gz) = 645789
+MD5 (qhacc-3.2.3.tar.gz) = 97e387253145035e3355789a9fbec89d
+SIZE (qhacc-3.2.3.tar.gz) = 666935
diff --git a/finance/qhacc/files/patch-configure.in b/finance/qhacc/files/patch-configure.in
deleted file mode 100644
index e48f6cecb2eb..000000000000
--- a/finance/qhacc/files/patch-configure.in
+++ /dev/null
@@ -1,118 +0,0 @@
---- configure.in.orig	Thu Dec  4 22:21:26 2003
-+++ configure.in	Fri Dec  5 22:24:09 2003
-@@ -121,26 +121,60 @@
- 	fi
- ])
- 
--AC_DEFUN(FIND_MYSQL,[
--	echo -n "checking for mysql_config script... "
-+AC_DEFUN(FIND_MYSQL_LIBS,[
-+  echo -n "checking for MySQL libraries... "
-   for dir in $1
- 	do
-- 	  if test -f $dir/mysql_config
-+ 	  if test -n $2
-+ 	  then
-+ 	    dir=$dir/$2
-+ 		fi
-+
-+ 	  if test -f $dir/libmysqlclient.so
-  		then
-  		  echo "found in $dir"
--			MYSQLDIR="$dir"
-+			MYSQLLIBDIR="$dir"
-+ 			AC_SUBST(MYSQLLIBDIR)
-  		  break
-  		fi
-  	done
-  	
-- 	if test -z $MYSQLDIR
-+ 	if test -z $MYSQLLIBDIR
-  	then
-  		echo ""
-- 		echo "MySQL config script not found! If you have installed it  in an"
-- 		echo "unusual place, please use the \"--with-mysql=\"" option
-+ 		echo "MySQL libraries not found! If you have installed MySQL in an"
-+ 		echo "unusual place, please use the \"--with-mysql-libs=\"" option
-  		echo ""
-  		exit
-- 	fi	
-+ 	fi
-+ ])
-+
-+AC_DEFUN(FIND_MYSQL_INCS,[
-+  echo -n "checking for MySQL headers... "
-+  for dir in $1
-+	do
-+	  if test -n $2
-+		then
-+		  dir=$dir/$2
-+		fi
-+
-+	  if test -f $dir/mysql.h
-+		then
-+		  echo "found in $dir"
-+			MYSQLINCDIR=$dir
-+			AC_SUBST(MYSQLINCDIR)
-+		  break
-+		fi
-+	done
-+	
-+	if test -z $MYSQLINCDIR
-+	then
-+		echo ""
-+		echo "MySQL headers not found! If you have installed MySQL in an"
-+		echo "unusual place, please use the \"--with-mysql-includes=\"" option
-+		echo ""
-+		exit
-+	fi
- ])
- 
- AC_DEFUN(FIND_XML,[
-@@ -251,13 +285,13 @@
- 											 else
- 												 QHACCQT=qt-mt
- 												 dnl see if we have multi-threaded qt
--												 AC_CHECK_LIB(pthread,main)
-+												 AC_CHECK_FUNC(pthread_create)
- 											 fi
- 											 AC_SUBST(QHACCQT)
- 										 ],
- 										 [
- 											 dnl see if we have multi-threaded qt
--											 AC_CHECK_LIB(pthread,main)
-+											 AC_CHECK_FUNC(pthread_create)
- 
- 										   QHACCQT=qt-mt
- 											 AC_SUBST(QHACCQT)
-@@ -344,14 +378,13 @@
- then
- if test x"$bMySQL" = "xtrue"
- then
--	AC_ARG_WITH(mysql, [  --with-mysql=DIR           mysql_config script in DIR],
--										[FIND_MYSQL($withval)],
--										[FIND_MYSQL($BINPATH)])
--
--	MYSQLLIBS=$($MYSQLDIR/mysql_config --libs)
--	MYSQLFLAGS=$($MYSQLDIR/mysql_config --cflags)
--	AC_SUBST(MYSQLFLAGS)
--	AC_SUBST(MYSQLLIBS)
-+AC_ARG_WITH(mysql-libs,[  --with-mysql-libs=DIR           mysql libraries in DIR],
-+										[FIND_MYSQL_LIBS($withval, "")],
-+										[FIND_MYSQL_LIBS($MYSQLDIRS, "lib")])
-+
-+AC_ARG_WITH(mysql-includes,[  --with-mysql-includes=DIR mysql includes in DIR],
-+										[FIND_MYSQL_INCS($withval, "")],
-+										[FIND_MYSQL_INCS($MYSQLDIRS, "include")])
- fi
- 
- if test x"$bPSQL" = "xtrue"
-@@ -383,7 +416,7 @@
- 													 [FIND_SQLITE_LIBS($withval, "")],
- 													 [FIND_SQLITE_LIBS($SQLITEDIRS, "lib")])
- 
--AC_ARG_WITH(mysql-includes,[  --with-sqlite-includes=DIR sqlite includes in DIR],
-+AC_ARG_WITH(sqlite-includes,[  --with-sqlite-includes=DIR sqlite includes in DIR],
- 													 [FIND_SQLITE_INCS($withval, "")],
- 													 [FIND_SQLITE_INCS($SQLITEDIRS, "include")])
- fi
diff --git a/finance/qhacc/files/patch-lib::qhacc.cpp b/finance/qhacc/files/patch-lib::qhacc.cpp
index 6c93fae32782..2592654e4a99 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	Thu Jul  8 07:06:55 2004
-+++ lib/qhacc.cpp	Thu Aug 12 03:10:59 2004
+--- lib/qhacc.cpp.orig	Thu Dec  9 08:25:23 2004
++++ lib/qhacc.cpp	Fri Dec 10 00:05:58 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;

+ #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-plugins::mysql::Makefile.in b/finance/qhacc/files/patch-plugins::mysql::Makefile.in
deleted file mode 100644
index deb83f3d0536..000000000000
--- a/finance/qhacc/files/patch-plugins::mysql::Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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@
--MYSQLFLAGS = @MYSQLFLAGS@
--MYSQLLIBS = @MYSQLLIBS@
-+MYSQLINCDIR = @MYSQLINCDIR@
-+MYSQLLIBDIR = @MYSQLLIBDIR@
- MYSQL_FALSE = @MYSQL_FALSE@
- MYSQL_TRUE = @MYSQL_TRUE@
- OBJEXT = @OBJEXT@
-@@ -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@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)
- all: all-am
- 
diff --git a/finance/qhacc/files/patch-src::qhacc.in b/finance/qhacc/files/patch-src::qhacc.in
index a55df5e2511d..e3624ade6675 100644
--- a/finance/qhacc/files/patch-src::qhacc.in
+++ b/finance/qhacc/files/patch-src::qhacc.in
@@ -1,17 +1,17 @@
---- src/qhacc.in.bak	Thu Dec  4 22:21:26 2003
-+++ src/qhacc.in	Fri Dec  5 16:48:17 2003
+--- src/qhacc.in.orig	Tue Dec  7 11:05:34 2004
++++ src/qhacc.in	Fri Dec 10 02:47:25 2004
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#!%%LOCALBASE%%/bin/bash
  ###############################################################
  # parse the command line, and call the appropriate executable #
  #                                                             #
-@@ -42,7 +42,7 @@
- 
- 
+@@ -39,7 +39,7 @@
  # You can change QHACC_ROOT and QHACC_HOME to fit your needs
--QHACC_ROOT=${QHACC_ROOT:="@prefix@"}
-+QHACC_ROOT=${QHACC_ROOT:="@prefix@/lib/qhacc"}
+ QHACC_ROOT=${QHACC_ROOT:="@libdir@"}
  QHACC_HOME=${QHACC_HOME:="${HOME}/.qhacc"}
+-QHACC_LANGDIR=${QHACC_LANGDIR:="@datadir@"}
++QHACC_LANGDIR=${QHACC_LANGDIR:="@datadir@/qhacc"}
+ 
+ export LD_LIBRARY_PATH=$QHACC_ROOT:$LD_LIBRARY_PATH
  
- prefix=@prefix@
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 68bf6315543a..68176fce7936 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.4
+lib/libdbbase.so.5
 lib/libdeltas.a
 lib/libdeltas.so
 lib/libdeltas.so.1
@@ -50,7 +50,7 @@ lib/libextprgio.so
 lib/libextprgio.so.2
 lib/libfiledbio.a
 lib/libfiledbio.so
-lib/libfiledbio.so.4
+lib/libfiledbio.so.5
 lib/libgraphbase.a
 lib/libgraphbase.so
 lib/libgraphbase.so.1
@@ -59,7 +59,7 @@ lib/libjournal.so
 lib/libjournal.so.1
 %%SQLITE%%lib/liblfsqliteio.a
 %%SQLITE%%lib/liblfsqliteio.so
-%%SQLITE%%lib/liblfsqliteio.so.2
+%%SQLITE%%lib/liblfsqliteio.so.3
 %%MYSQL%%lib/libmysqlio.a
 %%MYSQL%%lib/libmysqlio.so
 %%MYSQL%%lib/libmysqlio.so.2
@@ -71,7 +71,7 @@ lib/libmonthlygraph.so
 lib/libmonthlygraph.so.1
 lib/libnativedbio.a
 lib/libnativedbio.so
-lib/libnativedbio.so.4
+lib/libnativedbio.so.5
 lib/libpayee.a
 lib/libpayee.so
 lib/libpayee.so.1
@@ -86,13 +86,13 @@ lib/libprofitloss.so
 lib/libprofitloss.so.1
 lib/libqhacc.a
 lib/libqhacc.so
-lib/libqhacc.so.4
+lib/libqhacc.so.5
 lib/libqhaccext.a
 lib/libqhaccext.so
-lib/libqhaccext.so.4
+lib/libqhaccext.so.5
 lib/libqhaccutils.a
 lib/libqhaccutils.so
-lib/libqhaccutils.so.4
+lib/libqhaccutils.so.5
 lib/libqifio.a
 lib/libqifio.so
 lib/libqifio.so.2
@@ -104,7 +104,7 @@ lib/libsinglelinegraph.so
 lib/libsinglelinegraph.so.1
 %%SQLITE%%lib/libsqliteio.a
 %%SQLITE%%lib/libsqliteio.so
-%%SQLITE%%lib/libsqliteio.so.2
+%%SQLITE%%lib/libsqliteio.so.3
 lib/libtbal.a
 lib/libtbal.so
 lib/libtbal.so.1
@@ -117,46 +117,45 @@ lib/libupgradeio.so.2
 lib/libxmlio.a
 lib/libxmlio.so
 lib/libxmlio.so.2
-lib/qhacc/plugins/db/libextprgio.so
-%%SQLITE%%lib/qhacc/plugins/db/liblfsqliteio.so
-%%MYSQL%%lib/qhacc/plugins/db/libmysqlio.so
-%%PGSQL%%lib/qhacc/plugins/db/libpsqlio.so
-%%SQLITE%%lib/qhacc/plugins/db/libsqliteio.so
-lib/qhacc/plugins/db/libupgradeio.so
-lib/qhacc/plugins/db/libxmlio.so
-lib/qhacc/plugins/export/libarcio.so
-lib/qhacc/plugins/export/libextprgio.so
-%%SQLITE%%lib/qhacc/plugins/export/liblfsqliteio.so
-%%MYSQL%%lib/qhacc/plugins/export/libmysqlio.so
-%%PGSQL%%lib/qhacc/plugins/export/libpsqlio.so
-%%SQLITE%%lib/qhacc/plugins/export/libsqliteio.so
-lib/qhacc/plugins/export/libxmlio.so
-lib/qhacc/plugins/graph/libdoublebargraph.so
-lib/qhacc/plugins/graph/libdoublelinegraph.so
-lib/qhacc/plugins/graph/libpiegraph.so
-lib/qhacc/plugins/graph/libsinglebargraph.so
-lib/qhacc/plugins/graph/libsinglelinegraph.so
-lib/qhacc/plugins/import/libarcio.so
-lib/qhacc/plugins/import/libcliimpio.so
-lib/qhacc/plugins/import/libextprgio.so
-%%SQLITE%%lib/qhacc/plugins/import/liblfsqliteio.so
-%%MYSQL%%lib/qhacc/plugins/import/libmysqlio.so
-%%PGSQL%%lib/qhacc/plugins/import/libpsqlio.so
-lib/qhacc/plugins/import/libqifio.so
-%%SQLITE%%lib/qhacc/plugins/import/libsqliteio.so
-lib/qhacc/plugins/import/libxmlio.so
-lib/qhacc/plugins/report/libacct.so
-lib/qhacc/plugins/report/libaves.so
-lib/qhacc/plugins/report/libbalances.so
-lib/qhacc/plugins/report/libbudget.so
-lib/qhacc/plugins/report/libdeltas.so
-lib/qhacc/plugins/report/libjournal.so
-lib/qhacc/plugins/report/libmbudget.so
-lib/qhacc/plugins/report/libpayee.so
-lib/qhacc/plugins/report/libprofitloss.so
-lib/qhacc/plugins/report/libtbal.so
-lib/qhacc/plugins/report/libtrans.so
-lib/qhacc/qhacc_es_ES.qm
+lib/plugins/db/libextprgio.so
+%%SQLITE%%lib/plugins/db/liblfsqliteio.so
+%%MYSQL%%lib/plugins/db/libmysqlio.so
+%%PGSQL%%lib/plugins/db/libpsqlio.so
+%%SQLITE%%lib/plugins/db/libsqliteio.so
+lib/plugins/db/libupgradeio.so
+lib/plugins/db/libxmlio.so
+lib/plugins/export/libarcio.so
+lib/plugins/export/libextprgio.so
+%%SQLITE%%lib/plugins/export/liblfsqliteio.so
+%%MYSQL%%lib/plugins/export/libmysqlio.so
+%%PGSQL%%lib/plugins/export/libpsqlio.so
+%%SQLITE%%lib/plugins/export/libsqliteio.so
+lib/plugins/export/libxmlio.so
+lib/plugins/graph/libdoublebargraph.so
+lib/plugins/graph/libdoublelinegraph.so
+lib/plugins/graph/libpiegraph.so
+lib/plugins/graph/libsinglebargraph.so
+lib/plugins/graph/libsinglelinegraph.so
+lib/plugins/import/libarcio.so
+lib/plugins/import/libcliimpio.so
+lib/plugins/import/libextprgio.so
+%%SQLITE%%lib/plugins/import/liblfsqliteio.so
+%%MYSQL%%lib/plugins/import/libmysqlio.so
+%%PGSQL%%lib/plugins/import/libpsqlio.so
+lib/plugins/import/libqifio.so
+%%SQLITE%%lib/plugins/import/libsqliteio.so
+lib/plugins/import/libxmlio.so
+lib/plugins/report/libacct.so
+lib/plugins/report/libaves.so
+lib/plugins/report/libbalances.so
+lib/plugins/report/libbudget.so
+lib/plugins/report/libdeltas.so
+lib/plugins/report/libjournal.so
+lib/plugins/report/libmbudget.so
+lib/plugins/report/libpayee.so
+lib/plugins/report/libprofitloss.so
+lib/plugins/report/libtbal.so
+lib/plugins/report/libtrans.so
 %%PORTDOCS%%%%DOCSDIR%%/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/compiling.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
@@ -173,12 +172,13 @@ lib/qhacc/qhacc_es_ES.qm
 %%PORTDOCS%%%%EXAMPLESDIR%%/preferences
 %%PORTDOCS%%%%EXAMPLESDIR%%/splits
 %%PORTDOCS%%%%EXAMPLESDIR%%/transactions
+%%DATADIR%%/qhacc_bg_BG.qm
+%%DATADIR%%/qhacc_es_ES.qm
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/qhacc/plugins/report
-@dirrm lib/qhacc/plugins/import
-@dirrm lib/qhacc/plugins/graph
-@dirrm lib/qhacc/plugins/export
-@dirrm lib/qhacc/plugins/db
-@dirrm lib/qhacc/plugins
-@dirrm lib/qhacc
+@unexec rmdir %D/lib/plugins/report 2>/dev/null || true
+@unexec rmdir %D/lib/plugins/import 2>/dev/null || true
+@unexec rmdir %D/lib/plugins/graph 2>/dev/null || true
+@unexec rmdir %D/lib/plugins/export 2>/dev/null || true
+@unexec rmdir %D/lib/plugins/db 2>/dev/null || true