Upgrade to version 1.4.2.

Submitted by:	Matthew Condell <mcondell@bbn.com>

PR:				19550
Submitted by:	Glenn Johnson <glennpj@bayouhome.net>

9 files changed, 660 insertions, 594 deletions

diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile
index 3b738db..44c145c 100644
--- a/deskutils/gnucash/Makefile
+++ b/deskutils/gnucash/Makefile
@@ -7,45 +7,56 @@
 #
 
 PORTNAME=	gnucash
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
+MASTER_SITES=	ftp://ftp.gnucash.org/pub/gnucash/gnucash/sources/stable/ \
+		http://www.gnucash.org/pub/gnucash/sources/stable/ \
+		http://www.linas.org/pub/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnucash
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
+		g-wrap:${PORTSDIR}/devel/g-wrap \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		guile.6:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		gnome.4:${PORTSDIR}/x11/gnomelibs \
+		guile.6:${PORTSDIR}/lang/guile \
+		xml.5:${PORTSDIR}/textproc/libxml
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
+RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib \
+		gnuplot:${PORTSDIR}/math/gnuplot \
+		${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
 		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI  \
+		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-ALL_TARGET=	gnome
-
+#USE_X_PREFIX=	yes
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= 	${LOCALBASE}/bin/glib12-config
-
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 CONFIGURE_ENV=	MAKE=gmake \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
-MAKE_ENV=	MAKE=gmake
+CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+MAN1=		gnc-prices.1 gnucash.1
 
-post-configure:
-	${PERL} -pi.orig -e 's:/usr/lib/gnucash:${PREFIX}/lib/gnucash:g'  \
-		${WRKSRC}/src/quotes/gnc-prices
 
 post-install:
-	@strip ${PREFIX}/bin/gnucash.gnome
-	${LDCONFIG} -m ${PREFIX}/lib/gnucash
-	cd ${PREFIX}/share/guile && ln -sf ../slib .
+	@strip ${PREFIX}/bin/gnucash
+	${LDCONFIG} -m ${PREFIX}/lib/
+	${LDCONFIG} -m ${PREFIX}/lib/gnucash/perl
+	cd ${LOCALBASE}/share/guile && ${LN} -sf ../slib .
 	guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnucash/distinfo b/deskutils/gnucash/distinfo
index 7cdc58b..fed17c3 100644
--- a/deskutils/gnucash/distinfo
+++ b/deskutils/gnucash/distinfo
@@ -1 +1 @@
-MD5 (gnucash-1.3.4.tar.gz) = d82390d0736273e83d7ded7429e72265
+MD5 (gnucash-1.4.2.tar.gz) = 28f40b7c88e61f848bd9def7dfff0a39
diff --git a/deskutils/gnucash/pkg-plist b/deskutils/gnucash/pkg-plist
index bc309ed..d44af44 100644
--- a/deskutils/gnucash/pkg-plist
+++ b/deskutils/gnucash/pkg-plist
@@ -1,27 +1,182 @@
 @comment $FreeBSD$
-bin/gnucash.gnome
 bin/gnucash
 bin/gnc-prices
-doc/gnucash/README
-doc/gnucash/README.SuSE-6.3
-doc/gnucash/README.aix
-doc/gnucash/README.francais
-doc/gnucash/README.german
-doc/gnucash/README.gnome-hackers
-doc/gnucash/README.guile-hackers
-doc/gnucash/README.install
-doc/gnucash/README.irix
-doc/gnucash/README.sco
-doc/gnucash/README.solaris
-doc/gnucash/TODO
-doc/gnucash/CHANGES
-lib/gnucash/gnucash.pm
-lib/gnucash/gnucash.so
+etc/gnucash/config
+lib/libgncengine.a
+lib/libgncengine.so
+lib/libgncengine.so.1
+lib/gnucash/perl/gnucash.so
+lib/gnucash/perl/libgncswig.so
+lib/gnucash/perl/libgncswig.so.1
+lib/gnucash/perl/libgncswig.la
+lib/gnucash/perl/libgncswig.a
 @exec /sbin/ldconfig -m %D/lib/gnucash
 @unexec /sbin/ldconfig -R
-lib/gnucash/Quote.pm
+share/gnucash/doc/examples/Money95bank_fr.qif
+share/gnucash/doc/examples/Money95invst_fr.qif
+share/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnucash/doc/examples/README
+share/gnucash/doc/examples/abc-all.qif
+share/gnucash/doc/examples/abc.qif
+share/gnucash/doc/examples/bogus.qif
+share/gnucash/doc/examples/cbb-export.qif
+share/gnucash/doc/examples/currency.xac
+share/gnucash/doc/examples/every.qif
+share/gnucash/doc/examples/ms-money.qif
+share/gnucash/doc/examples/quicktest.qif
+share/gnucash/doc/examples/splitdemo.xac
+share/gnucash/doc/examples/swipe.qif
+share/gnucash/doc/examples/test.xac
+share/gnucash/doc/examples/test2.xac
+share/gnucash/doc/examples/test3.xac
+share/gnucash/doc/examples/test4.xac
+share/gnucash/doc/examples/trading.xac
+share/gnucash/doc/examples/trading2.xac
+share/gnucash/doc/examples/web.qif
+share/gnucash/doc/examples/xfer.xac
+share/gnucash/doc/README.francais
+share/gnucash/doc/README.german
+share/gnucash/doc/guile-hackers.txt
+share/gnucash/doc/gnc.html
+share/gnucash/doc/AUTHORS
+share/gnucash/doc/COPYING
+share/gnucash/doc/ChangeLog
+share/gnucash/doc/INSTALL
+share/gnucash/doc/NEWS
+share/gnucash/doc/README
+share/gnucash/html/C/image/appr-asset1.gif
+share/gnucash/html/C/image/appr-asset2.gif
+share/gnucash/html/C/image/appr-income.gif
+share/gnucash/html/C/image/appr-main1.gif
+share/gnucash/html/C/image/appr-main2.gif
+share/gnucash/html/C/image/bal-graph.gif
+share/gnucash/html/C/image/contract.gif
+share/gnucash/html/C/image/depr-asset.gif
+share/gnucash/html/C/image/depr-main.gif
+share/gnucash/html/C/image/expand.gif
+share/gnucash/html/C/image/foliowin-single.gif
+share/gnucash/html/C/image/foliowin.gif
+share/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnucash/html/C/image/logo-bullogogross.gif
+share/gnucash/html/C/image/logo-debian.jpg
+share/gnucash/html/C/image/logo-ibm.gif
+share/gnucash/html/C/image/logo-linux.gif
+share/gnucash/html/C/image/logo-sgi.gif
+share/gnucash/html/C/image/logo-skunkware.gif
+share/gnucash/html/C/image/newaccwin-code.gif
+share/gnucash/html/C/image/newaccwin-trade.gif
+share/gnucash/html/C/image/recnwin.gif
+share/gnucash/html/C/image/regwin-double.gif
+share/gnucash/html/C/image/regwin-multi.gif
+share/gnucash/html/C/image/regwin-single.gif
+share/gnucash/html/C/image/regwin-single2.gif
+share/gnucash/html/C/image/report-av-baln.gif
+share/gnucash/html/C/image/report-baln.gif
+share/gnucash/html/C/image/report-folio.gif
+share/gnucash/html/C/image/report-option.gif
+share/gnucash/html/C/image/report-pnl.gif
+share/gnucash/html/C/image/reportwin.gif
+share/gnucash/html/C/image/ticker-a.gif
+share/gnucash/html/C/image/ticker-b.gif
+share/gnucash/html/C/RAW-NOTES
+share/gnucash/html/C/bofa-mym.html
+share/gnucash/html/C/projects.html
+share/gnucash/html/C/xacc-about.html
+share/gnucash/html/C/xacc-accountedit.html
+share/gnucash/html/C/xacc-acctypes.html
+share/gnucash/html/C/xacc-accwin.html
+share/gnucash/html/C/xacc-adjbwin.html
+share/gnucash/html/C/xacc-apar.html
+share/gnucash/html/C/xacc-apprdepr.html
+share/gnucash/html/C/xacc-bal_tracker.html
+share/gnucash/html/C/xacc-balsheet.html
+share/gnucash/html/C/xacc-currency.html
+share/gnucash/html/C/xacc-date.html
+share/gnucash/html/C/xacc-double.html
+share/gnucash/html/C/xacc-euro.html
+share/gnucash/html/C/xacc-expense.html
+share/gnucash/html/C/xacc-find-transactions.html
+share/gnucash/html/C/xacc-globalprefs.html
+share/gnucash/html/C/xacc-globalprops.html
+share/gnucash/html/C/xacc-gpl.html
+share/gnucash/html/C/xacc-groups.html
+share/gnucash/html/C/xacc-main.html
+share/gnucash/html/C/xacc-mainwin.html
+share/gnucash/html/C/xacc-pnl.html
+share/gnucash/html/C/xacc-portfolio_report.html
+share/gnucash/html/C/xacc-print.html
+share/gnucash/html/C/xacc-qif-import.html
+share/gnucash/html/C/xacc-quicken.html
+share/gnucash/html/C/xacc-recnwin.html
+share/gnucash/html/C/xacc-regwin.html
+share/gnucash/html/C/xacc-regwin_kbd.html
+share/gnucash/html/C/xacc-reports.html
+share/gnucash/html/C/xacc-ticker.html
+share/gnucash/html/C/xacc-trans_report.html
+share/gnucash/html/C/xacc-y2k.html
+share/gnucash/html/fr/image/appr-asset1.gif
+share/gnucash/html/fr/image/appr-asset2.gif
+share/gnucash/html/fr/image/appr-income.gif
+share/gnucash/html/fr/image/appr-main1.gif
+share/gnucash/html/fr/image/appr-main2.gif
+share/gnucash/html/fr/image/contract.gif
+share/gnucash/html/fr/image/depr-asset.gif
+share/gnucash/html/fr/image/depr-main.gif
+share/gnucash/html/fr/image/expand.gif
+share/gnucash/html/fr/image/foliowin-single.gif
+share/gnucash/html/fr/image/foliowin.gif
+share/gnucash/html/fr/image/newaccwin-code.gif
+share/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnucash/html/fr/image/newaccwin.gif
+share/gnucash/html/fr/image/recnwin.gif
+share/gnucash/html/fr/image/regwin-double.gif
+share/gnucash/html/fr/image/regwin-multi.gif
+share/gnucash/html/fr/image/regwin-single.gif
+share/gnucash/html/fr/image/regwin-single2.gif
+share/gnucash/html/fr/image/regwin.gif
+share/gnucash/html/fr/image/report-baln.gif
+share/gnucash/html/fr/image/report-folio.gif
+share/gnucash/html/fr/image/report-option.gif
+share/gnucash/html/fr/image/reportwin.gif
+share/gnucash/html/fr/image/ticker-a.gif
+share/gnucash/html/fr/image/ticker-b.gif
+share/gnucash/html/fr/bofa-mym.html
+share/gnucash/html/fr/projects.html
+share/gnucash/html/fr/xacc-about.html
+share/gnucash/html/fr/xacc-accountedit.html
+share/gnucash/html/fr/xacc-acctypes.html
+share/gnucash/html/fr/xacc-accwin.html
+share/gnucash/html/fr/xacc-adjbwin.html
+share/gnucash/html/fr/xacc-apar.html
+share/gnucash/html/fr/xacc-apprdepr.html
+share/gnucash/html/fr/xacc-bal_tracker.html
+share/gnucash/html/fr/xacc-balsheet.html
+share/gnucash/html/fr/xacc-currency.html
+share/gnucash/html/fr/xacc-date.html
+share/gnucash/html/fr/xacc-double.html
+share/gnucash/html/fr/xacc-expense.html
+share/gnucash/html/fr/xacc-globalprefs.html
+share/gnucash/html/fr/xacc-gpl.html
+share/gnucash/html/fr/xacc-gpl-fr.html
+share/gnucash/html/fr/xacc-groups.html
+share/gnucash/html/fr/xacc-main.html
+share/gnucash/html/fr/xacc-mainwin.html
+share/gnucash/html/fr/xacc-pnl.html
+share/gnucash/html/fr/xacc-print.html
+share/gnucash/html/fr/xacc-quicken.html
+share/gnucash/html/fr/xacc-recnwin.html
+share/gnucash/html/fr/xacc-regwin.html
+share/gnucash/html/fr/xacc-reports.html
+share/gnucash/html/fr/xacc-ticker.html
+share/gnucash/html/fr/xacc-trans_report.html
+share/gnucash/html/fr/xacc-y2k.html
+share/gnucash/html/gnucash.css
+share/gnucash/html/index.html
 share/gnucash/scm/gnumeric/gnumeric-utilities.scm
 share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/printing/number-to-words.scm
+share/gnucash/scm/printing/print-check.scm
 share/gnucash/scm/qif-import/qif-dialog-utils.scm
 share/gnucash/scm/qif-import/qif-file.scm
 share/gnucash/scm/qif-import/qif-guess-map.scm
@@ -31,16 +186,6 @@ share/gnucash/scm/qif-import/qif-parse.scm
 share/gnucash/scm/qif-import/qif-to-gnc.scm
 share/gnucash/scm/qif-import/qif-utils.scm
 share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/qifs/dates-qif.scm
-share/gnucash/scm/qifs/gc-import-qifs.scm
-share/gnucash/scm/qifs/guess-category-qif.scm
-share/gnucash/scm/qifs/importqif.scm
-share/gnucash/scm/qifs/parseqif.scm
-share/gnucash/scm/qifs/qif2gc.scm
-share/gnucash/scm/qifs/qifcats.scm
-share/gnucash/scm/qifs/qifstate.scm
-share/gnucash/scm/qifs/qifutils.scm
-share/gnucash/scm/qifs/split-qif.scm
 share/gnucash/scm/report/average-balance.scm
 share/gnucash/scm/report/balance-and-pnl.scm
 share/gnucash/scm/report/budget-report.scm
@@ -52,21 +197,22 @@ share/gnucash/scm/srfi/srfi-1.r5rs.scm
 share/gnucash/scm/srfi/srfi-1.unclear.scm
 share/gnucash/scm/srfi/srfi-19.scm
 share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/acc-create.scm
+share/gnucash/scm/srfi/srfi-8.scm
 share/gnucash/scm/bootstrap.scm
 share/gnucash/scm/bs-interp.scm
 share/gnucash/scm/c-interface.scm
 share/gnucash/scm/command-line.scm
 share/gnucash/scm/config-var.scm
-share/gnucash/scm/convenience-wrappers.scm
+share/gnucash/scm/currencies.scm
 share/gnucash/scm/date-utilities.scm
 share/gnucash/scm/depend.scm
 share/gnucash/scm/doc.scm
+share/gnucash/scm/engine-interface.scm
+share/gnucash/scm/engine-utilities.scm
 share/gnucash/scm/extensions.scm
 share/gnucash/scm/graph.scm
 share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-generator.scm
-share/gnucash/scm/macros.scm
 share/gnucash/scm/main.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/path.scm
@@ -79,146 +225,10 @@ share/gnucash/scm/structure.scm
 share/gnucash/scm/substring-search.scm
 share/gnucash/scm/testbed.scm
 share/gnucash/scm/text-export.scm
-share/gnucash/scm/txn-create.scm
 share/gnucash/scm/utilities.scm
 share/gnucash/scm/xml-generator.scm
-share/gnucash/data/currency.xac
-share/gnucash/data/splitdemo.xac
-share/gnucash/data/test.xac
-share/gnucash/data/test2.xac
-share/gnucash/data/test3.xac
-share/gnucash/data/test4.xac
-share/gnucash/data/trading.xac
-share/gnucash/data/trading2.xac
-share/gnucash/data/xfer.xac
-share/gnucash/Docs/C/pix/appr-asset1.gif
-share/gnucash/Docs/C/pix/appr-asset2.gif
-share/gnucash/Docs/C/pix/appr-income.gif
-share/gnucash/Docs/C/pix/appr-main1.gif
-share/gnucash/Docs/C/pix/appr-main2.gif
-share/gnucash/Docs/C/pix/contract.gif
-share/gnucash/Docs/C/pix/depr-asset.gif
-share/gnucash/Docs/C/pix/depr-main.gif
-share/gnucash/Docs/C/pix/expand.gif
-share/gnucash/Docs/C/pix/foliowin-single.gif
-share/gnucash/Docs/C/pix/foliowin.gif
-share/gnucash/Docs/C/pix/newaccwin-code.gif
-share/gnucash/Docs/C/pix/newaccwin-trade.gif
-share/gnucash/Docs/C/pix/newaccwin.gif
-share/gnucash/Docs/C/pix/recnwin.gif
-share/gnucash/Docs/C/pix/regwin-double.gif
-share/gnucash/Docs/C/pix/regwin-multi.gif
-share/gnucash/Docs/C/pix/regwin-single.gif
-share/gnucash/Docs/C/pix/regwin-single2.gif
-share/gnucash/Docs/C/pix/regwin.gif
-share/gnucash/Docs/C/pix/report-baln.gif
-share/gnucash/Docs/C/pix/report-folio.gif
-share/gnucash/Docs/C/pix/report-option.gif
-share/gnucash/Docs/C/pix/reportwin.gif
-share/gnucash/Docs/C/pix/ticker-a.gif
-share/gnucash/Docs/C/pix/ticker-b.gif
-share/gnucash/Docs/C/bofa-mym.html
-share/gnucash/Docs/C/projects.html
-share/gnucash/Docs/C/xacc-about.html
-share/gnucash/Docs/C/xacc-accountedit.html
-share/gnucash/Docs/C/xacc-acctypes.html
-share/gnucash/Docs/C/xacc-accwin.html
-share/gnucash/Docs/C/xacc-adjbwin.html
-share/gnucash/Docs/C/xacc-apar.html
-share/gnucash/Docs/C/xacc-apprdepr.html
-share/gnucash/Docs/C/xacc-bal_tracker.html
-share/gnucash/Docs/C/xacc-balsheet.html
-share/gnucash/Docs/C/xacc-currency.html
-share/gnucash/Docs/C/xacc-date.html
-share/gnucash/Docs/C/xacc-double.html
-share/gnucash/Docs/C/xacc-expense.html
-share/gnucash/Docs/C/xacc-globalprefs.html
-share/gnucash/Docs/C/xacc-globalprops.html
-share/gnucash/Docs/C/xacc-gpl.html
-share/gnucash/Docs/C/xacc-groups.html
-share/gnucash/Docs/C/xacc-main.html
-share/gnucash/Docs/C/xacc-mainwin.html
-share/gnucash/Docs/C/xacc-pnl.html
-share/gnucash/Docs/C/xacc-print.html
-share/gnucash/Docs/C/xacc-qif-import.html
-share/gnucash/Docs/C/xacc-quicken.html
-share/gnucash/Docs/C/xacc-recnwin.html
-share/gnucash/Docs/C/xacc-regwin.html
-share/gnucash/Docs/C/xacc-reports.html
-share/gnucash/Docs/C/xacc-ticker.html
-share/gnucash/Docs/C/xacc-trans_report.html
-share/gnucash/Docs/C/xacc-y2k.html
-share/gnucash/Docs/fr/pix/appr-asset1.gif
-share/gnucash/Docs/fr/pix/appr-asset2.gif
-share/gnucash/Docs/fr/pix/appr-income.gif
-share/gnucash/Docs/fr/pix/appr-main1.gif
-share/gnucash/Docs/fr/pix/appr-main2.gif
-share/gnucash/Docs/fr/pix/contract.gif
-share/gnucash/Docs/fr/pix/depr-asset.gif
-share/gnucash/Docs/fr/pix/depr-main.gif
-share/gnucash/Docs/fr/pix/expand.gif
-share/gnucash/Docs/fr/pix/foliowin-single.gif
-share/gnucash/Docs/fr/pix/foliowin.gif
-share/gnucash/Docs/fr/pix/newaccwin-code.gif
-share/gnucash/Docs/fr/pix/newaccwin-trade.gif
-share/gnucash/Docs/fr/pix/newaccwin.gif
-share/gnucash/Docs/fr/pix/recnwin.gif
-share/gnucash/Docs/fr/pix/regwin-double.gif
-share/gnucash/Docs/fr/pix/regwin-multi.gif
-share/gnucash/Docs/fr/pix/regwin-single.gif
-share/gnucash/Docs/fr/pix/regwin-single2.gif
-share/gnucash/Docs/fr/pix/regwin.gif
-share/gnucash/Docs/fr/pix/report-baln.gif
-share/gnucash/Docs/fr/pix/report-folio.gif
-share/gnucash/Docs/fr/pix/report-option.gif
-share/gnucash/Docs/fr/pix/reportwin.gif
-share/gnucash/Docs/fr/pix/ticker-a.gif
-share/gnucash/Docs/fr/pix/ticker-b.gif
-share/gnucash/Docs/fr/bofa-mym.html
-share/gnucash/Docs/fr/projects.html
-share/gnucash/Docs/fr/xacc-about.html
-share/gnucash/Docs/fr/xacc-accountedit.html
-share/gnucash/Docs/fr/xacc-acctypes.html
-share/gnucash/Docs/fr/xacc-accwin.html
-share/gnucash/Docs/fr/xacc-adjbwin.html
-share/gnucash/Docs/fr/xacc-apar.html
-share/gnucash/Docs/fr/xacc-apprdepr.html
-share/gnucash/Docs/fr/xacc-bal_tracker.html
-share/gnucash/Docs/fr/xacc-balsheet.html
-share/gnucash/Docs/fr/xacc-currency.html
-share/gnucash/Docs/fr/xacc-date.html
-share/gnucash/Docs/fr/xacc-double.html
-share/gnucash/Docs/fr/xacc-expense.html
-share/gnucash/Docs/fr/xacc-globalprefs.html
-share/gnucash/Docs/fr/xacc-gpl.html
-share/gnucash/Docs/fr/xacc-groups.html
-share/gnucash/Docs/fr/xacc-main.html
-share/gnucash/Docs/fr/xacc-mainwin.html
-share/gnucash/Docs/fr/xacc-pnl.html
-share/gnucash/Docs/fr/xacc-print.html
-share/gnucash/Docs/fr/xacc-quicken.html
-share/gnucash/Docs/fr/xacc-recnwin.html
-share/gnucash/Docs/fr/xacc-regwin.html
-share/gnucash/Docs/fr/xacc-reports.html
-share/gnucash/Docs/fr/xacc-ticker.html
-share/gnucash/Docs/fr/xacc-trans_report.html
-share/gnucash/Docs/fr/xacc-y2k.html
-share/gnucash/Docs/gnucash.css
-share/gnucash/Docs/logos/NetBSD-banner.gif
-share/gnucash/Docs/logos/bullogogross.gif
-share/gnucash/Docs/logos/debian.jpg
-share/gnucash/Docs/logos/ibm.gif
-share/gnucash/Docs/logos/linux.gif
-share/gnucash/Docs/logos/sgi.gif
-share/gnucash/Docs/logos/skunkware.gif
-share/gnucash/Reports/report-baln.phtml
-share/gnucash/Reports/report-folio.phtml
-share/gnucash/Reports/report-formtest.html
-share/gnucash/Reports/report-main.html
-share/gnucash/Reports/report-menu.html
-share/gnucash/Reports/report-null.html
-share/gnucash/Reports/report-pnl.phtml
-share/gnucash/config
+share/gnucash/perl/Quote.pm
+share/gnucash/perl/gnucash.pm
 share/locale/de/LC_MESSAGES/gnucash.mo
 share/locale/en_GB/LC_MESSAGES/gnucash.mo
 share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -226,20 +236,21 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
 share/gnome/apps/Applications/gnucash.desktop
 @exec cd share/guile && ln -sf ../slib .
 @exec guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-@dirrm doc/gnucash
+@dirrm etc/gnucash
+@dirrm lib/gnucash/perl
 @dirrm lib/gnucash
+@dirrm share/gnucash/doc/examples
+@dirrm share/gnucash/doc
+@dirrm share/gnucash/html/C/image
+@dirrm share/gnucash/html/C
+@dirrm share/gnucash/html/fr/image
+@dirrm share/gnucash/html/fr
+@dirrm share/gnucash/html
+@dirrm share/gnucash/perl
 @dirrm share/gnucash/scm/gnumeric
+@dirrm share/gnucash/scm/printing
 @dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/qifs
 @dirrm share/gnucash/scm/srfi
 @dirrm share/gnucash/scm/report
 @dirrm share/gnucash/scm
-@dirrm share/gnucash/data
-@dirrm share/gnucash/Docs/C/pix
-@dirrm share/gnucash/Docs/C
-@dirrm share/gnucash/Docs/fr/pix
-@dirrm share/gnucash/Docs/fr
-@dirrm share/gnucash/Docs/logos
-@dirrm share/gnucash/Docs
-@dirrm share/gnucash/Reports
 @dirrm share/gnucash
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 3b738db..44c145c 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -7,45 +7,56 @@
 #
 
 PORTNAME=	gnucash
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
+MASTER_SITES=	ftp://ftp.gnucash.org/pub/gnucash/gnucash/sources/stable/ \
+		http://www.gnucash.org/pub/gnucash/sources/stable/ \
+		http://www.linas.org/pub/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnucash
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
+		g-wrap:${PORTSDIR}/devel/g-wrap \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		guile.6:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		gnome.4:${PORTSDIR}/x11/gnomelibs \
+		guile.6:${PORTSDIR}/lang/guile \
+		xml.5:${PORTSDIR}/textproc/libxml
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
+RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib \
+		gnuplot:${PORTSDIR}/math/gnuplot \
+		${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
 		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI  \
+		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-ALL_TARGET=	gnome
-
+#USE_X_PREFIX=	yes
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= 	${LOCALBASE}/bin/glib12-config
-
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 CONFIGURE_ENV=	MAKE=gmake \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
-MAKE_ENV=	MAKE=gmake
+CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+MAN1=		gnc-prices.1 gnucash.1
 
-post-configure:
-	${PERL} -pi.orig -e 's:/usr/lib/gnucash:${PREFIX}/lib/gnucash:g'  \
-		${WRKSRC}/src/quotes/gnc-prices
 
 post-install:
-	@strip ${PREFIX}/bin/gnucash.gnome
-	${LDCONFIG} -m ${PREFIX}/lib/gnucash
-	cd ${PREFIX}/share/guile && ln -sf ../slib .
+	@strip ${PREFIX}/bin/gnucash
+	${LDCONFIG} -m ${PREFIX}/lib/
+	${LDCONFIG} -m ${PREFIX}/lib/gnucash/perl
+	cd ${LOCALBASE}/share/guile && ${LN} -sf ../slib .
 	guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash-devel/distinfo b/finance/gnucash-devel/distinfo
index 7cdc58b..fed17c3 100644
--- a/finance/gnucash-devel/distinfo
+++ b/finance/gnucash-devel/distinfo
@@ -1 +1 @@
-MD5 (gnucash-1.3.4.tar.gz) = d82390d0736273e83d7ded7429e72265
+MD5 (gnucash-1.4.2.tar.gz) = 28f40b7c88e61f848bd9def7dfff0a39
diff --git a/finance/gnucash-devel/pkg-plist b/finance/gnucash-devel/pkg-plist
index bc309ed..d44af44 100644
--- a/finance/gnucash-devel/pkg-plist
+++ b/finance/gnucash-devel/pkg-plist
@@ -1,27 +1,182 @@
 @comment $FreeBSD$
-bin/gnucash.gnome
 bin/gnucash
 bin/gnc-prices
-doc/gnucash/README
-doc/gnucash/README.SuSE-6.3
-doc/gnucash/README.aix
-doc/gnucash/README.francais
-doc/gnucash/README.german
-doc/gnucash/README.gnome-hackers
-doc/gnucash/README.guile-hackers
-doc/gnucash/README.install
-doc/gnucash/README.irix
-doc/gnucash/README.sco
-doc/gnucash/README.solaris
-doc/gnucash/TODO
-doc/gnucash/CHANGES
-lib/gnucash/gnucash.pm
-lib/gnucash/gnucash.so
+etc/gnucash/config
+lib/libgncengine.a
+lib/libgncengine.so
+lib/libgncengine.so.1
+lib/gnucash/perl/gnucash.so
+lib/gnucash/perl/libgncswig.so
+lib/gnucash/perl/libgncswig.so.1
+lib/gnucash/perl/libgncswig.la
+lib/gnucash/perl/libgncswig.a
 @exec /sbin/ldconfig -m %D/lib/gnucash
 @unexec /sbin/ldconfig -R
-lib/gnucash/Quote.pm
+share/gnucash/doc/examples/Money95bank_fr.qif
+share/gnucash/doc/examples/Money95invst_fr.qif
+share/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnucash/doc/examples/README
+share/gnucash/doc/examples/abc-all.qif
+share/gnucash/doc/examples/abc.qif
+share/gnucash/doc/examples/bogus.qif
+share/gnucash/doc/examples/cbb-export.qif
+share/gnucash/doc/examples/currency.xac
+share/gnucash/doc/examples/every.qif
+share/gnucash/doc/examples/ms-money.qif
+share/gnucash/doc/examples/quicktest.qif
+share/gnucash/doc/examples/splitdemo.xac
+share/gnucash/doc/examples/swipe.qif
+share/gnucash/doc/examples/test.xac
+share/gnucash/doc/examples/test2.xac
+share/gnucash/doc/examples/test3.xac
+share/gnucash/doc/examples/test4.xac
+share/gnucash/doc/examples/trading.xac
+share/gnucash/doc/examples/trading2.xac
+share/gnucash/doc/examples/web.qif
+share/gnucash/doc/examples/xfer.xac
+share/gnucash/doc/README.francais
+share/gnucash/doc/README.german
+share/gnucash/doc/guile-hackers.txt
+share/gnucash/doc/gnc.html
+share/gnucash/doc/AUTHORS
+share/gnucash/doc/COPYING
+share/gnucash/doc/ChangeLog
+share/gnucash/doc/INSTALL
+share/gnucash/doc/NEWS
+share/gnucash/doc/README
+share/gnucash/html/C/image/appr-asset1.gif
+share/gnucash/html/C/image/appr-asset2.gif
+share/gnucash/html/C/image/appr-income.gif
+share/gnucash/html/C/image/appr-main1.gif
+share/gnucash/html/C/image/appr-main2.gif
+share/gnucash/html/C/image/bal-graph.gif
+share/gnucash/html/C/image/contract.gif
+share/gnucash/html/C/image/depr-asset.gif
+share/gnucash/html/C/image/depr-main.gif
+share/gnucash/html/C/image/expand.gif
+share/gnucash/html/C/image/foliowin-single.gif
+share/gnucash/html/C/image/foliowin.gif
+share/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnucash/html/C/image/logo-bullogogross.gif
+share/gnucash/html/C/image/logo-debian.jpg
+share/gnucash/html/C/image/logo-ibm.gif
+share/gnucash/html/C/image/logo-linux.gif
+share/gnucash/html/C/image/logo-sgi.gif
+share/gnucash/html/C/image/logo-skunkware.gif
+share/gnucash/html/C/image/newaccwin-code.gif
+share/gnucash/html/C/image/newaccwin-trade.gif
+share/gnucash/html/C/image/recnwin.gif
+share/gnucash/html/C/image/regwin-double.gif
+share/gnucash/html/C/image/regwin-multi.gif
+share/gnucash/html/C/image/regwin-single.gif
+share/gnucash/html/C/image/regwin-single2.gif
+share/gnucash/html/C/image/report-av-baln.gif
+share/gnucash/html/C/image/report-baln.gif
+share/gnucash/html/C/image/report-folio.gif
+share/gnucash/html/C/image/report-option.gif
+share/gnucash/html/C/image/report-pnl.gif
+share/gnucash/html/C/image/reportwin.gif
+share/gnucash/html/C/image/ticker-a.gif
+share/gnucash/html/C/image/ticker-b.gif
+share/gnucash/html/C/RAW-NOTES
+share/gnucash/html/C/bofa-mym.html
+share/gnucash/html/C/projects.html
+share/gnucash/html/C/xacc-about.html
+share/gnucash/html/C/xacc-accountedit.html
+share/gnucash/html/C/xacc-acctypes.html
+share/gnucash/html/C/xacc-accwin.html
+share/gnucash/html/C/xacc-adjbwin.html
+share/gnucash/html/C/xacc-apar.html
+share/gnucash/html/C/xacc-apprdepr.html
+share/gnucash/html/C/xacc-bal_tracker.html
+share/gnucash/html/C/xacc-balsheet.html
+share/gnucash/html/C/xacc-currency.html
+share/gnucash/html/C/xacc-date.html
+share/gnucash/html/C/xacc-double.html
+share/gnucash/html/C/xacc-euro.html
+share/gnucash/html/C/xacc-expense.html
+share/gnucash/html/C/xacc-find-transactions.html
+share/gnucash/html/C/xacc-globalprefs.html
+share/gnucash/html/C/xacc-globalprops.html
+share/gnucash/html/C/xacc-gpl.html
+share/gnucash/html/C/xacc-groups.html
+share/gnucash/html/C/xacc-main.html
+share/gnucash/html/C/xacc-mainwin.html
+share/gnucash/html/C/xacc-pnl.html
+share/gnucash/html/C/xacc-portfolio_report.html
+share/gnucash/html/C/xacc-print.html
+share/gnucash/html/C/xacc-qif-import.html
+share/gnucash/html/C/xacc-quicken.html
+share/gnucash/html/C/xacc-recnwin.html
+share/gnucash/html/C/xacc-regwin.html
+share/gnucash/html/C/xacc-regwin_kbd.html
+share/gnucash/html/C/xacc-reports.html
+share/gnucash/html/C/xacc-ticker.html
+share/gnucash/html/C/xacc-trans_report.html
+share/gnucash/html/C/xacc-y2k.html
+share/gnucash/html/fr/image/appr-asset1.gif
+share/gnucash/html/fr/image/appr-asset2.gif
+share/gnucash/html/fr/image/appr-income.gif
+share/gnucash/html/fr/image/appr-main1.gif
+share/gnucash/html/fr/image/appr-main2.gif
+share/gnucash/html/fr/image/contract.gif
+share/gnucash/html/fr/image/depr-asset.gif
+share/gnucash/html/fr/image/depr-main.gif
+share/gnucash/html/fr/image/expand.gif
+share/gnucash/html/fr/image/foliowin-single.gif
+share/gnucash/html/fr/image/foliowin.gif
+share/gnucash/html/fr/image/newaccwin-code.gif
+share/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnucash/html/fr/image/newaccwin.gif
+share/gnucash/html/fr/image/recnwin.gif
+share/gnucash/html/fr/image/regwin-double.gif
+share/gnucash/html/fr/image/regwin-multi.gif
+share/gnucash/html/fr/image/regwin-single.gif
+share/gnucash/html/fr/image/regwin-single2.gif
+share/gnucash/html/fr/image/regwin.gif
+share/gnucash/html/fr/image/report-baln.gif
+share/gnucash/html/fr/image/report-folio.gif
+share/gnucash/html/fr/image/report-option.gif
+share/gnucash/html/fr/image/reportwin.gif
+share/gnucash/html/fr/image/ticker-a.gif
+share/gnucash/html/fr/image/ticker-b.gif
+share/gnucash/html/fr/bofa-mym.html
+share/gnucash/html/fr/projects.html
+share/gnucash/html/fr/xacc-about.html
+share/gnucash/html/fr/xacc-accountedit.html
+share/gnucash/html/fr/xacc-acctypes.html
+share/gnucash/html/fr/xacc-accwin.html
+share/gnucash/html/fr/xacc-adjbwin.html
+share/gnucash/html/fr/xacc-apar.html
+share/gnucash/html/fr/xacc-apprdepr.html
+share/gnucash/html/fr/xacc-bal_tracker.html
+share/gnucash/html/fr/xacc-balsheet.html
+share/gnucash/html/fr/xacc-currency.html
+share/gnucash/html/fr/xacc-date.html
+share/gnucash/html/fr/xacc-double.html
+share/gnucash/html/fr/xacc-expense.html
+share/gnucash/html/fr/xacc-globalprefs.html
+share/gnucash/html/fr/xacc-gpl.html
+share/gnucash/html/fr/xacc-gpl-fr.html
+share/gnucash/html/fr/xacc-groups.html
+share/gnucash/html/fr/xacc-main.html
+share/gnucash/html/fr/xacc-mainwin.html
+share/gnucash/html/fr/xacc-pnl.html
+share/gnucash/html/fr/xacc-print.html
+share/gnucash/html/fr/xacc-quicken.html
+share/gnucash/html/fr/xacc-recnwin.html
+share/gnucash/html/fr/xacc-regwin.html
+share/gnucash/html/fr/xacc-reports.html
+share/gnucash/html/fr/xacc-ticker.html
+share/gnucash/html/fr/xacc-trans_report.html
+share/gnucash/html/fr/xacc-y2k.html
+share/gnucash/html/gnucash.css
+share/gnucash/html/index.html
 share/gnucash/scm/gnumeric/gnumeric-utilities.scm
 share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/printing/number-to-words.scm
+share/gnucash/scm/printing/print-check.scm
 share/gnucash/scm/qif-import/qif-dialog-utils.scm
 share/gnucash/scm/qif-import/qif-file.scm
 share/gnucash/scm/qif-import/qif-guess-map.scm
@@ -31,16 +186,6 @@ share/gnucash/scm/qif-import/qif-parse.scm
 share/gnucash/scm/qif-import/qif-to-gnc.scm
 share/gnucash/scm/qif-import/qif-utils.scm
 share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/qifs/dates-qif.scm
-share/gnucash/scm/qifs/gc-import-qifs.scm
-share/gnucash/scm/qifs/guess-category-qif.scm
-share/gnucash/scm/qifs/importqif.scm
-share/gnucash/scm/qifs/parseqif.scm
-share/gnucash/scm/qifs/qif2gc.scm
-share/gnucash/scm/qifs/qifcats.scm
-share/gnucash/scm/qifs/qifstate.scm
-share/gnucash/scm/qifs/qifutils.scm
-share/gnucash/scm/qifs/split-qif.scm
 share/gnucash/scm/report/average-balance.scm
 share/gnucash/scm/report/balance-and-pnl.scm
 share/gnucash/scm/report/budget-report.scm
@@ -52,21 +197,22 @@ share/gnucash/scm/srfi/srfi-1.r5rs.scm
 share/gnucash/scm/srfi/srfi-1.unclear.scm
 share/gnucash/scm/srfi/srfi-19.scm
 share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/acc-create.scm
+share/gnucash/scm/srfi/srfi-8.scm
 share/gnucash/scm/bootstrap.scm
 share/gnucash/scm/bs-interp.scm
 share/gnucash/scm/c-interface.scm
 share/gnucash/scm/command-line.scm
 share/gnucash/scm/config-var.scm
-share/gnucash/scm/convenience-wrappers.scm
+share/gnucash/scm/currencies.scm
 share/gnucash/scm/date-utilities.scm
 share/gnucash/scm/depend.scm
 share/gnucash/scm/doc.scm
+share/gnucash/scm/engine-interface.scm
+share/gnucash/scm/engine-utilities.scm
 share/gnucash/scm/extensions.scm
 share/gnucash/scm/graph.scm
 share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-generator.scm
-share/gnucash/scm/macros.scm
 share/gnucash/scm/main.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/path.scm
@@ -79,146 +225,10 @@ share/gnucash/scm/structure.scm
 share/gnucash/scm/substring-search.scm
 share/gnucash/scm/testbed.scm
 share/gnucash/scm/text-export.scm
-share/gnucash/scm/txn-create.scm
 share/gnucash/scm/utilities.scm
 share/gnucash/scm/xml-generator.scm
-share/gnucash/data/currency.xac
-share/gnucash/data/splitdemo.xac
-share/gnucash/data/test.xac
-share/gnucash/data/test2.xac
-share/gnucash/data/test3.xac
-share/gnucash/data/test4.xac
-share/gnucash/data/trading.xac
-share/gnucash/data/trading2.xac
-share/gnucash/data/xfer.xac
-share/gnucash/Docs/C/pix/appr-asset1.gif
-share/gnucash/Docs/C/pix/appr-asset2.gif
-share/gnucash/Docs/C/pix/appr-income.gif
-share/gnucash/Docs/C/pix/appr-main1.gif
-share/gnucash/Docs/C/pix/appr-main2.gif
-share/gnucash/Docs/C/pix/contract.gif
-share/gnucash/Docs/C/pix/depr-asset.gif
-share/gnucash/Docs/C/pix/depr-main.gif
-share/gnucash/Docs/C/pix/expand.gif
-share/gnucash/Docs/C/pix/foliowin-single.gif
-share/gnucash/Docs/C/pix/foliowin.gif
-share/gnucash/Docs/C/pix/newaccwin-code.gif
-share/gnucash/Docs/C/pix/newaccwin-trade.gif
-share/gnucash/Docs/C/pix/newaccwin.gif
-share/gnucash/Docs/C/pix/recnwin.gif
-share/gnucash/Docs/C/pix/regwin-double.gif
-share/gnucash/Docs/C/pix/regwin-multi.gif
-share/gnucash/Docs/C/pix/regwin-single.gif
-share/gnucash/Docs/C/pix/regwin-single2.gif
-share/gnucash/Docs/C/pix/regwin.gif
-share/gnucash/Docs/C/pix/report-baln.gif
-share/gnucash/Docs/C/pix/report-folio.gif
-share/gnucash/Docs/C/pix/report-option.gif
-share/gnucash/Docs/C/pix/reportwin.gif
-share/gnucash/Docs/C/pix/ticker-a.gif
-share/gnucash/Docs/C/pix/ticker-b.gif
-share/gnucash/Docs/C/bofa-mym.html
-share/gnucash/Docs/C/projects.html
-share/gnucash/Docs/C/xacc-about.html
-share/gnucash/Docs/C/xacc-accountedit.html
-share/gnucash/Docs/C/xacc-acctypes.html
-share/gnucash/Docs/C/xacc-accwin.html
-share/gnucash/Docs/C/xacc-adjbwin.html
-share/gnucash/Docs/C/xacc-apar.html
-share/gnucash/Docs/C/xacc-apprdepr.html
-share/gnucash/Docs/C/xacc-bal_tracker.html
-share/gnucash/Docs/C/xacc-balsheet.html
-share/gnucash/Docs/C/xacc-currency.html
-share/gnucash/Docs/C/xacc-date.html
-share/gnucash/Docs/C/xacc-double.html
-share/gnucash/Docs/C/xacc-expense.html
-share/gnucash/Docs/C/xacc-globalprefs.html
-share/gnucash/Docs/C/xacc-globalprops.html
-share/gnucash/Docs/C/xacc-gpl.html
-share/gnucash/Docs/C/xacc-groups.html
-share/gnucash/Docs/C/xacc-main.html
-share/gnucash/Docs/C/xacc-mainwin.html
-share/gnucash/Docs/C/xacc-pnl.html
-share/gnucash/Docs/C/xacc-print.html
-share/gnucash/Docs/C/xacc-qif-import.html
-share/gnucash/Docs/C/xacc-quicken.html
-share/gnucash/Docs/C/xacc-recnwin.html
-share/gnucash/Docs/C/xacc-regwin.html
-share/gnucash/Docs/C/xacc-reports.html
-share/gnucash/Docs/C/xacc-ticker.html
-share/gnucash/Docs/C/xacc-trans_report.html
-share/gnucash/Docs/C/xacc-y2k.html
-share/gnucash/Docs/fr/pix/appr-asset1.gif
-share/gnucash/Docs/fr/pix/appr-asset2.gif
-share/gnucash/Docs/fr/pix/appr-income.gif
-share/gnucash/Docs/fr/pix/appr-main1.gif
-share/gnucash/Docs/fr/pix/appr-main2.gif
-share/gnucash/Docs/fr/pix/contract.gif
-share/gnucash/Docs/fr/pix/depr-asset.gif
-share/gnucash/Docs/fr/pix/depr-main.gif
-share/gnucash/Docs/fr/pix/expand.gif
-share/gnucash/Docs/fr/pix/foliowin-single.gif
-share/gnucash/Docs/fr/pix/foliowin.gif
-share/gnucash/Docs/fr/pix/newaccwin-code.gif
-share/gnucash/Docs/fr/pix/newaccwin-trade.gif
-share/gnucash/Docs/fr/pix/newaccwin.gif
-share/gnucash/Docs/fr/pix/recnwin.gif
-share/gnucash/Docs/fr/pix/regwin-double.gif
-share/gnucash/Docs/fr/pix/regwin-multi.gif
-share/gnucash/Docs/fr/pix/regwin-single.gif
-share/gnucash/Docs/fr/pix/regwin-single2.gif
-share/gnucash/Docs/fr/pix/regwin.gif
-share/gnucash/Docs/fr/pix/report-baln.gif
-share/gnucash/Docs/fr/pix/report-folio.gif
-share/gnucash/Docs/fr/pix/report-option.gif
-share/gnucash/Docs/fr/pix/reportwin.gif
-share/gnucash/Docs/fr/pix/ticker-a.gif
-share/gnucash/Docs/fr/pix/ticker-b.gif
-share/gnucash/Docs/fr/bofa-mym.html
-share/gnucash/Docs/fr/projects.html
-share/gnucash/Docs/fr/xacc-about.html
-share/gnucash/Docs/fr/xacc-accountedit.html
-share/gnucash/Docs/fr/xacc-acctypes.html
-share/gnucash/Docs/fr/xacc-accwin.html
-share/gnucash/Docs/fr/xacc-adjbwin.html
-share/gnucash/Docs/fr/xacc-apar.html
-share/gnucash/Docs/fr/xacc-apprdepr.html
-share/gnucash/Docs/fr/xacc-bal_tracker.html
-share/gnucash/Docs/fr/xacc-balsheet.html
-share/gnucash/Docs/fr/xacc-currency.html
-share/gnucash/Docs/fr/xacc-date.html
-share/gnucash/Docs/fr/xacc-double.html
-share/gnucash/Docs/fr/xacc-expense.html
-share/gnucash/Docs/fr/xacc-globalprefs.html
-share/gnucash/Docs/fr/xacc-gpl.html
-share/gnucash/Docs/fr/xacc-groups.html
-share/gnucash/Docs/fr/xacc-main.html
-share/gnucash/Docs/fr/xacc-mainwin.html
-share/gnucash/Docs/fr/xacc-pnl.html
-share/gnucash/Docs/fr/xacc-print.html
-share/gnucash/Docs/fr/xacc-quicken.html
-share/gnucash/Docs/fr/xacc-recnwin.html
-share/gnucash/Docs/fr/xacc-regwin.html
-share/gnucash/Docs/fr/xacc-reports.html
-share/gnucash/Docs/fr/xacc-ticker.html
-share/gnucash/Docs/fr/xacc-trans_report.html
-share/gnucash/Docs/fr/xacc-y2k.html
-share/gnucash/Docs/gnucash.css
-share/gnucash/Docs/logos/NetBSD-banner.gif
-share/gnucash/Docs/logos/bullogogross.gif
-share/gnucash/Docs/logos/debian.jpg
-share/gnucash/Docs/logos/ibm.gif
-share/gnucash/Docs/logos/linux.gif
-share/gnucash/Docs/logos/sgi.gif
-share/gnucash/Docs/logos/skunkware.gif
-share/gnucash/Reports/report-baln.phtml
-share/gnucash/Reports/report-folio.phtml
-share/gnucash/Reports/report-formtest.html
-share/gnucash/Reports/report-main.html
-share/gnucash/Reports/report-menu.html
-share/gnucash/Reports/report-null.html
-share/gnucash/Reports/report-pnl.phtml
-share/gnucash/config
+share/gnucash/perl/Quote.pm
+share/gnucash/perl/gnucash.pm
 share/locale/de/LC_MESSAGES/gnucash.mo
 share/locale/en_GB/LC_MESSAGES/gnucash.mo
 share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -226,20 +236,21 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
 share/gnome/apps/Applications/gnucash.desktop
 @exec cd share/guile && ln -sf ../slib .
 @exec guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-@dirrm doc/gnucash
+@dirrm etc/gnucash
+@dirrm lib/gnucash/perl
 @dirrm lib/gnucash
+@dirrm share/gnucash/doc/examples
+@dirrm share/gnucash/doc
+@dirrm share/gnucash/html/C/image
+@dirrm share/gnucash/html/C
+@dirrm share/gnucash/html/fr/image
+@dirrm share/gnucash/html/fr
+@dirrm share/gnucash/html
+@dirrm share/gnucash/perl
 @dirrm share/gnucash/scm/gnumeric
+@dirrm share/gnucash/scm/printing
 @dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/qifs
 @dirrm share/gnucash/scm/srfi
 @dirrm share/gnucash/scm/report
 @dirrm share/gnucash/scm
-@dirrm share/gnucash/data
-@dirrm share/gnucash/Docs/C/pix
-@dirrm share/gnucash/Docs/C
-@dirrm share/gnucash/Docs/fr/pix
-@dirrm share/gnucash/Docs/fr
-@dirrm share/gnucash/Docs/logos
-@dirrm share/gnucash/Docs
-@dirrm share/gnucash/Reports
 @dirrm share/gnucash
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 3b738db..44c145c 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -7,45 +7,56 @@
 #
 
 PORTNAME=	gnucash
-PORTVERSION=	1.3.4
+PORTVERSION=	1.4.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/
+MASTER_SITES=	ftp://ftp.gnucash.org/pub/gnucash/gnucash/sources/stable/ \
+		http://www.gnucash.org/pub/gnucash/sources/stable/ \
+		http://www.linas.org/pub/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gnucash
 
 MAINTAINER=     obrien@FreeBSD.org
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
+		g-wrap:${PORTSDIR}/devel/g-wrap \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		guile.6:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.4:${PORTSDIR}/graphics/png \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		gnome.4:${PORTSDIR}/x11/gnomelibs \
+		guile.6:${PORTSDIR}/lang/guile \
+		xml.5:${PORTSDIR}/textproc/libxml
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
+RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib \
+		gnuplot:${PORTSDIR}/math/gnuplot \
+		${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
 		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI  \
+		${site_perl}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${site_perl}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-ALL_TARGET=	gnome
-
+#USE_X_PREFIX=	yes
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= 	${LOCALBASE}/bin/glib12-config
-
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 CONFIGURE_ENV=	MAKE=gmake \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}"
-MAKE_ENV=	MAKE=gmake
+CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+MAN1=		gnc-prices.1 gnucash.1
 
-post-configure:
-	${PERL} -pi.orig -e 's:/usr/lib/gnucash:${PREFIX}/lib/gnucash:g'  \
-		${WRKSRC}/src/quotes/gnc-prices
 
 post-install:
-	@strip ${PREFIX}/bin/gnucash.gnome
-	${LDCONFIG} -m ${PREFIX}/lib/gnucash
-	cd ${PREFIX}/share/guile && ln -sf ../slib .
+	@strip ${PREFIX}/bin/gnucash
+	${LDCONFIG} -m ${PREFIX}/lib/
+	${LDCONFIG} -m ${PREFIX}/lib/gnucash/perl
+	cd ${LOCALBASE}/share/guile && ${LN} -sf ../slib .
 	guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
 
 .include <bsd.port.mk>
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 7cdc58b..fed17c3 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1 +1 @@
-MD5 (gnucash-1.3.4.tar.gz) = d82390d0736273e83d7ded7429e72265
+MD5 (gnucash-1.4.2.tar.gz) = 28f40b7c88e61f848bd9def7dfff0a39
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index bc309ed..d44af44 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -1,27 +1,182 @@
 @comment $FreeBSD$
-bin/gnucash.gnome
 bin/gnucash
 bin/gnc-prices
-doc/gnucash/README
-doc/gnucash/README.SuSE-6.3
-doc/gnucash/README.aix
-doc/gnucash/README.francais
-doc/gnucash/README.german
-doc/gnucash/README.gnome-hackers
-doc/gnucash/README.guile-hackers
-doc/gnucash/README.install
-doc/gnucash/README.irix
-doc/gnucash/README.sco
-doc/gnucash/README.solaris
-doc/gnucash/TODO
-doc/gnucash/CHANGES
-lib/gnucash/gnucash.pm
-lib/gnucash/gnucash.so
+etc/gnucash/config
+lib/libgncengine.a
+lib/libgncengine.so
+lib/libgncengine.so.1
+lib/gnucash/perl/gnucash.so
+lib/gnucash/perl/libgncswig.so
+lib/gnucash/perl/libgncswig.so.1
+lib/gnucash/perl/libgncswig.la
+lib/gnucash/perl/libgncswig.a
 @exec /sbin/ldconfig -m %D/lib/gnucash
 @unexec /sbin/ldconfig -R
-lib/gnucash/Quote.pm
+share/gnucash/doc/examples/Money95bank_fr.qif
+share/gnucash/doc/examples/Money95invst_fr.qif
+share/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnucash/doc/examples/README
+share/gnucash/doc/examples/abc-all.qif
+share/gnucash/doc/examples/abc.qif
+share/gnucash/doc/examples/bogus.qif
+share/gnucash/doc/examples/cbb-export.qif
+share/gnucash/doc/examples/currency.xac
+share/gnucash/doc/examples/every.qif
+share/gnucash/doc/examples/ms-money.qif
+share/gnucash/doc/examples/quicktest.qif
+share/gnucash/doc/examples/splitdemo.xac
+share/gnucash/doc/examples/swipe.qif
+share/gnucash/doc/examples/test.xac
+share/gnucash/doc/examples/test2.xac
+share/gnucash/doc/examples/test3.xac
+share/gnucash/doc/examples/test4.xac
+share/gnucash/doc/examples/trading.xac
+share/gnucash/doc/examples/trading2.xac
+share/gnucash/doc/examples/web.qif
+share/gnucash/doc/examples/xfer.xac
+share/gnucash/doc/README.francais
+share/gnucash/doc/README.german
+share/gnucash/doc/guile-hackers.txt
+share/gnucash/doc/gnc.html
+share/gnucash/doc/AUTHORS
+share/gnucash/doc/COPYING
+share/gnucash/doc/ChangeLog
+share/gnucash/doc/INSTALL
+share/gnucash/doc/NEWS
+share/gnucash/doc/README
+share/gnucash/html/C/image/appr-asset1.gif
+share/gnucash/html/C/image/appr-asset2.gif
+share/gnucash/html/C/image/appr-income.gif
+share/gnucash/html/C/image/appr-main1.gif
+share/gnucash/html/C/image/appr-main2.gif
+share/gnucash/html/C/image/bal-graph.gif
+share/gnucash/html/C/image/contract.gif
+share/gnucash/html/C/image/depr-asset.gif
+share/gnucash/html/C/image/depr-main.gif
+share/gnucash/html/C/image/expand.gif
+share/gnucash/html/C/image/foliowin-single.gif
+share/gnucash/html/C/image/foliowin.gif
+share/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnucash/html/C/image/logo-bullogogross.gif
+share/gnucash/html/C/image/logo-debian.jpg
+share/gnucash/html/C/image/logo-ibm.gif
+share/gnucash/html/C/image/logo-linux.gif
+share/gnucash/html/C/image/logo-sgi.gif
+share/gnucash/html/C/image/logo-skunkware.gif
+share/gnucash/html/C/image/newaccwin-code.gif
+share/gnucash/html/C/image/newaccwin-trade.gif
+share/gnucash/html/C/image/recnwin.gif
+share/gnucash/html/C/image/regwin-double.gif
+share/gnucash/html/C/image/regwin-multi.gif
+share/gnucash/html/C/image/regwin-single.gif
+share/gnucash/html/C/image/regwin-single2.gif
+share/gnucash/html/C/image/report-av-baln.gif
+share/gnucash/html/C/image/report-baln.gif
+share/gnucash/html/C/image/report-folio.gif
+share/gnucash/html/C/image/report-option.gif
+share/gnucash/html/C/image/report-pnl.gif
+share/gnucash/html/C/image/reportwin.gif
+share/gnucash/html/C/image/ticker-a.gif
+share/gnucash/html/C/image/ticker-b.gif
+share/gnucash/html/C/RAW-NOTES
+share/gnucash/html/C/bofa-mym.html
+share/gnucash/html/C/projects.html
+share/gnucash/html/C/xacc-about.html
+share/gnucash/html/C/xacc-accountedit.html
+share/gnucash/html/C/xacc-acctypes.html
+share/gnucash/html/C/xacc-accwin.html
+share/gnucash/html/C/xacc-adjbwin.html
+share/gnucash/html/C/xacc-apar.html
+share/gnucash/html/C/xacc-apprdepr.html
+share/gnucash/html/C/xacc-bal_tracker.html
+share/gnucash/html/C/xacc-balsheet.html
+share/gnucash/html/C/xacc-currency.html
+share/gnucash/html/C/xacc-date.html
+share/gnucash/html/C/xacc-double.html
+share/gnucash/html/C/xacc-euro.html
+share/gnucash/html/C/xacc-expense.html
+share/gnucash/html/C/xacc-find-transactions.html
+share/gnucash/html/C/xacc-globalprefs.html
+share/gnucash/html/C/xacc-globalprops.html
+share/gnucash/html/C/xacc-gpl.html
+share/gnucash/html/C/xacc-groups.html
+share/gnucash/html/C/xacc-main.html
+share/gnucash/html/C/xacc-mainwin.html
+share/gnucash/html/C/xacc-pnl.html
+share/gnucash/html/C/xacc-portfolio_report.html
+share/gnucash/html/C/xacc-print.html
+share/gnucash/html/C/xacc-qif-import.html
+share/gnucash/html/C/xacc-quicken.html
+share/gnucash/html/C/xacc-recnwin.html
+share/gnucash/html/C/xacc-regwin.html
+share/gnucash/html/C/xacc-regwin_kbd.html
+share/gnucash/html/C/xacc-reports.html
+share/gnucash/html/C/xacc-ticker.html
+share/gnucash/html/C/xacc-trans_report.html
+share/gnucash/html/C/xacc-y2k.html
+share/gnucash/html/fr/image/appr-asset1.gif
+share/gnucash/html/fr/image/appr-asset2.gif
+share/gnucash/html/fr/image/appr-income.gif
+share/gnucash/html/fr/image/appr-main1.gif
+share/gnucash/html/fr/image/appr-main2.gif
+share/gnucash/html/fr/image/contract.gif
+share/gnucash/html/fr/image/depr-asset.gif
+share/gnucash/html/fr/image/depr-main.gif
+share/gnucash/html/fr/image/expand.gif
+share/gnucash/html/fr/image/foliowin-single.gif
+share/gnucash/html/fr/image/foliowin.gif
+share/gnucash/html/fr/image/newaccwin-code.gif
+share/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnucash/html/fr/image/newaccwin.gif
+share/gnucash/html/fr/image/recnwin.gif
+share/gnucash/html/fr/image/regwin-double.gif
+share/gnucash/html/fr/image/regwin-multi.gif
+share/gnucash/html/fr/image/regwin-single.gif
+share/gnucash/html/fr/image/regwin-single2.gif
+share/gnucash/html/fr/image/regwin.gif
+share/gnucash/html/fr/image/report-baln.gif
+share/gnucash/html/fr/image/report-folio.gif
+share/gnucash/html/fr/image/report-option.gif
+share/gnucash/html/fr/image/reportwin.gif
+share/gnucash/html/fr/image/ticker-a.gif
+share/gnucash/html/fr/image/ticker-b.gif
+share/gnucash/html/fr/bofa-mym.html
+share/gnucash/html/fr/projects.html
+share/gnucash/html/fr/xacc-about.html
+share/gnucash/html/fr/xacc-accountedit.html
+share/gnucash/html/fr/xacc-acctypes.html
+share/gnucash/html/fr/xacc-accwin.html
+share/gnucash/html/fr/xacc-adjbwin.html
+share/gnucash/html/fr/xacc-apar.html
+share/gnucash/html/fr/xacc-apprdepr.html
+share/gnucash/html/fr/xacc-bal_tracker.html
+share/gnucash/html/fr/xacc-balsheet.html
+share/gnucash/html/fr/xacc-currency.html
+share/gnucash/html/fr/xacc-date.html
+share/gnucash/html/fr/xacc-double.html
+share/gnucash/html/fr/xacc-expense.html
+share/gnucash/html/fr/xacc-globalprefs.html
+share/gnucash/html/fr/xacc-gpl.html
+share/gnucash/html/fr/xacc-gpl-fr.html
+share/gnucash/html/fr/xacc-groups.html
+share/gnucash/html/fr/xacc-main.html
+share/gnucash/html/fr/xacc-mainwin.html
+share/gnucash/html/fr/xacc-pnl.html
+share/gnucash/html/fr/xacc-print.html
+share/gnucash/html/fr/xacc-quicken.html
+share/gnucash/html/fr/xacc-recnwin.html
+share/gnucash/html/fr/xacc-regwin.html
+share/gnucash/html/fr/xacc-reports.html
+share/gnucash/html/fr/xacc-ticker.html
+share/gnucash/html/fr/xacc-trans_report.html
+share/gnucash/html/fr/xacc-y2k.html
+share/gnucash/html/gnucash.css
+share/gnucash/html/index.html
 share/gnucash/scm/gnumeric/gnumeric-utilities.scm
 share/gnucash/scm/gnumeric/table-utils.scm
+share/gnucash/scm/printing/number-to-words.scm
+share/gnucash/scm/printing/print-check.scm
 share/gnucash/scm/qif-import/qif-dialog-utils.scm
 share/gnucash/scm/qif-import/qif-file.scm
 share/gnucash/scm/qif-import/qif-guess-map.scm
@@ -31,16 +186,6 @@ share/gnucash/scm/qif-import/qif-parse.scm
 share/gnucash/scm/qif-import/qif-to-gnc.scm
 share/gnucash/scm/qif-import/qif-utils.scm
 share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/qifs/dates-qif.scm
-share/gnucash/scm/qifs/gc-import-qifs.scm
-share/gnucash/scm/qifs/guess-category-qif.scm
-share/gnucash/scm/qifs/importqif.scm
-share/gnucash/scm/qifs/parseqif.scm
-share/gnucash/scm/qifs/qif2gc.scm
-share/gnucash/scm/qifs/qifcats.scm
-share/gnucash/scm/qifs/qifstate.scm
-share/gnucash/scm/qifs/qifutils.scm
-share/gnucash/scm/qifs/split-qif.scm
 share/gnucash/scm/report/average-balance.scm
 share/gnucash/scm/report/balance-and-pnl.scm
 share/gnucash/scm/report/budget-report.scm
@@ -52,21 +197,22 @@ share/gnucash/scm/srfi/srfi-1.r5rs.scm
 share/gnucash/scm/srfi/srfi-1.unclear.scm
 share/gnucash/scm/srfi/srfi-19.scm
 share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/acc-create.scm
+share/gnucash/scm/srfi/srfi-8.scm
 share/gnucash/scm/bootstrap.scm
 share/gnucash/scm/bs-interp.scm
 share/gnucash/scm/c-interface.scm
 share/gnucash/scm/command-line.scm
 share/gnucash/scm/config-var.scm
-share/gnucash/scm/convenience-wrappers.scm
+share/gnucash/scm/currencies.scm
 share/gnucash/scm/date-utilities.scm
 share/gnucash/scm/depend.scm
 share/gnucash/scm/doc.scm
+share/gnucash/scm/engine-interface.scm
+share/gnucash/scm/engine-utilities.scm
 share/gnucash/scm/extensions.scm
 share/gnucash/scm/graph.scm
 share/gnucash/scm/hooks.scm
 share/gnucash/scm/html-generator.scm
-share/gnucash/scm/macros.scm
 share/gnucash/scm/main.scm
 share/gnucash/scm/options.scm
 share/gnucash/scm/path.scm
@@ -79,146 +225,10 @@ share/gnucash/scm/structure.scm
 share/gnucash/scm/substring-search.scm
 share/gnucash/scm/testbed.scm
 share/gnucash/scm/text-export.scm
-share/gnucash/scm/txn-create.scm
 share/gnucash/scm/utilities.scm
 share/gnucash/scm/xml-generator.scm
-share/gnucash/data/currency.xac
-share/gnucash/data/splitdemo.xac
-share/gnucash/data/test.xac
-share/gnucash/data/test2.xac
-share/gnucash/data/test3.xac
-share/gnucash/data/test4.xac
-share/gnucash/data/trading.xac
-share/gnucash/data/trading2.xac
-share/gnucash/data/xfer.xac
-share/gnucash/Docs/C/pix/appr-asset1.gif
-share/gnucash/Docs/C/pix/appr-asset2.gif
-share/gnucash/Docs/C/pix/appr-income.gif
-share/gnucash/Docs/C/pix/appr-main1.gif
-share/gnucash/Docs/C/pix/appr-main2.gif
-share/gnucash/Docs/C/pix/contract.gif
-share/gnucash/Docs/C/pix/depr-asset.gif
-share/gnucash/Docs/C/pix/depr-main.gif
-share/gnucash/Docs/C/pix/expand.gif
-share/gnucash/Docs/C/pix/foliowin-single.gif
-share/gnucash/Docs/C/pix/foliowin.gif
-share/gnucash/Docs/C/pix/newaccwin-code.gif
-share/gnucash/Docs/C/pix/newaccwin-trade.gif
-share/gnucash/Docs/C/pix/newaccwin.gif
-share/gnucash/Docs/C/pix/recnwin.gif
-share/gnucash/Docs/C/pix/regwin-double.gif
-share/gnucash/Docs/C/pix/regwin-multi.gif
-share/gnucash/Docs/C/pix/regwin-single.gif
-share/gnucash/Docs/C/pix/regwin-single2.gif
-share/gnucash/Docs/C/pix/regwin.gif
-share/gnucash/Docs/C/pix/report-baln.gif
-share/gnucash/Docs/C/pix/report-folio.gif
-share/gnucash/Docs/C/pix/report-option.gif
-share/gnucash/Docs/C/pix/reportwin.gif
-share/gnucash/Docs/C/pix/ticker-a.gif
-share/gnucash/Docs/C/pix/ticker-b.gif
-share/gnucash/Docs/C/bofa-mym.html
-share/gnucash/Docs/C/projects.html
-share/gnucash/Docs/C/xacc-about.html
-share/gnucash/Docs/C/xacc-accountedit.html
-share/gnucash/Docs/C/xacc-acctypes.html
-share/gnucash/Docs/C/xacc-accwin.html
-share/gnucash/Docs/C/xacc-adjbwin.html
-share/gnucash/Docs/C/xacc-apar.html
-share/gnucash/Docs/C/xacc-apprdepr.html
-share/gnucash/Docs/C/xacc-bal_tracker.html
-share/gnucash/Docs/C/xacc-balsheet.html
-share/gnucash/Docs/C/xacc-currency.html
-share/gnucash/Docs/C/xacc-date.html
-share/gnucash/Docs/C/xacc-double.html
-share/gnucash/Docs/C/xacc-expense.html
-share/gnucash/Docs/C/xacc-globalprefs.html
-share/gnucash/Docs/C/xacc-globalprops.html
-share/gnucash/Docs/C/xacc-gpl.html
-share/gnucash/Docs/C/xacc-groups.html
-share/gnucash/Docs/C/xacc-main.html
-share/gnucash/Docs/C/xacc-mainwin.html
-share/gnucash/Docs/C/xacc-pnl.html
-share/gnucash/Docs/C/xacc-print.html
-share/gnucash/Docs/C/xacc-qif-import.html
-share/gnucash/Docs/C/xacc-quicken.html
-share/gnucash/Docs/C/xacc-recnwin.html
-share/gnucash/Docs/C/xacc-regwin.html
-share/gnucash/Docs/C/xacc-reports.html
-share/gnucash/Docs/C/xacc-ticker.html
-share/gnucash/Docs/C/xacc-trans_report.html
-share/gnucash/Docs/C/xacc-y2k.html
-share/gnucash/Docs/fr/pix/appr-asset1.gif
-share/gnucash/Docs/fr/pix/appr-asset2.gif
-share/gnucash/Docs/fr/pix/appr-income.gif
-share/gnucash/Docs/fr/pix/appr-main1.gif
-share/gnucash/Docs/fr/pix/appr-main2.gif
-share/gnucash/Docs/fr/pix/contract.gif
-share/gnucash/Docs/fr/pix/depr-asset.gif
-share/gnucash/Docs/fr/pix/depr-main.gif
-share/gnucash/Docs/fr/pix/expand.gif
-share/gnucash/Docs/fr/pix/foliowin-single.gif
-share/gnucash/Docs/fr/pix/foliowin.gif
-share/gnucash/Docs/fr/pix/newaccwin-code.gif
-share/gnucash/Docs/fr/pix/newaccwin-trade.gif
-share/gnucash/Docs/fr/pix/newaccwin.gif
-share/gnucash/Docs/fr/pix/recnwin.gif
-share/gnucash/Docs/fr/pix/regwin-double.gif
-share/gnucash/Docs/fr/pix/regwin-multi.gif
-share/gnucash/Docs/fr/pix/regwin-single.gif
-share/gnucash/Docs/fr/pix/regwin-single2.gif
-share/gnucash/Docs/fr/pix/regwin.gif
-share/gnucash/Docs/fr/pix/report-baln.gif
-share/gnucash/Docs/fr/pix/report-folio.gif
-share/gnucash/Docs/fr/pix/report-option.gif
-share/gnucash/Docs/fr/pix/reportwin.gif
-share/gnucash/Docs/fr/pix/ticker-a.gif
-share/gnucash/Docs/fr/pix/ticker-b.gif
-share/gnucash/Docs/fr/bofa-mym.html
-share/gnucash/Docs/fr/projects.html
-share/gnucash/Docs/fr/xacc-about.html
-share/gnucash/Docs/fr/xacc-accountedit.html
-share/gnucash/Docs/fr/xacc-acctypes.html
-share/gnucash/Docs/fr/xacc-accwin.html
-share/gnucash/Docs/fr/xacc-adjbwin.html
-share/gnucash/Docs/fr/xacc-apar.html
-share/gnucash/Docs/fr/xacc-apprdepr.html
-share/gnucash/Docs/fr/xacc-bal_tracker.html
-share/gnucash/Docs/fr/xacc-balsheet.html
-share/gnucash/Docs/fr/xacc-currency.html
-share/gnucash/Docs/fr/xacc-date.html
-share/gnucash/Docs/fr/xacc-double.html
-share/gnucash/Docs/fr/xacc-expense.html
-share/gnucash/Docs/fr/xacc-globalprefs.html
-share/gnucash/Docs/fr/xacc-gpl.html
-share/gnucash/Docs/fr/xacc-groups.html
-share/gnucash/Docs/fr/xacc-main.html
-share/gnucash/Docs/fr/xacc-mainwin.html
-share/gnucash/Docs/fr/xacc-pnl.html
-share/gnucash/Docs/fr/xacc-print.html
-share/gnucash/Docs/fr/xacc-quicken.html
-share/gnucash/Docs/fr/xacc-recnwin.html
-share/gnucash/Docs/fr/xacc-regwin.html
-share/gnucash/Docs/fr/xacc-reports.html
-share/gnucash/Docs/fr/xacc-ticker.html
-share/gnucash/Docs/fr/xacc-trans_report.html
-share/gnucash/Docs/fr/xacc-y2k.html
-share/gnucash/Docs/gnucash.css
-share/gnucash/Docs/logos/NetBSD-banner.gif
-share/gnucash/Docs/logos/bullogogross.gif
-share/gnucash/Docs/logos/debian.jpg
-share/gnucash/Docs/logos/ibm.gif
-share/gnucash/Docs/logos/linux.gif
-share/gnucash/Docs/logos/sgi.gif
-share/gnucash/Docs/logos/skunkware.gif
-share/gnucash/Reports/report-baln.phtml
-share/gnucash/Reports/report-folio.phtml
-share/gnucash/Reports/report-formtest.html
-share/gnucash/Reports/report-main.html
-share/gnucash/Reports/report-menu.html
-share/gnucash/Reports/report-null.html
-share/gnucash/Reports/report-pnl.phtml
-share/gnucash/config
+share/gnucash/perl/Quote.pm
+share/gnucash/perl/gnucash.pm
 share/locale/de/LC_MESSAGES/gnucash.mo
 share/locale/en_GB/LC_MESSAGES/gnucash.mo
 share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -226,20 +236,21 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
 share/gnome/apps/Applications/gnucash.desktop
 @exec cd share/guile && ln -sf ../slib .
 @exec guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-@dirrm doc/gnucash
+@dirrm etc/gnucash
+@dirrm lib/gnucash/perl
 @dirrm lib/gnucash
+@dirrm share/gnucash/doc/examples
+@dirrm share/gnucash/doc
+@dirrm share/gnucash/html/C/image
+@dirrm share/gnucash/html/C
+@dirrm share/gnucash/html/fr/image
+@dirrm share/gnucash/html/fr
+@dirrm share/gnucash/html
+@dirrm share/gnucash/perl
 @dirrm share/gnucash/scm/gnumeric
+@dirrm share/gnucash/scm/printing
 @dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/qifs
 @dirrm share/gnucash/scm/srfi
 @dirrm share/gnucash/scm/report
 @dirrm share/gnucash/scm
-@dirrm share/gnucash/data
-@dirrm share/gnucash/Docs/C/pix
-@dirrm share/gnucash/Docs/C
-@dirrm share/gnucash/Docs/fr/pix
-@dirrm share/gnucash/Docs/fr
-@dirrm share/gnucash/Docs/logos
-@dirrm share/gnucash/Docs
-@dirrm share/gnucash/Reports
 @dirrm share/gnucash