Hi,

here's a work-in-progress update to cairo 1.8.0, needed by the (coming)
update to latest pango. Regress tests are failing on sparc64 (it tries
to compile header files ? wtf ?) but brad told me they have been already
broken since ages. I didn't test other archs, but will do powerpc and
amd64.
If you run bulk builds, please put the diff in and report failures.

Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile    16 May 2008 17:52:18 -0000      1.18
+++ Makefile    19 Oct 2008 18:27:33 -0000
@@ -2,8 +2,8 @@
 
 COMMENT=               vector graphics library
 
-DISTNAME=              cairo-1.6.4
-SHARED_LIBS=           cairo   8.0
+DISTNAME=              cairo-1.8.0
+SHARED_LIBS=           cairo   9.0 # .10802.0
 CATEGORIES=            graphics
 
 HOMEPAGE=              http://cairographics.org/introduction
@@ -13,14 +13,13 @@
 WANTLIB=               X11 Xau Xdmcp Xrender expat fontconfig freetype m \
                        pixman-1.>=11.0 z
 
-# LGPL
+# LGPLv2.1 / MPL 1.1
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=          http://cairographics.org/releases/ \
-                       http://cairographics.org/snapshots/
+MASTER_SITES=          http://cairographics.org/releases/
 
 USE_X11=               Yes
 USE_LIBTOOL=           Yes
@@ -32,8 +31,8 @@
 CONFIGURE_ENV=         png_REQUIRES=libpng
 CONFIGURE_ARGS=                --enable-glitz
 
-
-REGRESS_DEPENDS=       :ghostscript-*:print/ghostscript/gnu
-SEPARATE_BUILD=                simple
+#make regress tries to build header files ?
+# REGRESS_DEPENDS=     :ghostscript-*:print/ghostscript/gnu
+# SEPARATE_BUILD=              simple
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo    16 May 2008 17:52:18 -0000      1.11
+++ distinfo    19 Oct 2008 18:27:33 -0000
@@ -1,5 +1,5 @@
-MD5 (cairo-1.6.4.tar.gz) = oZjVCfnjo1t43ouwIXTruQ==
-RMD160 (cairo-1.6.4.tar.gz) = zK5zakDZhbcr2nwvCpigg4AgZY4=
-SHA1 (cairo-1.6.4.tar.gz) = nZkP45oSXOsHIhYjwjfNcBWFXVw=
-SHA256 (cairo-1.6.4.tar.gz) = fwzijDWHBpE7w55pMKGK6J87mmqheZj6orWdHg4rT0I=
-SIZE (cairo-1.6.4.tar.gz) = 5042623
+MD5 (cairo-1.8.0.tar.gz) = TqcOqHtH6S0xjU5/W5QPRw==
+RMD160 (cairo-1.8.0.tar.gz) = GxB5q3OBPKZ4LA1Ms2I1deCO6U4=
+SHA1 (cairo-1.8.0.tar.gz) = imicpHwkIW83u4yrriH/CKf0eJk=
+SHA256 (cairo-1.8.0.tar.gz) = gnrO6Juj6Odi+7IxZc+NRV59leHlCYTmiCsgcKfzq64=
+SIZE (cairo-1.8.0.tar.gz) = 5662670
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST   16 May 2008 17:52:18 -0000      1.5
+++ pkg/PLIST   19 Oct 2008 18:27:33 -0000
@@ -8,6 +8,7 @@
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-svg.h
+include/cairo/cairo-version.h
 include/cairo/cairo-xlib-xrender.h
 include/cairo/cairo-xlib.h
 include/cairo/cairo.h
@@ -26,10 +27,6 @@
 share/gtk-doc/
 share/gtk-doc/html/
 share/gtk-doc/html/cairo/
-share/gtk-doc/html/cairo/Drawing.html
-share/gtk-doc/html/cairo/Fonts.html
-share/gtk-doc/html/cairo/Support.html
-share/gtk-doc/html/cairo/Surfaces.html
 share/gtk-doc/html/cairo/bindings-errors.html
 share/gtk-doc/html/cairo/bindings-fonts.html
 share/gtk-doc/html/cairo/bindings-memory.html
