- Update to version 2.9.4

PR:		60335
Submitted by:	Ports Fury

12 files changed, 364 insertions, 39 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 240e581c791..96ff02c2400 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	2.9.1
-PORTREVISION=	2
+PORTVERSION=	2.9.4
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,35 +18,95 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
-USE_GNOME=	gnometarget libxml
+WANT_GNOME=	yes
+USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-xml=yes \
-		--with-qt-moc=${QT_PREFIX}/bin \
+USE_AUTOCONF_VER=	257
+CONFIGURE_ARGS=	--with-qt-moc=${QT_PREFIX}/bin \
 		--with-qt-libs=${QT_PREFIX}/lib
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 INSTALLS_SHLIB=	yes
 
-STRIP=		# none
+QTCPPFLAGS+=	${PTHREAD_CFLAGS}
+QTCFGLIBS+=	${PTHREAD_LIBS}
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500035
+CXXFLAGS+=	-fpermissive
+.endif
+
+.if ${HAVE_GNOME:Mlibxml}!=""
+USE_GNOME+=	libxml
+CONFIGURE_ARGS+=	--enable-xml
+PLIST_SUB+=	LIBXML=""
+.else
+PLIST_SUB+=	LIBXML="@comment "
+.endif
+
+.if defined(WITH_MYSQL)
+CONFIGURE_ARGS+=	--enable-mysql \
+		--with-mysql-libs="${LOCALBASE}/lib/mysql" \
+		--with-mysql-includes="${LOCALBASE}/include/mysql"
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
+.if defined(WITH_PGSQL)
+POSTGRESQL_PORT?=	databases/postgresql7
+LIB_DEPENDS+=	pq:${PORTSDIR}/${POSTGRESQL_PORT}
+CONFIGURE_ARGS+=	--enable-psql
+PLIST_SUB+=	PGSQL=""
+.else
+PLIST_SUB+=	PGSQL="@comment "
+.endif
+
+.if defined(WITH_SQLITE)
+LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite
+CONFIGURE_ARGS+=	--enable-sqlite \
+		--with-sqlite-libs="${LOCALBASE}/lib" \
+		--with-sqlite-includes="${LOCALBASE}/include"
+PLIST_SUB+=	SQLITE=""
+.else
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "QHacc has the following tunable option(s):"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "	WITHOUT_GNOME=libxml	Turns off LibXML support"
+	@${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}
 
 post-patch:
