From 4acc6fb2a411b291c9c210d82bafe7c62e71c77d Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 24 Oct 2007 23:37:25 +0000
Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD.  The
 official GNOME 2.20 release notes can be found at
 http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
 includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338
---
 finance/homebank/Makefile  | 25 +++----------------------
 finance/homebank/pkg-plist |  8 ++++----
 2 files changed, 7 insertions(+), 26 deletions(-)

(limited to 'finance/homebank')

diff --git a/finance/homebank/Makefile b/finance/homebank/Makefile
index 5743e94487fd..a35a97ab82e9 100644
--- a/finance/homebank/Makefile
+++ b/finance/homebank/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	homebank
 PORTVERSION=	3.5
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://homebank.free.fr/public/
 
@@ -15,7 +16,7 @@ COMMENT=	Manage your personal accounts at home
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 desktopfileutils
+USE_GNOME=	gnomeprefix gtk20 desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
@@ -25,26 +26,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 DOCS=		AUTHORS COPYING ChangeLog NEWS README
 
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgnomehier}!=""
-USE_GNOME+=	gnomehier
-PLIST_SUB+=	GNOME:=""
-GNOME_ENABLED=	yes
-.else
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|[(]datadir[)]/application-registry|(prefix)/share/gnome/application-registry|g ; \
-		s|[(]datadir[)]/mime-info|(prefix)/share/gnome/mime-info|g' \
-			${WRKSRC}/mime/Makefile.in
-.ifndef (GNOME_ENABLED)
-	@${REINPLACE_CMD} -e 's|install-appDATA install|install|g ; \
-		s| install-mimeDATA||g' \
-			${WRKSRC}/mime/Makefile.in
-.endif
-
 post-install:
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -54,4 +35,4 @@ post-install:
 .endif
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/finance/homebank/pkg-plist b/finance/homebank/pkg-plist
index 4deffcec66f6..d32f7c51cbea 100644
--- a/finance/homebank/pkg-plist
+++ b/finance/homebank/pkg-plist
@@ -1,13 +1,11 @@
 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
-%%GNOME:%%share/gnome/application-registry/homebank.applications
-%%GNOME:%%share/gnome/mime-info/homebank.keys
-%%GNOME:%%share/gnome/mime-info/homebank.mime
 %%DATADIR%%/help/02balance.html
 %%DATADIR%%/help/02concepts.html
 %%DATADIR%%/help/02intro.html
@@ -157,6 +155,8 @@ share/locale/nl/LC_MESSAGES/homebank.mo
 share/locale/pt_BR/LC_MESSAGES/homebank.mo
 share/locale/ru/LC_MESSAGES/homebank.mo
 share/locale/zh_CN/LC_MESSAGES/homebank.mo
+share/mime-info/homebank.keys
+share/mime-info/homebank.mime
 share/mime/packages/homebank.xml
 share/pixmaps/homebank.svg
 @dirrm %%DATADIR%%/images
@@ -164,8 +164,8 @@ share/pixmaps/homebank.svg
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications
-- 
cgit v1.2.3