On Sat, Apr 30, 2011 at 10:38:59AM -0400, Brad wrote: > Here is an update to inkscape 0.48.1.
An updated diff to sync with the ports tree. No change over the previous diff. Index: Makefile =================================================================== RCS file: /home/cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 17 Nov 2010 08:05:14 -0000 1.19 +++ Makefile 29 Apr 2011 23:43:35 -0000 @@ -2,32 +2,29 @@ COMMENT= SVG vector drawing application -DISTNAME= inkscape-0.48.0 -REVISION= 0 +DISTNAME= inkscape-0.48.1 CATEGORIES= graphics - -MAINTAINER= Benoit Chesneau <beno...@metavers.net> +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} HOMEPAGE= http://www.inkscape.org/ -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/} +MAINTAINER= Benoit Chesneau <beno...@metavers.net> -# GPLv2/LGPLv2.1 +# GPLv2 and LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender aspell atk-1.0 c cairo \ - cairomm-1.0 expat fontconfig freetype glib-2.0 glibmm-2.4 \ - gmodule-2.0 gobject-2.0 gsl gslcblas gthread-2.0 m \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread \ - sigc-2.0 stdc++ xml2 z gio-2.0 giomm-2.4 \ - pthread-stubs xcb gc>=3 popt MagickCore Magick++ \ - lcms png xslt poppler poppler-glib atkmm-1.6 gdkmm-2.4 \ - gtkmm-2.4 pangomm-1.4 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ - gtkspell xcb-render xcb-render-util +WANTLIB= GL Magick++ MagickCore X11 Xau Xcomposite Xcursor Xdamage \ + Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm \ + aspell atk-1.0 atkmm-1.6 c cairo cairomm-1.0 drm expat \ + fontconfig freetype gc gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 \ + gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 \ + gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell \ + lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 \ + pixman-1 png poppler poppler-glib popt pthread pthread-stubs \ + sigc-2.0 stdc++ xcb xcb-render xcb-shm xml2 xslt z MODULES= devel/gettext \ textproc/intltool @@ -51,17 +48,15 @@ RUN_DEPENDS= devel/desktop-file-utils \ USE_GMAKE= Yes USE_LIBTOOL= Yes -USE_GROFF = Yes -NO_REGRESS= Yes - -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --disable-silent-rules --without-gnome-vfs +USE_GROFF= Yes +CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.67 +CONFIGURE_ARGS= --disable-silent-rules \ + --without-gnome-vfs +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/ImageMagick \ + -I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ - -I${LOCALBASE}/include/libpng \ - -I${LOCALBASE}/include/ImageMagick - -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +NO_REGRESS= Yes .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 5 Oct 2010 08:57:47 -0000 1.2 +++ distinfo 29 Apr 2011 19:54:01 -0000 @@ -1,5 +1,5 @@ -MD5 (inkscape-0.48.0.tar.gz) = u5RUO4ExV9gygWV6iUZdRg== -RMD160 (inkscape-0.48.0.tar.gz) = DZfBcTb+aaIki7TPTS9ils4Yw38= -SHA1 (inkscape-0.48.0.tar.gz) = IgremBBpqR06+rnL/3X2XHURnaI= -SHA256 (inkscape-0.48.0.tar.gz) = CBL2ymOqfEuyNskyoCvU4MtSCUBLtCz/X2WtD4SEQXY= -SIZE (inkscape-0.48.0.tar.gz) = 25870275 +MD5 (inkscape-0.48.1.tar.gz) = PBeeuZjUnRwxKCLhV3O/bQ== +RMD160 (inkscape-0.48.1.tar.gz) = oaIe24diSXKwvJhaeqIdOvcKySM= +SHA1 (inkscape-0.48.1.tar.gz) = pDRnEZklrucNHWPXRvmEartN6pE= +SHA256 (inkscape-0.48.1.tar.gz) = Cn90TjJupaNeZEzo5JuG+gQ7z30ihwhnmhX/CxTzqIg= +SIZE (inkscape-0.48.1.tar.gz) = 26249296 Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 29 Apr 2011 21:51:18 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.ac.orig Fri Apr 29 17:50:22 2011 ++++ configure.ac Fri Apr 29 17:51:09 2011 +@@ -767,7 +767,7 @@ if test "x$cairo_pdf" = "xyes"; then + fi + + dnl Shouldn't we test for libpng and libz? +-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 -ldl" ++INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lX11 -lxml2 $lt_cv_dlopen_libs" + if test "x$openmp_ok" = "xyes"; then + INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp" + fi Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 5 Oct 2010 08:57:47 -0000 1.4 +++ pkg/PLIST 29 Apr 2011 23:35:12 -0000 @@ -628,6 +628,7 @@ share/inkscape/tutorials/potrace-es.png share/inkscape/tutorials/potrace-eu.png share/inkscape/tutorials/potrace-fr.png share/inkscape/tutorials/potrace-hu.png +share/inkscape/tutorials/potrace-id.png share/inkscape/tutorials/potrace-ja.png share/inkscape/tutorials/potrace-nl.png share/inkscape/tutorials/potrace-pl.png @@ -697,7 +698,9 @@ share/inkscape/tutorials/tutorial-callig share/inkscape/tutorials/tutorial-calligraphy.fa.svg share/inkscape/tutorials/tutorial-calligraphy.fr.svg share/inkscape/tutorials/tutorial-calligraphy.hu.svg +share/inkscape/tutorials/tutorial-calligraphy.id.svg share/inkscape/tutorials/tutorial-calligraphy.ja.svg +share/inkscape/tutorials/tutorial-calligraphy.nl.svg share/inkscape/tutorials/tutorial-calligraphy.pl.svg share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg share/inkscape/tutorials/tutorial-calligraphy.ru.svg @@ -714,7 +717,9 @@ share/inkscape/tutorials/tutorial-elemen share/inkscape/tutorials/tutorial-elements.fa.svg share/inkscape/tutorials/tutorial-elements.fr.svg share/inkscape/tutorials/tutorial-elements.hu.svg +share/inkscape/tutorials/tutorial-elements.id.svg share/inkscape/tutorials/tutorial-elements.ja.svg +share/inkscape/tutorials/tutorial-elements.nl.svg share/inkscape/tutorials/tutorial-elements.pl.svg share/inkscape/tutorials/tutorial-elements.pt_BR.svg share/inkscape/tutorials/tutorial-elements.ru.svg @@ -727,6 +732,7 @@ share/inkscape/tutorials/tutorial-interp share/inkscape/tutorials/tutorial-interpolate.fr.svg share/inkscape/tutorials/tutorial-interpolate.hu.svg share/inkscape/tutorials/tutorial-interpolate.ja.svg +share/inkscape/tutorials/tutorial-interpolate.nl.svg share/inkscape/tutorials/tutorial-interpolate.pl.svg share/inkscape/tutorials/tutorial-interpolate.sk.svg share/inkscape/tutorials/tutorial-interpolate.sl.svg @@ -763,8 +769,10 @@ share/inkscape/tutorials/tutorial-tips.e share/inkscape/tutorials/tutorial-tips.fa.svg share/inkscape/tutorials/tutorial-tips.fr.svg share/inkscape/tutorials/tutorial-tips.hu.svg +share/inkscape/tutorials/tutorial-tips.id.svg share/inkscape/tutorials/tutorial-tips.it.svg share/inkscape/tutorials/tutorial-tips.ja.svg +share/inkscape/tutorials/tutorial-tips.nl.svg share/inkscape/tutorials/tutorial-tips.pl.svg share/inkscape/tutorials/tutorial-tips.pt_BR.svg share/inkscape/tutorials/tutorial-tips.ru.svg @@ -781,6 +789,7 @@ share/inkscape/tutorials/tutorial-tracin share/inkscape/tutorials/tutorial-tracing.fa.svg share/inkscape/tutorials/tutorial-tracing.fr.svg share/inkscape/tutorials/tutorial-tracing.hu.svg +share/inkscape/tutorials/tutorial-tracing.id.svg share/inkscape/tutorials/tutorial-tracing.ja.svg share/inkscape/tutorials/tutorial-tracing.nl.svg share/inkscape/tutorials/tutorial-tracing.pl.svg -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.