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

3 files changed, 63 insertions, 59 deletions

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index b5040d2737b0..c32b57e9278e 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -3,15 +3,14 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports/www/kazehakase/Makefile,v 1.4 2006/03/10 02:09:53 ahze Exp $
+#   $MCom: ports/www/kazehakase/Makefile,v 1.9 2007/10/24 16:17:14 ahze Exp $
 #
 
 PORTNAME=	kazehakase
-PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTVERSION=	0.4.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/24791
+MASTER_SITE_SUBDIR=	${PORTNAME}/27353
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Kazehakase is a browser with gecko engine like Epiphany or Galeon
@@ -37,13 +36,13 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 # !!! gtk-webcore higly experimental right now and not very stable !!!
 # See https://mail.gna.org/public/kazehakase-devel/2004-10/msg00001.html
 # on how to use gtk-webcore with kazehakase. and yes you still have to
 # have mozilla even if you don't use it in kazehakase.
-.if defined(WITH_GTKWEBCORE)
+.if defined(WITH_GTKWEBCORE) || exists(${LOCALBASE}/libnrcit.a)
 LIB_DEPENDS+=	nrcit.0:${PORTSDIR}/www/osb-nrcit
 CONFIGURE_ARGS+=--enable-gtk-webcore
 .endif
@@ -89,4 +88,8 @@ post-patch:
 	@${ECHO_MSG} "create_thumbnail=true" >> ${WRKSRC}/etc/kzrc
 .endif
 
+pre-install:
+	@${REINPLACE_CMD} -e 's|localen|locale|' \
+		${WRKSRC}/po/Makefile
+
 .include <bsd.port.post.mk>
diff --git a/www/kazehakase/distinfo b/www/kazehakase/distinfo
index e9a39c451918..50c9e6d8d2df 100644
--- a/www/kazehakase/distinfo
+++ b/www/kazehakase/distinfo
@@ -1,3 +1,3 @@
-MD5 (kazehakase-0.4.5.tar.gz) = 2171f02d58a575e148436c7102686afb
-SHA256 (kazehakase-0.4.5.tar.gz) = 87ad1345e1d6df6ffdb1b43af92cfd87a16eade7de4060c5ce2fabd4d37bf99a
-SIZE (kazehakase-0.4.5.tar.gz) = 1445140
+MD5 (kazehakase-0.4.9.tar.gz) = 6259322e4fb6ed18a5f23ceda97f7ceb
+SHA256 (kazehakase-0.4.9.tar.gz) = b6b04776c058a88efd888bb61140e3a80658ac51e7f6151dc5c4f2edc644c326
+SIZE (kazehakase-0.4.9.tar.gz) = 1364165
diff --git a/www/kazehakase/pkg-plist b/www/kazehakase/pkg-plist
index a8bf98b2d615..cd41b8e8fcfb 100644
--- a/www/kazehakase/pkg-plist
+++ b/www/kazehakase/pkg-plist
@@ -11,66 +11,67 @@ etc/kazehakase/proxyrc
 etc/kazehakase/smartbookmarks.xml
 lib/kazehakase/libkazehakase.la
 lib/kazehakase/libkazehakase.so
-lib/kazehakase/libkazehakase.so.0
+lib/kazehakase/libkazehakase.so.1
 lib/kazehakase/embed/gecko.la
 lib/kazehakase/embed/gecko.so
 lib/kazehakase/search/hyper-estraier.la
 lib/kazehakase/search/hyper-estraier.so
