4 files changed, 144 insertions, 29 deletions

diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 73330c369112..7eb4e3d1212d 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -6,38 +6,42 @@
 #
 
 PORTNAME=	homebank
-PORTVERSION=	4.0.2
+PORTVERSION=	4.0.3
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manage your personal accounts at home
 
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gtk20 desktopfileutils librsvg2
+OPTIONS=	OFX "Enable libOFX support" on
+
+USE_GNOME=	desktopfileutils gnomehier gtk20 librsvg2
 USE_GETTEXT=	yes
-INSTALLS_ICONS=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+INSTALLS_ICONS=	yes
 
-DOCS=		AUTHORS COPYING ChangeLog NEWS README
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if !defined(WITHOUT_OFX)
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_OFX)
+CONFIGURE_ARGS+=--without-ofx
+.else
 LIB_DEPENDS+=	ofx.4:${PORTSDIR}/finance/libofx
 CONFIGURE_ARGS+=--with-ofx
-.else
-CONFIGURE_ARGS+=--without-ofx
 .endif
 
 post-install:
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.for file in AUTHORS ChangeLog NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 	@-update-desktop-database
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/finance/homebank/distinfo b/finance/homebank/distinfo
index 6c1fb33cf8ae..9746636f51c5 100644
--- a/finance/homebank/distinfo
+++ b/finance/homebank/distinfo
@@ -1,3 +1,3 @@
-MD5 (homebank-4.0.2.tar.gz) = 7a3c04e540ddf1660ef51fe19bc090c1
-SHA256 (homebank-4.0.2.tar.gz) = ea313a3d7bcde98141cb274e5830b262edd823a271d184e5361c6b2c30e6cc09
-SIZE (homebank-4.0.2.tar.gz) = 2548216
+MD5 (homebank-4.0.3.tar.gz) = 8ff3dde0a594f34d086148e4bae2d624
+SHA256 (homebank-4.0.3.tar.gz) = f822b5a96e09dba4ea12b4315c1f097350e63a294e2931c92fa2fdd4ae779217
+SIZE (homebank-4.0.3.tar.gz) = 2483792
diff --git a/finance/homebank/files/patch-src__import.c b/finance/homebank/files/patch-src__import.c
new file mode 100644
index 000000000000..a9af77c59d6a
--- /dev/null
+++ b/finance/homebank/files/patch-src__import.c
@@ -0,0 +1,121 @@
+--- src/import.c.orig	2009-05-01 21:57:15.000000000 +0900
++++ src/import.c	2009-05-05 05:09:06.000000000 +0900
+@@ -244,7 +244,7 @@
+ 
+ 				g_free(converted_contents);
+ 		
+-				if( isutf8 == true )
++				if( isutf8 == TRUE )
+ 				{
+ 					
+ 					retval = enc->charset;
+@@ -509,24 +509,24 @@
+ 
+ 	DB( g_print("** ofx_proc_account_cb()\n") );
+ 
+-	if(data.account_id_valid==true)
++	if(data.account_id_valid==TRUE)
+ 	{
+ 		DB( g_print("  account_id: %s\n", data.account_id) );
+ 		DB( g_print("  account_name: %s\n", data.account_name) );
+ 	}
+ 
+-	//if(data.account_number_valid==true)
++	//if(data.account_number_valid==TRUE)
+ 	//{
+ 		DB( g_print("  account_number: %s\n", data.account_number) );
+ 	//}
+ 
+ 
+-	if(data.account_type_valid==true)
++	if(data.account_type_valid==TRUE)
+ 	{
+ 		DB( g_print("  account_type: %d\n", data.account_type) );
+ 	}
+ 
+-	if(data.currency_valid==true)
++	if(data.currency_valid==TRUE)
+ 	{
+ 		DB( g_print("  currency: %s\n", data.currency) );
+ 	}
+@@ -575,7 +575,7 @@
+ 	DB( g_print("** ofx_proc_statement_cb()\n") );
+ 
+ #ifdef MYDEBUG
+-	if(data.ledger_balance_date_valid==true)
++	if(data.ledger_balance_date_valid==TRUE)
+ 	{
+ 	struct tm temp_tm;	
+ 
+@@ -584,7 +584,7 @@
+ 	}
+ #endif
+ 
+-	if(data.ledger_balance_valid==true)
++	if(data.ledger_balance_valid==TRUE)
+ 	{
+ 		if( ctx->curr_acc != NULL && ctx->curr_acc_isnew == TRUE )
+ 		{	
+@@ -616,7 +616,7 @@
+ 	newope = da_operation_malloc();
+ 
+ // date	
+-	if(data.date_posted_valid==true)
++	if(data.date_posted_valid==TRUE)
+ 	{
+ 		temp_tm = *localtime(&(data.date_posted));
+ 		date = g_date_new();
+@@ -625,7 +625,7 @@
+ 		g_date_free(date);
+ 	}
+ // amount
+-	if(data.amount_valid==true)
++	if(data.amount_valid==TRUE)
+ 	{
+ 		newope->amount = data.amount;
+ 
+@@ -633,14 +633,14 @@
+ 			newope->flags |= OF_INCOME;
+ 	}
+ // check number
+-	if(data.check_number_valid==true)
++	if(data.check_number_valid==TRUE)
+ 	{
+ 		newope->info = g_strdup(data.check_number);
+ 	}
+ 	//todo: reference_number ?
+ 
+ // wording
+-	if(data.name_valid==true)
++	if(data.name_valid==TRUE)
+ 	{
+ 		newope->wording = g_strdup(data.name);
+ 	}
+@@ -648,7 +648,7 @@
+ 	//todo: memo ?
+ 
+ // payment
+-	if(data.transactiontype_valid==true)
++	if(data.transactiontype_valid==TRUE)
+ 	{
+ 		switch(data.transactiontype)
+ 		{
+@@ -753,12 +753,12 @@
+ 
+ 	DB( g_print("(import) ofx import\n") );
+ 
+-	ofx_PARSER_msg	= false;
+-	ofx_DEBUG_msg	= false;
+-	ofx_WARNING_msg = false;
+-	ofx_ERROR_msg	= false;
+-	ofx_INFO_msg	= false;
+-	ofx_STATUS_msg	= false;
++	ofx_PARSER_msg	= FALSE;
++	ofx_DEBUG_msg	= FALSE;
++	ofx_WARNING_msg = FALSE;
++	ofx_ERROR_msg	= FALSE;
++	ofx_INFO_msg	= FALSE;
++	ofx_STATUS_msg	= FALSE;
+ 
+ 	LibofxContextPtr libofx_context = libofx_get_new_context();
+ 	ofx_set_statement_cb  (libofx_context, (LibofxProcStatementCallback)  ofx_proc_statement_cb  , &ctx);
diff --git a/finance/homebank/pkg-plist b/finance/homebank/pkg-plist
index 274c15cd539f..099d349a1dfd 100644
--- a/finance/homebank/pkg-plist
+++ b/finance/homebank/pkg-plist
@@ -2,7 +2,6 @@ bin/homebank
 share/application-registry/homebank.applications
 share/applications/homebank.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -150,7 +149,6 @@ share/icons/hicolor/24x24/apps/homebank.png
 share/icons/hicolor/32x32/apps/homebank.png
 share/icons/hicolor/48x48/apps/homebank.png
 share/icons/hicolor/scalable/apps/homebank.svg
-share/locale/am/LC_MESSAGES/homebank.mo
 share/locale/ar/LC_MESSAGES/homebank.mo
 share/locale/bg/LC_MESSAGES/homebank.mo
 share/locale/ca/LC_MESSAGES/homebank.mo
@@ -171,32 +169,24 @@ share/locale/he/LC_MESSAGES/homebank.mo
 share/locale/hr/LC_MESSAGES/homebank.mo
 share/locale/hu/LC_MESSAGES/homebank.mo
 share/locale/id/LC_MESSAGES/homebank.mo
-share/locale/is/LC_MESSAGES/homebank.mo
 share/locale/it/LC_MESSAGES/homebank.mo
-share/locale/ja/LC_MESSAGES/homebank.mo
-share/locale/kn/LC_MESSAGES/homebank.mo
+share/locale/ka/LC_MESSAGES/homebank.mo
 share/locale/ko/LC_MESSAGES/homebank.mo
 share/locale/lt/LC_MESSAGES/homebank.mo
-share/locale/lv/LC_MESSAGES/homebank.mo
-share/locale/mi/LC_MESSAGES/homebank.mo
-share/locale/ms/LC_MESSAGES/homebank.mo
 share/locale/nb/LC_MESSAGES/homebank.mo
-share/locale/nds/LC_MESSAGES/homebank.mo
 share/locale/nl/LC_MESSAGES/homebank.mo
 share/locale/oc/LC_MESSAGES/homebank.mo
 share/locale/pl/LC_MESSAGES/homebank.mo
 share/locale/pt/LC_MESSAGES/homebank.mo
 share/locale/pt_BR/LC_MESSAGES/homebank.mo
-share/locale/pt_PT/LC_MESSAGES/homebank.mo
 share/locale/ro/LC_MESSAGES/homebank.mo
 share/locale/ru/LC_MESSAGES/homebank.mo
 share/locale/sk/LC_MESSAGES/homebank.mo
 share/locale/sl/LC_MESSAGES/homebank.mo
 share/locale/sv/LC_MESSAGES/homebank.mo
-share/locale/ta/LC_MESSAGES/homebank.mo
 share/locale/tr/LC_MESSAGES/homebank.mo
 share/locale/uk/LC_MESSAGES/homebank.mo
-share/locale/ur/LC_MESSAGES/homebank.mo
+share/locale/uz/LC_MESSAGES/homebank.mo
 share/locale/vi/LC_MESSAGES/homebank.mo
 share/locale/zh_CN/LC_MESSAGES/homebank.mo
 share/locale/zh_HK/LC_MESSAGES/homebank.mo