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, 15 insertions, 24 deletions

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 9bb4bd7..1189bce 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,21 +6,25 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	2.4.2
+PORTVERSION=	2.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
 
-RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
+BUILD_DEPENDS=	${PYEXPAT}
+RUN_DEPENDS=	${PYEXPAT} \
+		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_PYTHON=	yes
 USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack libxml2 gtk20
 INSTALLS_SHLIB=	yes
@@ -33,19 +37,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
 		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
 
-.if !defined(WITHOUT_PYTHON)
-BUILD_DEPENDS+=	${PYEXPAT}
-RUN_DEPENDS+=	${PYEXPAT}
-
-USE_PYTHON=	yes
-PLIST_SUB+=	PYTHON=""
-.else
-USE_REINPLACE=	yes
-PLIST_SUB+=	PYTHON="@comment "
-
-post-patch:
-	@${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \
-		${WRKSRC}/configure
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index e9de859..5282553 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,2 +1,4 @@
-MD5 (gnome2/libglade-2.4.2.tar.bz2) = 83d08f9ab485a10454bd5171d2d53fb0
-SIZE (gnome2/libglade-2.4.2.tar.bz2) = 317692
+MD5 (gnome2/libglade-2.5.1.tar.bz2) = e4734a59f1f2308d7714dc0ebf8163f1
+SIZE (gnome2/libglade-2.5.1.tar.bz2) = 317524
+MD5 (gnome2/tacos) = e4734a59f1f2308d7714dc0ebf8163f2
+SIZE (gnome2/tacos) = 317525
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index 48724e9..1ef7b7e 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Nov 29 15:14:24 2004
-+++ Makefile.in	Mon Nov 29 15:14:24 2004
+--- Makefile.in.orig	Mon May 17 12:30:40 2004
++++ Makefile.in	Mon May 17 12:31:44 2004
 @@ -22,7 +22,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -9,7 +9,7 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-@@ -250,7 +250,7 @@
+@@ -229,7 +229,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 588f41a..cba156f 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -1,4 +1,4 @@
-%%PYTHON%%bin/libglade-convert
+bin/libglade-convert
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
 include/libglade-2.0/glade/glade-parser.h