Update synfig ports to 0.64.2 release

PR:		194495
Submitted by:	tkato432@yahoo.com

6 files changed, 91 insertions, 90 deletions

diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index ef36eeea23b5..f51b29adb871 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	synfig
-PORTVERSION=	0.63.05
-PORTREVISION=	8
+PORTVERSION=	0.64.2
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source
 
@@ -13,7 +12,9 @@ COMMENT=	Vector based 2D animation package
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
+		libltdl.so:${PORTSDIR}/devel/libltdl \
+		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libmng.so:${PORTSDIR}/graphics/libmng \
@@ -22,13 +23,13 @@ LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libdv.so:${PORTSDIR}/multimedia/libdv
 
-USES=		gettext libtool pathfix pkgconfig
+USES=		gettext iconv libtool pathfix pkgconfig
 USE_GNOME=	cairo glibmm libxml++26
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	$$(Magick++-config --cppflags)
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -36,29 +37,24 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
 		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 /MAGICKPP_LIBS/s|-lMagick++|`Magick++-config --libs`| ; \
+		 s|el_GR|el| ; \
+		 s|ja_JP|ja| ; \
 		 s|no_NO|no| ; \
 		 s|pl_PL|pl| ; \
 		 s|sk_SK|sk| ; \
-		 s|el_GR|el| ; \
+		 s|sv_SE|sv| ; \
 		 s|<tr1/|<| ; \
 		 s|::tr1||' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		'/url_fclose/s|&formatc|formatc|g' \
-		${WRKSRC}/src/modules/mod_libavcodec/trgt_av.cpp
-.for i in exception.h layer.h target.h time.h
-	@${REINPLACE_CMD} -e \
-		's|"string_decl.h"|"string.h"|' \
-		${WRKSRC}/src/synfig/${i}
-.endfor
 
 post-build:
 # FIX LC_MESSAGES
+	@${LN} -sf el_GR.gmo ${WRKSRC}/po/el.gmo
+	@${LN} -sf ja_JP.gmo ${WRKSRC}/po/ja.gmo
 	@${LN} -sf no_NO.gmo ${WRKSRC}/po/no.gmo
 	@${LN} -sf pl_PL.gmo ${WRKSRC}/po/pl.gmo
 	@${LN} -sf sk_SK.gmo ${WRKSRC}/po/sk.gmo
