Update to 0.37

10 files changed, 66 insertions, 104 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index b49ad5798e7e..adc02f03a074 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	inkscape
-PORTVERSION=	0.36
-PORTREVISION=	3
+PORTVERSION=	0.37
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,19 +19,33 @@ RUN_DEPENDS=	${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 libartlgpl2 libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack lthack intlhack libglade2 libartlgpl2 libgnomeprintui
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-popt \
 		--with-gnome-print
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -L${LOCALBASE}"
 
 MAN1=		inkscape.1
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
-		${WRKSRC}/src/helper/action.c \
-		${WRKSRC}/src/libarikkei/arikkei-token.c
+		${WRKSRC}/src/helper/action.cpp \
+		${WRKSRC}/src/libarikkei/arikkei-token.cpp
+	@${REINPLACE_CMD} -e 's|round|rint|g' \
+		${WRKSRC}/src/livarot/Shape.h \
+		${WRKSRC}/src/modules/gnome.cpp \
+		${WRKSRC}/src/object-edit.cpp \
+		${WRKSRC}/src/spiral-context.cpp \
+		${WRKSRC}/src/star-context.cpp
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's|<stdint.h>|<sys/types.h>|g' \
+		${WRKSRC}/src/livarot/*.h
+	@${REINPLACE_CMD} -e 's|isfinite|!isinf|g' \
+		${WRKSRC}/src/helper/*.cpp
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index b2de612f2acb..a8708502e39d 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1 +1,2 @@
-MD5 (inkscape-0.36.tar.gz) = 3bd8581afee27b00dd7fdce0e7d8f6fa
+MD5 (inkscape-0.37.tar.gz) = a53355cd2c2d6b838e75a089afb14d3e
+SIZE (inkscape-0.37.tar.gz) = 2574901
diff --git a/graphics/inkscape/files/patch-configure b/graphics/inkscape/files/patch-configure
index a3c7f3eae335..f7c2ffd8963d 100644
--- a/graphics/inkscape/files/patch-configure
+++ b/graphics/inkscape/files/patch-configure
@@ -1,28 +1,23 @@
---- configure.orig	Fri Jun 20 11:55:40 2003
-+++ configure	Fri Jun 20 11:57:22 2003
-@@ -3094,6 +3094,9 @@
- echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-+_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS `gnome-config --cflags print`"
+--- configure.orig	Sun Feb 15 23:02:51 2004
++++ configure	Sun Feb 15 23:07:26 2004
+@@ -16588,17 +16588,12 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char dgettext ();
++#include <libintl.h>
 +
- 
- 
- if
-@@ -3168,6 +3171,7 @@
- fi
- 
- 
-+CPPFLAGS="$_CPPFLAGS"
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -15765,6 +15769,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ int
+ main ()
+ {
+-dgettext ();
++dgettext ("","");
+   ;
+   return 0;
+ }
diff --git a/graphics/inkscape/files/patch-src::dialogs::dialog-events.c b/graphics/inkscape/files/patch-src::dialogs::dialog-events.c
deleted file mode 100644
index 786fc32dd499..000000000000
--- a/graphics/inkscape/files/patch-src::dialogs::dialog-events.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/dialogs/dialog-events.c.orig	Thu Dec 11 08:08:58 2003
-+++ src/dialogs/dialog-events.c	Thu Dec 11 08:09:47 2003
-@@ -122,12 +122,13 @@
- sp_transientize_callback (Inkscape *inkscape, SPDesktop *desktop, win_data *wd)
- {
- #ifndef WIN32
-+	GtkWindow *w;
-+
- 	if (wd->stop) { // if retransientizing of this dialog is still forbidden after previous call
- 		// warning turned off because it was confusingly fired when loading many files from command line
- 		//		g_warning("Retranzientize aborted! You're switching windows too fast!"); 
- 		return;
- 	}
--	GtkWindow *w;
- 
- 	w = (GtkWindow *) g_object_get_data (G_OBJECT (desktop), "window"); 
- 	if (w && wd->win) {
diff --git a/graphics/inkscape/files/patch-src::dialogs::stroke-style.c b/graphics/inkscape/files/patch-src::dialogs::stroke-style.c
deleted file mode 100644
index a888a5e73e3c..000000000000
--- a/graphics/inkscape/files/patch-src::dialogs::stroke-style.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/dialogs/stroke-style.c.orig	Thu Dec 11 08:05:58 2003
-+++ src/dialogs/stroke-style.c	Thu Dec 11 08:08:22 2003
-@@ -581,6 +581,7 @@
- 	GtkWidget *spw, *f, *t, *l, *hb, *sb, *us, *tb, *ds;
- 	GtkObject *a;
- 	gint i;
-+	SPDesktop *desktop;
- 
- 	spw = sp_widget_new_global (INKSCAPE);
- 
-@@ -725,7 +726,7 @@
- 	gtk_signal_connect (GTK_OBJECT (spw), "change_selection", GTK_SIGNAL_FUNC (sp_stroke_style_line_change_selection), NULL);
- 	gtk_signal_connect (GTK_OBJECT (spw), "attr_changed", GTK_SIGNAL_FUNC (sp_stroke_style_line_attr_changed), NULL);
- 
--	SPDesktop *desktop = inkscape_active_desktop();
-+	desktop = inkscape_active_desktop();
- 	sp_stroke_style_line_update (SP_WIDGET (spw), desktop ? SP_DT_SELECTION (desktop) : NULL);
- 	// sp_stroke_style_line_update (SP_WIDGET (spw), SP_ACTIVE_DESKTOP ? SP_DT_SELECTION (SP_ACTIVE_DESKTOP) : NULL);
- 
diff --git a/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
new file mode 100644
index 000000000000..359ab2d6b0d6
--- /dev/null
+++ b/graphics/inkscape/files/patch-src::libnr::nr-matrix.cpp
@@ -0,0 +1,10 @@
+--- src/libnr/nr-matrix.cpp.org Sun Feb 15 09:45:06 2004
++++ src/libnr/nr-matrix.cpp     Sun Feb 15 09:44:32 2004
+@@ -9,6 +9,7 @@
+  * This code is in public domain
+  */
+ 
++#include <stdio.h>
+ #include "nr-matrix.h"
+ 
+ NRMatrix *
diff --git a/graphics/inkscape/files/patch-src::main.c b/graphics/inkscape/files/patch-src::main.cpp
index 767c61265d7c..4e97db192993 100644
--- a/graphics/inkscape/files/patch-src::main.c
+++ b/graphics/inkscape/files/patch-src::main.cpp
@@ -1,5 +1,5 @@
---- src/main.c.orig	Fri Jan 30 15:23:48 2004
-+++ src/main.c	Fri Jan 30 15:24:10 2004
+--- src/main.cpp.orig	Fri Jan 30 15:23:48 2004
++++ src/main.cpp	Fri Jan 30 15:24:10 2004
 @@ -200,7 +200,7 @@
  	}
  
