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

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index e7c8688..5c6c9822 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,27 +3,28 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/graphics/cairo/Makefile,v 1.30 2005/10/04 04:35:57 ahze Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	0.4.0
+PORTVERSION=	1.0.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://cairographics.org/snapshots/
+MASTER_SITES=	http://cairographics.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
 
-LIB_DEPENDS=	pixman.1:${PORTSDIR}/graphics/libpixman \
-		freetype.9:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		png.5:${PORTSDIR}/graphics/png \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_GNOME=	gnometarget gnomehack
-USE_LIBTOOL_VER=15
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
+		--enable-pdf \
+		--enable-ps
+USE_GNOME=	gnometarget gnomehack ltverhack
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
-
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
 
@@ -31,10 +32,12 @@ OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GLITZ) || exists(${LOCALBASE}/lib/libglitz.a)
+.if defined(WITH_GLITZ)
 LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
+CONFIGURE_ARGS+=	--enable-glitz
 PLIST_SUB+=	GLITZ=""
 .else
+CONFIGURE_ARGS+=	--disable-glitz
 PLIST_SUB+=	GLITZ="@comment "
 .endif
 
@@ -49,7 +52,10 @@ PLIST_SUB+=	X11=""
 post-patch:
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
-		${WRKSRC}/src/*.*
+		${WRKSRC}/src/*.* \
+		${WRKSRC}/pixman/src/*.*
 .endif
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/test/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 3243e4b..bd6f30e 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,2 +1,2 @@
-MD5 (cairo-0.4.0.tar.gz) = 2c76c6f6717cb5fc7398eb2e0f9cb025
-SIZE (cairo-0.4.0.tar.gz) = 781463
+MD5 (cairo-1.0.2.tar.gz) = d0b7111a14f90ec3afa777ec40c44984
+SIZE (cairo-1.0.2.tar.gz) = 1458903
diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c
new file mode 100644
index 0000000..8cd6066
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo-ft-font.c
@@ -0,0 +1,28 @@
+--- src/cairo-ft-font.c.orig	Tue Aug 16 14:46:46 2005
++++ src/cairo-ft-font.c	Tue Aug 16 14:46:59 2005
+@@ -44,6 +44,11 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ 
++#include <sys/types.h>
++#include <stdlib.h>
++#include <time.h>
++#include <unistd.h>
++
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_OUTLINE_H
+@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_
+     key->id = id;
+ 
+     /* 1607 is just an arbitrary prime. */
+-    hash = _cairo_hash_string (filename);
++    if (filename != NULL) {
++        hash = _cairo_hash_string (filename);
++    } else {
++	srandom(time(NULL) * getpid());
++	hash = random();
++    }
+     hash += ((unsigned long) id) * 1607;
+ 	
+     key->base.hash_entry.hash = hash;
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index aec401c..437d0b5 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -2,32 +2,55 @@ include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 %%GLITZ%%include/cairo/cairo-glitz.h
 include/cairo/cairo-pdf.h
-include/cairo/cairo-png.h
 include/cairo/cairo-ps.h
+%%X11%%include/cairo/cairo-xlib-xrender.h
 %%X11%%include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/libcairo.a
 lib/libcairo.so
-lib/libcairo.so.1
+lib/libcairo.so.2
 libdata/pkgconfig/cairo.pc
-%%DOCSDIR%%/cairo/cairo-ATSUI-Fonts.html
+%%DOCSDIR%%/cairo/Drawing.html
+%%DOCSDIR%%/cairo/Fonts.html
+%%DOCSDIR%%/cairo/Support.html
+%%DOCSDIR%%/cairo/Surfaces.html
+%%DOCSDIR%%/cairo/bindings-errors.html
+%%DOCSDIR%%/cairo/bindings-fonts.html
+%%DOCSDIR%%/cairo/bindings-memory.html
+%%DOCSDIR%%/cairo/bindings-overloading.html
+%%DOCSDIR%%/cairo/bindings-path.html
+%%DOCSDIR%%/cairo/bindings-patterns.html
+%%DOCSDIR%%/cairo/bindings-return-values.html
+%%DOCSDIR%%/cairo/bindings-streams.html
+%%DOCSDIR%%/cairo/bindings-surfaces.html
+%%DOCSDIR%%/cairo/cairo-Error-handling.html
+%%DOCSDIR%%/cairo/cairo-Font-Options.html
 %%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html
-%%DOCSDIR%%/cairo/cairo-Glitz-backend.html
-%%DOCSDIR%%/cairo/cairo-Microsoft-Windows-Backend.html
-%%DOCSDIR%%/cairo/cairo-PDF-Backend.html
-%%DOCSDIR%%/cairo/cairo-PNG-Backend.html
-%%DOCSDIR%%/cairo/cairo-PS-Backend.html
-%%DOCSDIR%%/cairo/cairo-Quartz-Backend.html
-%%DOCSDIR%%/cairo/cairo-XCB-Backend.html
-%%DOCSDIR%%/cairo/cairo-XLib-Backend.html
+%%DOCSDIR%%/cairo/cairo-Glitz-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-Image-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-PDF-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-PNG-Support.html
+%%DOCSDIR%%/cairo/cairo-Paths.html
+%%DOCSDIR%%/cairo/cairo-Patterns.html
+%%DOCSDIR%%/cairo/cairo-PostScript-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-Scaled-Fonts.html
+%%DOCSDIR%%/cairo/cairo-Text.html
+%%DOCSDIR%%/cairo/cairo-Transformations.html
+%%DOCSDIR%%/cairo/cairo-Types.html
+%%DOCSDIR%%/cairo/cairo-Version-Information.html
+%%DOCSDIR%%/cairo/cairo-Win32-Fonts.html
+%%DOCSDIR%%/cairo/cairo-Win32-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-XLib-Surfaces.html
+%%DOCSDIR%%/cairo/cairo-cairo-font-face-t.html
 %%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html
-%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html
 %%DOCSDIR%%/cairo/cairo-cairo-surface-t.html
 %%DOCSDIR%%/cairo/cairo-cairo-t.html
 %%DOCSDIR%%/cairo/cairo.devhelp
 %%DOCSDIR%%/cairo/home.png
 %%DOCSDIR%%/cairo/index.html
 %%DOCSDIR%%/cairo/index.sgml
+%%DOCSDIR%%/cairo/ix01.html
+%%DOCSDIR%%/cairo/language-bindings.html
 %%DOCSDIR%%/cairo/left.png
 %%DOCSDIR%%/cairo/pt01.html
 %%DOCSDIR%%/cairo/pt02.html