Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

4 files changed, 62 insertions, 54 deletions

diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index c573b15d4902..1c89297220f7 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	diacanvas2
-PORTVERSION=	0.14.2
-PORTREVISION=	1
+PORTVERSION=	0.14.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
@@ -32,11 +31,4 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
 
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.png ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index 440c317ee7c6..8e4314469d97 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,3 +1,3 @@
-MD5 (diacanvas2-0.14.2.tar.gz) = bd78fff277279abb003bb271baef3788
-SHA256 (diacanvas2-0.14.2.tar.gz) = 06eb7ad7936ca4ba483b2ae2f1f9cb90186529a76ca7020e3bc5d7c674fc9ce3
-SIZE (diacanvas2-0.14.2.tar.gz) = 725584
+MD5 (diacanvas2-0.14.4.tar.gz) = b3db6c961de3023489a4d2419dab89bd
+SHA256 (diacanvas2-0.14.4.tar.gz) = 90972c659015b4d9c45b31177e464df46494d293e83e9ea3657e8b8358edca1c
+SIZE (diacanvas2-0.14.4.tar.gz) = 718229
diff --git a/graphics/diacanvas2/files/patch-python_diacanvas.override b/graphics/diacanvas2/files/patch-python_diacanvas.override
new file mode 100644
index 000000000000..2b5457da9a72
--- /dev/null
+++ b/graphics/diacanvas2/files/patch-python_diacanvas.override
@@ -0,0 +1,58 @@
+--- python/diacanvas.override.orig	Tue Oct 26 03:54:46 2004
++++ python/diacanvas.override	Fri Oct 13 14:22:52 2006
+@@ -182,55 +182,6 @@ _wrap_dia_canvas_text_new (PyGObject *se
+ 	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+ }
+ %%
+-override dia_canvas_item_new kwargs
+-static int
+-_wrap_dia_canvas_item_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ITEM);
+-}
+-%%
+-override dia_canvas_group_new kwargs
+-static int
+-_wrap_dia_canvas_group_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_GROUP);
+-}
+-%%
+-override dia_canvas_element_new kwargs
+-static int
+-_wrap_dia_canvas_element_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ELEMENT);
+-}
+-%%
+-override dia_canvas_line_new kwargs
+-static int
+-_wrap_dia_canvas_line_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_LINE);
+-}
+-%%
+-override dia_canvas_box_new kwargs
+-static int
+-_wrap_dia_canvas_box_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_BOX);
+-}
+-%%
+-override dia_canvas_image_new kwargs
+-static int
+-_wrap_dia_canvas_image_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_IMAGE);
+-}
+-%%
+-override dia_canvas_text_new kwargs
+-static int
+-_wrap_dia_canvas_text_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+-}
+-%%
+ override dia_canvas_get_pango_layout noargs
+ static PyObject *
+ _wrap_dia_canvas_get_pango_layout(PyGObject *self)
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
index d4c6a2e30ad6..028492d3a767 100644
--- a/graphics/diacanvas2/pkg-plist
+++ b/graphics/diacanvas2/pkg-plist
@@ -59,53 +59,11 @@ lib/libdiacanvas2.so.0
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.la
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
 libdata/pkgconfig/diacanvas2.pc
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvas.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasBox.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasEditable.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasElement.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroupable.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasImage.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasItem.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasLine.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasText.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasView.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasViewItem.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaConstraint.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaHandle.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaHandleLayer.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaSolver.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaTool.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaUndoManager.html
-%%PORTDOCS%%%%DOCSDIR%%/DiaVariable.html
-%%PORTDOCS%%%%DOCSDIR%%/arrowhead.png
-%%PORTDOCS%%%%DOCSDIR%%/chap-DiaCanvas.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Geometry.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Objects.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Python.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Solver.html
-%%PORTDOCS%%%%DOCSDIR%%/chap-Views.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas.png
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaEvent.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaExpression.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaGeometry.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-LibArt-rendering.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-X11-rendering.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaStrength.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaUndoManager.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-Exporting.html
-%%PORTDOCS%%%%DOCSDIR%%/diacanvasview.png
-%%PORTDOCS%%%%DOCSDIR%%/diasolver.png
-%%PORTDOCS%%%%DOCSDIR%%/element.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/line.png
 share/locale/nl/LC_MESSAGES/diacanvas.mo
 share/pygtk/2.0/defs/dia-boxed.defs
 share/pygtk/2.0/defs/diacanvas.defs
 share/pygtk/2.0/defs/diageometry.defs
 share/pygtk/2.0/defs/diashape.defs
 share/pygtk/2.0/defs/diaview.defs
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/diacanvas
 @dirrm include/diacanvas