Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

4 files changed, 19 insertions, 9 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 07f2f493513a..9bc8a06a3ef1 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.8.13
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -22,12 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier gconf2 libglade2
+USE_GNOME=	gnomeprefix intlhack gnomehack gconf2
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--enable-render
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	metacity.schemas
 
+MAN1=		metacity-theme-viewer.1 metacity-window-demo.1
+
 .include <bsd.port.mk>
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index a5e609db2090..2cc0abb186ba 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/metacity-2.8.13.tar.bz2) = 81ac009f514c939831d72df52d77f0ed
-SIZE (gnome2/metacity-2.8.13.tar.bz2) = 2178494
+MD5 (gnome2/metacity-2.10.0.tar.bz2) = fed363d8ce6ae33d6dd4850c8e48fbbc
+SIZE (gnome2/metacity-2.10.0.tar.bz2) = 1581003
diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
new file mode 100644
index 000000000000..09c5caee784b
--- /dev/null
+++ b/x11-wm/metacity/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Mon Jan 10 04:40:58 2005
++++ configure	Mon Jan 10 04:41:11 2005
+@@ -25377,7 +25377,6 @@
+ 
+   if test x$have_xrender = xyes; then
+      echo "Building with Render"
+-     METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION"
+   fi
+ fi ## have_composite
+ 
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 8fa23364fcd5..a4a73a6519f9 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -13,9 +13,7 @@ lib/libmetacity-private.so
 lib/libmetacity-private.so.0
 libdata/pkgconfig/libmetacity-private.pc
 libexec/metacity-dialog
-share/gnome/metacity/glade/metacity-properties.glade
 share/gnome/metacity/icons/metacity-window-demo.png
-share/gnome/pixmaps/metacity-properties.png
 share/gnome/themes/AgingGorilla/metacity-1/active-button.png
 share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png
 share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
@@ -174,8 +172,6 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/themes/Simple
 @dirrm share/gnome/themes/Metabox/metacity-1
 @dirrm share/gnome/themes/Metabox
-@dirrm share/gnome/themes/AgingGorilla/metacity-1
-@dirrm share/gnome/themes/AgingGorilla
 @dirrm share/gnome/themes/Esco/metacity-1
 @dirrm share/gnome/themes/Esco
 @dirrm share/gnome/themes/Crux/metacity-1
@@ -184,8 +180,9 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/themes/Bright
 @dirrm share/gnome/themes/Atlanta/metacity-1
 @dirrm share/gnome/themes/Atlanta
+@dirrm share/gnome/themes/AgingGorilla/metacity-1
+@dirrm share/gnome/themes/AgingGorilla
 @dirrm share/gnome/metacity/icons
-@dirrm share/gnome/metacity/glade
 @dirrm share/gnome/metacity
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1