Upgrade to version 1.3.3.

Submitted by:	Matthew Condell <mcondell@bbn.com>
		For whom I cannot give enough praise for upgrading one of
		the most difficult ports I know of.

3 files changed, 281 insertions, 43 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6b93c98eafc2..22b8a2d07d5b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,30 +1,54 @@
 # ex:ts=8
 # Ports collection makefile for:  gnucash
-# Version required: 0.0
+# Version required:     	  1.0.18
 # Date created:			  Mon Feb 03, 1997
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xacc-1.0.18
-PKGNAME=	gnucash-1.0.18
+DISTNAME=	gnucash-1.3.3
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.gnucash.org/pub/xacc/  \
-		ftp://ftp.gnucash.org/pub/gnucash/xacc/
+MASTER_SITES=	ftp://www.gnucash.org/pub/gnucash/gnucash/sources/unstable/1.3.x/1.3.3/
 
 MAINTAINER=     obrien@FreeBSD.org
 
-REQUIRES_MOTIF=	yes
+BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
+		eperl:${PORTSDIR}/lang/eperl
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		glib12.3:${PORTSDIR}/devel/glib12 \
+		gnome.3:${PORTSDIR}/x11/gnomelibs \
+		guile.6:${PORTSDIR}/lang/guile
+site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib  \
+		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${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
-ALL_TARGET=	depend default
+USE_PERL5=	yes
+ALL_TARGET=	gnome
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+GLIB_CONFIG?= 	${LOCALBASE}/bin/glib12-config
+
+CONFIGURE_ENV=	MAKE=gmake \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}"
+MAKE_ENV=	MAKE=gmake
 
-pre-build:
-	@${LN} -sf ${WRKSRC}/lib/Xbae-4.6.2-linas/src ${WRKSRC}/lib/Xbae-4.6.2-linas/Xbae
+post-configure:
+	${PERL} -pi.orig -e 's:/usr/lib/gnucash:${PREFIX}/lib/gnucash:g'  \
+		${WRKSRC}/src/quotes/gnc-prices
 
 post-install:
-	@strip ${PREFIX}/bin/xacc.bin
-	@${LN} -f ${PREFIX}/bin/xacc ${PREFIX}/bin/gnucash
-	@${LN} -f ${PREFIX}/bin/xacc.bin ${PREFIX}/bin/gnucash.bin
+	@strip ${PREFIX}/bin/gnucash.gnome
+	${LDCONFIG} -m ${PREFIX}/lib/gnucash
+	cd ${PREFIX}/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 698a1ee5637d..81ce57cd2ee6 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1 +1 @@
-MD5 (xacc-1.0.18.tar.gz) = 02e59faf3a191139eb4ed4f6f9e9bf4f
+MD5 (gnucash-1.3.3.tar.gz) = f854b27d17873ac11013090ffc7eb1a7
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 41007326c631..bc309ed2a860 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -1,31 +1,245 @@
+@comment $FreeBSD$
+bin/gnucash.gnome
 bin/gnucash
-bin/gnucash.bin
-bin/xacc
-bin/xacc.bin
-share/doc/xacc/contract.gif
-share/doc/xacc/expand.gif
-share/doc/xacc/foliowin.gif
-share/doc/xacc/newaccwin.gif
-share/doc/xacc/pix.xpm
-share/doc/xacc/projects.html
-share/doc/xacc/recnwin.gif
-share/doc/xacc/regwin.gif
-share/doc/xacc/xacc-about.html
-share/doc/xacc/xacc-accwin.html
-share/doc/xacc/xacc-adjbwin.html
-share/doc/xacc/xacc-double.html
-share/doc/xacc/xacc-expense.html
-share/doc/xacc/xacc-gpl.html
-share/doc/xacc/xacc-main.html
-share/doc/xacc/xacc-mainwin.html
-share/doc/xacc/xacc-quicken.html
-share/doc/xacc/xacc-recnwin.html
-share/doc/xacc/xacc-regwin.html
-share/doc/xacc/logos/bullogogross.gif
-share/doc/xacc/logos/debian.jpg
-share/doc/xacc/logos/ibm.gif
-share/doc/xacc/logos/linux.gif
-share/doc/xacc/logos/sgi.gif
-share/doc/xacc/logos/skunkware.gif
-@dirrm share/doc/xacc/logos
-@dirrm share/doc/xacc
+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
+@exec /sbin/ldconfig -m %D/lib/gnucash
+@unexec /sbin/ldconfig -R
+lib/gnucash/Quote.pm
+share/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnucash/scm/gnumeric/table-utils.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
+share/gnucash/scm/qif-import/qif-import.scm
+share/gnucash/scm/qif-import/qif-objects.scm
+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
+share/gnucash/scm/report/folio.scm
+share/gnucash/scm/report/hello-world.scm
+share/gnucash/scm/report/report-list.scm
+share/gnucash/scm/report/transaction-report.scm
+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/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/date-utilities.scm
+share/gnucash/scm/depend.scm
+share/gnucash/scm/doc.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
+share/gnucash/scm/prefs.scm
+share/gnucash/scm/report-utilities.scm
+share/gnucash/scm/report.scm
+share/gnucash/scm/slib-backup.scm
+share/gnucash/scm/startup.scm
+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/locale/de/LC_MESSAGES/gnucash.mo
+share/locale/en_GB/LC_MESSAGES/gnucash.mo
+share/locale/fr/LC_MESSAGES/gnucash.mo
+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 lib/gnucash
+@dirrm share/gnucash/scm/gnumeric
+@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