5 files changed, 18 insertions, 40 deletions

diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 03eb18ac6b82..2363c56a6979 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	grisbi
-PORTVERSION=	0.6.0
+PORTVERSION=	0.8.1
 CATEGORIES=	finance
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION:R}.x/
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A personnal accounting application
@@ -16,6 +16,8 @@ COMMENT=	A personnal accounting application
 LIB_DEPENDS=	ofx.4:${PORTSDIR}/finance/libofx	\
 		ssl.7:${PORTSDIR}/security/openssl
 
+LICENSE=	GPLv2
+
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
diff --git a/finance/grisbi/distinfo b/finance/grisbi/distinfo
index 063dbde8338c..5dd1dac36010 100644
--- a/finance/grisbi/distinfo
+++ b/finance/grisbi/distinfo
@@ -1,3 +1,2 @@
-MD5 (grisbi-0.6.0.tar.bz2) = 19062be7f4f6ec29adda4ec09f0d626f
-SHA256 (grisbi-0.6.0.tar.bz2) = 3b9759e0839fc571ccedfb8514b47bef86db50223424137c2e70997f6d252527
-SIZE (grisbi-0.6.0.tar.bz2) = 1966296
+SHA256 (grisbi-0.8.1.tar.bz2) = ebff98e82a53727b87222a78d94b3e73a85913d00c77e52b41f63c5b51d32379
+SIZE (grisbi-0.8.1.tar.bz2) = 1872598
diff --git a/finance/grisbi/files/patch-configure b/finance/grisbi/files/patch-configure
deleted file mode 100644
index dde0eb529c2a..000000000000
--- a/finance/grisbi/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2010-05-04 20:15:58.000000000 +0200
-+++ configure	2010-06-07 22:44:31.000000000 +0200
-@@ -17527,7 +17527,7 @@
- $as_echo "yes" >&6; }
- 	:
- fi
--if test x$noxml2 == xtrue
-+if test "x$noxml2" = "xtrue"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: libxml2 support not available, this Grisbi build will not be able to load Gnucash files." >&5
- $as_echo "libxml2 support not available, this Grisbi build will not be able to load Gnucash files." >&6; }
-@@ -17610,7 +17610,7 @@
- $as_echo "yes" >&6; }
- 	:
- fi
--if test x$nossl == xtrue
-+if test "x$nossl" = "xtrue"
- then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL support not available, this Grisbi build will not be able to crypt/decrypt files." >&5
- $as_echo "OpenSSL support not available, this Grisbi build will not be able to crypt/decrypt files." >&6; }
diff --git a/finance/grisbi/files/patch-src::Makefile.in b/finance/grisbi/files/patch-src::Makefile.in
index 6149291b4fbf..679b844e95c3 100644
--- a/finance/grisbi/files/patch-src::Makefile.in
+++ b/finance/grisbi/files/patch-src::Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	2010-05-04 20:15:57.000000000 +0200
-+++ src/Makefile.in	2010-06-07 19:00:24.000000000 +0200
-@@ -483,7 +483,7 @@
+--- src/Makefile.in.orig	2011-02-19 07:18:29.000000000 +0100
++++ src/Makefile.in	2011-02-20 23:14:42.000000000 +0100
+@@ -375,7 +375,7 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(libdir)/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\"" -DPLUGINS_DIR="\"$(libdir)/@PACKAGE@\"" -DLOGO_PATH="\"$(pkgdatadir)/pixmaps/grisbi-logo.png\"" -DDATA_PATH="\"$(pkgdatadir)\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
- 
- # TODO: This manual setting of -Wl is a hack, I cannot get it from
- # configure right now because of no doc.
+-AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\""
++AM_CPPFLAGS = -I$(top_srcdir) $(GRISBI_CFLAGS) $(IGE_MAC_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(pkgdatadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(plugindir)\"" -DLOGO_PATH="\"$(pkgdatadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(pkgdatadir)/@PACKAGE@\"" -DHELP_PATH="\"$(docdir)\""
+ noinst_LTLIBRARIES = libgrisbi.la
+ grisbi_LDADD = $(GRISBI_LIBS) $(IGE_MAC_LIBS) libgrisbi.la
+ libgrisbi_la_LIBADD = $(am__append_1) $(GRISBI_LIBS) $(IGE_MAC_LIBS)
diff --git a/finance/grisbi/pkg-plist b/finance/grisbi/pkg-plist
index 2fce19f75161..cd7965c1b60c 100644
--- a/finance/grisbi/pkg-plist
+++ b/finance/grisbi/pkg-plist
@@ -1,11 +1,8 @@
 bin/grisbi
-lib/grisbi/gnucash.a
 lib/grisbi/gnucash.la
 lib/grisbi/gnucash.so
-lib/grisbi/ofx.a
 lib/grisbi/ofx.la
 lib/grisbi/ofx.so
-lib/grisbi/openssl.a
 lib/grisbi/openssl.la
 lib/grisbi/openssl.so
 share/applications/grisbi.desktop
@@ -40,16 +37,14 @@ share/applications/grisbi.desktop
 %%NLS%%share/locale/cs/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/da/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/de/LC_MESSAGES/grisbi.mo
-%%PORTDOCS%%%%NLS%%share/locale/de/LC_MESSAGES/grisbi-tips.mo
 %%NLS%%share/locale/el/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/es/LC_MESSAGES/grisbi.mo
-%%PORTDOCS%%%%NLS%%share/locale/es/LC_MESSAGES/grisbi-tips.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/grisbi.mo
-%%PORTDOCS%%%%NLS%%share/locale/fr/LC_MESSAGES/grisbi-tips.mo
 %%NLS%%share/locale/he/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/it/LC_MESSAGES/grisbi.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/grisbi.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/grisbi.mo
@@ -73,9 +68,11 @@ share/applications/grisbi.desktop
 %%DATADIR%%/categories/ru/empty.cgsb
 %%DATADIR%%/pixmaps/ac_asset.png
 %%DATADIR%%/pixmaps/ac_bank.png
+%%DATADIR%%/pixmaps/ac_bank_16.png
 %%DATADIR%%/pixmaps/ac_cash.png
 %%DATADIR%%/pixmaps/ac_home.png
 %%DATADIR%%/pixmaps/ac_liability.png
+%%DATADIR%%/pixmaps/ac_liability_16.png
 %%DATADIR%%/pixmaps/addresses.png
 %%DATADIR%%/pixmaps/amount.png
 %%DATADIR%%/pixmaps/archive.png
@@ -290,6 +287,7 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/impexp.png
 %%DATADIR%%/pixmaps/import.png
 %%DATADIR%%/pixmaps/importlg.png
+%%DATADIR%%/pixmaps/locale.png
 %%DATADIR%%/pixmaps/new-categ.png
 %%DATADIR%%/pixmaps/new-ib.png
 %%DATADIR%%/pixmaps/new-payee.png
@@ -316,7 +314,6 @@ share/applications/grisbi.desktop
 %%DATADIR%%/pixmaps/transdisplay.png
 %%DATADIR%%/pixmaps/transfer.png
 %%DATADIR%%/pixmaps/warnings.png
-%%PORTDOCS%%%%DATADIR%%/tips.txt
 share/icons/hicolor/48x48/apps/grisbi.png
 share/mime-info/grisbi.keys
 share/mime-info/grisbi.mime