- Update to 0.43

- Make GNOME dependency optional.
- Use bzip2 distfile.
- Add SHA256 checksum.

3 files changed, 53 insertions, 14 deletions

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 58654a878af5..112e927ce446 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	inkscape
-PORTVERSION=	0.42.2
-PORTREVISION=	1
+PORTVERSION=	0.43
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,16 +20,17 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 RUN_DEPENDS=	${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libxslt
+WANT_GNOME=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack libxslt
 USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4
-CONFIGURE_ARGS=	--with-popt \
-		--with-gnome-print
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${LOCALBASE} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -L${LOCALBASE} ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--with-popt
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		inkscape.1 inkview.1
 
@@ -40,6 +40,19 @@ MAN1=		inkscape.1 inkview.1
 IGNORE=	Requires symbols not present on 4.X
 .endif
 
+.if ${HAVE_GNOME:Mlibgnomeprint} != ""
+USE_GNOME+=		libgnomeprint
+CONFIGURE_ARGS+=	--with-gnome-print
+.else
+CONFIGURE_ARGS+=	--without-gnome-print
+.endif
+.if ${HAVE_GNOME:Mgnomevfs2} != ""
+USE_GNOME+=		gnomevfs2
+CONFIGURE_ARGS+=	--with-gnome-vfs
+.else
+CONFIGURE_ARGS+=	--without-gnome-vfs
+.endif
+
 patch-autotools::
 	@(cd ${PATCH_WRKSRC}; \
 	for file in ${LIBTOOLFILES}; do \
diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index 58816c8d3936..0ac9bab9e162 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,2 +1,3 @@
-MD5 (inkscape-0.42.2.tar.gz) = 8f149678508733f511e70f8a0901cea4
-SIZE (inkscape-0.42.2.tar.gz) = 8013311
+MD5 (inkscape-0.43.tar.bz2) = 97c606182f5e177eef70c1e8a55efc1f
+SHA256 (inkscape-0.43.tar.bz2) = 74d6088a6f7521c36b73550baa9dd0381505d66658f0bc01802aa2dfc7430fbc
+SIZE (inkscape-0.43.tar.bz2) = 6244558
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index 2bf3ad5c09e9..37b4abaccf3f 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -24,6 +24,8 @@ share/gnome/inkscape/examples/tesselation-P3.svg
 share/gnome/inkscape/examples/text-on-path.svg
 share/gnome/inkscape/examples/tiger.svgz
 share/gnome/inkscape/extensions/SpSVG.pm
+share/gnome/inkscape/extensions/addnodes.inx
+share/gnome/inkscape/extensions/addnodes.py
 share/gnome/inkscape/extensions/ai_input.inx
 share/gnome/inkscape/extensions/ai_output.inx
 share/gnome/inkscape/extensions/bezmisc.py
@@ -33,7 +35,11 @@ share/gnome/inkscape/extensions/dia2svg.sh
 share/gnome/inkscape/extensions/dots.inx
 share/gnome/inkscape/extensions/dots.py
 share/gnome/inkscape/extensions/dropshadow.inx
+share/gnome/inkscape/extensions/dxf_input.inx
+share/gnome/inkscape/extensions/dxf_output.inx
 share/gnome/inkscape/extensions/embed_raster_in_svg.pl
+share/gnome/inkscape/extensions/embedimage.inx
+share/gnome/inkscape/extensions/embedimage.py
 share/gnome/inkscape/extensions/eps_input.inx
 share/gnome/inkscape/extensions/epsi_output.inx
 share/gnome/inkscape/extensions/ffgeom.py
@@ -61,6 +67,7 @@ share/gnome/inkscape/extensions/lindenmayer.py
 share/gnome/inkscape/extensions/motion.inx
 share/gnome/inkscape/extensions/motion.py
 share/gnome/inkscape/extensions/pdf_output.inx
+share/gnome/inkscape/extensions/ps2dxf.sh
 share/gnome/inkscape/extensions/ps2epsi.sh
 share/gnome/inkscape/extensions/ps2pdf.sh
 share/gnome/inkscape/extensions/ps_input.inx
@@ -75,6 +82,8 @@ share/gnome/inkscape/extensions/sk2svg.sh
 share/gnome/inkscape/extensions/sk_input.inx
 share/gnome/inkscape/extensions/straightseg.inx
 share/gnome/inkscape/extensions/straightseg.py
+share/gnome/inkscape/extensions/summersnight.inx
+share/gnome/inkscape/extensions/summersnight.py
 share/gnome/inkscape/extensions/svg_dropshadow
 share/gnome/inkscape/extensions/svgz_input.inx
 share/gnome/inkscape/extensions/svgz_output.inx
@@ -82,6 +91,8 @@ share/gnome/inkscape/extensions/txt2svg.inx
 share/gnome/inkscape/extensions/txt2svg.pl
 share/gnome/inkscape/extensions/wavy.inx
 share/gnome/inkscape/extensions/wavy.py
+share/gnome/inkscape/extensions/whirl.inx
+share/gnome/inkscape/extensions/whirl.py
 share/gnome/inkscape/extensions/wmf_input.inx
 share/gnome/inkscape/fonts/README
 share/gnome/inkscape/gradients/README
@@ -92,6 +103,7 @@ share/gnome/inkscape/icons/inkscape.svg
 share/gnome/inkscape/keyboards/README
 share/gnome/inkscape/markers/markers.svg
 share/gnome/inkscape/palettes/README
+share/gnome/inkscape/palettes/Tango-Palette.gpl
 share/gnome/inkscape/palettes/svg.gpl
 share/gnome/inkscape/palettes/webhex.gpl
 share/gnome/inkscape/palettes/websafe22.gpl
@@ -110,8 +122,11 @@ share/gnome/inkscape/templates/black_opaque.svg
 share/gnome/inkscape/templates/business_card_90x50mm.svg
 share/gnome/inkscape/templates/default.cs.svg
 share/gnome/inkscape/templates/default.de.svg
+share/gnome/inkscape/templates/default.es.svg
 share/gnome/inkscape/templates/default.fr.svg
+share/gnome/inkscape/templates/default.hu.svg
 share/gnome/inkscape/templates/default.it.svg
+share/gnome/inkscape/templates/default.pl.svg
 share/gnome/inkscape/templates/default.svg
 share/gnome/inkscape/templates/default_mm.svg
 share/gnome/inkscape/templates/default_pt.svg
@@ -129,21 +144,22 @@ share/gnome/inkscape/templates/web_banner_468x60.svg
 share/gnome/inkscape/templates/web_banner_728x90.svg
 share/gnome/inkscape/templates/white_opaque.svg
 share/gnome/inkscape/tutorials/README
-share/gnome/inkscape/tutorials/elementsofdesign.sl.svg
 share/gnome/inkscape/tutorials/gpl-2.svg
 share/gnome/inkscape/tutorials/making_markers.svg
 share/gnome/inkscape/tutorials/oldguitar.jpg
+share/gnome/inkscape/tutorials/potrace-de.png
 share/gnome/inkscape/tutorials/potrace-fr.png
 share/gnome/inkscape/tutorials/potrace.png
-share/gnome/inkscape/tutorials/tipsandtricks.sl.svg
+share/gnome/inkscape/tutorials/tutorial-advanced.es.svg
 share/gnome/inkscape/tutorials/tutorial-advanced.fr.svg
-share/gnome/inkscape/tutorials/tutorial-advanced.jp.svg
+share/gnome/inkscape/tutorials/tutorial-advanced.ja.svg
 share/gnome/inkscape/tutorials/tutorial-advanced.sl.svg
 share/gnome/inkscape/tutorials/tutorial-advanced.svg
 share/gnome/inkscape/tutorials/tutorial-basic.ca.svg
+share/gnome/inkscape/tutorials/tutorial-basic.de.svg
 share/gnome/inkscape/tutorials/tutorial-basic.es.svg
 share/gnome/inkscape/tutorials/tutorial-basic.fr.svg
-share/gnome/inkscape/tutorials/tutorial-basic.jp.svg
+share/gnome/inkscape/tutorials/tutorial-basic.ja.svg
 share/gnome/inkscape/tutorials/tutorial-basic.nn.svg
 share/gnome/inkscape/tutorials/tutorial-basic.ru.svg
 share/gnome/inkscape/tutorials/tutorial-basic.sl.svg
@@ -154,16 +170,22 @@ share/gnome/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/gnome/inkscape/tutorials/tutorial-calligraphy.svg
 share/gnome/inkscape/tutorials/tutorial-elements.es.svg
 share/gnome/inkscape/tutorials/tutorial-elements.fr.svg
+share/gnome/inkscape/tutorials/tutorial-elements.sl.svg
 share/gnome/inkscape/tutorials/tutorial-elements.svg
+share/gnome/inkscape/tutorials/tutorial-shapes.ca.svg
 share/gnome/inkscape/tutorials/tutorial-shapes.es.svg
 share/gnome/inkscape/tutorials/tutorial-shapes.fr.svg
-share/gnome/inkscape/tutorials/tutorial-shapes.jp.svg
+share/gnome/inkscape/tutorials/tutorial-shapes.ja.svg
 share/gnome/inkscape/tutorials/tutorial-shapes.sl.svg
 share/gnome/inkscape/tutorials/tutorial-shapes.svg
+share/gnome/inkscape/tutorials/tutorial-tips.es.svg
 share/gnome/inkscape/tutorials/tutorial-tips.fr.svg
+share/gnome/inkscape/tutorials/tutorial-tips.sl.svg
 share/gnome/inkscape/tutorials/tutorial-tips.svg
+share/gnome/inkscape/tutorials/tutorial-tracing.de.svg
 share/gnome/inkscape/tutorials/tutorial-tracing.es.svg
 share/gnome/inkscape/tutorials/tutorial-tracing.fr.svg
+share/gnome/inkscape/tutorials/tutorial-tracing.sl.svg
 share/gnome/inkscape/tutorials/tutorial-tracing.svg
 share/gnome/inkscape/tutorials/tux.png
 share/gnome/inkscape/ui/keybindings.rc
@@ -183,15 +205,18 @@ share/locale/el/LC_MESSAGES/inkscape.mo
 share/locale/es/LC_MESSAGES/inkscape.mo
 share/locale/es_MX/LC_MESSAGES/inkscape.mo
 share/locale/et/LC_MESSAGES/inkscape.mo
+share/locale/eu/LC_MESSAGES/inkscape.mo
 share/locale/fr/LC_MESSAGES/inkscape.mo
 share/locale/ga/LC_MESSAGES/inkscape.mo
 share/locale/gl/LC_MESSAGES/inkscape.mo
 share/locale/hu/LC_MESSAGES/inkscape.mo
 share/locale/it/LC_MESSAGES/inkscape.mo
 share/locale/ja/LC_MESSAGES/inkscape.mo
+share/locale/mk/LC_MESSAGES/inkscape.mo
 share/locale/nb/LC_MESSAGES/inkscape.mo
 share/locale/nl/LC_MESSAGES/inkscape.mo
 share/locale/nn/LC_MESSAGES/inkscape.mo
+share/locale/pa/LC_MESSAGES/inkscape.mo
 share/locale/pl/LC_MESSAGES/inkscape.mo
 share/locale/pt/LC_MESSAGES/inkscape.mo
 share/locale/pt_BR/LC_MESSAGES/inkscape.mo