Update inkscape to 0.40. The ChangeLog is too long to add here. The NEWS file

has:
     This release has been slow in coming, but it was worth the wait: Inkscape
   0.40 brings a huge amount of new features, usability enhancements,
   documentation, and bugfixes. The three most important new features are:

     * Layers are almost complete in this version; this fills a major gap in
       functionality, making Inkscape usable for complex artwork.

     * The Potrace bitmap tracer is incorporated into Inkscape - now
       vectorizing bitmaps is easy and interactive. A matching command,
       "Create bitmap copy", converts from any object to bitmap.

     * The text-on-path implementation is complete and very flexible. Both
       the text and the path remain fully editable and transformable.
...
     * Bugfixes: too many to mention (in total, 228 bugs closed in the
       tracker since 0.39), including several important SVG compatibility
       fixes.

More information at  http://inkscape.org/cgi-bin/wiki.pl?ReleaseNotes040

This package now depends on boehm-gc. And it uses libsigc++2
and gtkmm24 instead of libsigc++ and gtkmm.

Many new templates added. And a new library added: libgimpgrad.

Patches removed. (The landscape printing support was added to 0.40.)

5 files changed, 60 insertions, 109 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 1f76d92a0c8..a3150284c1e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/11/29 15:14:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/12 20:54:52 reed Exp $
 #
 
-DISTNAME=		inkscape-0.39
-PKGREVISION=		2
+DISTNAME=		inkscape-0.40
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,8 +23,9 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
+.include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libsigc++/buildlink3.mk"
+.include "../../devel/libsigc++2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
@@ -35,6 +35,6 @@ USE_GNU_TOOLS+=		make
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtkmm/buildlink3.mk"
+.include "../../x11/gtkmm24/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/inkscape/PLIST b/graphics/inkscape/PLIST
index 08febf2d22c..08b9a8630f5 100644
--- a/graphics/inkscape/PLIST
+++ b/graphics/inkscape/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/15 03:11:50 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/12 20:54:52 reed Exp $
 bin/inkscape
 bin/inkview
+lib/inkscape/plugins/libgimpgrad.la
 man/man1/inkscape.1
 man/man1/inkview.1
 share/applications/inkscape.desktop
@@ -12,33 +13,38 @@ share/inkscape/clipart/ribbon.svg
 share/inkscape/clipart/tux.png
 share/inkscape/clipart/tux.svg
 share/inkscape/examples/README
+share/inkscape/examples/data_uri.svg
+share/inkscape/examples/flowsample.svg
 share/inkscape/examples/gradient.svg
 share/inkscape/examples/i18n.svg
+share/inkscape/examples/istest.pov
 share/inkscape/examples/markers.svg
 share/inkscape/examples/stars.svgz
+share/inkscape/examples/text-on-path.svg
 share/inkscape/examples/tiger.svgz
 share/inkscape/extensions/SpSVG.pm
-share/inkscape/extensions/ai_input.inkmod
-share/inkscape/extensions/ai_output.inkmod
-share/inkscape/extensions/dia.inkmod
+share/inkscape/extensions/ai_input.inx
+share/inkscape/extensions/ai_output.inx
+share/inkscape/extensions/dia.inx
 share/inkscape/extensions/dia2svg.sh
-share/inkscape/extensions/dropshadow.inkmod
-share/inkscape/extensions/eps_input.inkmod
-share/inkscape/extensions/epsi_output.inkmod
+share/inkscape/extensions/dropshadow.inx
+share/inkscape/extensions/eps_input.inx
+share/inkscape/extensions/epsi_output.inx
+share/inkscape/extensions/gimpgrad.inx
 share/inkscape/extensions/ill2svg.pl
 share/inkscape/extensions/ps2epsi.sh
-share/inkscape/extensions/ps_input.inkmod
+share/inkscape/extensions/ps_input.inx
 share/inkscape/extensions/roundhole
-share/inkscape/extensions/roundhole.inkmod
+share/inkscape/extensions/roundhole.inx
 share/inkscape/extensions/roundhole.xpm
 share/inkscape/extensions/sk2svg.sh
