[UPDATE] updating graphics/diacanvas2 to 0.14.1 and fix problem

with python bindings

	This patch updates the port graphics/diacanvas2 to 0.14.1
	and marks it as unbroken.

	Please commit PR/73309
	(http://www.freebsd.org/cgi/query-pr.cgi?pr=73309) before
	testing/commiting this patch.

	If someone is interested, I could also take maintainership
	for this port.

PR:		ports/73310
Submitted by:	Jens Rehsack <rehsack@liwing.de>

5 files changed, 9 insertions, 38 deletions

diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 4cb460a1af93..8258b736c611 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	diacanvas2
-PORTVERSION=	0.13.1
-PORTREVISION=	1
+PORTVERSION=	0.14.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
@@ -28,12 +27,6 @@ INSTALLS_SHLIB=	yes
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Broken pkg-plist"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
@@ -45,4 +38,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.png ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index 486b70bea445..f83eee05ea3a 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,2 +1,2 @@
-MD5 (diacanvas2-0.13.1.tar.gz) = 6ecbb99890b5663623d6d50208956d75
-SIZE (diacanvas2-0.13.1.tar.gz) = 711600
+MD5 (diacanvas2-0.14.1.tar.gz) = 4475435c068531c3c98781bcabb1e688
+SIZE (diacanvas2-0.14.1.tar.gz) = 724090
diff --git a/graphics/diacanvas2/files/patch-demos::dia-textbox.c b/graphics/diacanvas2/files/patch-demos::dia-textbox.c
deleted file mode 100644
index e03ed74a61d7..000000000000
--- a/graphics/diacanvas2/files/patch-demos::dia-textbox.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- demos/dia-textbox.c.orig	Mon Oct  6 03:18:15 2003
-+++ demos/dia-textbox.c	Sat Aug 28 00:07:51 2004
-@@ -140,7 +140,7 @@
- 	textbox->text = dia_canvas_item_create (DIA_TYPE_CANVAS_TEXT, NULL);
- 	dia_canvas_item_set_child_of (textbox->text, DIA_CANVAS_ITEM (textbox));
- 	
--	g_message (__FUNCTION__": %p %p %p %p %p", textbox, textbox->text, textbox->text->parent, DIA_CANVAS_ITEM (textbox)->canvas, textbox->text->canvas);
-+	g_message ("%s: %p %p %p %p %p", __func__, textbox, textbox->text, textbox->text->parent, DIA_CANVAS_ITEM (textbox)->canvas, textbox->text->canvas);
- }
- 
- static void
diff --git a/graphics/diacanvas2/files/patch-diacanvas::dia-export-print.c b/graphics/diacanvas2/files/patch-diacanvas::dia-export-print.c
deleted file mode 100644
index 89f5fb3a1670..000000000000
--- a/graphics/diacanvas2/files/patch-diacanvas::dia-export-print.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- diacanvas/dia-export-print.c.orig	Sat Aug 28 00:01:51 2004
-+++ diacanvas/dia-export-print.c	Sat Aug 28 00:07:51 2004
-@@ -310,10 +310,10 @@
- 			print_image ((DiaShapeImage *)shape, context);
- 			break;
- 		case DIA_SHAPE_WIDGET:
--			g_message (__FUNCTION__": Widget not yet implemented.");
-+			g_message ("%s: Widget not yet implemented.", __func__);
- 			break;
- 		case DIA_SHAPE_CLIP:
--			g_message (__FUNCTION__": Clip not yet implemented.");
-+			g_message ("%s: Clip not yet implemented.", __func__);
- 			break;
- 		default:
- 			g_message ("Shape with type %d is not (yet) implemented", shape->type);
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
index 867ae90f5cb4..019290e64de1 100644
--- a/graphics/diacanvas2/pkg-plist
+++ b/graphics/diacanvas2/pkg-plist
@@ -31,6 +31,8 @@ include/diacanvas/dia-solver.h
 include/diacanvas/dia-stack-tool.h
 include/diacanvas/dia-strength.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
@@ -65,6 +67,7 @@ libdata/pkgconfig/diacanvas2.pc
 %%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
@@ -81,6 +84,7 @@ libdata/pkgconfig/diacanvas2.pc
 %%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
@@ -93,6 +97,6 @@ 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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/diacanvas
 @dirrm include/diacanvas