svn commit: r313634 - in head/graphics/inkscape: . files

[Koop Mast]

Author: kwm
Date: Fri Mar  8 10:58:45 2013
New Revision: 313634
URL: http://svnweb.freebsd.org/changeset/ports/313634

Log:
  Update to 0.48.4.
  
  Convert to optionsNG, update Makefile and comment. Remove shlib versions.
  add USE_GCC=any since it doesn't compile with clang, and restrict manpages to
  the english version only.

Added:
  head/graphics/inkscape/files/patch-Makefile.in   (contents, props changed)
Deleted:
  head/graphics/inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp
  head/graphics/inkscape/files/patch-src_helper_png-write.cpp
  head/graphics/inkscape/files/patch-src_sp-image.cpp
Modified:
  head/graphics/inkscape/Makefile
  head/graphics/inkscape/distinfo   (contents, props changed)
  head/graphics/inkscape/pkg-plist   (contents, props changed)

Modified: head/graphics/inkscape/Makefile
==============================================================================
--- head/graphics/inkscape/Makefile	Fri Mar  8 10:51:34 2013	(r313633)
+++ head/graphics/inkscape/Makefile	Fri Mar  8 10:58:45 2013	(r313634)
@@ -1,33 +1,29 @@
-# New ports collection makefile for:	inkscape
-# Date created:		17 Nov 2003
-# Whom:			Alexander Nedotsukov <bland at FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	inkscape
-PORTVERSION=	0.48.2
-PORTREVISION=	3
+PORTVERSION=	0.48.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT=	A program seeks to become a full featured open source SVG editor
+COMMENT=	Full featured open source SVG editor
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		gc.1:${PORTSDIR}/devel/boehm-gc \
-		gsl.16:${PORTSDIR}/math/gsl \
-		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
-		lcms.1:${PORTSDIR}/graphics/lcms \
+LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt \
+		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		gc:${PORTSDIR}/devel/boehm-gc \
+		gsl:${PORTSDIR}/math/gsl \
+		gtkspell:${PORTSDIR}/textproc/gtkspell \
+		lcms:${PORTSDIR}/graphics/lcms \
 		wpg-0.2:${PORTSDIR}/graphics/libwpg \
 		png15:${PORTSDIR}/graphics/png \
 		Magick++:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
 
 USE_BZIP2=	yes
+USE_GCC=	any
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
@@ -39,23 +35,25 @@ INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-MAN1=		inkscape.1
-MAN1_EN=	inkview.1
-MANLANG=	"" fr
+MAN1=		inkscape.1 inkview.1
+NO_MANCOMPRESS=	yes
 
-OPTIONS=	POPPLER	"Enable libpoppler-cairo for rendering PDF preview" on
+OPTIONS_DEFINE=	GNOMEVFS POPPLER
+OPTIONS_DEFAULT=POPPLER
+POPPLER_DESC=	PDF preview rendering
+GNOMEVFS_DESC=	Use gnomevfs for loading files
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${HAVE_GNOME:Mgnomevfs2} != ""
+.if ${PORT_OPTIONS:MGNOMEVFS}
 USE_GNOME+=		gnomevfs2
 CONFIGURE_ARGS+=	--with-gnome-vfs
 .else
 CONFIGURE_ARGS+=	--without-gnome-vfs
 .endif
 
-.if defined(WITH_POPPLER)
-LIB_DEPENDS+=		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+.if ${PORT_OPTIONS:MPOPPLER}
+LIB_DEPENDS+=		poppler-glib:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=	--enable-poppler-cairo
 .else
 CONFIGURE_ARGS+=	--enable-poppler-cairo=no
@@ -77,4 +75,4 @@ post-patch:
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/inkscape/distinfo
==============================================================================
--- head/graphics/inkscape/distinfo	Fri Mar  8 10:51:34 2013	(r313633)
+++ head/graphics/inkscape/distinfo	Fri Mar  8 10:58:45 2013	(r313634)
@@ -1,2 +1,2 @@
-SHA256 (inkscape-0.48.2.tar.bz2) = 223a42ba6e3644bb2956c485ca0c210edc14e90fa882cdc57c1bb9f35b8f6783
-SIZE (inkscape-0.48.2.tar.bz2) = 19583331
+SHA256 (inkscape-0.48.4.tar.bz2) = 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d
+SIZE (inkscape-0.48.4.tar.bz2) = 19712522

Added: head/graphics/inkscape/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/inkscape/files/patch-Makefile.in	Fri Mar  8 10:58:45 2013	(r313634)
@@ -0,0 +1,25 @@
+--- Makefile.in.orig	2013-03-07 08:40:14.000000000 +0000
++++ Makefile.in	2013-03-07 08:59:34.000000000 +0000
+@@ -421,11 +421,6 @@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+ man_MANS = \
+ 	inkscape.1 \
+-	inkscape.el.1		\
+-	inkscape.fr.1		\
+-	inkscape.ja.1		\
+-	inkscape.sk.1		\
+-	inkscape.zh_TW.1		\
+ 	inkview.1
+ 
+ EXTRA_DIST = \
+@@ -1351,9 +1346,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-GraphicsDATA install-man install-manelDATA \
+-	install-manfrDATA install-manjaDATA install-manskDATA \
+-	install-manzhtwDATA
++install-data-am: install-GraphicsDATA install-man 
+ 
+ install-dvi: install-dvi-recursive
+ 

Modified: head/graphics/inkscape/pkg-plist
==============================================================================
--- head/graphics/inkscape/pkg-plist	Fri Mar  8 10:51:34 2013	(r313633)
+++ head/graphics/inkscape/pkg-plist	Fri Mar  8 10:58:45 2013	(r313634)
@@ -415,6 +415,7 @@ share/icons/hicolor/48x48/apps/inkscape.
 %%DATADIR%%/extensions/uniconv-ext.py
 %%DATADIR%%/extensions/uniconv_output.py
 %%DATADIR%%/extensions/voronoi.py
+%%DATADIR%%/extensions/voronoi2svg.py
 %%DATADIR%%/extensions/web-set-att.inx
 %%DATADIR%%/extensions/web-set-att.py
 %%DATADIR%%/extensions/web-transmit-att.inx
@@ -852,8 +853,6 @@ share/locale/zh_TW/LC_MESSAGES/inkscape.
 @dirrm %%DATADIR%%/clipart
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
- at dirrmtry man/fr/man1
- at dirrmtry man/fr
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/te_IN/LC_MESSAGES