- Update to 1.8.12

PR:		ports/87703
Submitted by:	Alex Varju <freebsd-ports@varju.ca>

8 files changed, 70 insertions, 98 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index f6077dd7f203..8552319f633c 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnucash
-PORTVERSION=	1.8.11
-PORTREVISION=	1
+PORTVERSION=	1.8.12
 CATEGORIES=	finance gnome
 MASTER_SITES=	http://www.gnucash.org/pub/gnucash/sources/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -35,7 +34,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp
+USE_GNOME=	gnomeprefix gnomehack gnomeprint libglade gtkhtml libghttp intltool intlhack
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -61,11 +60,13 @@ LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 
 # WITH_OPENHBCI is old synonym for aqbanking option
 .if defined(WITH_AQBANKING) || defined(WITH_OPENHBCI)
-LIB_DEPENDS+=	aqbanking.5:${PORTSDIR}/finance/aqbanking \
-		ktoblzcheck.1:${PORTSDIR}/finance/ktoblzcheck
+LIB_DEPENDS+=	aqbanking.8:${PORTSDIR}/finance/aqbanking \
+		ktoblzcheck.4:${PORTSDIR}/finance/ktoblzcheck
 CONFIGURE_ARGS+=--enable-hbci
+PLIST_SUB=	AQBANKING=""
 .else
 CONFIGURE_ARGS+=--disable-hbci
+PLIST_SUB=	AQBANKING="@comment "
 .endif
 
 post-configure:
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 10a478a64bfe..85c535245563 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnucash-1.8.11.tar.gz) = 62f94331936e37ed1b1d28b5a1863bb3
-SHA256 (gnucash-1.8.11.tar.gz) = 46d67731992c06f4cefe3cb0129bfd00f49ef72c8f44d3aae6317ef9d44fc107
+MD5 (gnucash-1.8.12.tar.gz) = 81e7c703db56bb203e106664157779cc
+SIZE (gnucash-1.8.12.tar.gz) = 8290229
 SIZE (gnucash-1.8.11.tar.gz) = 7822353
diff --git a/finance/gnucash/files/patch-Makefile.in b/finance/gnucash/files/patch-Makefile.in
index bdabc9770ec4..7ce6ec37981e 100644
--- a/finance/gnucash/files/patch-Makefile.in
+++ b/finance/gnucash/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Dec 17 13:21:00 2003
-+++ Makefile.in	Wed Dec 17 13:22:34 2003
-@@ -227,7 +227,7 @@
- enable_html_docs = @enable_html_docs@
- enable_latex_docs = @enable_latex_docs@
- 
+--- Makefile.in~	Wed Oct 19 21:05:51 2005
++++ Makefile.in	Wed Oct 19 21:06:29 2005
+@@ -412,7 +412,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = intl  m4  macros doc lib src intl-scm po rpm accounts
 +SUBDIRS = m4  macros doc lib src intl-scm po rpm accounts
- 
  docdir = ${GNC_DOC_INSTALL_DIR}
- 
+ @GNC_FALSE@dummy_SOURCES = dummy.c
+ noinst_DATA = make-gnucash-patch make-gnucash-potfiles
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index 094f45f1bb2c..aae73e5c8b09 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -1,33 +1,44 @@
---- configure.orig	Sun Sep 21 16:06:57 2003
-+++ configure	Sun Sep 21 16:07:24 2003
-@@ -3860,10 +3860,10 @@
- #include "confdefs.h"
+--- configure.orig	Thu Oct 20 21:05:33 2005
++++ configure	Thu Oct 20 21:12:31 2005
+@@ -9710,12 +9710,12 @@
+ /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
 -extern int *_nl_domain_bindings;
 +extern int *libintl_nl_domain_bindings;
- int main() {
+ int
+ main ()
+ {
  bindtextdomain ("", "");
 -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
 +return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
- ; return 0; }
- EOF
- if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -11776,7 +11776,7 @@
+   ;
+   return 0;
+ }
+@@ -20102,7 +20102,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
+ fi;
  
  
-@@ -13665,7 +13665,7 @@
-   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 13671 "configure"
- #include "confdefs.h"
+@@ -21587,7 +21587,7 @@
+ 
+ 
+ 
+-for ac_header in db_185.h db1/db.h db4/db_185.h
++for ac_header in db_185.h db1/db.h db41/db_185.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -21750,7 +21750,7 @@
+ 
+ 
+ 
+-for ac_header in db.h db_185.h db1/db.h db4/db_185.h
++for ac_header in db.h db_185.h db1/db.h db41/db_185.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/finance/gnucash/files/patch-po::ru.po b/finance/gnucash/files/patch-po::ru.po
index a8a6f915834d..d1d17a2ad6b1 100644
--- a/finance/gnucash/files/patch-po::ru.po
+++ b/finance/gnucash/files/patch-po::ru.po
@@ -1,6 +1,6 @@
---- po/ru.po.orig	Mon Feb 10 01:52:51 2003
-+++ po/ru.po	Tue Feb 11 22:29:55 2003
-@@ -4767,7 +4767,7 @@
+--- po/ru.po.orig	Sun Oct 16 13:14:00 2005
++++ po/ru.po	Wed Oct 19 21:10:01 2005
+@@ -4953,7 +4953,7 @@
  
  #: src/gnome/dialog-totd.c:303
  msgid "-*-helvetica-bold-r-normal-*-*-180-*-*-p-*-*-*"
