summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/gnucash/Makefile30
-rw-r--r--misc/gnucash/files/md54
-rw-r--r--misc/gnucash/files/patch-sum17
-rw-r--r--misc/gnucash/patches/patch-aa308
-rw-r--r--misc/gnucash/patches/patch-ab20
-rw-r--r--misc/gnucash/patches/patch-ad16
-rw-r--r--misc/gnucash/patches/patch-ae28
-rw-r--r--misc/gnucash/patches/patch-af18
-rw-r--r--misc/gnucash/patches/patch-ag20
-rw-r--r--misc/gnucash/patches/patch-ah21
-rw-r--r--misc/gnucash/patches/patch-ai31
-rw-r--r--misc/gnucash/pkg/DESCR2
-rw-r--r--misc/gnucash/pkg/PLIST330
13 files changed, 440 insertions, 405 deletions
diff --git a/misc/gnucash/Makefile b/misc/gnucash/Makefile
index 0e4b3969090..c6a9bfed037 100644
--- a/misc/gnucash/Makefile
+++ b/misc/gnucash/Makefile
@@ -1,26 +1,32 @@
-# $NetBSD: Makefile,v 1.9 2000/02/28 01:25:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2000/05/13 06:21:01 rh Exp $
#
-DISTNAME= gnucash-1.1.25
+DISTNAME= gnucash-1.3.7
CATEGORIES= misc
-MASTER_SITES= ftp://ftp.gnucash.org/pub/gnucash/sources/
+MASTER_SITES= ftp://ftp.gnucash.org/pub/gnucash/sources/unstable/1.3.x/
-MAINTAINER= mellon@isc.org
+MAINTAINER= drankin@bohemians.lexington.ky.us
HOMEPAGE= http://www.gnucash.org/
-DEPENDS+= xpm-3.4k:../../graphics/xpm
-DEPENDS+= jpeg-6b:../../graphics/jpeg
-DEPENDS+= swig-1.1p5:../../devel/swig
+DEPENDS+= gnome-libs>=1.0.40:../../x11/gnome-libs
+DEPENDS+= gettext>=0.10.35:../../devel/gettext
DEPENDS+= eperl-2.2.14:../../textproc/eperl
-DEPENDS+= XmHTML-1.1.*:../../x11/XmHTML
-DEPENDS+= guile-1.3.*:../../lang/guile
DEPENDS+= libperl-5.00404:../../lang/libperl
-DEPENDS+= gtk+-1.2.*:../../x11/gtk
+DEPENDS+= guile-1.3.*:../../lang/guile
+DEPENDS+= guile-slib-2c7:../../devel/guile-slib
+DEPENDS+= swig-1.1p5:../../devel/swig
+DEPENDS+= libxml-1.8.5:../../textproc/libxml
USE_X11= yes
-USE_MOTIF= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-guile=${LOCALBASE} --with-perl-includes=${LOCALBASE}/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404/CORE
+CONFIGURE_ARGS+= --with-guile-config=${LOCALBASE}/bin/guile-config \
+ --without-motif --without-included-gettext \
+ --with-perl-includes=${LOCALBASE}/lib/perl5/${MACHINE_ARCH}-netbsd/5.00404
+CONFIGURE_ENV+= "LOCALBASE=${LOCALBASE}"
USE_GMAKE= yes
+USE_PERL= yes
+USE_LIBTOOL= yes
+
+ALL_TARGET= gnome
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnucash/files/md5 b/misc/gnucash/files/md5
index 743aebcb284..71a62e6324a 100644
--- a/misc/gnucash/files/md5
+++ b/misc/gnucash/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/01/23 03:56:11 mellon Exp $
+$NetBSD: md5,v 1.2 2000/05/13 06:21:02 rh Exp $
-MD5 (gnucash-1.1.25.tar.gz) = ea9f138fc7fc6bbd3c5ef75e4bf6441e
+MD5 (gnucash-1.3.7.tar.gz) = e92a19bc0f088936d3a773b9f2e6519e
diff --git a/misc/gnucash/files/patch-sum b/misc/gnucash/files/patch-sum
index 18b55fbbd28..27569315f09 100644
--- a/misc/gnucash/files/patch-sum
+++ b/misc/gnucash/files/patch-sum
@@ -1,10 +1,11 @@
-$NetBSD: patch-sum,v 1.2 2000/02/28 02:34:43 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/13 06:21:02 rh Exp $
-MD5 (patch-aa) = 156104e3f90f84be26e0a0479d72d4bd
-MD5 (patch-ab) = 6305321e97c828a6677811d83ca922e4
+MD5 (patch-aa) = cba09025966ce8d716121a52b34d111e
+MD5 (patch-ab) = ec8365eaadeed38e48a375985add1fa0
MD5 (patch-ac) = ac5cd850f1f2e74361c5f20f4db094a2
-MD5 (patch-ad) = a963aa55e15d9b10447bed4ebf38a20c
-MD5 (patch-ae) = a1854ae8b1b196e5697bd5ae811bf57a
-MD5 (patch-af) = f0c9ed18ecb0aa779e9a6b9c586f1aeb
-MD5 (patch-ag) = bd566569c82a5329c037a194b99ca570
-MD5 (patch-ah) = 2f3dc2f98f1552f068ce56c407ba5907
+MD5 (patch-ad) = 1ac1bd9d1d3781536f177c0d3e1a8908
+MD5 (patch-ae) = dd79e34570aaa07adbba367661f59b9d
+MD5 (patch-af) = fdf1033c63922b08d2c47667ae37b044
+MD5 (patch-ag) = 75c00d2c75c5bdf239e86375ffe01b07
+MD5 (patch-ah) = 0cb264b879ddba6580507031166ee125
+MD5 (patch-ai) = d804d2dea0d174cae64f95aed7d29f9c
diff --git a/misc/gnucash/patches/patch-aa b/misc/gnucash/patches/patch-aa
index 0f925c77e49..dbaf3c223b6 100644
--- a/misc/gnucash/patches/patch-aa
+++ b/misc/gnucash/patches/patch-aa
@@ -1,237 +1,73 @@
-$NetBSD: patch-aa,v 1.2 2000/02/28 02:34:44 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.3 2000/05/13 06:21:02 rh Exp $
-diff -rc2 --exclude=Makefile Makefile.in Makefile.in
-*** Makefile.in Tue Jan 5 23:58:02 1999
---- Makefile.in Fri Jan 22 22:01:40 1999
-***************
-*** 34,46 ****
- # install -- installs everything
-
-! default:
-! @echo " "
-! @echo "Please choose one of the following targets:"
-! @echo "motif dynamically linked motif version"
-! @echo "motif-static statically linked motif version"
-! @echo "gnome gnome/gtk version"
-! @echo "gnome-static gnome/gtk statically linked version"
-! @echo "qt kde/qt version"
-! @echo " "
-
- # This inclusion must come after the first target, and after the
---- 34,38 ----
- # install -- installs everything
-
-! all: motif
-
- # This inclusion must come after the first target, and after the
-***************
-*** 84,88 ****
- DIST_TRASH += config.cache config.log config.status config.h
-
-! tagsfiles := $(shell find -name "*.[ch]")
-
- TAGS: ${tagsfiles}
---- 84,88 ----
- DIST_TRASH += config.cache config.log config.status config.h
-
-! tagsfiles := $(shell find . -name "*.[ch]")
-
- TAGS: ${tagsfiles}
-***************
-*** 114,123 ****
- -e ${GNC_BINDIR}/gnucash.qt \
- ]
- $(INSTALL_DATA) src/quotes/gnc-prices ${GNC_LIBDIR}
-
-! @mkdir -p ${GNC_LIBDIR}
-! $(INSTALL_DATA) src/swig/perl5/gnucash.pm ${GNC_LIBDIR}
-! $(INSTALL_DATA) src/swig/perl5/gnucash.so ${GNC_LIBDIR}
-! $(INSTALL_DATA) src/swig/perl5/Quote.pm ${GNC_LIBDIR}
-
- @mkdir -p ${GNC_DOCDIR}
---- 114,123 ----
- -e ${GNC_BINDIR}/gnucash.qt \
- ]
-+ @mkdir -p ${GNC_LIBDIR}
- $(INSTALL_DATA) src/quotes/gnc-prices ${GNC_LIBDIR}
-
-! # $(INSTALL_DATA) src/swig/perl5/gnucash.pm ${GNC_LIBDIR}
-! # $(INSTALL_DATA) src/swig/perl5/gnucash.so ${GNC_LIBDIR}
-! # $(INSTALL_DATA) src/swig/perl5/Quote.pm ${GNC_LIBDIR}
-
- @mkdir -p ${GNC_DOCDIR}
-diff -rc2 --exclude=Makefile src/engine/Scrub.c src/engine/Scrub.c
-*** src/engine/Scrub.c Sat Dec 26 22:07:41 1998
---- src/engine/Scrub.c Fri Jan 22 12:10:11 1999
-***************
-*** 29,33 ****
---- 29,35 ----
- \********************************************************************/
-
-+ #if 0
- #include <nana.h>
-+ #endif
- #include <stdio.h>
- #include <stdlib.h>
-diff -rc2 --exclude=Makefile src/engine/Session.c src/engine/Session.c
-*** src/engine/Session.c Mon Jan 4 02:31:09 1999
---- src/engine/Session.c Fri Jan 22 12:13:16 1999
-***************
-*** 30,34 ****
---- 30,36 ----
- #include <fcntl.h>
- #include <limits.h>
-+ #if 0
- #include <nana.h>
-+ #endif
- #include <stdlib.h>
- #include <string.h>
-***************
-*** 98,102 ****
- int retval;
-
-! if (!sess) return EBADSLT;
- retval = sess->errtype;
- sess->errtype = 0;
---- 100,104 ----
- int retval;
-
-! if (!sess) return ENOENT;
- retval = sess->errtype;
- sess->errtype = 0;
-diff -rc2 --exclude=Makefile src/engine/util.h src/engine/util.h
-*** src/engine/util.h Mon Dec 14 03:31:25 1998
---- src/engine/util.h Fri Jan 22 13:05:55 1999
-***************
-*** 35,38 ****
---- 35,39 ----
- /* The debuging macros enable the setting of trace messages */
- #include <stdio.h>
-+ #if 0
- #include <nana.h>
-
-***************
-*** 43,56 ****
- #define assert I
-
-- #define MOD_ENGINE 1
-- #define MOD_IO 2
-- #define MOD_REGISTER 3
-- #define MOD_LEDGER 4
-- #define MOD_GUI 5
-- #define MOD_SCRUB 6
-- #define MODULE_MAX 7
--
-- extern int loglevel[MODULE_MAX];
--
- #define LERR (1 <= loglevel[module])
- #define LWARN (2 <= loglevel[module])
---- 44,47 ----
-***************
-*** 70,73 ****
---- 61,85 ----
-
- #define DEBUGCMD(x) { if (LINFO) { x; }}
-+ #else
-+ #define assert(x)
-+ #define PERR(x...)
-+ #define PWARN(x...)
-+ #define PINFO(x...)
-+ #define DEBUG(x...)
-+ #define ENTER(x...)
-+ #define LEAVE(x...)
-+ #define DETAIL(x...)
-+ #define DEBUGCMD(x)
-+ #endif
-+
-+ #define MOD_ENGINE 1
-+ #define MOD_IO 2
-+ #define MOD_REGISTER 3
-+ #define MOD_LEDGER 4
-+ #define MOD_GUI 5
-+ #define MOD_SCRUB 6
-+ #define MODULE_MAX 7
-+
-+ extern int loglevel[MODULE_MAX];
-
- #include <errno.h>
-diff -rc2 --exclude=Makefile src/gnome/Makefile.in src/gnome/Makefile.in
-*** src/gnome/Makefile.in Tue Dec 22 00:43:31 1998
---- src/gnome/Makefile.in Fri Jan 22 12:28:31 1999
-***************
-*** 43,47 ****
- $(shell @GNOME_CONFIG_BIN@ --libs gtk) @X_EXTRA_LIBS@ -lgnomeui \
- $(shell @GNOME_CONFIG_BIN@ --libs gnome gnomeui ) \
-! $(GUILELIBS) -lnana @LIBS@ # -lintl
-
- GNOMELIBS = @GNOMELIBS@
---- 43,47 ----
- $(shell @GNOME_CONFIG_BIN@ --libs gtk) @X_EXTRA_LIBS@ -lgnomeui \
- $(shell @GNOME_CONFIG_BIN@ --libs gnome gnomeui ) \
-! $(GUILELIBS) @LIBS@ # -lintl
-
- GNOMELIBS = @GNOMELIBS@
-diff -rc2 --exclude=Makefile src/motif/FileBox.c src/motif/FileBox.c
-*** src/motif/FileBox.c Tue Dec 29 03:37:39 1998
---- src/motif/FileBox.c Fri Jan 22 13:14:16 1999
-***************
-*** 155,159 ****
- previous_path = strdup (fileName);
- slash = strrchr (previous_path, '/');
-! *(slash+1) = 0x0;
- }
-
---- 155,162 ----
- previous_path = strdup (fileName);
- slash = strrchr (previous_path, '/');
-! if (slash)
-! *(slash+1) = 0x0;
-! else
-! *previous_path = 0x0;
- }
-
-diff -rc2 --exclude=Makefile src/swig/Makefile.in src/swig/Makefile.in
-*** src/swig/Makefile.in Sun Jan 3 03:22:06 1999
---- src/swig/Makefile.in Fri Jan 22 22:02:13 1999
-***************
-*** 23,27 ****
- # See Makefile.common for information about these variables.
- INDEP_SRCS := helperfuncs.c
-! CLEAN_SUBDIRS := guile perl5
- ######################################################################
-
---- 23,27 ----
- # See Makefile.common for information about these variables.
- INDEP_SRCS := helperfuncs.c
-! CLEAN_SUBDIRS := guile # perl5
- ######################################################################
-
-***************
-*** 32,36 ****
- include @top_srcdir@/Makefile.common
-
-! default: guile perl5
-
- ifeq (${HAVE_PLOTUTILS},1)
---- 32,36 ----
- include @top_srcdir@/Makefile.common
-
-! default: guile # perl5
-
- ifeq (${HAVE_PLOTUTILS},1)
-diff -rc2 --exclude=Makefile src/swig/perl5/Makefile.in src/swig/perl5/Makefile.in
-*** src/swig/perl5/Makefile.in Sun Jan 3 15:57:48 1999
---- src/swig/perl5/Makefile.in Fri Jan 22 12:49:10 1999
-***************
-*** 51,55 ****
-
- gnucash.so: ${OBJS} ../../engine/libengine.a
-! gcc -shared ${OBJS} ../../engine/libengine.a -lnana -o gnucash.so
-
- SWIG_FILTER := %P.h %/util.h
---- 51,55 ----
-
- gnucash.so: ${OBJS} ../../engine/libengine.a
-! gcc -shared ${OBJS} ../../engine/libengine.a -o gnucash.so
-
- SWIG_FILTER := %P.h %/util.h
+--- configure.orig Mon May 8 04:31:08 2000
++++ configure Wed May 10 10:03:47 2000
+@@ -2358,7 +2358,7 @@
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+- nls_cv_header_libgt=intl/libgettext.h
++ nls_cv_header_libgt=${LOCALBASE}/share/gettext/intl/libgettext.h
+ fi
+ else
+ echo "$ac_t""no" 1>&6
+@@ -2487,7 +2487,7 @@
+ INTLLIBS=$INTLDEPS
+ LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+ nls_cv_header_intl=intl/libintl.h
+- nls_cv_header_libgt=intl/libgettext.h
++ nls_cv_header_libgt=${LOCALBASE}/share/gettext/intl/libgettext.h
+ fi
+
+ if test "$XGETTEXT" != ":"; then
+@@ -2504,7 +2504,7 @@
+ else
+ DATADIRNAME=share
+ nls_cv_header_intl=intl/libintl.h
+- nls_cv_header_libgt=intl/libgettext.h
++ nls_cv_header_libgt=${LOCALBASE}/share/gettext/intl/libgettext.h
+ fi
+
+
+@@ -4787,6 +4787,7 @@
+ s%@RANLIB@%$RANLIB%g
+ s%@CC@%$CC%g
+ s%@CPP@%$CPP%g
++s%@LIBTOOL@%${LIBTOOL}%g
+ s%@OPT_STYLE_INSTALL@%$OPT_STYLE_INSTALL%g
+ s%@LOCALE_DIR@%$LOCALE_DIR%g
+ s%@GNC_EXPANDED_LOCALE_DIR@%$GNC_EXPANDED_LOCALE_DIR%g
+@@ -5088,10 +5089,10 @@
+ set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+ set $ac_sources; ac_source=$1; shift; ac_sources=$*
+
+- echo "linking $srcdir/$ac_source to $ac_dest"
++ echo "linking $ac_source to $ac_dest"
+
+- if test ! -r $srcdir/$ac_source; then
+- { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
++ if test ! -r $ac_source; then
++ { echo "configure: error: $ac_source: File not found" 1>&2; exit 1; }
+ fi
+ rm -f $ac_dest
+
+@@ -5109,15 +5110,15 @@
+ fi
+
+ case "$srcdir" in
+- [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+- *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
++ [/$]*) ac_rel_source="$ac_source" ;;
++ *) ac_rel_source="$ac_source" ;;
+ esac
+
+ # Make a symlink if possible; otherwise try a hard link.
+ if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+- ln $srcdir/$ac_source $ac_dest; then :
++ ln $ac_source $ac_dest; then :
+ else
+- { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
++ { echo "configure: error: can not link $ac_dest to $ac_source" 1>&2; exit 1; }
+ fi
+ done
+ EOF
diff --git a/misc/gnucash/patches/patch-ab b/misc/gnucash/patches/patch-ab
index 3001624446a..218322f6caa 100644
--- a/misc/gnucash/patches/patch-ab
+++ b/misc/gnucash/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 1999/03/03 23:34:06 jwise Exp $
---- Makefile.init.in.orig Wed Mar 3 18:07:12 1999
-+++ Makefile.init.in Wed Mar 3 18:07:24 1999
-@@ -2,8 +2,6 @@
+$NetBSD: patch-ab,v 1.3 2000/05/13 06:21:02 rh Exp $
+
+--- Makefile.init.in.orig Thu May 4 10:58:00 2000
++++ Makefile.init.in Thu May 4 10:58:24 2000
+@@ -54,6 +54,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ SWIG = @SWIG@
+ PERL = @PERL@
++LIBTOOL = @LIBTOOL@
- @SET_MAKE@
-
--export SHELL=/bin/bash
--
- srcdir = @srcdir@
- VPATH = @srcdir@
+ CPU = @target_cpu@
diff --git a/misc/gnucash/patches/patch-ad b/misc/gnucash/patches/patch-ad
index 7a37ece3ed7..a5f5c037380 100644
--- a/misc/gnucash/patches/patch-ad
+++ b/misc/gnucash/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 1999/03/25 19:25:32 tsarna Exp $
+$NetBSD: patch-ad,v 1.3 2000/05/13 06:21:02 rh Exp $
---- src/engine/Makefile.in.orig Sat Jan 2 19:55:32 1999
-+++ src/engine/Makefile.in Thu Mar 25 13:17:14 1999
-@@ -34,7 +34,7 @@
- # See Makefile.common for information about these variables.
+--- src/engine/Makefile.in.orig Fri Apr 14 06:33:38 2000
++++ src/engine/Makefile.in Tue May 9 16:38:00 2000
+@@ -37,7 +37,7 @@
INDEP_SRCS := AccInfo.c Account.c DateUtils.c FileIO.c Group.c \
- LedgerUtils.c QIFIO.c Query.c Scrub.c Session.c \
-- Transaction.c TransLog.c date.c util.c
-+ Transaction.c TransLog.c date.c util.c asprintf.c
+ LedgerUtils.c QIFIO.c Query.c Queue.c Scrub.c Session.c \
+ Transaction.c TransLog.c date.c util.c GNCId.c \
+- guid/md5.c guid/guid.c
++ guid/md5.c guid/guid.c asprintf.c
######################################################################
all: default
diff --git a/misc/gnucash/patches/patch-ae b/misc/gnucash/patches/patch-ae
index f7760528040..32adb664655 100644
--- a/misc/gnucash/patches/patch-ae
+++ b/misc/gnucash/patches/patch-ae
@@ -1,19 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2000/05/13 06:21:02 rh Exp $
---- ./src/motif/Makefile.in.orig Sun Jan 3 01:51:20 1999
-+++ ./src/motif/Makefile.in Sun Feb 27 21:19:56 2000
-@@ -33,5 +33,6 @@
- -I@srcdir@/../../@XMHTML_INC@ \
- -I@srcdir@/../../lib/Xbae-4.6.2-linas \
-- -I$(prefix)/include
-+ -I$(prefix)/include \
-+ @GUILE_INC@
+--- lib/Makefile.in.orig Thu May 4 10:47:37 2000
++++ lib/Makefile.in Thu May 4 10:59:40 2000
+@@ -52,7 +52,7 @@
+ # try and re-build every make.
+ g-wrap.configure:
+ (cd g-wrap && \
+- ./configure --prefix=${ABSOLUTE_TOP_SRCDIR}/lib/g-wrap-install)
++ env LIBTOOL=${LIBTOOL} ./configure --prefix=${ABSOLUTE_TOP_SRCDIR}/lib/g-wrap-install)
+ touch g-wrap.configure
+ DIST_TRASH += g-wrap.configure
- CFLAGS = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH}
-@@ -41,5 +42,5 @@
- LIBS = -L$(prefix)/lib \
- @X_PRE_LIBS@ @MOTIF_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@ \
-- $(GUILELIBS) @LIBS@ -lnana
-+ $(GUILELIBS) @LIBS@
-
- # Have to use wildcard here otherwise filters below won't get the expanded
diff --git a/misc/gnucash/patches/patch-af b/misc/gnucash/patches/patch-af
index e8fcde98cd8..736a6711c23 100644
--- a/misc/gnucash/patches/patch-af
+++ b/misc/gnucash/patches/patch-af
@@ -1,11 +1,13 @@
-$NetBSD: patch-af,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2000/05/13 06:21:02 rh Exp $
---- ./src/reports/Makefile.in.orig Wed Oct 28 00:55:33 1998
-+++ ./src/reports/Makefile.in Sun Feb 27 21:22:05 2000
-@@ -24,5 +24,5 @@
- include @top_srcdir@/Makefile.init
+--- Makefile.common.orig Thu May 4 11:24:58 2000
++++ Makefile.common Thu May 4 11:25:29 2000
+@@ -42,7 +42,7 @@
+ QT_OBJS := $(addprefix obj/qt/,${COMMON_SRCS:.c=.o})
+ QT_OBJS += $(addprefix obj/qt/,${QT_SRCS:.cpp=.o})
--INCLPATH = -I../.. -I../engine -I@srcdir@/../../include -I@prefix@/include
-+INCLPATH = -I../.. -I../engine -I@srcdir@/../../include -I@prefix@/include @GUILE_INC@
- CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH}
+-CFLAGS += -pg ${DEFS}
++CFLAGS += ${DEFS}
+ ifdef GNOME_CONFIG_BIN
+ GNOME_CFLAGS += $(shell ${GNOME_CONFIG_BIN} --cflags gnomeui)
diff --git a/misc/gnucash/patches/patch-ag b/misc/gnucash/patches/patch-ag
index 44bb8e30049..6edc6af01a9 100644
--- a/misc/gnucash/patches/patch-ag
+++ b/misc/gnucash/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.2 2000/05/13 06:21:02 rh Exp $
---- ./src/swig/guile/Makefile.in.orig Mon Nov 23 00:08:33 1998
-+++ ./src/swig/guile/Makefile.in Sun Feb 27 21:23:21 2000
-@@ -31,5 +31,6 @@
- -I@top_srcdir@/lib/ComboBox-1.33 \
- -I@top_srcdir@/lib/Xbae-4.6.2-linas \
-- -I$(prefix)/include
-+ -I$(prefix)/include \
-+ @GUILE_INC@
+--- src/engine/util.h.orig Thu May 4 16:27:13 2000
++++ src/engine/util.h Thu May 4 16:27:32 2000
+@@ -28,6 +28,7 @@
+ #define __XACC_UTIL_H__
+
+ #include <stdlib.h>
++#include <locale.h>
+ #include "config.h"
+ #include "gnc-common.h"
- CFLAGS = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH} -Wno-unused
diff --git a/misc/gnucash/patches/patch-ah b/misc/gnucash/patches/patch-ah
index b9610adb190..94f99f01f6c 100644
--- a/misc/gnucash/patches/patch-ah
+++ b/misc/gnucash/patches/patch-ah
@@ -1,12 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2000/05/13 06:21:02 rh Exp $
---- ./src/guile/Makefile.in.orig Sat Dec 19 03:16:25 1998
-+++ ./src/guile/Makefile.in Sun Feb 27 21:24:16 2000
-@@ -36,5 +36,6 @@
- -I@top_srcdir@/lib/ComboBox-1.33 \
- -I@top_srcdir@/lib/Xbae-4.6.2-linas \
-- -I$(prefix)/include
-+ -I$(prefix)/include \
-+ @GUILE_INC@
+--- lib/g-wrap/Makefile.in.orig Fri Mar 31 04:52:58 2000
++++ lib/g-wrap/Makefile.in Wed May 10 10:04:42 2000
+@@ -86,7 +86,7 @@
+ RS_SCRIPT = @RS_SCRIPT@
+ VERSION = @VERSION@
- CFLAGS = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH}
+-SUBDIRS = doc g-scan guile rscheme
++SUBDIRS = doc g-scan guile # rscheme
+ EXTRA_DIST = VERSION THANKS README README.g-translate
+ include_HEADERS = g-wrap.h
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/misc/gnucash/patches/patch-ai b/misc/gnucash/patches/patch-ai
new file mode 100644
index 00000000000..68b69d39b7b
--- /dev/null
+++ b/misc/gnucash/patches/patch-ai
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.1 2000/05/13 06:21:02 rh Exp $
+
+--- lib/g-wrap/configure.orig Fri Mar 31 04:55:10 2000
++++ lib/g-wrap/configure Thu May 4 11:04:27 2000
+@@ -817,7 +817,7 @@
+
+
+ # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
++set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:823: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+@@ -831,7 +831,7 @@
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+- ac_cv_prog_CC="gcc"
++ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+@@ -1552,7 +1552,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/misc/gnucash/pkg/DESCR b/misc/gnucash/pkg/DESCR
index bdc470dc0f6..ccc8441e9c7 100644
--- a/misc/gnucash/pkg/DESCR
+++ b/misc/gnucash/pkg/DESCR
@@ -2,4 +2,4 @@ GNUcash: a personal double-entry accounting program
GNUcash is intended to be a fully-featured accounting program that could
easily replace something like Quicken or Microsoft Money. It is extensible
-in guile (an embedded scheme interpreter), and also in Perl.
+in guile (an embedded scheme interpreter).
diff --git a/misc/gnucash/pkg/PLIST b/misc/gnucash/pkg/PLIST
index 612d1e9d567..46120918272 100644
--- a/misc/gnucash/pkg/PLIST
+++ b/misc/gnucash/pkg/PLIST
@@ -1,91 +1,255 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/01/23 03:56:11 mellon Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/05/13 06:21:03 rh Exp $
bin/gnucash
-bin/gnucash.motif
-lib/gnucash/gnc-prices
-@dirrm lib/gnucash
-share/gnucash/config
-share/gnucash/scm/startup/command-line.scm
-share/gnucash/scm/startup/config-var.scm
-share/gnucash/scm/startup/main.scm
-share/gnucash/scm/startup/path.scm
-share/gnucash/scm/startup/prefs.scm
-share/gnucash/scm/startup/utilities.scm
-share/gnucash/scm/startup/init.scm
+bin/gnucash.gnome
+bin/gnc-prices
+etc/gnucash/config
+lib/gnucash/gnucash.pm
+lib/gnucash/gnucash.so
+lib/gnucash/Quote.pm
+man/man1/gnucash.1
+man/man1/gnc-prices.1
+share/locale/de/LC_MESSAGES/gnucash.mo
+share/locale/fr/LC_MESSAGES/gnucash.mo
+share/locale/sv/LC_MESSAGES/gnucash.mo
+share/locale/en_GB/LC_MESSAGES/gnucash.mo
+share/gnucash/html/C/pix/appr-asset1.gif
+share/gnucash/html/C/pix/appr-asset2.gif
+share/gnucash/html/C/pix/appr-income.gif
+share/gnucash/html/C/pix/appr-main1.gif
+share/gnucash/html/C/pix/appr-main2.gif
+share/gnucash/html/C/pix/contract.gif
+share/gnucash/html/C/pix/depr-asset.gif
+share/gnucash/html/C/pix/depr-main.gif
+share/gnucash/html/C/pix/expand.gif
+share/gnucash/html/C/pix/foliowin-single.gif
+share/gnucash/html/C/pix/foliowin.gif
+share/gnucash/html/C/pix/newaccwin-code.gif
+share/gnucash/html/C/pix/newaccwin-trade.gif
+share/gnucash/html/C/pix/newaccwin.gif
+share/gnucash/html/C/pix/recnwin.gif
+share/gnucash/html/C/pix/regwin-double.gif
+share/gnucash/html/C/pix/regwin-multi.gif
+share/gnucash/html/C/pix/regwin-single.gif
+share/gnucash/html/C/pix/regwin-single2.gif
+share/gnucash/html/C/pix/regwin.gif
+share/gnucash/html/C/pix/report-baln.gif
+share/gnucash/html/C/pix/report-folio.gif
+share/gnucash/html/C/pix/report-option.gif
+share/gnucash/html/C/pix/reportwin.gif
+share/gnucash/html/C/pix/ticker-a.gif
+share/gnucash/html/C/pix/ticker-b.gif
+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-print-check.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-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/pix/appr-asset1.gif
+share/gnucash/html/fr/pix/appr-asset2.gif
+share/gnucash/html/fr/pix/appr-income.gif
+share/gnucash/html/fr/pix/appr-main1.gif
+share/gnucash/html/fr/pix/appr-main2.gif
+share/gnucash/html/fr/pix/contract.gif
+share/gnucash/html/fr/pix/depr-asset.gif
+share/gnucash/html/fr/pix/depr-main.gif
+share/gnucash/html/fr/pix/expand.gif
+share/gnucash/html/fr/pix/foliowin-single.gif
+share/gnucash/html/fr/pix/foliowin.gif
+share/gnucash/html/fr/pix/newaccwin-code.gif
+share/gnucash/html/fr/pix/newaccwin-trade.gif
+share/gnucash/html/fr/pix/newaccwin.gif
+share/gnucash/html/fr/pix/recnwin.gif
+share/gnucash/html/fr/pix/regwin-double.gif
+share/gnucash/html/fr/pix/regwin-multi.gif
+share/gnucash/html/fr/pix/regwin-single.gif
+share/gnucash/html/fr/pix/regwin-single2.gif
+share/gnucash/html/fr/pix/regwin.gif
+share/gnucash/html/fr/pix/report-baln.gif
+share/gnucash/html/fr/pix/report-folio.gif
+share/gnucash/html/fr/pix/report-option.gif
+share/gnucash/html/fr/pix/reportwin.gif
+share/gnucash/html/fr/pix/ticker-a.gif
+share/gnucash/html/fr/pix/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-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/logos/NetBSD-banner.gif
+share/gnucash/html/logos/bullogogross.gif
+share/gnucash/html/logos/debian.jpg
+share/gnucash/html/logos/ibm.gif
+share/gnucash/html/logos/linux.gif
+share/gnucash/html/logos/sgi.gif
+share/gnucash/html/logos/skunkware.gif
+share/gnucash/html/gnucash.css
+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
+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-2.scm
+share/gnucash/scm/report/transaction-report.scm
+share/gnucash/scm/srfi/srfi-19.scm
+share/gnucash/scm/srfi/srfi-1.r5rs.scm
+share/gnucash/scm/srfi/srfi-1.unclear.scm
+share/gnucash/scm/srfi/srfi-8.guile.scm
+share/gnucash/scm/acc-create.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/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/bofa-mym.html
-share/gnucash/Docs/projects.html
-share/gnucash/Docs/xacc-about.html
-share/gnucash/Docs/xacc-acctypes.html
-share/gnucash/Docs/xacc-accwin.html
-share/gnucash/Docs/xacc-adjbwin.html
-share/gnucash/Docs/xacc-apar.html
-share/gnucash/Docs/xacc-currency.html
-share/gnucash/Docs/xacc-date.html
-share/gnucash/Docs/xacc-double.html
-share/gnucash/Docs/xacc-expense.html
-share/gnucash/Docs/xacc-gpl.html
-share/gnucash/Docs/xacc-groups.html
-share/gnucash/Docs/xacc-main.html
-share/gnucash/Docs/xacc-mainwin.html
-share/gnucash/Docs/xacc-print.html
-share/gnucash/Docs/xacc-quicken.html
-share/gnucash/Docs/xacc-recnwin.html
-share/gnucash/Docs/pix.xpm
-share/gnucash/Docs/xacc-regwin.html
-share/gnucash/Docs/xacc-reports.html
-share/gnucash/Docs/xacc-y2k.html
-share/gnucash/Docs/contract.gif
-share/gnucash/Docs/expand.gif
-share/gnucash/Docs/foliowin-single.gif
-share/gnucash/Docs/foliowin.gif
-share/gnucash/Docs/newaccwin-code.gif
-share/gnucash/Docs/newaccwin-trade.gif
-share/gnucash/Docs/newaccwin.gif
-share/gnucash/Docs/recnwin.gif
-share/gnucash/Docs/regwin-double.gif
-share/gnucash/Docs/regwin-multi.gif
-share/gnucash/Docs/regwin-single.gif
-share/gnucash/Docs/regwin.gif
-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-main.html
-share/gnucash/Reports/report-menu.html
-share/gnucash/Reports/report-null.html
-share/gnucash/Reports/report-baln.phtml
-share/gnucash/Reports/report-folio.phtml
-share/gnucash/Reports/report-pnl.phtml
-@dirrm share/gnucash/scm/startup
-@dirrm share/gnucash/scm
-@dirrm share/gnucash/data
-@dirrm share/gnucash/Docs/logos
-@dirrm share/gnucash/Docs/images
-@dirrm share/gnucash/Docs
-@dirrm share/gnucash/Reports/images
-@dirrm share/gnucash/Reports
-@dirrm share/gnucash
+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/scm/bootstrap.scm
+share/gnome/apps/Applications/gnucash.desktop
+doc/gnucash/examples/currency.xac
+doc/gnucash/examples/splitdemo.xac
+doc/gnucash/examples/test.xac
+doc/gnucash/examples/test2.xac
+doc/gnucash/examples/test3.xac
+doc/gnucash/examples/test4.xac
+doc/gnucash/examples/trading.xac
+doc/gnucash/examples/trading2.xac
+doc/gnucash/examples/xfer.xac
+doc/gnucash/examples/Money95bank_fr.qif
+doc/gnucash/examples/Money95invst_fr.qif
+doc/gnucash/examples/Money95mfunds_fr.qif
+doc/gnucash/examples/Money95stocks_fr.qif
+doc/gnucash/examples/abc-all.qif
+doc/gnucash/examples/abc.qif
+doc/gnucash/examples/bogus.qif
+doc/gnucash/examples/cbb-export.qif
+doc/gnucash/examples/every.qif
+doc/gnucash/examples/ms-money.qif
+doc/gnucash/examples/quicktest.qif
+doc/gnucash/examples/swipe.qif
+doc/gnucash/examples/web.qif
+doc/gnucash/examples/README
doc/gnucash/README
-doc/gnucash/README.aix
-doc/gnucash/README.binaries
+doc/gnucash/README.francais
doc/gnucash/README.german
-doc/gnucash/README.install
-doc/gnucash/README.irix
-doc/gnucash/README.sco
-doc/gnucash/README.solaris
+doc/gnucash/SuSE-6.3.txt
+doc/gnucash/aix.txt
+doc/gnucash/gnome-hackers.txt
+doc/gnucash/guile-hackers.txt
+doc/gnucash/solaris.txt
+doc/gnucash/INSTALL
doc/gnucash/TODO
-doc/gnucash/CHANGES
+doc/gnucash/NEWS
+@dirrm doc/gnucash/examples
@dirrm doc/gnucash
+@dirrm etc/gnucash
+@dirrm lib/gnucash
+@dirrm share/gnucash/html/C/pix
+@dirrm share/gnucash/html/C
+@dirrm share/gnucash/html/fr/pix
+@dirrm share/gnucash/html/fr
+@dirrm share/gnucash/html/logos
+@dirrm share/gnucash/html
+@dirrm share/gnucash/scm/printing
+@dirrm share/gnucash/scm/gnumeric
+@dirrm share/gnucash/scm/qif-import
+@dirrm share/gnucash/scm/qifs
+@dirrm share/gnucash/scm/report
+@dirrm share/gnucash/scm/srfi
+@dirrm share/gnucash/scm
+@dirrm share/gnucash