-	@${LN} -sf el_GR.gmo ${WRKSRC}/po/el.gmo
+	@${LN} -sf sv_SE.gmo ${WRKSRC}/po/sv.gmo
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/synfig/distinfo b/devel/synfig/distinfo
index 8bdd70d08491..20489dec5f73 100644
--- a/devel/synfig/distinfo
+++ b/devel/synfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (synfig-0.63.05.tar.gz) = 47d0f0db5e14b173df36221bcb7428c92651464608e97e4ed6bf40a6fe57b370
-SIZE (synfig-0.63.05.tar.gz) = 3548004
+SHA256 (synfig-0.64.2.tar.gz) = b4fd71a9b1fb29a9f6ad5b098fe0c2fc0c2ecb868139580c7d3689f48318bd12
+SIZE (synfig-0.64.2.tar.gz) = 4015863
diff --git a/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp b/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp
deleted file mode 100644
index c08294a961d5..000000000000
--- a/devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/modules/mod_magickpp/trgt_magickpp.cpp.orig
-+++ src/modules/mod_magickpp/trgt_magickpp.cpp
-@@ -53,16 +53,16 @@
- /* === M E T H O D S ======================================================= */
- 
- template <class Container>
--MagickLib::Image* copy_image_list(Container& container)
-+MagickCore::Image* copy_image_list(Container& container)
- {
- 	typedef typename Container::iterator Iter;
--	MagickLib::Image* previous = 0;
--	MagickLib::Image* first = NULL;
--	MagickLib::ExceptionInfo exceptionInfo;
--	MagickLib::GetExceptionInfo(&exceptionInfo);
-+	MagickCore::Image* previous = 0;
-+	MagickCore::Image* first = NULL;
-+	MagickCore::ExceptionInfo exceptionInfo;
-+	MagickCore::GetExceptionInfo(&exceptionInfo);
- 	for (Iter iter = container.begin(); iter != container.end(); ++iter)
- 	{
--		MagickLib::Image* current;
-+		MagickCore::Image* current;
- 
- 		try
- 		{
-@@ -86,8 +86,8 @@
- 
- magickpp_trgt::~magickpp_trgt()
- {
--	MagickLib::ExceptionInfo exceptionInfo;
--	MagickLib::GetExceptionInfo(&exceptionInfo);
-+	MagickCore::ExceptionInfo exceptionInfo;
-+	MagickCore::GetExceptionInfo(&exceptionInfo);
- 
- 	try
- 	{
-@@ -118,7 +118,6 @@
- 			for_each(images.begin(), images.end(), Magick::animationDelayImage(delay));
- 
- 			// optimize the images (only write the pixels that change from frame to frame
--#ifdef HAVE_MAGICK_OPTIMIZE
- 			// make a completely new image list
- 			// this is required because:
- 			//   RemoveDuplicateLayers wants a linked list of images, and removes some of them
-@@ -126,7 +125,7 @@
- 			//   when we destroy our container, the image is re-freed, failing an assertion
- 
- 			synfig::info("copying image list");
--			MagickLib::Image *image_list = copy_image_list(images);
-+			MagickCore::Image *image_list = copy_image_list(images);
- 
- 			synfig::info("clearing old image list");
- 			images.clear();
-@@ -169,18 +168,6 @@
- 
- 			synfig::info("recreating image list");
- 			insertImages(&images, image_list);
--#else
--			synfig::info("not optimizing images");
--			// DeconstructImages is available in ImageMagic 6.2.* but it doesn't take
--			// the 'dispose' method into account, so for frames with transparency where
--			// nothing is moving, we end up with objects disappearing when they shouldn't
--
--			// linkImages(images.begin(), images.end());
--			// MagickLib::Image* new_images = DeconstructImages(images.begin()->image(),&exceptionInfo);
--			// unlinkImages(images.begin(), images.end());
--			// images.clear();
--			// insertImages(&images, new_images);
--#endif
- 		}
- 		else if (multiple_images)
- 		{
diff --git a/devel/synfig/files/patch-src__synfig__main.cpp b/devel/synfig/files/patch-src__synfig__main.cpp
new file mode 100644
index 000000000000..858e620b02f1
--- /dev/null
+++ b/devel/synfig/files/patch-src__synfig__main.cpp
@@ -0,0 +1,41 @@
+--- src/synfig/main.cpp.orig
++++ src/synfig/main.cpp
+@@ -193,8 +193,10 @@
+ 
+ 	unsigned int i;
+ #ifdef _DEBUG
++#ifndef __clang__
+ 	std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
+ #endif
++#endif
+ 
+ #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE)
+ 	signal(SIGPIPE, broken_pipe_signal);
+@@ -464,7 +466,11 @@
+ 
+ 	/* Read from /proc/self/exe (symlink) */
+ 	char* path2 = (char*)malloc(buf_size);
++#if defined(__FreeBSD__)
++	strncpy(path2, "/proc/curproc/file", buf_size - 1);
++#else
+ 	strncpy(path2, "/proc/self/exe", buf_size - 1);
++#endif
+ 
+ 	while (1) {
+ 		int i;
+@@ -501,6 +507,7 @@
+ 	
+ 	free(path2);
+ 
++#if !defined(__FreeBSD__)
+ 	if (result == "")
+ 	{
+ 		/* readlink() or stat() failed; this can happen when the program is
+@@ -542,6 +549,7 @@
+ 		free(line);
+ 		fclose(f);
+ 	}
++#endif
+ 	
+ 	free(path);
+ 
diff --git a/devel/synfig/files/patch-src__synfig__transform.cpp b/devel/synfig/files/patch-src__synfig__transform.cpp
new file mode 100644
index 000000000000..542f162de27e
--- /dev/null
+++ b/devel/synfig/files/patch-src__synfig__transform.cpp
@@ -0,0 +1,10 @@
+--- src/synfig/transform.cpp.orig
++++ src/synfig/transform.cpp
+@@ -31,6 +31,7 @@
+ 
+ #include "transform.h"
+ #include <algorithm>
++#include <cstdlib>
+ 
+ #endif
+ 
diff --git a/devel/synfig/pkg-plist b/devel/synfig/pkg-plist
index e5c58788edbf..aabad5df4ae5 100644
--- a/devel/synfig/pkg-plist
+++ b/devel/synfig/pkg-plist
@@ -5,6 +5,12 @@ include/synfig-0.0/synfig/activepoint.h
 include/synfig-0.0/synfig/angle.h
 include/synfig-0.0/synfig/blinepoint.h
 include/synfig-0.0/synfig/blur.h
+include/synfig-0.0/synfig/bone.h
+include/synfig-0.0/synfig/boneweightpair.h
+include/synfig-0.0/synfig/cairo_operators.h
+include/synfig-0.0/synfig/cairo_renddesc.h
+include/synfig-0.0/synfig/cairoimporter.h
+include/synfig-0.0/synfig/cairolistimporter.h
 include/synfig-0.0/synfig/canvas.h
 include/synfig-0.0/synfig/canvasbase.h
 include/synfig-0.0/synfig/color.h
@@ -31,10 +37,12 @@ include/synfig-0.0/synfig/layer_motionblur.h
 include/synfig-0.0/synfig/layer_pastecanvas.h
 include/synfig-0.0/synfig/layer_polygon.h
 include/synfig-0.0/synfig/layer_shape.h
+include/synfig-0.0/synfig/layer_skeleton.h
 include/synfig-0.0/synfig/layer_solidcolor.h
 include/synfig-0.0/synfig/listimporter.h
 include/synfig-0.0/synfig/loadcanvas.h
 include/synfig-0.0/synfig/main.h
+include/synfig-0.0/synfig/matrix.h
 include/synfig-0.0/synfig/module.h
 include/synfig-0.0/synfig/mutex.h
 include/synfig-0.0/synfig/node.h
@@ -48,6 +56,7 @@ include/synfig-0.0/synfig/rect.h
 include/synfig-0.0/synfig/releases.h
 include/synfig-0.0/synfig/renddesc.h
 include/synfig-0.0/synfig/render.h
+include/synfig-0.0/synfig/rendermethod.h
 include/synfig-0.0/synfig/savecanvas.h
 include/synfig-0.0/synfig/segment.h
 include/synfig-0.0/synfig/smartfile.h
@@ -56,6 +65,8 @@ include/synfig-0.0/synfig/string_decl.h
 include/synfig-0.0/synfig/surface.h
 include/synfig-0.0/synfig/surfacenew.h
 include/synfig-0.0/synfig/target.h
+include/synfig-0.0/synfig/target_cairo.h
+include/synfig-0.0/synfig/target_cairo_tile.h
 include/synfig-0.0/synfig/target_multi.h
 include/synfig-0.0/synfig/target_null.h
 include/synfig-0.0/synfig/target_null_tile.h
@@ -79,6 +90,9 @@ include/synfig-0.0/synfig/valuenode_blinecalctangent.h
 include/synfig-0.0/synfig/valuenode_blinecalcvertex.h
 include/synfig-0.0/synfig/valuenode_blinecalcwidth.h
 include/synfig-0.0/synfig/valuenode_blinereversetangent.h
+include/synfig-0.0/synfig/valuenode_bone.h
+include/synfig-0.0/synfig/valuenode_boneinfluence.h
+include/synfig-0.0/synfig/valuenode_boneweightpair.h
 include/synfig-0.0/synfig/valuenode_compare.h
 include/synfig-0.0/synfig/valuenode_composite.h
 include/synfig-0.0/synfig/valuenode_const.h
@@ -101,6 +115,7 @@ include/synfig-0.0/synfig/valuenode_or.h
 include/synfig-0.0/synfig/valuenode_pow.h
 include/synfig-0.0/synfig/valuenode_radialcomposite.h
 include/synfig-0.0/synfig/valuenode_range.h
+include/synfig-0.0/synfig/valuenode_real.h
 include/synfig-0.0/synfig/valuenode_realstring.h
 include/synfig-0.0/synfig/valuenode_reciprocal.h
 include/synfig-0.0/synfig/valuenode_reference.h
@@ -109,6 +124,7 @@ include/synfig-0.0/synfig/valuenode_scale.h
 include/synfig-0.0/synfig/valuenode_segcalctangent.h
 include/synfig-0.0/synfig/valuenode_segcalcvertex.h
 include/synfig-0.0/synfig/valuenode_sine.h
+include/synfig-0.0/synfig/valuenode_staticlist.h
 include/synfig-0.0/synfig/valuenode_step.h
 include/synfig-0.0/synfig/valuenode_stripes.h
 include/synfig-0.0/synfig/valuenode_subtract.h
@@ -157,13 +173,20 @@ libdata/pkgconfig/synfig.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+share/locale/ca/LC_MESSAGES/synfig.mo
+share/locale/cs/LC_MESSAGES/synfig.mo
+share/locale/da/LC_MESSAGES/synfig.mo
 share/locale/de/LC_MESSAGES/synfig.mo
 share/locale/el/LC_MESSAGES/synfig.mo
 share/locale/en_GB/LC_MESSAGES/synfig.mo
 share/locale/es/LC_MESSAGES/synfig.mo
+share/locale/eu/LC_MESSAGES/synfig.mo
+share/locale/eu_ES/LC_MESSAGES/synfig.mo
 share/locale/fa_IR/LC_MESSAGES/synfig.mo
 share/locale/fr/LC_MESSAGES/synfig.mo
+share/locale/hu/LC_MESSAGES/synfig.mo
 share/locale/it/LC_MESSAGES/synfig.mo
+share/locale/ja/LC_MESSAGES/synfig.mo
 share/locale/lt/LC_MESSAGES/synfig.mo
 share/locale/nl/LC_MESSAGES/synfig.mo
 share/locale/no/LC_MESSAGES/synfig.mo
@@ -171,5 +194,8 @@ share/locale/pl/LC_MESSAGES/synfig.mo
 share/locale/pt_BR/LC_MESSAGES/synfig.mo
 share/locale/ro/LC_MESSAGES/synfig.mo
 share/locale/ru/LC_MESSAGES/synfig.mo
+share/locale/si/LC_MESSAGES/synfig.mo
 share/locale/sk/LC_MESSAGES/synfig.mo
+share/locale/sv/LC_MESSAGES/synfig.mo
+share/locale/tr/LC_MESSAGES/synfig.mo
 share/locale/zh_CN/LC_MESSAGES/synfig.mo