3 files changed, 186 insertions, 7 deletions

diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index c61f4fef6e4d..070f044008fc 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cairomm
-PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -19,9 +18,10 @@ LIB_DEPENDS=	xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 .include <bsd.port.pre.mk>
 
@@ -29,4 +29,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 BROKEN="Does not build"
 .endif
 
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--disable-docs
+
+post-patch:
+	@${REINPLACE_CMD} -E '/^SUBDIRS = /s/(docs|examples)//g' ${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo
index 7a0f5e7d6657..0d2879606292 100644
--- a/graphics/cairomm/distinfo
+++ b/graphics/cairomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairomm-0.4.0.tar.gz) = c16328236167afa99fe60626846fc1a1
-SHA256 (cairomm-0.4.0.tar.gz) = 62ccf604ba90e22beda87bacd6e210899202e5e7eada0386e9fb47ce49fa2c02
-SIZE (cairomm-0.4.0.tar.gz) = 325829
+MD5 (cairomm-0.5.0.tar.gz) = e2762aedc2dac1ffa5b91a51e3a957fd
+SHA256 (cairomm-0.5.0.tar.gz) = 201a14f9db35dc34b926c840e1c1c3ba995adb225cf7a95aa3eb8494ef3dd874
+SIZE (cairomm-0.5.0.tar.gz) = 428228
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index a732722b626b..c5f2a74c7a2a 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -8,10 +8,182 @@ include/cairomm-1.0/cairomm/path.h
 include/cairomm-1.0/cairomm/pattern.h
 include/cairomm-1.0/cairomm/refptr.h
 include/cairomm-1.0/cairomm/surface.h
+include/cairomm-1.0/cairomm/win32_surface.h
+include/cairomm-1.0/cairomm/xlib_surface.h
 lib/libcairomm-1.0.a
 lib/libcairomm-1.0.la
 lib/libcairomm-1.0.so
 lib/libcairomm-1.0.so.0
 libdata/pkgconfig/cairomm-1.0.pc
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/annotated.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/cairomm_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Context-members.html
+%%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_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_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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1GlitzSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Gradient__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1ImageSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1LinearGradient.html
+%%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_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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Pattern__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PdfSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1PsSurface.html
+%%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_1RadialGradient-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RadialGradient__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1RefPtr.html
+%%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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SolidPattern__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SurfacePattern__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Surface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1SvgSurface.html
+%%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_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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1Win32Surface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1XlibSurface__inherit__graph.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error-members.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classCairo_1_1logic__error.html
+%%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/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/dir_000000.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_000000_dep.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dirs.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/doxygen.css
+%%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/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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontface_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/fontoptions_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_func.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_type.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/functions_vars.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_func.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/globals_type.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/graph_legend.dot
+%%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/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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__0.png
+%%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__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
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__3.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__4.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__5.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__6.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.map
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.md5
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherit__graph__7.png
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/inherits.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/introduction_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespaceCairo.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/namespacemembers.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/path_8h-source.html
+%%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/private_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/private_8h.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h-source.html
+%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/refptr_8h.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/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