-share/inkscape/extensions/sk_input.inkmod
+share/inkscape/extensions/sk_input.inx
 share/inkscape/extensions/svg_dropshadow
-share/inkscape/extensions/svgz_input.inkmod
-share/inkscape/extensions/svgz_output.inkmod
-share/inkscape/extensions/txt2svg.inkmod
+share/inkscape/extensions/svgz_input.inx
+share/inkscape/extensions/svgz_output.inx
+share/inkscape/extensions/txt2svg.inx
 share/inkscape/extensions/txt2svg.pl
-share/inkscape/extensions/wmf_input.inkmod
+share/inkscape/extensions/wmf_input.inx
 share/inkscape/fonts/README
 share/inkscape/gradients/README
 share/inkscape/icons/add.xpm
@@ -217,18 +223,46 @@ share/inkscape/patterns/README
 share/inkscape/screens/about.svg
 share/inkscape/screens/keys.sl.svg
 share/inkscape/screens/keys.svg
+share/inkscape/templates/A4.svg
+share/inkscape/templates/A4_landscape.svg
+share/inkscape/templates/CD_cover_300dpi.svg
+share/inkscape/templates/Letter.svg
+share/inkscape/templates/Letter_landscape.svg
 share/inkscape/templates/README
+share/inkscape/templates/black_opaque.svg
+share/inkscape/templates/business_card_90x50mm.svg
+share/inkscape/templates/default.svg
+share/inkscape/templates/desktop_1024x768.svg
+share/inkscape/templates/desktop_1600x1200.svg
+share/inkscape/templates/desktop_640x480.svg
+share/inkscape/templates/desktop_800x600.svg
+share/inkscape/templates/icon_16x16.svg
+share/inkscape/templates/icon_32x32.svg
+share/inkscape/templates/icon_48x48.svg
+share/inkscape/templates/icon_64x64.svg
+share/inkscape/templates/no_borders.svg
+share/inkscape/templates/no_layers.svg
+share/inkscape/templates/web_banner_468x60.svg
+share/inkscape/templates/web_banner_728x90.svg
+share/inkscape/templates/white_opaque.svg
 share/inkscape/tutorials/elementsofdesign.sl.svg
 share/inkscape/tutorials/elementsofdesign.svg
+share/inkscape/tutorials/oldguitar.jpg
+share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/tipsandtricks.sl.svg
 share/inkscape/tutorials/tipsandtricks.svg
 share/inkscape/tutorials/tutorial-advanced.fr.svg
 share/inkscape/tutorials/tutorial-advanced.sl.svg
 share/inkscape/tutorials/tutorial-advanced.svg
 share/inkscape/tutorials/tutorial-basic.fr.svg
+share/inkscape/tutorials/tutorial-basic.nn.svg
 share/inkscape/tutorials/tutorial-basic.ru.svg
 share/inkscape/tutorials/tutorial-basic.sl.svg
 share/inkscape/tutorials/tutorial-basic.svg
+share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-shapes.svg
+share/inkscape/tutorials/tutorial-tracing.svg
+share/inkscape/tutorials/tux.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/inkscape.mo
@@ -246,8 +280,9 @@ ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/inkscape.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/inkscape.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/inkscape.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/inkscape.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/inkscape.mo
@@ -277,3 +312,5 @@ share/pixmaps/inkscape.png
 @dirrm share/inkscape/clipart
 @dirrm share/inkscape
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/inkscape/plugins
+@dirrm lib/inkscape
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index daaadcf262e..1cf1b941322 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/15 03:11:50 reed Exp $
+$NetBSD: distinfo,v 1.2 2005/01/12 20:54:52 reed Exp $
 
