Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

4 files changed, 22 insertions, 15 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 19610636faf2..b84857142399 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,20 +3,22 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.43 2005/10/03 15:42:47 ahze Exp $
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.8.2
+PORTVERSION=	1.10.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.8,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.6/
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.10,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.7/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft \
+		cairo.2:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
 
@@ -26,8 +28,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-USE_GNOME=	gnomehack glib20
+USE_AUTOTOOLS=	libtool:15
+USE_GNOME=	gnomehack glib20 ltverhack
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
 		--enable-static
@@ -52,9 +54,6 @@ post-patch:
 	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
 		s|TT_Err_|FT_Err_|g'
-	@${REINPLACE_CMD} -e 's|LT_VERSION_INFO="801:1:801"|LT_VERSION_INFO="800:1:800"|g' \
-		${WRKSRC}/configure
-
 post-install:
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index d3637baa544b..4666201303b7 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/pango-1.8.2.tar.bz2) = f5b5da7a173f0566d8217ec112fde993
-SIZE (gnome2/pango-1.8.2.tar.bz2) = 1021372
+MD5 (gnome2/pango-1.10.1.tar.bz2) = 1ff4c96982f61ea6f390d09a4febdf18
+SIZE (gnome2/pango-1.10.1.tar.bz2) = 1186783
diff --git a/x11-toolkits/pango/files/patch-ac b/x11-toolkits/pango/files/patch-ac
index 362dcd3f45d5..e6215105d2ee 100644
--- a/x11-toolkits/pango/files/patch-ac
+++ b/x11-toolkits/pango/files/patch-ac
@@ -1,5 +1,6 @@
 
 $FreeBSD$
+  $MCom: ports/x11-toolkits/pango/files/patch-ac,v 1.15 2005/06/28 05:40:16 adamw Exp $
 
 --- Makefile.in.orig	Mon Aug  2 19:12:56 2004
 +++ Makefile.in	Mon Aug  2 19:13:11 2004
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 46c8656d3cde..9eb6d24a8d7c 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -22,6 +22,7 @@ include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
+include/pango-1.0/pango/pangocairo.h
 include/pango-1.0/pango/pangofc-decoder.h
 include/pango-1.0/pango/pangofc-font.h
 include/pango-1.0/pango/pangofc-fontmap.h
@@ -31,16 +32,19 @@ include/pango-1.0/pango/pangoxft-render.h
 include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.so
-lib/libpango-1.0.so.800
+lib/libpango-1.0.so.0
+lib/libpangocairo-1.0.a
+lib/libpangocairo-1.0.so
+lib/libpangocairo-1.0.so.0
 lib/libpangoft2-1.0.a
 lib/libpangoft2-1.0.so
-lib/libpangoft2-1.0.so.800
+lib/libpangoft2-1.0.so.0
 lib/libpangox-1.0.a
 lib/libpangox-1.0.so
-lib/libpangox-1.0.so.800
+lib/libpangox-1.0.so.0
 lib/libpangoxft-1.0.a
 lib/libpangoxft-1.0.so
-lib/libpangoxft-1.0.so.800
+lib/libpangoxft-1.0.so.0
 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so
 lib/pango/%%VERSION%%/modules/pango-basic-fc.so
 lib/pango/%%VERSION%%/modules/pango-basic-x.so
@@ -52,6 +56,7 @@ lib/pango/%%VERSION%%/modules/pango-syriac-fc.so
 lib/pango/%%VERSION%%/modules/pango-thai-fc.so
 lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so
 libdata/pkgconfig/pango.pc
+libdata/pkgconfig/pangocairo.pc
 libdata/pkgconfig/pangoft2.pc
 libdata/pkgconfig/pangox.pc
 libdata/pkgconfig/pangoxft.pc
@@ -68,6 +73,7 @@ libdata/pkgconfig/pangoxft.pc
 %%DOCSDIR%%/layout.gif
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/lowlevel.html
+%%DOCSDIR%%/pango-Cairo-Rendering.html
 %%DOCSDIR%%/pango-Coverage-Maps.html
 %%DOCSDIR%%/pango-Engines.html
 %%DOCSDIR%%/pango-Fonts.html
@@ -88,6 +94,7 @@ libdata/pkgconfig/pangoxft.pc
 %%DOCSDIR%%/pango.html
 %%DOCSDIR%%/rendering.html
 %%DOCSDIR%%/right.png
+%%DOCSDIR%%/rotated-text.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/tools.html
 %%DOCSDIR%%/up.png