diff --git a/graphics/inkscape/files/patch-src::module.c b/graphics/inkscape/files/patch-src::module.c
deleted file mode 100644
index 2671a5f3f8af..000000000000
--- a/graphics/inkscape/files/patch-src::module.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/module.c.orig	Fri Dec 12 00:10:31 2003
-+++ src/module.c	Fri Dec 12 00:14:45 2003
-@@ -38,7 +38,7 @@
- static void sp_module_private_build (SPModule *module, SPRepr *repr);
- static void sp_module_load_default (SPModule * module);
- static void sp_module_unload_default (SPModule * module);
--static SPModule * sp_module_new (GType type, SPRepr *repr);
-+SPModule * sp_module_new (GType type, SPRepr *repr);
- 
- /** 
- 	\var module_parent_class
-@@ -283,7 +283,7 @@
- 	A reference to the SPRepr structure is added in this function so it
- 	should not need to be added by each individual subclass.
- */
--static SPModule *
-+SPModule *
- sp_module_new (GType type, SPRepr *repr)
- {
- 	SPModule *module;
diff --git a/graphics/inkscape/files/patch-src::modules::gnome.c b/graphics/inkscape/files/patch-src::modules::gnome.c
deleted file mode 100644
index 25bbad22f630..000000000000
--- a/graphics/inkscape/files/patch-src::modules::gnome.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/modules/gnome.c.orig	Thu Dec 11 23:52:25 2003
-+++ src/modules/gnome.c	Thu Dec 11 23:52:44 2003
-@@ -31,6 +31,7 @@
- #include <libgnomeprintui/gnome-print-dialog.h>
- 
- #include "helper/sp-intl.h"
-+#include "helper/canvas-bpath.h"
- #include "enums.h"
- #include "document.h"
- #include "style.h"
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index d4bee7377323..38b140d1daa4 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -1,4 +1,5 @@
 bin/inkscape
+bin/inkview
 lib/inkscape/extensions/SpSVG.pm
 lib/inkscape/extensions/dia2svg.sh
 lib/inkscape/extensions/ill2svg.pl
@@ -99,12 +100,19 @@ share/gnome/inkscape/join.xpm
 share/gnome/inkscape/join_bevel.xpm
 share/gnome/inkscape/join_miter.xpm
 share/gnome/inkscape/join_round.xpm
+share/gnome/inkscape/keys.svg
 share/gnome/inkscape/line.xpm
 share/gnome/inkscape/line_dashed.xpm
 share/gnome/inkscape/line_doubled.xpm
 share/gnome/inkscape/line_full.xpm
 share/gnome/inkscape/lock_aspect_no.xpm
 share/gnome/inkscape/lock_aspect_yes.xpm
+share/gnome/inkscape/marker_arrow_end.xpm
+share/gnome/inkscape/marker_arrow_start.xpm
+share/gnome/inkscape/marker_none_end.xpm
+share/gnome/inkscape/marker_none_start.xpm
+share/gnome/inkscape/marker_triangle_end.xpm
+share/gnome/inkscape/marker_triangle_start.xpm
 share/gnome/inkscape/modules/ai_input.inkmod
 share/gnome/inkscape/modules/dia.inkmod
 share/gnome/inkscape/modules/dropshadow.inkmod
@@ -174,6 +182,7 @@ share/gnome/inkscape/toolbox_node.xpm
 share/gnome/inkscape/toolbox_object.xpm
 share/gnome/inkscape/toolbox_select.xpm
 share/gnome/inkscape/toolbox_zoom.xpm
+share/gnome/inkscape/tutorial.svg
 share/gnome/inkscape/unknown.xpm
 share/gnome/inkscape/writing_mode_lr.xpm
 share/gnome/inkscape/writing_mode_tb.xpm