Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.30/ .

This release brings initial PackageKit support, Upower (replaces power
management part of hal), cuse4bsd integration with HAL and cheese, and a
faster Evolution.

Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This
will also be the last of the 2.x releases. The next release will be the
highly-anticipated GNOME 3.0 which will bring with it a new UI experience.

Currently, there are a few bugs with GNOME 2.30 that may be of note for our
users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at
http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading
instructions, and the up-to-date list of known issues.

This release features commits by avl, ahze, bland, marcus, mezz, and myself.

The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the
initual packagekit porting.

And the following contributors & testers for there help with this release:
Eric L. Chen
Vladimir Grebenschikov
Sergio de Almeida Lenzi
DomiX
walder
crsd
Kevin Oberman
Michal Varga
Pavel Plesov
Bapt
kevin

and ITetcu for two exp-run

PR:	ports/143852
	ports/145347
	ports/144980
	ports/145830
	ports/145511

3 files changed, 22 insertions, 75 deletions

diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index 42c957336882..eaa4c25945eb 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $
+#   $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $
 #
 
 MASTER_SITES=	# Empty
@@ -16,11 +16,7 @@ COMMENT=	Introspection information for various libraries
 
 NO_BUILD=	yes
 
-RUN_DEPENDS=	${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \
-		${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \
-		${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
-		${GIRDIR}/${gtk20_GIR}.gir:${PORTSDIR}/${gtk20_CATEGORY}/gir-repository-gtk20 \
-		${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \
+RUN_DEPENDS=	${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
 		${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
 		${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
 		${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
@@ -31,8 +27,6 @@ RUN_DEPENDS=	${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository
 		${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \
 		${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \
 		${GIRDIR}/${avahi_GIR}.gir:${PORTSDIR}/${avahi_CATEGORY}/gir-repository-avahi \
-		${GIRDIR}/${gnomemenus_GIR}.gir:${PORTSDIR}/${gnomemenus_CATEGORY}/gir-repository-gnome-menus \
-		${GIRDIR}/${libwnck_GIR}.gir:${PORTSDIR}/${libwnck_CATEGORY}/gir-repository-libwnck \
 		${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
 
 do-install:	# empty
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index 4c419ff538fe..d8457a6bbd6b 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -1,27 +1,14 @@
 PORTNAME=	gir-repository
 PORTVERSION=	0.6.5
-PORTREVISION?=	3
+PORTREVISION?=	4
 
 MAINTAINER=	gnome@FreeBSD.org
 
 GIRDIR=		${LOCALBASE}/share/gir-1.0
 
-atk_CATEGORY=	accessibility
-atk_GIR=	Atk-1.0
-
-pango_CATEGORY=	x11-toolkits
-pango_GIR=	Pango-1.0
-
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
-gtk20_CATEGORY=	x11-toolkits
-gtk20_GIR=	Gtk-2.0
-gtk20_GIR_TMPL=	gtk
-
-webkit_CATEGORY=	www
-webkit_GIR=	WebKit-1.0
-
 libsoup_CATEGORY=	devel
 libsoup_GIR=	Soup-2.4
 libsoup_GIR_TMPL=	soup
@@ -53,12 +40,6 @@ vte_GIR=	Vte-1.0
 avahi_CATEGORY=	net
 avahi_GIR=	Avahi-0.6
 
-gnomemenus_CATEGORY=	x11
-gnomemenus_GIR=	GMenu-2.0
-
-libwnck_CATEGORY=	x11-toolkits
-libwnck_GIR=	Wnck-1.0
-
 goocanvas_CATEGORY=	graphics
 goocanvas_GIR=	GooCanvas-0.10
 
@@ -92,38 +73,13 @@ _USE_GIR_ALL=	dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextens
 		gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \
 		goocanvas gssdp gupnp avahi unique gmenu wnck
 
-.if ${GIR_NAME} == "atk"
-USE_GNOME+=	atk
-GIR_FILES=	Atk-1.0
-.endif
-
-.if ${GIR_NAME} == "pango"
-USE_GNOME+=	pango
-GIR_FILES=	Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0
-DEP_NAMES+=	pangoxft
-.endif
-
 .if ${GIR_NAME} == "poppler"
 LIB_DEPENDS+=	poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
-USE_GIR=	gtk20 pango
+USE_GNOME+=	gtk20
 GIR_FILES=	Poppler-0.8
 CLEAR_DEPS+=	Gdk-2.0
 .endif
 
-.if ${GIR_NAME} == "gtk20"
-USE_GNOME+=	gtk20
-USE_GIR=	atk pango
-GIR_FILES=	Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0
-LIB_FILES=	Gdk Gtk
-DEP_NAMES=	gtk
-.endif
-
-.if ${GIR_NAME} == "webkit"
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-USE_GIR=	gtk20 libsoup
-GIR_FILES=	WebKit-1.0 JSCore-1.0
-.endif
-
 .if ${GIR_NAME} == "libsoup"
 LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 GIR_FILES=	Soup-2.4
@@ -143,9 +99,9 @@ GIR_FILES=	Babl-0.1
 
 .if ${GIR_NAME} == "nautilus"
 USE_GNOME+=	nautilus2
-USE_GIR=	gtk20
 GIR_FILES=	Nautilus-1.0
 DEP_NAMES=	nautilusextension
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "gnomekeyring"
@@ -155,9 +111,10 @@ GIR_FILES=	GnomeKeyring-2.0
 
 .if ${GIR_NAME} == "libnotify"
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
-USE_GIR=	gtk20
+USE_GNOME+=	gtk20
 GIR_FILES=	Notify-0.4
 DEP_NAMES=	notify
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "dbus"
@@ -168,15 +125,15 @@ LIB_FILES=	DBus
 
 .if ${GIR_NAME} == "gtksourceview2"
 USE_GNOME+=	gtksourceview2
-USE_GIR=	gtk20
 GIR_FILES=	GtkSource-2.2
 DEP_NAMES=	gtksourceview
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "vte"
 USE_GNOME+=	vte
-USE_GIR=	gtk20
 GIR_FILES=	Vte-1.0
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "avahi"
@@ -184,24 +141,11 @@ LIB_DEPENDS+=	avahi-gobject.0:${PORTSDIR}/net/avahi-app
 GIR_FILES=	Avahi-0.6 AvahiCore-0.6
 .endif
 
-.if ${GIR_NAME} == "gnomemenus"
-USE_GNOME+=	gnomemenus
-USE_GIR=	gtk20
-GIR_FILES=	GMenu-2.0
-DEP_NAMES=	gmenu
-.endif
-
-.if ${GIR_NAME} == "libwnck"
-USE_GNOME+=	libwnck
-USE_GIR=	gtk20
-GIR_FILES=	Wnck-1.0
-DEP_NAMES=	wnck
-.endif
-
 .if ${GIR_NAME} == "goocanvas"
 LIB_DEPENDS+=	goocanvas.3:${PORTSDIR}/graphics/goocanvas
-USE_GIR=	gtk20
+USE_GNOME+=	gtk20
 GIR_FILES=	GooCanvas-0.10
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 . for component in ${USE_GIR:C/^([^:]+).*/\1/}
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
index ec37f1636cd1..5c559acda3b4 100644
--- a/devel/gir-repository/files/patch-gir_Makefile.in
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -1,5 +1,5 @@
---- gir/Makefile.in.orig	2010-03-24 14:45:41.000000000 +0100
-+++ gir/Makefile.in	2010-03-24 14:45:41.000000000 +0100
+--- gir/Makefile.in.orig	2009-09-09 21:31:46.000000000 +0200
++++ gir/Makefile.in	2010-04-07 15:17:19.000000000 +0200
 @@ -86,7 +86,7 @@ host_triplet = @host@
  @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir
  @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir
@@ -27,6 +27,15 @@
  @BUILD_UNIQUE_TRUE@UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
  @BUILD_NAUTILUS_TRUE@NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
  @BUILD_WNCK_TRUE@WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck
+@@ -1083,7 +1083,7 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            --pkg freetype2 \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            --pkg pangox \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            $(PANGO_INCLUDEDIR)/pango/pangox.h
+-@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(INTROSPECTION_SCANNER)
++@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir $(INTROSPECTION_SCANNER)
+ @BUILD_POPPLER_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
+ @BUILD_POPPLER_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
+ @BUILD_POPPLER_TRUE@             --include=GObject-2.0 \
 @@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --output $@ \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTFFT_INCLUDEDIR)/gst/fft/*h