Update to 1.8.0.

6 files changed, 86 insertions, 101 deletions

diff --git a/finance/gnucash/files/patch-Makefile.in b/finance/gnucash/files/patch-Makefile.in
new file mode 100644
index 000000000000..a64b9a662fe8
--- /dev/null
+++ b/finance/gnucash/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Feb  4 22:33:22 2003
++++ Makefile.in	Tue Feb  4 22:33:30 2003
+@@ -226,7 +226,7 @@
+ enable_html_docs = @enable_html_docs@
+ enable_latex_docs = @enable_latex_docs@
+ 
+-SUBDIRS = intl  m4  macros debian doc lib src intl-scm po rpm accounts
++SUBDIRS = m4  macros debian doc lib src intl-scm po rpm accounts
+ 
+ docdir = ${GNC_DOC_INSTALL_DIR}
+ 
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index e8a6c574bf3a..164cccc98f79 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -1,73 +1,11 @@
---- configure.orig	Wed Aug 21 23:07:06 2002
-+++ configure	Mon Nov 11 21:54:28 2002
-@@ -5523,6 +5523,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10138,7 +10139,7 @@
- #include "confdefs.h"
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
-+extern int *libintl_nl_domain_bindings;
- extern
- #ifdef __cplusplus
- "C"
-@@ -10146,7 +10147,7 @@
- const char *_nl_expand_alias ();
- int main() {
- bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0)
- ; return 0; }
- EOF
- if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -10614,7 +10615,7 @@
-   withval="$with_help_prefix"
-   GNC_HELPDIR="$with_help_prefix/gnome/help/gnucash"
- else
--  GNC_HELPDIR="\${datadir}/gnome/help/gnucash"
-+  GNC_HELPDIR="\${datadir}/help/gnucash"
- fi
- 
- 
-@@ -11134,7 +11135,7 @@
- 
- 
- if test "$prefer_db1" = "yes"; then
--	for ac_hdr in db_185.h db1/db.h
-+	for ac_hdr in db_185.h db.h db1/db.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -11174,7 +11175,7 @@
- fi
- done
- 
--	if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then
-+	if test "$ac_cv_header_db_185_h$ac_cv_header_db_h" = nono; then
- 	  { echo "configure: error: Berkeley db library required for GnuCash" 1>&2; exit 1; }
- 	fi
- 	cat >> confdefs.h <<\EOF
-@@ -11329,14 +11330,14 @@
- 
- # check for gtkhtml and enable it via HAVE_LIBGTKHTML
- # if found
--echo $ac_n "checking for gtk_html_new in -lgtkhtml""... $ac_c" 1>&6
--echo "configure:11334: checking for gtk_html_new in -lgtkhtml" >&5
-+echo $ac_n "checking for gtk_html_new in -lgtkhtml-1.1""... $ac_c" 1>&6
-+echo "configure:11334: checking for gtk_html_new in -lgtkhtml-1.1" >&5
- ac_lib_var=`echo gtkhtml'_'gtk_html_new | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgtkhtml $GTKHTML_LIBS $LIBS"
-+LIBS="-lgtkhtml-1.1 $GTKHTML_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11342 "configure"
- #include "confdefs.h"
+--- configure.orig	Mon Feb  3 02:20:35 2003
++++ configure	Tue Feb  4 22:00:37 2003
+@@ -13115,7 +13116,7 @@
+ echo "configure:13116: checking for gtkhtml < 1.1" >&5
+     GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
+     GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
+-    if test "x$GTKHTML_LIBS" != x; then
++    if test "x$GTKHTML_LIBS" = "xNO"; then
+ 	# check for gtkhtml and enable it via HAVE_LIBGTKHTML
+ 	# if found
+ 	echo $ac_n "checking for gtk_html_new in -lgtkhtml""... $ac_c" 1>&6
diff --git a/finance/gnucash/files/patch-ltmain.sh b/finance/gnucash/files/patch-ltmain.sh
new file mode 100644
index 000000000000..1c2fba5d533f
--- /dev/null
+++ b/finance/gnucash/files/patch-ltmain.sh
@@ -0,0 +1,42 @@
+--- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
++++ ltmain.sh	Fri Oct 11 01:44:24 2002
+@@ -1073,8 +1073,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4286,10 +4297,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/finance/gnucash/files/patch-po::ru.po b/finance/gnucash/files/patch-po::ru.po
index f4e7ac7fa9d2..eb5274f28ebc 100644
--- a/finance/gnucash/files/patch-po::ru.po
+++ b/finance/gnucash/files/patch-po::ru.po
@@ -1,28 +1,26 @@
-
-$FreeBSD$
-
---- po/ru.po	2002/08/18 07:33:38	1.1
-+++ po/ru.po	2002/08/18 07:34:07
-@@ -907,7 +907,7 @@
+--- po/ru.po.orig	Mon Feb  3 02:46:19 2003
++++ po/ru.po	Tue Feb  4 20:36:19 2003
+@@ -4767,7 +4767,7 @@
  
- #: src/gnome/dialog-totd.c:302
+ #: src/gnome/dialog-totd.c:303
  msgid "-*-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 -msgstr "-rfx-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
 +msgstr "-cronyx-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
  
- #: src/gnome/dialog-totd.c:303
+ #: src/gnome/dialog-totd.c:304
  msgid "Tip of the Day:"
-@@ -4259,11 +4259,11 @@
+@@ -8574,12 +8574,12 @@
  msgid ""
  "register-default-font:-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
  msgstr ""
 -"register-default-font:-rfx-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
-+"register-default-font:-cronyx-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
++"register-hint-font:-cronyx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*"
  
- #: src/register/gnome/gnucash-style.c:904
+ #: src/register/register-gnome/gnucash-style.c:812
+ #: intl-scm/guile-strings.c:248
  msgid "register-hint-font:-adobe-helvetica-medium-o-normal--*-120-*-*-*-*-*-*"
 -msgstr "register-hint-font:-rfx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*"
 +msgstr "register-hint-font:-cronyx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*"
  
- #: src/register/splitreg.c:93
- msgid "sample: 12/12/2000"
+ #: src/report/report-gnome/dialog-column-view.c:271
+ msgid "Contents"
diff --git a/finance/gnucash/files/patch-src::Makefile.in b/finance/gnucash/files/patch-src::Makefile.in
deleted file mode 100644
index 7c9c05ece4fe..000000000000
--- a/finance/gnucash/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2002/03/13 10:25:32	1.1
-+++ src/Makefile.in	2002/03/13 10:25:44
-@@ -174,8 +174,7 @@
-   quotes \
-   pixmaps \
-   optional \
--  . \
--  test
-+  .
- 
- 
- # Engine Makefile.am file.
diff --git a/finance/gnucash/files/patch-src_doc_Makefile.in b/finance/gnucash/files/patch-src_doc_Makefile.in
new file mode 100644
index 000000000000..4cc5e1b93ad2
--- /dev/null
+++ b/finance/gnucash/files/patch-src_doc_Makefile.in
@@ -0,0 +1,11 @@
+--- src/doc/Makefile.in.orig	Tue Feb  4 23:55:03 2003
++++ src/doc/Makefile.in	Tue Feb  4 23:58:49 2003
+@@ -492,7 +492,7 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
+ 	mkdir -p html #Workaround to allow libofx-cvs user to install without doc.
+ #	cp -rp $(srcdir)/html ${docdir}
+-	cp -rp html $(DESTDIR)$(docdir)/html
++	cp -rp html/* $(DESTDIR)$(docdir)/html
+ 
+ uninstall-hook:
+ 	rm -rf ${docdir}/html