6 files changed, 32 insertions, 22 deletions

diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 1e6a899cd129..1606645d232c 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	diacanvas2
-PORTVERSION=	0.13.0
+PORTVERSION=	0.13.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
@@ -15,12 +15,11 @@ MASTER_SITE_SUBDIR=	diacanvas
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A general drawing canvas from dia dialog editor
 
-USE_GNOME=	gnomehack libgnomeprint libgnomeprintui libartlgpl2 \
-		libgnomecanvas pygnome2
+USE_GNOME=	gnomehack gnometarget pygnome2
 USE_PYTHON=	2.2+
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=	15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index 2d938dff67cc..486b70bea445 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,2 +1,2 @@
-MD5 (diacanvas2-0.13.0.tar.gz) = 014b44002ee7a6962da50782cb3fb10b
-SIZE (diacanvas2-0.13.0.tar.gz) = 710528
+MD5 (diacanvas2-0.13.1.tar.gz) = 6ecbb99890b5663623d6d50208956d75
+SIZE (diacanvas2-0.13.1.tar.gz) = 711600
diff --git a/graphics/diacanvas2/files/patch-demos::dia-textbox.c b/graphics/diacanvas2/files/patch-demos::dia-textbox.c
new file mode 100644
index 000000000000..e03ed74a61d7
--- /dev/null
+++ b/graphics/diacanvas2/files/patch-demos::dia-textbox.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..89f5fb3a1670
--- /dev/null
+++ b/graphics/diacanvas2/files/patch-diacanvas::dia-export-print.c
@@ -0,0 +1,15 @@
+--- 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/files/patch-ltmain.sh b/graphics/diacanvas2/files/patch-ltmain.sh
deleted file mode 100644
index b59517094f9c..000000000000
--- a/graphics/diacanvas2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Wed Oct 29 09:38:29 2003
-+++ ltmain.sh	Wed Oct 29 09:38:41 2003
-@@ -4210,10 +4210,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
index 27535fd9b549..867ae90f5cb4 100644
--- a/graphics/diacanvas2/pkg-plist
+++ b/graphics/diacanvas2/pkg-plist
@@ -26,7 +26,6 @@ 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-x.h
 include/diacanvas/dia-shape.h
 include/diacanvas/dia-solver.h
 include/diacanvas/dia-stack-tool.h
@@ -35,6 +34,7 @@ include/diacanvas/dia-tool.h
 include/diacanvas/dia-variable.h
 include/diacanvas/diamarshal.h
 include/diacanvas/diatypebuiltins.h
+lib/libdiacanvas2.a
 lib/libdiacanvas2.so
 lib/libdiacanvas2.so.0
 %%PYTHON_SITELIBDIR%%/diacanvas/__init__.py