4 files changed, 80 insertions, 10 deletions

diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 4600a4decde5..0032c432e630 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qhacc
-PORTVERSION=	2.9
-PORTREVISION=	2
+PORTVERSION=	2.9.1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,23 +18,24 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
+USE_GNOME=	gnometarget libxml
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-mysql=no \
+CONFIGURE_ARGS=	--enable-xml=yes \
 		--with-qt-moc=${QT_PREFIX}/bin \
 		--with-qt-libs=${QT_PREFIX}/lib
 INSTALLS_SHLIB=	yes
 
 STRIP=		# none
 
+post-extract:
+	@${CP} -f ${FILESDIR}/xmlplugin.h ${WRKSRC}/plugins/xml
+
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/lib/|g ; \
-		 s|#! /bin/sh|#!${LOCALBASE}/bin/bash|g' \
-			${WRKSRC}/src/qhacc.orig
+	@${REINPLACE_CMD} -e 's|#! /bin/sh|#!${LOCALBASE}/bin/bash|g ; \
+		 s|/usr/local/q|${PREFIX}/lib/q|g' ${WRKSRC}/src/qhacc.orig
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-O2 -Wall -g||g ; \
 		 s|contrib docs qm|contrib|g ; \
diff --git a/finance/qhacc/distinfo b/finance/qhacc/distinfo
index dc8451ca1033..988296f98f87 100644
--- a/finance/qhacc/distinfo
+++ b/finance/qhacc/distinfo
@@ -1 +1 @@
-MD5 (qhacc-2.9.tar.gz) = 5df88c785d1f30cd60592eabeda4467c
+MD5 (qhacc-2.9.1.tar.gz) = 67ddb65c89424bf684b1dca998d0a212
diff --git a/finance/qhacc/files/patch-ltmain.sh b/finance/qhacc/files/patch-ltmain.sh
index 9be482bc72a2..a2ba9330ef4d 100644
--- a/finance/qhacc/files/patch-ltmain.sh
+++ b/finance/qhacc/files/patch-ltmain.sh
@@ -1,5 +1,23 @@
 --- ltmain.sh.orig	Thu Mar 13 01:25:30 2003
-+++ ltmain.sh	Tue Aug 12 01:49:52 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
  
diff --git a/finance/qhacc/files/xmlplugin.h b/finance/qhacc/files/xmlplugin.h
new file mode 100644
index 000000000000..d6b7f22dbc7e
--- /dev/null
+++ b/finance/qhacc/files/xmlplugin.h
@@ -0,0 +1,52 @@
+/************************* * * * * * * * * * * * * ***************************
+    Copyright (c) 1999-2003 Ryan Bobko
+                       ryan@ostrich-emulators.com
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.     
+************************** * * * * * * * * * * * * **************************/
+
+#ifndef XMLIMPORTER_H
+#define XMLIMPORTER_H
+
+#include "localfileplugin.h"
+
+#include <stdlib.h>
+#include <tree.h>
+#include <xmlmemory.h>
+#include <parser.h>
+
+class XMLDBPlugin : public LocalFileDBPlugin {
+ public:
+	XMLDBPlugin();
+	virtual ~XMLDBPlugin();
+
+	virtual bool load( QHacc * eng, const QString& home, QString& error );
+	virtual bool save( const QString&, bool, QString& );
+
+	virtual QString description() const;
+	static QString sdescription();
+
+	virtual QString understands() const; // what QHACC_HOME keywords do I know?
+	static QString sunderstands(); // what QHACC_HOME keywords do I know?
+
+ protected:
+	void writeTable( QHaccResultSet& data, const char ** lbls, uint lblcnt,
+									 xmlDocPtr tree, xmlNsPtr ns, const QString& label ) const;
+	void readTable( QHaccResultSet& data, const char ** lbls,
+									uint lblcnt, xmlNodePtr cur, xmlDocPtr doc, 
+									const QString& label ) const;
+};
+
+#endif