8 files changed, 99 insertions, 92 deletions
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index ac43146..2883eb8 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	grisbi
-PORTVERSION=	0.4.5
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,25 +14,25 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A personnal accounting application
 
+LIB_DEPENDS=	ofx.0:${PORTSDIR}/finance/libofx
+.if !defined(WITHOUT_LATEX)
+RUN_DEPENDS=	${UCS_CLASSDIR}/ucs.sty:${PORTSDIR}/print/latex-ucs
+.endif
+
+USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gtk12 libcapplet libxml gnomepanel orbit gdkpixbuf gnomelibs gnomeprint
-USE_BISON=	yes
-USE_BZIP2=	yes
-USE_AUTOCONF_VER=	213
+USE_GCC=	3.3
+GNU_CONFIGURE=	yes
+USE_GNOME=	gtk20 glib20 libxml2
+
+TEXMF?=		share/texmf
+UCS_CLASSDIR=	${LOCALBASE}/${TEXMF}/tex/latex/ucs
 
 MAN1=		grisbi.1
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"		\
-		AUTOHEADER="${AUTOHEADER}" AUTOCONF="${AUTOCONF}"
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:"
-	@${ECHO_MSG}
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git a/finance/grisbi/distinfo b/finance/grisbi/distinfo
index 074f979..ae5becc 100644
--- a/finance/grisbi/distinfo
+++ b/finance/grisbi/distinfo
@@ -1,2 +1,2 @@
-MD5 (grisbi-0.4.5.tar.bz2) = fd27f4a47a9a1d5409181718c5444170
-SIZE (grisbi-0.4.5.tar.bz2) = 554609
+MD5 (grisbi-0.5.0.tar.bz2) = ceccf6799317686fe53f61730241f7e1
+SIZE (grisbi-0.5.0.tar.bz2) = 677255
diff --git a/finance/grisbi/files/patch-aclocal.m4 b/finance/grisbi/files/patch-aclocal.m4
deleted file mode 100644
index 7da0f91..0000000
--- a/finance/grisbi/files/patch-aclocal.m4
+++ /dev/null
@@ -1,26 +0,0 @@
---- aclocal.m4.orig	Thu Oct 24 11:02:25 2002
-+++ aclocal.m4	Tue Nov 26 19:28:10 2002
-@@ -60,10 +60,10 @@
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOCONF, $AUTOCONF, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake${am__api_version}, $missing_dir)
-+AM_MISSING_PROG(AUTOHEADER, $AUTOHEADER, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
- 
-@@ -87,7 +87,7 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="14"])
- 
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
diff --git a/finance/grisbi/files/patch-help_Makefile.in b/finance/grisbi/files/patch-help_Makefile.in
deleted file mode 100644
index cd21cdd..0000000
--- a/finance/grisbi/files/patch-help_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- help/Makefile.in.orig	Sat Feb 15 23:19:45 2003
-+++ help/Makefile.in	Sun Feb 16 21:21:17 2003
-@@ -238,7 +238,8 @@
- 	distdir=`cd $(distdir) && pwd`; \
- 	cd $(top_srcdir) \
- 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu help/Makefile
--	@for file in $(DISTFILES); do \
-+	@if test "x$(srcdir)" != "x$(DISTFILES)"; then \
-+	 for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
- 	    cp -pr $$d/$$file $(distdir)/$$file; \
-@@ -247,7 +248,8 @@
- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
--	done
-+	 done; \
-+	fi
- 	for subdir in $(SUBDIRS); do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d $(distdir)/$$subdir \
diff --git a/finance/grisbi/files/patch-pixmaps::Makefile.in b/finance/grisbi/files/patch-pixmaps::Makefile.in
new file mode 100644
index 0000000..373d34f
--- /dev/null
+++ b/finance/grisbi/files/patch-pixmaps::Makefile.in
@@ -0,0 +1,11 @@
+--- pixmaps/Makefile.in.orig	Sun May 23 18:00:24 2004
++++ pixmaps/Makefile.in	Mon May 24 17:11:38 2004
+@@ -96,7 +96,7 @@
+ VERSION = @VERSION@
+ prefix = @prefix@
+ 
+-grisbi_pixmapsdir = $(datadir)/pixmaps/grisbi
++grisbi_pixmapsdir = $(pkgdatadir)/pixmaps
+ 
+ grisbi_pixmaps_DATA =  	addresses.png 	banks.png 	currencies.png 	dollar.gif 	exec.png 	euro.gif 	files.png 	financial-years.png 	fonts.png 	form.png 	import.png 	payment-methods.png 	reconciliation.png 	transaction-list.png 	warnings.png 	grisbi-logo.png 	grisbi.png
+ 
diff --git a/finance/grisbi/files/patch-src::Makefile.in b/finance/grisbi/files/patch-src::Makefile.in
new file mode 100644
index 0000000..5d9c815
--- /dev/null
+++ b/finance/grisbi/files/patch-src::Makefile.in
@@ -0,0 +1,29 @@
+--- src/Makefile.in.orig	Sun May 23 18:00:25 2004
++++ src/Makefile.in	Mon May 24 17:39:53 2004
+@@ -99,7 +99,7 @@
+ prefix = @prefix@
+ 
+ localedir = $(datadir)/locale
+-INCLUDES = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/grisbi\"" -DLOGO_PATH="\"$(datadir)/pixmaps/grisbi/grisbi-logo.png\"" -DANIM_PATH="\"$(datadir)/pixmaps/grisbi/euro.gif\"" -DHELP_PATH="\"$(datadir)/doc/grisbi/help\"" -Wall 
++INCLUDES = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\"" -DLOGO_PATH="\"$(pkgdatadir)/pixmaps/grisbi-logo.png\"" -DANIM_PATH="\"$(pkgdatadir)/pixmaps/euro.gif\"" -DHELP_PATH="\"$(datadir)/doc/grisbi/help\"" -Wall 
+ bin_PROGRAMS = grisbi
+ 
+ sources =  	accueil.c			affichage.c			affichage_liste.c		banque.c			barre_outils.c			calendar.c			categories_onglet.c		comptes_gestion.c		comptes_onglet.c		comptes_traitements.c		devises.c			dialog.c			echeancier_onglet.c		echeancier_formulaire.c		echeancier_liste.c		echeancier_ventilation.c 	equilibrage.c			erreur.c			etat_io.c			etats_affiche.c			etats_calculs.c			etats_config.c			etats_gtktable.c		etats_latex.c			etats_onglet.c			etats_support.c			exercice.c			fenetre_principale.c		fichier_configuration.c		fichiers_gestion.c		fichiers_io.c			gtk_combofix.c			gtk_list_button.c		help.c				imputation_budgetaire.c		main.c				menu.c				ofx.c                   	operations_classement.c		operations_comptes.c		operations_formulaire.c 	operations_liste.c		operations_onglet.c		parametres.c			patienter.c			print_config.c			qif.c				import.c			html.c				tiers_onglet.c			traitement_variables.c		type_operations.c		ventilation.c			utils.c				search_glist.c
+@@ -110,7 +110,7 @@
+ grisbi_INCLUDES =  	accueil.h			affichage.h			affichage_liste.h		banque.h			barre_outils.h			calendar.h			categories_onglet.h		comptes_gestion.h		comptes_onglet.h		comptes_traitements.h		constants.h			devises.h			dialog.h			echeancier_onglet.h		echeancier_formulaire.h		echeancier_liste.h		echeancier_ventilation.h 	equilibrage.h			erreur.h			etat_io.h			etats_calculs.h			etats_config.h			etats_gtktable.h		etats.h				etats_latex.h			etats_onglet.h			etats_support.h			exercice.h			fenetre_principale.h		fichier_configuration.h		fichiers_gestion.h		fichiers_io.h			gtkcombofix.h			gtk_list_button.h		help.h				imputation_budgetaire.h		include.h			main.h				menu.h				operations_classement.h		operations_comptes.h		operations_formulaire.h		operations_liste.h		operations_onglet.h		parametres.h			patienter.h			print_config.h			qif.h				import.h			html.h				structures.h			tiers_onglet.h			traitement_variables.h		type_operations.h		ventilation.h			utils.h				search_glist.h
+ 
+ 
+-EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime $(grisbi_INCLUDES)
++EXTRA_DIST = grisbi.desktop $(grisbi_INCLUDES)
+ 
+ mimedir = $(datadir)/mime-info
+ mime_DATA = grisbi.keys grisbi.mime
+@@ -341,7 +341,7 @@
+ install-exec-am: install-binPROGRAMS
+ install-exec: install-exec-am
+ 
+-install-data-am: install-mimeDATA
++install-data-am:
+ install-data: install-data-am
+ 
+ install-am: all-am
diff --git a/finance/grisbi/pkg-message b/finance/grisbi/pkg-message
deleted file mode 100644
index 603b9b0..0000000
--- a/finance/grisbi/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-************************************************************************
-Documentation has been installed in %%PREFIX%%/share/gnome/help/grisbi/.
-************************************************************************
diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist
index 6bddf5c..9c32664 100644
--- a/finance/grisbi/pkg-plist
+++ b/finance/grisbi/pkg-plist
@@ -1,26 +1,45 @@
 bin/grisbi