@@ -9,7 +9,7 @@
  
  #: src/gnome/dialog-totd.c:304
  msgid "Tip of the Day:"
-@@ -8574,12 +8574,12 @@
+@@ -8660,12 +8660,12 @@
  msgid ""
  "register-default-font:-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*"
  msgstr ""
@@ -17,7 +17,7 @@
 +"register-hint-font:-cronyx-helvetica-medium-o-normal--*-120-*-*-*-*-*-*"
  
  #: src/register/register-gnome/gnucash-style.c:819
- #: intl-scm/guile-strings.c:248
+ #: intl-scm/guile-strings.c:1093
  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-*-*-*-*-*-*"
diff --git a/finance/gnucash/files/patch-src::gnome::Makefile.in b/finance/gnucash/files/patch-src::gnome::Makefile.in
index 2e9afd4bd045..704a756bc82b 100644
--- a/finance/gnucash/files/patch-src::gnome::Makefile.in
+++ b/finance/gnucash/files/patch-src::gnome::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- src/gnome/Makefile.in	2002/07/11 09:16:01	1.1
-+++ src/gnome/Makefile.in	2002/07/11 09:16:10
-@@ -226,7 +226,7 @@
-   window-report.c
- 
+--- src/gnome/Makefile.in.orig	Wed Oct 19 21:10:12 2005
++++ src/gnome/Makefile.in	Wed Oct 19 21:10:41 2005
+@@ -470,7 +470,7 @@
+   window-reconcile.c \
+   window-register.c
  
 -gnomeappdir = ${datadir}/gnome/apps/Applications
 +gnomeappdir = ${datadir}/apps/Applications
- 
- gnomeapp_DATA = gnucash.desktop
- 
+ gnomeapp_in_files = gnucash.desktop.in
+ gnomeapp_DATA = $(gnomeapp_in_files:.desktop.in=.desktop)
+ appicondir = $(datadir)/pixmaps
diff --git a/finance/gnucash/files/patch-src_doc_Makefile.in b/finance/gnucash/files/patch-src_doc_Makefile.in
index 4cc5e1b93ad2..45eec5037e0d 100644
--- a/finance/gnucash/files/patch-src_doc_Makefile.in
+++ b/finance/gnucash/files/patch-src_doc_Makefile.in
@@ -1,11 +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 @@
+--- src/doc/Makefile.in.orig	Wed Oct 19 21:11:16 2005
++++ src/doc/Makefile.in	Wed Oct 19 21:23:15 2005
+@@ -726,7 +726,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
++	cp -rp html $(DESTDIR)$(docdir)
  
  uninstall-hook:
  	rm -rf ${docdir}/html
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 49d466280095..bae85845a1e6 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -460,50 +460,6 @@ share/gnome/gnucash/doc/examples/trading2.xac
 share/gnome/gnucash/doc/examples/web.qif
 share/gnome/gnucash/doc/examples/xfer.xac
 share/gnome/gnucash/doc/guile-hackers.txt