-	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|#! /bin/sh|#!${LOCALBASE}/bin/bash|g ; \
-		 s|/usr/local/q|${PREFIX}/lib/q|g' ${WRKSRC}/src/qhacc.orig
+	@${REINPLACE_CMD} -e \
+		's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/qhacc.in
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|-O2 -Wall -g||g ; \
+		's| -O2||g ; \
+		 s| -g||g ; \
+		 s| -pedantic||g ; \
 		 s|contrib docs qm|contrib|g ; \
 		 s|$$(prefix)/plugins|$$(pkglibdir)/plugins|g'
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/qhacc-*
-.for file in accounts memorized preferences transactions
-	${INSTALL_DATA} ${WRKSRC}/contrib/easysetup/${file} ${PREFIX}/lib/qhacc
-.endfor
 	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${PREFIX}/lib/qhacc
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in accounts memorized preferences transactions
+	${INSTALL_DATA} ${WRKSRC}/contrib/easysetup/${file} ${EXAMPLESDIR}
+.endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index 479f6939c76..f9fb1263ef7 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1 +1 @@
-MD5 (qhacc-2.9.1.tar.gz) = 1e8b88a7ee1978bdcc7915ca9915a945
+MD5 (qhacc-2.9.4.tar.gz) = 6695c30fea7e59163314fc43e9372abc
diff --git a/finance/qhacc/files/patch-configure.in b/finance/qhacc/files/patch-configure.in
new file mode 100644
index 00000000000..e48f6cecb2e
--- /dev/null
+++ b/finance/qhacc/files/patch-configure.in
@@ -0,0 +1,118 @@
+--- 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::plugins.h b/finance/qhacc/files/patch-lib::plugins.h
new file mode 100644
index 00000000000..2c8d2791d46
--- /dev/null
+++ b/finance/qhacc/files/patch-lib::plugins.h
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..a50451b3b94
--- /dev/null
+++ b/finance/qhacc/files/patch-lib::qhacc.cpp
@@ -0,0 +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>
diff --git a/finance/qhacc/files/patch-lib::qhacc.h b/finance/qhacc/files/patch-lib::qhacc.h
new file mode 100644
index 00000000000..040297b311d
--- /dev/null
+++ b/finance/qhacc/files/patch-lib::qhacc.h
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..57837128988
--- /dev/null
+++ b/finance/qhacc/files/patch-lib::qhacctable.h
@@ -0,0 +1,10 @@
+--- 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-plugins::mysql::Makefile.in b/finance/qhacc/files/patch-plugins::mysql::Makefile.in
new file mode 100644
index 00000000000..a9da0f468e9
--- /dev/null
+++ b/finance/qhacc/files/patch-plugins::mysql::Makefile.in
@@ -0,0 +1,31 @@
+--- 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 @@
+ 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@
+@@ -167,13 +167,13 @@
+ 
+ @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@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
diff --git a/finance/qhacc/files/patch-plugins::xml::xmlplugin.h b/finance/qhacc/files/patch-plugins::xml::xmlplugin.h
new file mode 100644
index 00000000000..ff8b3505bcd
--- /dev/null
+++ b/finance/qhacc/files/patch-plugins::xml::xmlplugin.h
@@ -0,0 +1,13 @@
+--- plugins/xml/xmlplugin.h.orig	Thu Dec  4 22:21:26 2003
++++ plugins/xml/xmlplugin.h	Fri Dec  5 14:16:02 2003
+@@ -24,8 +24,8 @@
+ 
+ #include <stdlib.h>
+ #include <tree.h>
+-#include <xmlmemory.h>
+-#include <parser.h>
++#include <libxml/xmlmemory.h>
++#include <libxml/parser.h>
+ 
+ class XMLDBPlugin : public LocalFileDBPlugin {
+  public:
diff --git a/finance/qhacc/files/patch-src::Makefile.in b/finance/qhacc/files/patch-src::Makefile.in
new file mode 100644
index 00000000000..61d7a9ea9af
--- /dev/null
+++ b/finance/qhacc/files/patch-src::Makefile.in
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	Sun Dec  7 04:25:21 2003
++++ src/Makefile.in	Mon Dec 15 01:19:39 2003
+@@ -169,9 +169,9 @@
+ EXTRA_DIST = lupdate.info
+ 
+ SUBDIRS = pixmaps
+-INCLUDES = $(all_includes) -I$(QTINCDIR) -I$(top_srcdir)/lib
+-qhacc_gui_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS)
+-qhacc_cli_LDFLAGS = -L$(QTLIBDIR) -L$(top_builddir)/lib $(LDFLAGS)
++INCLUDES = -I$(top_srcdir)/lib $(all_includes) -I$(QTINCDIR)
++qhacc_gui_LDFLAGS = -L$(top_builddir)/lib -L$(QTLIBDIR) $(LDFLAGS)
++qhacc_cli_LDFLAGS = -L$(top_builddir)/lib -L$(QTLIBDIR) $(LDFLAGS)
+ qhacc_gui_LDADD = -l$(QHACCQT) -lqhacc
+ qhacc_cli_LDADD = -l$(QHACCQT) -lqhacc -lqhaccext
+ MOC = $(QTMOCDIR)/moc
diff --git a/finance/qhacc/files/patch-src::qhacc.in b/finance/qhacc/files/patch-src::qhacc.in
new file mode 100644
index 00000000000..a55df5e2511
--- /dev/null
+++ b/finance/qhacc/files/patch-src::qhacc.in
@@ -0,0 +1,17 @@
+--- src/qhacc.in.bak	Thu Dec  4 22:21:26 2003
++++ src/qhacc.in	Fri Dec  5 16:48:17 2003
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#!%%LOCALBASE%%/bin/bash
+ ###############################################################
+ # parse the command line, and call the appropriate executable #
+ #                                                             #
+@@ -42,7 +42,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_HOME=${QHACC_HOME:="${HOME}/.qhacc"}
+ 
+ prefix=@prefix@
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 2a41d5e4bd8..b50ccd2f7f4 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -1,5 +1,6 @@
 bin/qhacc
 bin/qhacc-cli