@@ -39,39 +36,45 @@
 share/gtk-doc/html/cairo/bindings-return-values.html
 share/gtk-doc/html/cairo/bindings-streams.html
 share/gtk-doc/html/cairo/bindings-surfaces.html
-share/gtk-doc/html/cairo/cairo-Error-Handling.html
-share/gtk-doc/html/cairo/cairo-Font-Options.html
-share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html
-share/gtk-doc/html/cairo/cairo-Image-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html
-share/gtk-doc/html/cairo/cairo-PNG-Support.html
-share/gtk-doc/html/cairo/cairo-Paths.html
-share/gtk-doc/html/cairo/cairo-Patterns.html
-share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Quartz-Fonts.html
-share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
-share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
-share/gtk-doc/html/cairo/cairo-Scaled-Fonts.html
-share/gtk-doc/html/cairo/cairo-Text.html
-share/gtk-doc/html/cairo/cairo-Transformations.html
-share/gtk-doc/html/cairo/cairo-Types.html
-share/gtk-doc/html/cairo/cairo-Version-Information.html
-share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
-share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
-share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
-share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
-share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html
-share/gtk-doc/html/cairo/cairo-cairo-surface-t.html
-share/gtk-doc/html/cairo/cairo-cairo-t.html
+share/gtk-doc/html/cairo/cairo-context.html
+share/gtk-doc/html/cairo/cairo-drawing.html
+share/gtk-doc/html/cairo/cairo-error-status.html
+share/gtk-doc/html/cairo/cairo-font-face.html
+share/gtk-doc/html/cairo/cairo-font-options.html
+share/gtk-doc/html/cairo/cairo-fonts.html
+share/gtk-doc/html/cairo/cairo-ft-font.html
+share/gtk-doc/html/cairo/cairo-image-surface.html
+share/gtk-doc/html/cairo/cairo-matrix.html
+share/gtk-doc/html/cairo/cairo-paths.html
+share/gtk-doc/html/cairo/cairo-pattern.html
+share/gtk-doc/html/cairo/cairo-pdf-surface.html
+share/gtk-doc/html/cairo/cairo-png-functions.html
+share/gtk-doc/html/cairo/cairo-ps-surface.html
+share/gtk-doc/html/cairo/cairo-quartz-font.html
+share/gtk-doc/html/cairo/cairo-quartz-surface.html
+share/gtk-doc/html/cairo/cairo-scaled-font.html
+share/gtk-doc/html/cairo/cairo-support.html
+share/gtk-doc/html/cairo/cairo-surface.html
+share/gtk-doc/html/cairo/cairo-surfaces.html
+share/gtk-doc/html/cairo/cairo-svg-surface.html
+share/gtk-doc/html/cairo/cairo-text.html
+share/gtk-doc/html/cairo/cairo-transformations.html
+share/gtk-doc/html/cairo/cairo-types.html
+share/gtk-doc/html/cairo/cairo-user-font.html
+share/gtk-doc/html/cairo/cairo-version-info.html
+share/gtk-doc/html/cairo/cairo-win32-font.html
+share/gtk-doc/html/cairo/cairo-win32-surface.html
+share/gtk-doc/html/cairo/cairo-xlib-surface.html
 share/gtk-doc/html/cairo/cairo.devhelp
 share/gtk-doc/html/cairo/cairo.devhelp2
 share/gtk-doc/html/cairo/home.png
 share/gtk-doc/html/cairo/index-1.2.html
 share/gtk-doc/html/cairo/index-1.4.html
 share/gtk-doc/html/cairo/index-1.6.html
+share/gtk-doc/html/cairo/index-1.8.html
+share/gtk-doc/html/cairo/index-all.html
 share/gtk-doc/html/cairo/index.html
 share/gtk-doc/html/cairo/index.sgml
-share/gtk-doc/html/cairo/ix01.html
 share/gtk-doc/html/cairo/language-bindings.html
 share/gtk-doc/html/cairo/left.png
 share/gtk-doc/html/cairo/right.png

Reply via email to