3 files changed, 47 insertions, 37 deletions

diff --git a/x11-toolkits/hippo-canvas/Makefile b/x11-toolkits/hippo-canvas/Makefile
index 93c72e6ab762..dd85cc7d9460 100644
--- a/x11-toolkits/hippo-canvas/Makefile
+++ b/x11-toolkits/hippo-canvas/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	hippo-canvas
-PORTVERSION=	0.2.31
-PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+PORTVERSION=	0.3.0
+CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
@@ -17,8 +16,7 @@ COMMENT=	A client stacker popup widget for GTK+ toolkit
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/libcroco-0.6.pc:${PORTSDIR}/textproc/libcroco \
 		${LOCALBASE}/libdata/pkgconfig/cairo.pc:${PORTSDIR}/graphics/cairo \
-		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo \
-		${LOCALBASE}/bin/gtkdocize:${PORTSDIR}/textproc/gtk-doc
+		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
 LIB_DEPENDS=	croco-0.6.3:${PORTSDIR}/textproc/libcroco \
 		cairo.2:${PORTSDIR}/graphics/cairo
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
@@ -28,7 +26,16 @@ USE_BZIP2=	yes
 USE_GNOME=	gnomehack gtk20 glib20 pygtk2 pango
 USE_PYTHON=	2.5+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python --enable-gtk-doc
+CONFIGURE_ARGS=	--enable-python
 USE_LDCONFIG=	yes
 
+.if !defined(NOPORTDOCS)
+CONFIGURE_ARGS+=	--enable-gtk-doc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/gtkdocize:${PORTSDIR}/textproc/gtk-doc
+.else
+CONFIGURE_ARGS+=	--disable-gtk-doc
+pre-configure:
+	${REINPLACE_CMD} -e 's/^SUBDIRS =.*$$/SUBDIRS = ./g' ${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hippo-canvas/distinfo b/x11-toolkits/hippo-canvas/distinfo
index 4f8e6eccb964..1f1f304dbd91 100644
--- a/x11-toolkits/hippo-canvas/distinfo
+++ b/x11-toolkits/hippo-canvas/distinfo
@@ -1,3 +1,3 @@
-MD5 (hippo-canvas-0.2.31.tar.bz2) = a5df369f4be5494d51bd0c7355c7fc48
-SHA256 (hippo-canvas-0.2.31.tar.bz2) = cbf2d7d6898f59934536dddcdb46cef67d6dd62e5e841de1ca2ab5e64101f321
-SIZE (hippo-canvas-0.2.31.tar.bz2) = 376039
+MD5 (hippo-canvas-0.3.0.tar.bz2) = 9a0f64eb0258a3e8ba710eff9798a7d0
+SHA256 (hippo-canvas-0.3.0.tar.bz2) = 21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514
+SIZE (hippo-canvas-0.3.0.tar.bz2) = 376859
diff --git a/x11-toolkits/hippo-canvas/pkg-plist b/x11-toolkits/hippo-canvas/pkg-plist
index 3ae313e359b9..fa22ab429a1a 100644
--- a/x11-toolkits/hippo-canvas/pkg-plist
+++ b/x11-toolkits/hippo-canvas/pkg-plist
@@ -1,3 +1,5 @@
+include/hippo-canvas-1/hippo/hippo-animation-manager.h
+include/hippo-canvas-1/hippo/hippo-animation.h
 include/hippo-canvas-1/hippo/hippo-canvas-box.h
 include/hippo-canvas-1/hippo/hippo-canvas-container.h
 include/hippo-canvas-1/hippo/hippo-canvas-context.h
@@ -10,6 +12,7 @@ include/hippo-canvas-1/hippo/hippo-canvas-link.h
 include/hippo-canvas-1/hippo/hippo-canvas-style.h
 include/hippo-canvas-1/hippo/hippo-canvas-text.h
 include/hippo-canvas-1/hippo/hippo-canvas-theme-engine.h
+include/hippo-canvas-1/hippo/hippo-canvas-theme-image.h
 include/hippo-canvas-1/hippo/hippo-canvas-theme.h
 include/hippo-canvas-1/hippo/hippo-canvas-util.h
 include/hippo-canvas-1/hippo/hippo-canvas-widget.h
@@ -26,34 +29,34 @@ lib/libhippocanvas-1.so.0
 %%PYTHON_SITELIBDIR%%/hippo.la
 %%PYTHON_SITELIBDIR%%/hippo.so
 libdata/pkgconfig/hippo-canvas-1.pc
-share/gtk-doc/html/hippo-canvas/HippoCanvasBox.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasContainer.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasContext.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasGradient.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasImage.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasImageButton.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasItem.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasLink.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasStyle.html
-share/gtk-doc/html/hippo-canvas/HippoCanvasText.html
-share/gtk-doc/html/hippo-canvas/ch01.html
-share/gtk-doc/html/hippo-canvas/hippo-canvas-Graphics.html
-share/gtk-doc/html/hippo-canvas/hippo-canvas-HippoEvent.html
-share/gtk-doc/html/hippo-canvas/hippo-canvas-Utilitites.html
-share/gtk-doc/html/hippo-canvas/hippo-canvas-Widgets.html
-share/gtk-doc/html/hippo-canvas/hippo-canvas.devhelp
-share/gtk-doc/html/hippo-canvas/hippo-canvas.devhelp2
-share/gtk-doc/html/hippo-canvas/home.png
-share/gtk-doc/html/hippo-canvas/index.html
-share/gtk-doc/html/hippo-canvas/index.sgml
-share/gtk-doc/html/hippo-canvas/left.png
-share/gtk-doc/html/hippo-canvas/right.png
-share/gtk-doc/html/hippo-canvas/style.css
-share/gtk-doc/html/hippo-canvas/up.png
-@dirrm share/gtk-doc/html/hippo-canvas
-@dirrm share/gtk-doc/html
-@dirrm share/gtk-doc
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasBox.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasContainer.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasContext.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasGradient.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasImage.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasImageButton.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasItem.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasLink.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasStyle.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/HippoCanvasText.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas-Graphics.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas-HippoEvent.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas-Utilitites.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas-Widgets.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas.devhelp
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/hippo-canvas.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/home.png
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/index.html
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/left.png
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/right.png
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/style.css
+%%PORTDOCS%%share/gtk-doc/html/hippo-canvas/up.png
+%%PORTDOCS%%@dirrm share/gtk-doc/html/hippo-canvas
+%%PORTDOCS%%@dirrmtry share/gtk-doc/html
+%%PORTDOCS%%@dirrmtry share/gtk-doc
 @dirrm %%PYTHON_SITELIBDIR%%
-@dirrm lib/python2.5
+@dirrmtry %%PYTHON_LIBDIR%%
 @dirrm include/hippo-canvas-1/hippo
 @dirrm include/hippo-canvas-1