+bin/qhacc-config
 bin/qhacc-gui
 include/localfileplugin.h
 include/plugins.h
@@ -12,45 +13,70 @@ include/qhacctablerows.h
 include/qhaccutils.h
 include/resultset.h
 include/sqldbplugin.h
-include/tableops.h
+lib/libarcio.a
+lib/libarcio.so
+lib/libarcio.so.1
 lib/libcliimpio.a
 lib/libcliimpio.so
 lib/libcliimpio.so.1
-lib/libcronio.a
-lib/libcronio.so
-lib/libcronio.so.1
 lib/libfiledbio.a
 lib/libfiledbio.so
-lib/libfiledbio.so.2
+lib/libfiledbio.so.3
 lib/libforeigndbio.a
 lib/libforeigndbio.so
-lib/libforeigndbio.so.2
+lib/libforeigndbio.so.3
+%%SQLITE%%lib/liblfsqliteio.a
+%%SQLITE%%lib/liblfsqliteio.so
+%%SQLITE%%lib/liblfsqliteio.so.1
+%%MYSQL%%lib/libmysqlio.a
+%%MYSQL%%lib/libmysqlio.so
+%%MYSQL%%lib/libmysqlio.so.2
 lib/libnativedbio.a
 lib/libnativedbio.so
-lib/libnativedbio.so.2
+lib/libnativedbio.so.3
+%%PGSQL%%lib/libpsqlio.a
+%%PGSQL%%lib/libpsqlio.so
+%%PGSQL%%lib/libpsqlio.so.1
 lib/libqhacc.a
 lib/libqhacc.so
-lib/libqhacc.so.2
+lib/libqhacc.so.3
 lib/libqhaccext.a
 lib/libqhaccext.so
-lib/libqhaccext.so.2
+lib/libqhaccext.so.3
 lib/libqifio.a
 lib/libqifio.so
 lib/libqifio.so.1
-lib/libxmlio.a
-lib/libxmlio.so
-lib/libxmlio.so.1
-lib/qhacc/accounts
-lib/qhacc/memorized
-lib/qhacc/plugins/db/libxmlio.so
-lib/qhacc/plugins/export/libxmlio.so
+%%SQLITE%%lib/libsqliteio.a
+%%SQLITE%%lib/libsqliteio.so
+%%SQLITE%%lib/libsqliteio.so.1
+lib/libupgradeio.a
+lib/libupgradeio.so
+lib/libupgradeio.so.1
+%%LIBXML%%lib/libxmlio.a
+%%LIBXML%%lib/libxmlio.so
+%%LIBXML%%lib/libxmlio.so.1
+%%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
+%%LIBXML%%lib/qhacc/plugins/db/libxmlio.so
+lib/qhacc/plugins/export/libarcio.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
+%%LIBXML%%lib/qhacc/plugins/export/libxmlio.so
+lib/qhacc/plugins/import/libarcio.so
 lib/qhacc/plugins/import/libcliimpio.so
-lib/qhacc/plugins/import/libcronio.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
-lib/qhacc/plugins/import/libxmlio.so
-lib/qhacc/preferences
+%%SQLITE%%lib/qhacc/plugins/import/libsqliteio.so
+%%LIBXML%%lib/qhacc/plugins/import/libxmlio.so
 lib/qhacc/qhacc_es_ES.qm
-lib/qhacc/transactions
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/compiling.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/formats.html
@@ -58,6 +84,11 @@ lib/qhacc/transactions
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/primer.html
 %%PORTDOCS%%%%DOCSDIR%%/using.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/accounts
+%%PORTDOCS%%%%EXAMPLESDIR%%/memorized
+%%PORTDOCS%%%%EXAMPLESDIR%%/preferences
+%%PORTDOCS%%%%EXAMPLESDIR%%/transactions
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/qhacc/plugins/import
 @dirrm lib/qhacc/plugins/export