-share/gnome/gnucash/doc/html/Account_8h.html
-share/gnome/gnucash/doc/html/SchedXaction_8h.html
-share/gnome/gnucash/doc/html/TransLog_8h.html
-share/gnome/gnucash/doc/html/Transaction_8h.html
-share/gnome/gnucash/doc/html/annotated.html
-share/gnome/gnucash/doc/html/classes.html
-share/gnome/gnucash/doc/html/combocell_8h.html
-share/gnome/gnucash/doc/html/date_8h.html
-share/gnome/gnucash/doc/html/doxygen.css
-share/gnome/gnucash/doc/html/doxygen.gif
-share/gnome/gnucash/doc/html/files.html
-share/gnome/gnucash/doc/html/functions.html
-share/gnome/gnucash/doc/html/globals.html
-share/gnome/gnucash/doc/html/gnc-hbci-trans-templ_8h.html
-share/gnome/gnucash/doc/html/gnc-log-replay_8h.html
-share/gnome/gnucash/doc/html/gnc-ofx-import_8h.html
-share/gnome/gnucash/doc/html/gnc-pricedb_8h.html
-share/gnome/gnucash/doc/html/gnc-ui-util_8h.html
-share/gnome/gnucash/doc/html/group__Account__Quickfill.html
-share/gnome/gnucash/doc/html/group__Date.html
-share/gnome/gnucash/doc/html/group__Engine.html
-share/gnome/gnucash/doc/html/group__Import__Export.html
-share/gnome/gnucash/doc/html/group__UI.html
-share/gnome/gnucash/doc/html/import-account-matcher_8h.html
-share/gnome/gnucash/doc/html/import-backend_8h.html
-share/gnome/gnucash/doc/html/import-commodity-matcher_8h.html
-share/gnome/gnucash/doc/html/import-main-matcher_8h.html
-share/gnome/gnucash/doc/html/import-match-map_8h.html
-share/gnome/gnucash/doc/html/import-match-picker_8h.html
-share/gnome/gnucash/doc/html/import-settings_8h.html
-share/gnome/gnucash/doc/html/import-utilities_8h.html
-share/gnome/gnucash/doc/html/index.html
-share/gnome/gnucash/doc/html/modules.html
-share/gnome/gnucash/doc/html/structGNCDateEdit.html
-share/gnome/gnucash/doc/html/struct__FormulaCell.html
-share/gnome/gnucash/doc/html/struct__GNCFrequency.html
-share/gnome/gnucash/doc/html/struct__temporalStateData.html
-share/gnome/gnucash/doc/html/structaccount__group__s.html
-share/gnome/gnucash/doc/html/structaccount__s.html
-share/gnome/gnucash/doc/html/structgnc__template__xaction__data.html
-share/gnome/gnucash/doc/html/structgncp__SchedXaction.html
-share/gnome/gnucash/doc/html/structgncp__freq__spec.html
-share/gnome/gnucash/doc/html/structsplit__s.html
-share/gnome/gnucash/doc/html/structtimespec64.html
 share/gnome/gnucash/doc/projects.html
 share/gnome/gnucash/finance-quote-check
 share/gnome/gnucash/finance-quote-helper
@@ -519,6 +475,8 @@ share/gnome/gnucash/glade/exchange-dialog.glade
 share/gnome/gnucash/glade/fincalc.glade
 share/gnome/gnucash/glade/generic-import.glade
 share/gnome/gnucash/glade/gnc-date-format.glade
+%%AQBANKING%%share/gnome/gnucash/glade/hbci.glade
+%%AQBANKING%%share/gnome/gnucash/glade/hbcipass.glade
 share/gnome/gnucash/glade/help.glade
 share/gnome/gnucash/glade/invoice.glade
 share/gnome/gnucash/glade/job.glade
@@ -646,6 +604,7 @@ share/gnome/gnucash/scm/gnc-menu-extensions.scm
 share/gnome/gnucash/scm/gnc-numeric.scm
 share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
 share/gnome/gnucash/scm/gnumeric/table-utils.scm
+%%AQBANKING%%share/gnome/gnucash/scm/hbci/hbci.scm
 share/gnome/gnucash/scm/help-topics-index.scm
 share/gnome/gnucash/scm/hooks.scm
 share/gnome/gnucash/scm/html-barchart.scm
@@ -710,6 +669,7 @@ share/locale/pl/LC_MESSAGES/gnucash.mo
 share/locale/pt/LC_MESSAGES/gnucash.mo
 share/locale/pt_BR/LC_MESSAGES/gnucash.mo
 share/locale/ru/LC_MESSAGES/gnucash.mo
+share/locale/rw/LC_MESSAGES/gnucash.mo
 share/locale/sk/LC_MESSAGES/gnucash.mo
 share/locale/sv/LC_MESSAGES/gnucash.mo
 share/locale/ta/LC_MESSAGES/gnucash.mo
@@ -717,6 +677,8 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
 @dirrm share/gnome/pixmaps/gnucash
@@ -724,6 +686,7 @@ share/locale/zh_TW/LC_MESSAGES/gnucash.mo
 @dirrm share/gnome/gnucash/scm/printing
 @dirrm share/gnome/gnucash/scm/ofx
 @dirrm share/gnome/gnucash/scm/log-replay
+%%AQBANKING%%@dirrm share/gnome/gnucash/scm/hbci
 @dirrm share/gnome/gnucash/scm/gnumeric
 @dirrm share/gnome/gnucash/scm/generic-import
 @dirrm share/gnome/gnucash/scm