3 files changed, 21 insertions, 7 deletions
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index dd41e39e6aa..143c1edd8e1 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.23 2008/04/07 17:08:53 adam Exp $
+$NetBSD: distinfo,v 1.24 2008/06/05 10:17:28 drochner Exp $
 
 SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7
 RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26
 Size (inkscape-0.46.tar.bz2) = 13368645 bytes
 SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb
+SHA1 (patch-ab) = 7eca63e71523f47d968d7b2c513a11010381f1ed
 SHA1 (patch-ac) = 8034de5cf024ef6ec55e378681a1f450da23bbce
-SHA1 (patch-ad) = 4700208bb97c3d09733f2777bb32f973779b06a8
+SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
 SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977
diff --git a/graphics/inkscape/patches/patch-ab b/graphics/inkscape/patches/patch-ab
new file mode 100644
index 00000000000..b3c904e4950
--- /dev/null
+++ b/graphics/inkscape/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2008/06/05 10:17:28 drochner Exp $
+
+--- ./src/ui/dialog/print.cpp.orig	2008-06-02 23:26:59 +0300
++++ ./src/ui/dialog/print.cpp	2008-06-02 23:28:48 +0300
+@@ -16,6 +16,8 @@
+ #include <io.h>
+ #endif
+ 
++#include <unistd.h> // close() and unlink()
++
+ #include <gtkmm/stock.h>
+ #include "print.h"
+ 
diff --git a/graphics/inkscape/patches/patch-ad b/graphics/inkscape/patches/patch-ad
index 8e421429119..5a1a0144b72 100644
--- a/graphics/inkscape/patches/patch-ad
+++ b/graphics/inkscape/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2007/02/05 20:20:03 adam Exp $
+$NetBSD: patch-ad,v 1.4 2008/06/05 10:17:28 drochner Exp $
 
---- src/trace/potrace/inkscape-potrace.cpp.orig	2007-01-16 03:05:41.000000000 +0100
-+++ src/trace/potrace/inkscape-potrace.cpp
+--- ./src/trace/potrace/inkscape-potrace.cpp.orig	2008-03-11 06:20:37 +0200
++++ ./src/trace/potrace/inkscape-potrace.cpp	2008-06-03 00:11:41 +0300
 @@ -31,7 +31,16 @@
  #include "curve.h"
  #include "bitmap.h"
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/param.h>
 +#endif
  
-+#if defined(__DragonFly__) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800)
++#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ < 399000800)
 +static double log2(double val)
 +{
 +    return log(val) / M_LN2;