Fix I18N support.

Reported by:	Burkard Meyendriesch <bm@malepartus.de>

6 files changed, 122 insertions, 6 deletions

diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index dadb24e1..4c985aa 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	http://www.gnucash.org/pub/gnucash/sources/stable/ \
 		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/finance/gnucash-devel/files/patch-configure b/finance/gnucash-devel/files/patch-configure
index 164cccc..e2f06e6 100644
--- a/finance/gnucash-devel/files/patch-configure
+++ b/finance/gnucash-devel/files/patch-configure
@@ -1,6 +1,55 @@
---- configure.orig	Mon Feb  3 02:20:35 2003
-+++ configure	Tue Feb  4 22:00:37 2003
-@@ -13115,7 +13116,7 @@
+--- configure.orig	Mon Feb 10 01:26:24 2003
++++ configure	Fri Feb 14 13:11:41 2003
+@@ -3535,10 +3535,10 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ 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:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3924,7 +3924,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"
+@@ -3932,7 +3932,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:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3952,7 +3952,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"
+@@ -3960,7 +3960,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:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -13115,7 +13115,7 @@
  echo "configure:13116: checking for gtkhtml < 1.1" >&5
      GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
      GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
diff --git a/finance/gnucash-devel/files/patch-src_app-utils_i18n.h b/finance/gnucash-devel/files/patch-src_app-utils_i18n.h
new file mode 100644
index 0000000..0625fd7
--- /dev/null
+++ b/finance/gnucash-devel/files/patch-src_app-utils_i18n.h
@@ -0,0 +1,8 @@
+--- src/app-utils/i18n.h.orig	Fri Feb 14 12:35:54 2003
++++ src/app-utils/i18n.h	Fri Feb 14 12:36:07 2003
+@@ -26,4 +26,4 @@
+ #endif
+ 
+ #define TEXT_DOMAIN		"gnucash"
+-#define LOCALE_DIR		"/usr/local/share/locale"
++#define LOCALE_DIR		"%%PREFIX%%/share/locale"
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index dadb24e1..4c985aa 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	http://www.gnucash.org/pub/gnucash/sources/stable/ \
 		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index 164cccc..e2f06e6 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -1,6 +1,55 @@
---- configure.orig	Mon Feb  3 02:20:35 2003
-+++ configure	Tue Feb  4 22:00:37 2003
-@@ -13115,7 +13116,7 @@
+--- configure.orig	Mon Feb 10 01:26:24 2003
++++ configure	Fri Feb 14 13:11:41 2003
+@@ -3535,10 +3535,10 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ 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:3545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3924,7 +3924,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"
+@@ -3932,7 +3932,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:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3952,7 +3952,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"
+@@ -3960,7 +3960,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:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -13115,7 +13115,7 @@
  echo "configure:13116: checking for gtkhtml < 1.1" >&5
      GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
      GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
diff --git a/finance/gnucash/files/patch-src_app-utils_i18n.h b/finance/gnucash/files/patch-src_app-utils_i18n.h
new file mode 100644
index 0000000..0625fd7
--- /dev/null
+++ b/finance/gnucash/files/patch-src_app-utils_i18n.h
@@ -0,0 +1,8 @@
+--- src/app-utils/i18n.h.orig	Fri Feb 14 12:35:54 2003
++++ src/app-utils/i18n.h	Fri Feb 14 12:36:07 2003
+@@ -26,4 +26,4 @@
+ #endif
+ 
+ #define TEXT_DOMAIN		"gnucash"
+-#define LOCALE_DIR		"/usr/local/share/locale"
++#define LOCALE_DIR		"%%PREFIX%%/share/locale"