-share/gnome/apps/Applications/grisbi.desktop
-share/gnome/help/grisbi/C/contents_motif.gif
-share/gnome/help/grisbi/C/grisbi-manuel.html
-share/gnome/help/grisbi/C/next_motif.gif
-share/gnome/help/grisbi/C/previous_motif.gif
-share/gnome/help/grisbi/C/quickstart.html
-share/gnome/help/grisbi/C/topic.dat
-share/gnome/help/grisbi/C/translation.html
-share/gnome/help/grisbi/fr/contents_motif.gif
-share/gnome/help/grisbi/fr/grisbi-manuel.html
-share/gnome/help/grisbi/fr/next_motif.gif
-share/gnome/help/grisbi/fr/previous_motif.gif
-share/gnome/help/grisbi/fr/quickstart.html
-share/gnome/help/grisbi/fr/topic.dat
-share/gnome/help/grisbi/fr/translation.html
+%%DOCSDIR%%/help/C/contents_motif.gif
+%%DOCSDIR%%/help/C/grisbi-manuel.html
+%%DOCSDIR%%/help/C/next_motif.gif
+%%DOCSDIR%%/help/C/previous_motif.gif
+%%DOCSDIR%%/help/C/quickstart.html
+%%DOCSDIR%%/help/C/translation.html
+%%DOCSDIR%%/help/C/topic.dat
+%%DOCSDIR%%/help/fr/contents_motif.gif
+%%DOCSDIR%%/help/fr/grisbi-manuel.html
+%%DOCSDIR%%/help/fr/next_motif.gif
+%%DOCSDIR%%/help/fr/previous_motif.gif
+%%DOCSDIR%%/help/fr/quickstart.html
+%%DOCSDIR%%/help/fr/topic.dat
+%%DOCSDIR%%/help/fr/translation.html
 share/locale/fr/LC_MESSAGES/grisbi.mo
