14 files changed, 1 insertions, 354 deletions

diff --git a/MOVED b/MOVED
index 8677ea85b2db..16e764910364 100644
--- a/MOVED
+++ b/MOVED
@@ -9570,3 +9570,4 @@ ports-mgmt/redports-node||2017-10-01|Has expired: Upstream is dead so port is no
 sysutils/py3-iocage|sysutils/iocage|2017-10-02|Port was renamed
 audio/ventrilo-server||2017-10-04|No more freebsd distfiles
 net-im/ayttm||2017-10-04|Non functional
+graphics/diacanvas2||2017-10-04|GNOME2 library unused anymore
diff --git a/graphics/Makefile b/graphics/Makefile
index 15c1753f2129..3384d05b4c58 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -138,7 +138,6 @@
     SUBDIR += derelict-gl3
     SUBDIR += devil
     SUBDIR += dia
-    SUBDIR += diacanvas2
     SUBDIR += diffpdf
     SUBDIR += digikam-kde4
     SUBDIR += digikam-kde4-doc
diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
deleted file mode 100644
index f8e60ef49d9e..000000000000
--- a/graphics/diacanvas2/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: ijliao
-# $FreeBSD$
-
-PORTNAME=	diacanvas2
-PORTVERSION=	0.15.4
-PORTREVISION=	6
-CATEGORIES=	graphics gnome
-MASTER_SITES=	SF/diacanvas/DiaCanvas2/${PORTVERSION}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	General drawing canvas from dia dialog editor
-
-LICENSE=	GPLv2
-
-USES=		gettext-tools gmake libtool pathfix pkgconfig python
-USE_GNOME=	pygnome2
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lm
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-OPTIONS_DEFINE=	NLS PRINT
-OPTIONS_DEFAULT=PRINT
-PRINT_DESC=	GNOME print support
-OPTIONS_SUB=	yes
-
-PRINT_CONFIGURE_ENABLE=	gnome-print
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPRINT}
-USE_GNOME+=	libgnomeprintui
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
-
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|po diacanvas po |diacanvas |' \
-		${WRKSRC}/Makefile.in
-.endif
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
-.for l in _canvasmodule shapemodule viewmodule geometrymodule
-	${STRIP_CMD} ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/diacanvas/${l}.so
-.endfor
-
-.include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
deleted file mode 100644
index ed694e09b434..000000000000
--- a/graphics/diacanvas2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (diacanvas2_0.15.4.tar.gz) = a0213e40ebcd7c7200a230aef2377ac35445a53db41870d3851a92a3e2cbbbd8
-SIZE (diacanvas2_0.15.4.tar.gz) = 974556
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c b/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c
deleted file mode 100644
index 2f97b40ae1a4..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- diacanvas/dia-canvas-editable.c.orig	2013-05-21 08:56:55.000000000 +0000
-+++ diacanvas/dia-canvas-editable.c	2013-05-21 08:59:33.000000000 +0000
-@@ -103,7 +103,8 @@ dia_canvas_editable_base_init (gpointer 
- gboolean
- dia_canvas_editable_is_editable (DiaCanvasEditable *editable)
- {
--	g_return_if_fail (DIA_IS_CANVAS_EDITABLE (editable));
-+	if (!DIA_IS_CANVAS_EDITABLE (editable))
-+		return FALSE;
- 	
- 	if (!DIA_CANVAS_EDITABLE_GET_IFACE (editable)->is_editable)
- 		return TRUE;
-@@ -115,7 +116,8 @@ DiaShapeText*
- dia_canvas_editable_get_editable_shape (DiaCanvasEditable *editable,
- 					gdouble x, gdouble y)
- {
--	g_return_if_fail (DIA_IS_CANVAS_EDITABLE (editable));
-+	if (!DIA_IS_CANVAS_EDITABLE (editable))
-+		return NULL;
- 	
- 	if (!DIA_CANVAS_EDITABLE_GET_IFACE (editable)->get_editable_shape) {
- 		g_warning ("DiaCanvasEditable::get_editable_shape not "
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c b/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c
deleted file mode 100644
index 43d584380d41..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- diacanvas/dia-canvas-item.c.orig	2013-05-21 08:53:38.000000000 +0000
-+++ diacanvas/dia-canvas-item.c	2013-05-21 08:55:27.000000000 +0000
-@@ -709,7 +709,7 @@ dia_real_canvas_item_disconnect (DiaCanv
- 
- static void item_button_press_event(DiaCanvasItem *item, gpointer event)
-        {
--        return TRUE;
-+        return;
-        }
- 
- /**
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c b/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c
deleted file mode 100644
index f1d174a8471e..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- diacanvas/dia-canvas-view.c.orig	2013-05-21 09:07:50.000000000 +0000
-+++ diacanvas/dia-canvas-view.c	2013-05-21 09:09:40.000000000 +0000
-@@ -1024,7 +1024,8 @@
- DiaTool*
- dia_canvas_view_get_tool (DiaCanvasView *view)
- {
--	g_return_if_fail (DIA_IS_CANVAS_VIEW (view));
-+	if (!DIA_IS_CANVAS_VIEW (view))
-+		return NULL;	
- 
- 	return view->tool;
- }
-@@ -1065,7 +1066,8 @@
- DiaTool*
- dia_canvas_view_get_default_tool (DiaCanvasView *view)
- {
--	g_return_if_fail (DIA_IS_CANVAS_VIEW (view));
-+	if (!DIA_IS_CANVAS_VIEW (view))
-+		return NULL;
- 
- 	return view->default_tool;
- }
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c b/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c
deleted file mode 100644
index dfe5f0ff3473..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- diacanvas/dia-canvas.c.orig	2007-05-15 19:26:57.000000000 +0000
-+++ diacanvas/dia-canvas.c	2013-05-21 08:52:10.000000000 +0000
-@@ -17,7 +17,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- #include <math.h>
--#include <glib/garray.h>
-+#include <glib.h>
- #include <libart_lgpl/art_rect.h>
- #include <libart_lgpl/art_affine.h>
- #include <pango/pangoft2.h>
-@@ -925,7 +925,8 @@ dia_canvas_redraw_views (DiaCanvas *canv
- DiaUndoManager*
- dia_canvas_get_undo_manager (DiaCanvas *canvas)
- {
--	g_return_if_fail (DIA_IS_CANVAS (canvas));
-+	if (! DIA_IS_CANVAS (canvas))
-+		return NULL;
- 
- 	return canvas->undo_manager;
- }
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c b/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c
deleted file mode 100644
index 27142ec36b48..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- diacanvas/dia-default-tool.c.orig	2013-05-21 09:10:22.000000000 +0000
-+++ diacanvas/dia-default-tool.c	2013-05-21 09:11:26.000000000 +0000
-@@ -302,7 +302,8 @@ dia_default_tool_set_handle_tool (DiaDef
- DiaTool*
- dia_default_tool_get_handle_tool (DiaDefaultTool *tool)
- {
--	g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool));
-+	if (!DIA_IS_DEFAULT_TOOL (tool))
-+		return NULL;
- 
- 	return tool->handle_tool;
- }
-@@ -323,7 +324,8 @@ dia_default_tool_set_item_tool (DiaDefau
- DiaTool*
- dia_default_tool_get_item_tool (DiaDefaultTool *tool)
- {
--	g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool));
-+	if (!DIA_IS_DEFAULT_TOOL (tool))
-+		return NULL;
- 
- 	return tool->item_tool;
- }
-@@ -345,7 +347,8 @@ dia_default_tool_set_selection_tool (Dia
- DiaTool*
- dia_default_tool_get_selection_tool (DiaDefaultTool *tool)
- {
--	g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool));
-+	if (!DIA_IS_DEFAULT_TOOL (tool))
-+		return NULL;
- 
- 	return tool->selection_tool;
- }
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c b/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c
deleted file mode 100644
index 07be6607c4ce..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- diacanvas/dia-shape.c.orig	2013-05-21 09:04:53.000000000 +0000
-+++ diacanvas/dia-shape.c	2013-05-21 09:06:04.000000000 +0000
-@@ -221,7 +221,8 @@ dia_shape_destroy (DiaShape *shape)
- DiaShape*
- dia_shape_ref (DiaShape *shape)
- {
--	g_return_if_fail (shape != NULL);
-+	if (shape != NULL)
-+		return NULL;
- 
- 	shape->ref_cnt++;
- 
diff --git a/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c b/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c
deleted file mode 100644
index 2dec667099da..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- diacanvas/dia-undo-manager.c.orig	2013-05-21 09:01:02.000000000 +0000
-+++ diacanvas/dia-undo-manager.c	2013-05-21 09:03:46.000000000 +0000
-@@ -195,7 +195,8 @@ dia_undo_manager_base_init (gpointer ifa
- gboolean
- dia_undo_manager_in_transaction (DiaUndoManager *undo_manager)
- {
--	g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager));
-+	if (!DIA_IS_UNDO_MANAGER (undo_manager))
-+		return FALSE;
- 	
- 	if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->in_transaction)
- 		return FALSE;
-@@ -214,7 +215,8 @@ dia_undo_manager_in_transaction (DiaUndo
- gboolean
- dia_undo_manager_can_undo (DiaUndoManager *undo_manager)
- {
--	g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager));
-+	if (!DIA_IS_UNDO_MANAGER (undo_manager))
-+		return FALSE;
- 	
- 	if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->can_undo)
- 		return FALSE;
-@@ -233,7 +235,8 @@ dia_undo_manager_can_undo (DiaUndoManage
- gboolean
- dia_undo_manager_can_redo (DiaUndoManager *undo_manager)
- {
--	g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager));
-+	if (!DIA_IS_UNDO_MANAGER (undo_manager))
-+		return FALSE;
- 	
- 	if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->can_redo)
- 		return FALSE;
diff --git a/graphics/diacanvas2/files/patch-python_diacanvas.override b/graphics/diacanvas2/files/patch-python_diacanvas.override
deleted file mode 100644
index 2b5457da9a72..000000000000
--- a/graphics/diacanvas2/files/patch-python_diacanvas.override
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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-descr b/graphics/diacanvas2/pkg-descr
deleted file mode 100644
index d9d713923147..000000000000
--- a/graphics/diacanvas2/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-DiaCanvas is in its second incarnation: DiaCanvas2. Aiming towards future
-computing needs on GNOME based desktop environments, DiaCanvas2 is providing
-you with a full featured diagramming canvas:
-   - Model/View/Controller based design: The DiaCanvas class only holds
-     abstract data (using DiaShape objects), the data is rendered by one or
-     more DiaCanvasView's.
-   - Usage of the widely used GnomeCanvas for visualization. This makes it
-     easy to let DiaCanvas2 display anti-aliased diagrams with translucency
-     (alpha) support.
-   - Export facilities for GnomePrint and SVG.
-   - Objects can be rotated/sheared/resized/etc. without the need to
-     recalculate shapes. DiaCanvas relies heavily on the LibArt library
-     (which is a standard GNOME library).
-   - Objects can connect to each other with handles. The connection is
-     represented as a mathematical equation, which is solved using a real
-     linear constraint solver (see the reference documentation for more info).
-     Handles do not need predefined connection points, but can connect to each
-     other in a more generic way.
-   - Of course DiaCanvas2 has all the features a modern application needs,
-     including undo/redo and copy/paste functionality (copying is not
-     implemented yet).
-
-WWW: http://diacanvas.sourceforge.net/
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
deleted file mode 100644
index 8053f3b36eeb..000000000000
--- a/graphics/diacanvas2/pkg-plist
+++ /dev/null
@@ -1,64 +0,0 @@
-include/diacanvas/dia-canvas-box.h
-include/diacanvas/dia-canvas-clipboard.h
-include/diacanvas/dia-canvas-editable.h
-include/diacanvas/dia-canvas-element.h
-include/diacanvas/dia-canvas-group.h
-include/diacanvas/dia-canvas-groupable.h
-include/diacanvas/dia-canvas-i18n.h
-include/diacanvas/dia-canvas-image.h
-include/diacanvas/dia-canvas-item.h
-include/diacanvas/dia-canvas-iter.h
-include/diacanvas/dia-canvas-line.h
-include/diacanvas/dia-canvas-punctum.h
-include/diacanvas/dia-canvas-text.h
-include/diacanvas/dia-canvas-varius-forma.h
-include/diacanvas/dia-canvas-view.h
-include/diacanvas/dia-canvas.h
-include/diacanvas/dia-constraint.h
-include/diacanvas/dia-default-tool.h
-include/diacanvas/dia-event.h
-include/diacanvas/dia-export-print.h
-include/diacanvas/dia-export-svg.h
-include/diacanvas/dia-features.h
-include/diacanvas/dia-geometry.h
-include/diacanvas/dia-handle-layer.h
-include/diacanvas/dia-handle-tool.h
-include/diacanvas/dia-handle.h
-include/diacanvas/dia-item-tool.h
-include/diacanvas/dia-placement-tool.h
-include/diacanvas/dia-selection-tool.h
-include/diacanvas/dia-selector.h
-include/diacanvas/dia-shape-art.h
-include/diacanvas/dia-shape.h
-include/diacanvas/dia-solver.h
-include/diacanvas/dia-stack-tool.h
-include/diacanvas/dia-strength.h
-include/diacanvas/dia-textus-cuadrus.h
-include/diacanvas/dia-textus-imago.h
-include/diacanvas/dia-textus-punctum.h
-include/diacanvas/dia-tool.h
-include/diacanvas/dia-undo-manager.h
-include/diacanvas/dia-undo.h
-include/diacanvas/dia-variable.h
-include/diacanvas/diamarshal.h
-include/diacanvas/diatypebuiltins.h
-lib/libdiacanvas2.so
-lib/libdiacanvas2.so.0
-lib/libdiacanvas2.so.0.0.0
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.py
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyc
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyo
-%%PYTHON_SITELIBDIR%%/diacanvas/_canvasmodule.so
-%%PYTHON_SITELIBDIR%%/diacanvas/geometrymodule.so
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.py
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.pyc
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.pyo
-%%PYTHON_SITELIBDIR%%/diacanvas/shapemodule.so
-%%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
-libdata/pkgconfig/diacanvas2.pc
-%%NLS%%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