Update to 1.8.0.

3 files changed, 88 insertions, 11 deletions

diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index b7e5b6256524..7ff3e9415609 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	cairomm
-PORTVERSION=	1.6.4
+PORTVERSION=	1.8.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo
index 6a92f7b0a9a7..174a77b9bcad 100644
--- a/graphics/cairomm/distinfo
+++ b/graphics/cairomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairomm-1.6.4.tar.gz) = 63561c62536173a98f03005dfe55c90e
-SHA256 (cairomm-1.6.4.tar.gz) = 3cb2c898d0ceb94ad2deb722b50a3a6ee46abdda741ecd6e5a40517c85ecea4c
-SIZE (cairomm-1.6.4.tar.gz) = 666416
+MD5 (cairomm-1.8.0.tar.gz) = 15c0f56eee57bb418c38463a6297d715
+SHA256 (cairomm-1.8.0.tar.gz) = 67f5ae93f26121c27ca58582868dc5ef938900253745ebbbfb3f5a54e1eb2afa
+SIZE (cairomm-1.8.0.tar.gz) = 854417
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index a3574d94ec5b..a337ac07b1b7 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -5,12 +5,16 @@ include/cairomm-1.0/cairomm/enums.h
 include/cairomm-1.0/cairomm/exception.h
 include/cairomm-1.0/cairomm/fontface.h
 include/cairomm-1.0/cairomm/fontoptions.h
+include/cairomm-1.0/cairomm/matrix.h
 include/cairomm-1.0/cairomm/path.h
 include/cairomm-1.0/cairomm/pattern.h
+include/cairomm-1.0/cairomm/quartz_font.h
 include/cairomm-1.0/cairomm/quartz_surface.h
 include/cairomm-1.0/cairomm/refptr.h
 include/cairomm-1.0/cairomm/scaledfont.h
 include/cairomm-1.0/cairomm/surface.h
+include/cairomm-1.0/cairomm/types.h
+include/cairomm-1.0/cairomm/win32_font.h
 include/cairomm-1.0/cairomm/win32_surface.h
 include/cairomm-1.0/cairomm/xlib_surface.h
 lib/libcairomm-1.0.a
@@ -18,6 +22,13 @@ lib/libcairomm-1.0.la
 lib/libcairomm-1.0.so
 lib/libcairomm-1.0.so.1
 libdata/pkgconfig/cairomm-1.0.pc
+libdata/pkgconfig/cairomm-ft-1.0.pc
+libdata/pkgconfig/cairomm-pdf-1.0.pc
+libdata/pkgconfig/cairomm-png-1.0.pc
+libdata/pkgconfig/cairomm-ps-1.0.pc
+libdata/pkgconfig/cairomm-svg-1.0.pc
+libdata/pkgconfig/cairomm-xlib-1.0.pc
+libdata/pkgconfig/cairomm-xlib-xrender-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/annotated.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm.css
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html
@@ -28,8 +39,21 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontFace__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FontOptions.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtFontFace-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtFontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtFontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtFontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtFontFace__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtScaledFont-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtScaledFont.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtScaledFont__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtScaledFont__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1FtScaledFont__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.map
@@ -50,6 +74,11 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Matrix-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Matrix.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Matrix__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Matrix__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Matrix__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Path.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern-members.html
@@ -67,6 +96,11 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzFontFace-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzFontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzFontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzFontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzFontFace__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1QuartzSurface__inherit__graph.map
@@ -81,6 +115,9 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ScaledFont__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.map
@@ -101,6 +138,31 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ToyFontFace-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ToyFontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ToyFontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ToyFontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ToyFontFace__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1UserFontFace-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1UserFontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1UserFontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1UserFontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1UserFontFace__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32FontFace-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32FontFace.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32FontFace__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32FontFace__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32FontFace__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32PrintingSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32ScaledFont__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface-members.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.map
@@ -116,14 +178,16 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classcairo__matrix__t.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classcairo__matrix__t__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classcairo__matrix__t__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classcairo__matrix__t__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context__private_8h-source.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context__private_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/deprecated.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_60681489e9d398c429ccaa1240ca56f5.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_60681489e9d398c429ccaa1240ca56f5_dep.map
@@ -132,6 +196,7 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/doxygen.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/enums_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/examples.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/exception_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/files.html
@@ -191,6 +256,7 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/hierarchy.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/image-surface_8cc-example.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/index.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.md5
@@ -198,6 +264,9 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__1.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__10.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__10.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__10.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.map
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__2.png
@@ -223,12 +292,12 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__9.md5
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__9.png
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherits.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/matrix_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/matrix_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaceCairo.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaceCairo_1_1Private.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_enum.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_eval.html
-%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_func.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers_type.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaces.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pages.html
@@ -236,6 +305,10 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/path_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pattern_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/pdf-surface_8cc-example.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/ps-surface_8cc-example.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/quartz__font_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/quartz__font_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/quartz__surface_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/quartz__surface_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html
@@ -246,14 +319,18 @@ libdata/pkgconfig/cairomm-1.0.pc
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/structCairo_1_1ColorStop.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/surface_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/svg-surface_8cc-example.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/tabs.css
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/todo.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/toy-text_8cc-example.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/types_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/types_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/user-font_8cc-example.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__font_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__font_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/win32__surface_8h.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h-source.html
 %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/xlib__surface_8h.html
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference/html
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0/reference
-%%PORTDOCS%%@dirrm share/doc/libcairomm-1.0
 @dirrm include/cairomm-1.0/cairomm
 @dirrm include/cairomm-1.0