-share/mime-info/grisbi.keys
-share/mime-info/grisbi.mime
-share/pixmaps/grisbi-logo.png
-share/pixmaps/grisbi.png
-@dirrm share/gnome/help/grisbi/C
-@dirrm share/gnome/help/grisbi/fr
-@dirrm share/gnome/help/grisbi
-@unexec rmdir %D/share/mime-info 2>/dev/null || true
-@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+share/locale/it/LC_MESSAGES/grisbi.mo
+%%DATADIR%%/pixmaps/addresses.png
+%%DATADIR%%/pixmaps/banks.png
+%%DATADIR%%/pixmaps/currencies.png
+%%DATADIR%%/pixmaps/dollar.gif
+%%DATADIR%%/pixmaps/euro.gif
+%%DATADIR%%/pixmaps/exec.png
+%%DATADIR%%/pixmaps/files.png
+%%DATADIR%%/pixmaps/financial-years.png
+%%DATADIR%%/pixmaps/fonts.png
+%%DATADIR%%/pixmaps/form.png
+%%DATADIR%%/pixmaps/grisbi-logo.png
+%%DATADIR%%/pixmaps/grisbi.png
+%%DATADIR%%/pixmaps/import.png
+%%DATADIR%%/pixmaps/payment-methods.png
+%%DATADIR%%/pixmaps/reconciliation.png
+%%DATADIR%%/pixmaps/transaction-list.png
+%%DATADIR%%/pixmaps/warnings.png
+@dirrm %%DOCSDIR%%/help/C
+@dirrm %%DOCSDIR%%/help/fr
+@dirrm %%DOCSDIR%%/help
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true