-share/gnome/applications/kazehakase.desktop
-share/gnome/kazehakase/icons/autoscroll.xpm
-share/gnome/kazehakase/icons/kz-anchor.png
-share/gnome/kazehakase/icons/kz-book-search.png
-share/gnome/kazehakase/icons/kz-bookmark.png
-share/gnome/kazehakase/icons/kz-closebackward.png
-share/gnome/kazehakase/icons/kz-closeforward.png
-share/gnome/kazehakase/icons/kz-closewindow.png
-share/gnome/kazehakase/icons/kz-copyimagelocation.png
-share/gnome/kazehakase/icons/kz-copyurl.png
-share/gnome/kazehakase/icons/kz-epiphany.png
-share/gnome/kazehakase/icons/kz-firefox.png
-share/gnome/kazehakase/icons/kz-folder-open.png
-share/gnome/kazehakase/icons/kz-folder-search.png
-share/gnome/kazehakase/icons/kz-folder.png
-share/gnome/kazehakase/icons/kz-font-decrease.png
-share/gnome/kazehakase/icons/kz-font-increase.png
-share/gnome/kazehakase/icons/kz-galeon.png
-share/gnome/kazehakase/icons/kz-google.png
-share/gnome/kazehakase/icons/kz-gray.png
-share/gnome/kazehakase/icons/kz-green.png
-share/gnome/kazehakase/icons/kz-history.png
-share/gnome/kazehakase/icons/kz-konqueror.png
-share/gnome/kazehakase/icons/kz-logo-bg.png
-share/gnome/kazehakase/icons/kz-logo.png
-share/gnome/kazehakase/icons/kz-mozilla.png
-share/gnome/kazehakase/icons/kz-netscape.png
-share/gnome/kazehakase/icons/kz-newwindow.png
-share/gnome/kazehakase/icons/kz-openimagewindow.png
-share/gnome/kazehakase/icons/kz-openlinkwindow.png
-share/gnome/kazehakase/icons/kz-openselectedlink.png
-share/gnome/kazehakase/icons/kz-red.png
-share/gnome/kazehakase/icons/kz-remote-bookmark.png
-share/gnome/kazehakase/icons/kz-rss-feed.png
-share/gnome/kazehakase/icons/kz-savelink.png
-share/gnome/kazehakase/icons/kz-scrap-bookmark.png
-share/gnome/kazehakase/icons/kz-search.png
-share/gnome/kazehakase/icons/kz-select-all.png
-share/gnome/kazehakase/icons/kz-separator.png
-share/gnome/kazehakase/icons/kz-smart-bookmark.png
-share/gnome/kazehakase/icons/kz-tab-next.png
-share/gnome/kazehakase/icons/kz-tab-prev.png
-share/gnome/kazehakase/icons/kz-view-source.png
-share/gnome/kazehakase/icons/kz-yellow.png
-share/gnome/kazehakase/kz-no-thumbnail.png
-share/gnome/kazehakase/search-result.css
-share/gnome/pixmaps/kazehakase-icon.png
+share/applications/kazehakase.desktop
+share/kazehakase/icons/autoscroll.xpm
+share/kazehakase/icons/kz-anchor.png
+share/kazehakase/icons/kz-book-search.png
+share/kazehakase/icons/kz-bookmark.png
+share/kazehakase/icons/kz-closebackward.png
+share/kazehakase/icons/kz-closeforward.png
+share/kazehakase/icons/kz-closewindow.png
+share/kazehakase/icons/kz-copyimagelocation.png
+share/kazehakase/icons/kz-copyurl.png
+share/kazehakase/icons/kz-epiphany.png
+share/kazehakase/icons/kz-firefox.png
+share/kazehakase/icons/kz-folder-open.png
+share/kazehakase/icons/kz-folder-search.png
+share/kazehakase/icons/kz-folder.png
+share/kazehakase/icons/kz-font-decrease.png
+share/kazehakase/icons/kz-font-increase.png
+share/kazehakase/icons/kz-galeon.png
+share/kazehakase/icons/kz-google.png
+share/kazehakase/icons/kz-gray.png
+share/kazehakase/icons/kz-green.png
+share/kazehakase/icons/kz-history.png
+share/kazehakase/icons/kz-konqueror.png
+share/kazehakase/icons/kz-logo-bg.png
+share/kazehakase/icons/kz-logo.png
+share/kazehakase/icons/kz-mozilla.png
+share/kazehakase/icons/kz-netscape.png
+share/kazehakase/icons/kz-newwindow.png
+share/kazehakase/icons/kz-openimagewindow.png
+share/kazehakase/icons/kz-openlinkwindow.png
+share/kazehakase/icons/kz-openselectedlink.png
+share/kazehakase/icons/kz-red.png
+share/kazehakase/icons/kz-remote-bookmark.png
+share/kazehakase/icons/kz-rss-feed.png
+share/kazehakase/icons/kz-savelink.png
+share/kazehakase/icons/kz-scrap-bookmark.png
+share/kazehakase/icons/kz-search.png
+share/kazehakase/icons/kz-select-all.png
+share/kazehakase/icons/kz-separator.png
+share/kazehakase/icons/kz-smart-bookmark.png
+share/kazehakase/icons/kz-tab-next.png
+share/kazehakase/icons/kz-tab-prev.png
+share/kazehakase/icons/kz-view-source.png
+share/kazehakase/icons/kz-yellow.png
+share/kazehakase/kz-no-thumbnail.png
+share/kazehakase/search-result.css
+share/pixmaps/kazehakase-icon.png
 share/locale/cs/LC_MESSAGES/kazehakase.mo
 share/locale/fr/LC_MESSAGES/kazehakase.mo
 share/locale/ja/LC_MESSAGES/kazehakase.mo
 share/locale/ru/LC_MESSAGES/kazehakase.mo
-@dirrm share/gnome/kazehakase/icons
-@dirrm share/gnome/kazehakase
+@dirrm share/kazehakase/icons
+@dirrm share/kazehakase
 @dirrm lib/kazehakase/search
 @dirrm lib/kazehakase/embed
 @dirrm lib/kazehakase
 @dirrm etc/kazehakase/mozilla
 @dirrm etc/kazehakase
+@dirrmtry share/applications