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

4 files changed, 18 insertions, 56 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index e7e9efa4611c..f2a26a2dbd3c 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.149 2009/11/18 11:00:12 kwm Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.154 2010/04/01 12:08:27 kwm Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.26.2
-PORTREVISION?=	2
+PORTVERSION=	1.28.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME \
 		ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
@@ -21,10 +21,12 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \
+		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
-		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
+		${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index 5898a42f1887..10f84879f6ae 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.26.2.tar.bz2) = f30212b8833af3ce5c82121dc309e3d0
-SHA256 (gnome2/pango-1.26.2.tar.bz2) = 3b85879e5d8794555d10a2b79428071c99a93b7502ccbef50360ae44c77c3e08
-SIZE (gnome2/pango-1.26.2.tar.bz2) = 1536011
+MD5 (gnome2/pango-1.28.0.tar.bz2) = 545ae8becf7ed74008120f96f4b095f4
+SHA256 (gnome2/pango-1.28.0.tar.bz2) = 68480485b714e3570a58c270add9e9785fa78068f7410949b478e8a9d3f5bc40
+SIZE (gnome2/pango-1.28.0.tar.bz2) = 1500538
diff --git a/x11-toolkits/pango/files/patch-64bit_safe b/x11-toolkits/pango/files/patch-64bit_safe
deleted file mode 100644
index 54c00ddc82ea..000000000000
--- a/x11-toolkits/pango/files/patch-64bit_safe
+++ /dev/null
@@ -1,48 +0,0 @@
-From 952847a6e2d53b33cea39d13255fd0f7c8075942 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Tue, 23 Feb 2010 21:44:55 +0000
-Subject: Make blob unlocking 64bit-safe
-
-Bug 604128 - Applications crash when displaying Hebrew characters
----
-diff --git a/pango/opentype/hb-blob.c b/pango/opentype/hb-blob.c
-index 107cd43..3348a38 100644
---- pango.orig/opentype/hb-blob.c
-+++ pango/opentype/hb-blob.c
-@@ -243,18 +243,18 @@ static hb_bool_t
- _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- {
- #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT)
--  unsigned int pagesize = -1, mask, length;
-+  uintptr_t pagesize = -1, mask, length;
-   const char *addr;
- 
- #if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
--  pagesize = (unsigned int) sysconf (_SC_PAGE_SIZE);
-+  pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE);
- #elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
--  pagesize = (unsigned int) sysconf (_SC_PAGESIZE);
-+  pagesize = (uintptr_t) sysconf (_SC_PAGESIZE);
- #elif defined(HAVE_GETPAGESIZE)
--  pagesize = (unsigned int) getpagesize ();
-+  pagesize = (uintptr_t) getpagesize ();
- #endif
- 
--  if ((unsigned int) -1 == pagesize) {
-+  if ((uintptr_t) -1L == pagesize) {
- #if HB_DEBUG_BLOB
-     fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno));
- #endif
-@@ -265,8 +265,8 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- #endif
- 
-   mask = ~(pagesize-1);
--  addr = (const char *) (((size_t) blob->data) & mask);
--  length = (const char *) (((size_t) blob->data + blob->length + pagesize-1) & mask)  - addr;
-+  addr = (const char *) (((uintptr_t) blob->data) & mask);
-+  length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask)  - addr;
- #if HB_DEBUG_BLOB
-   fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n",
- 	   blob, __FUNCTION__,
---
-cgit v0.8.3.1
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 1998b5ed4e6e..fc4b01635654 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -36,6 +36,10 @@ include/pango-1.0/pango/pangoft2.h
 %%X11%%include/pango-1.0/pango/pangox.h
 %%X11%%include/pango-1.0/pango/pangoxft-render.h
 %%X11%%include/pango-1.0/pango/pangoxft.h
+lib/girepository-1.0/Pango-1.0.typelib
+lib/girepository-1.0/PangoCairo-1.0.typelib
+lib/girepository-1.0/PangoFT2-1.0.typelib
+lib/girepository-1.0/PangoXft-1.0.typelib
 lib/libpango-1.0.a
 lib/libpango-1.0.la
 lib/libpango-1.0.so
@@ -97,6 +101,10 @@ libdata/pkgconfig/pangocairo.pc
 libdata/pkgconfig/pangoft2.pc
 %%X11%%libdata/pkgconfig/pangox.pc
 %%X11%%libdata/pkgconfig/pangoxft.pc
+share/gir-1.0/Pango-1.0.gir
+share/gir-1.0/PangoCairo-1.0.gir
+share/gir-1.0/PangoFT2-1.0.gir
+share/gir-1.0/PangoXft-1.0.gir
 @dirrm lib/pango/%%VERSION%%/modules
 @dirrm lib/pango/%%VERSION%%
 @dirrm lib/pango