-SHA1 (inkscape-0.39.tar.bz2) = 60e5a424c443fd022ce240daf0569ba1cfe522ba
-Size (inkscape-0.39.tar.bz2) = 3181447 bytes
-SHA1 (patch-aa) = c17f095f727f668870c807722f64731e194a42c6
-SHA1 (patch-ac) = 69f84f3d7d8f710167b8a7d745a699c14f21c0f9
+SHA1 (inkscape-0.40.tar.bz2) = 1dc713442abc887343c9dd966a7ea7470023036b
+Size (inkscape-0.40.tar.bz2) = 3822704 bytes
diff --git a/graphics/inkscape/patches/patch-aa b/graphics/inkscape/patches/patch-aa
deleted file mode 100644
index a17e30a5bb6..00000000000
--- a/graphics/inkscape/patches/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/15 03:11:50 reed Exp $
-
---- src/extension/internal/ps.cpp.orig	2004-06-20 22:49:24.000000000 -0700
-+++ src/extension/internal/ps.cpp
-@@ -52,6 +52,7 @@
- #include "document.h"
- #include "inkscape.h"
- #include "style.h"
-+#include "inkscape_version.h"
- 
- #include "ps.h"
- #include <extension/system.h>
-@@ -321,6 +322,7 @@ PrintPS::begin (Inkscape::Extension::Pri
- 
- 	NRRect d;
- 	bool   pageBoundingBox;
-+	bool   pageLandscape;
- 	mod->get_param("pageBoundingBox", &pageBoundingBox);
- 	// printf("Page Bounding Box: %s\n", pageBoundingBox ? "TRUE" : "FALSE");
- 	if (pageBoundingBox)
-@@ -336,20 +338,38 @@ PrintPS::begin (Inkscape::Extension::Pri
- 	}
- 
- 	if (res >= 0) {
--		os << "%%BoundingBox: " << (int) d.x0 << " "
--					<< (int) d.y0 << " "
--					<< (int) ceil (d.x1) << " "
--					<< (int) ceil (d.y1) << "\n";
--	}
--	if (res >= 0) {
--		os << "%%HiResBoundingBox: " << d.x0 << " "
--					<< d.y0 << " "
--					<< d.x1 << " "
--					<< d.y1 << "\n";
-+
-+		os << "%%Creator: Inkscape " << INKSCAPE_VERSION << "\n";
-+		
-+		pageLandscape = (d.x1 > d.y1) ? true : false;
-+
-+		if (pageLandscape) {
-+			os << "%%Orientation: Landscape\n";
-+			os << "%%BoundingBox: " << (int) d.x0 << " "
-+						<< (int) d.y0 << " "
-+						<< (int) ceil (d.y1) << " "
-+						<< (int) ceil (d.x1) << "\n";
-+			os << "%%HiResBoundingBox: " << d.x0 << " "
-+						<< d.y0 << " "
-+						<< d.y1 << " "
-+						<< d.x1 << "\n";
-+			os << 90 << " rotate\n";
-+		}
-+		else
-+		{
-+			os << "%%BoundingBox: " << (int) d.x0 << " "
-+						<< (int) d.y0 << " "
-+						<< (int) ceil (d.x1) << " "
-+						<< (int) ceil (d.y1) << "\n";
-+			os << "%%HiResBoundingBox: " << d.x0 << " "
-+						<< d.y0 << " "
-+						<< d.x1 << " "
-+						<< d.y1 << "\n";
-+			os << "0.0 " << sp_document_height (doc) << " translate\n";
-+		}
-+		os << "0.8 -0.8 scale\n";
- 	}
- 
--	os << "0.0 " << sp_document_height (doc) << " translate\n";
--	os << "0.8 -0.8 scale\n";
- 
- 	return fprintf (_stream, "%s", os.str().c_str());
- }
diff --git a/graphics/inkscape/patches/patch-ac b/graphics/inkscape/patches/patch-ac
deleted file mode 100644
index f49ec2c00dc..00000000000
--- a/graphics/inkscape/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/10/15 03:11:50 reed Exp $
-
---- src/main.cpp.orig	Tue Jul 13 00:52:19 2004
-+++ src/main.cpp
-@@ -236,7 +236,7 @@ main(int argc, char const **argv)
-     }
- 
- #ifdef HAVE_FPSETMASK
--    fpresetsticky(FP_X_DZ|FP_X_INV);
-+    fpsetsticky(FP_X_DZ|FP_X_INV);
-     fpsetmask(FP_X_DZ|FP_X_INV);
- #endif
-     return result;