devel/etl:

- fix build with clang
- bump PORTREVISION
devel/synfig, graphics/synfigstudio:i
- stage
- unbreak
- add license (GPLv3)
- drop .la files
- update USES
- bump PORTREVISION

PR:		193031
Submitted by:	Ports Fury
Approved by:	portmgr blanket (devel/etl)

devel/etl/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	etl
 PORTVERSION=	0.04.17
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	SF/synfig/releases/${SYNFIG_VERSION}/source/
 DISTNAME=	ETL-${PORTVERSION}

devel/etl/files/patch-ETL___stringf.h

@@ -0,0 +1,11 @@
+--- ETL/_stringf.h.orig
++++ ETL/_stringf.h
+@@ -57,7 +57,7 @@
+ 
+ _ETL_BEGIN_CDECLS
+ 
+-#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_WIN32)
++#if defined(__clang__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(_WIN32)
+ #define ETL_NO_THROW
+ #else
+ #define ETL_NO_THROW throw()

devel/etl/files/patch-ETL___surface.h

@@ -0,0 +1,10 @@
+--- ETL/_surface.h.orig
++++ ETL/_surface.h
+@@ -34,6 +34,7 @@
+ #include "_misc.h"
+ #include <algorithm>
+ #include <cstring>
++#include <cstdlib>
+ 
+ /* === M A C R O S ========================================================= */
+ 

devel/synfig/Makefile

@@ -2,59 +2,68 @@
 # $FreeBSD$
 
 PORTNAME=	synfig
-DISTVERSION=	0.63.05
-PORTREVISION=	6
+PORTVERSION=	0.63.05
+PORTREVISION=	7
 CATEGORIES=	devel graphics multimedia
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vector based 2D animation package
 
-# update to 0.64.1 does pick up ImageMagick correctly but there are a 
-# multitude of c++ build failures which are beyond my skill to fix ..
-BROKEN=		Doesn't pickup ImageMagick anymore.
+LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
+BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
+		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libmng.so:${PORTSDIR}/graphics/libmng \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
-		libdv.so:${PORTSDIR}/multimedia/libdv \
-		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+		libdv.so:${PORTSDIR}/multimedia/libdv
 
-USE_GNOME=	gnomehack glib20 glibmm libxml++26
-USES=		gettext
+USES=		gettext libtool pathfix pkgconfig
+USE_GNOME=	cairo glibmm libxml++26
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
+
+CPPFLAGS+=	$$(Magick++-config --cppflags)
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
-NO_STAGE=	yes
 post-patch:
-	@${REINPLACE_CMD} -e '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
-		 /optimization_flags/s|CFLAGS=|#CFLAGS=|' -e \
-		's|el_GR|el|g' -e \
-		's|no_NO|no|g' -e \
-		's|pl_PL|pl|g' -e \
-		's|sk_SK|sk|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/url_fclose/s|&formatc|formatc|g' \
+	@${REINPLACE_CMD} -e \
+		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
+		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
+		 /MAGICKPP_LIBS/s|-lMagick++|`Magick++-config --libs`| ; \
+		 s|no_NO|no| ; \
+		 s|pl_PL|pl| ; \
+		 s|sk_SK|sk| ; \
+		 s|el_GR|el| ; \
+		 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
-	${MV} ${WRKSRC}/po/no_NO.gmo ${WRKSRC}/po/no.gmo
-	${MV} ${WRKSRC}/po/pl_PL.gmo ${WRKSRC}/po/pl.gmo
-	${MV} ${WRKSRC}/po/sk_SK.gmo ${WRKSRC}/po/sk.gmo
-	${MV} ${WRKSRC}/po/el_GR.gmo ${WRKSRC}/po/el.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
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	(cd ${WRKSRC} &&  ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>

devel/synfig/files/patch-src__modules__mod_magickpp__trgt_magickpp.cpp

@@ -0,0 +1,72 @@
+--- 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)
+ 		{

devel/synfig/pkg-plist

@@ -1,8 +1,6 @@
 bin/synfig
 bin/synfig-config
 etc/synfig_modules.cfg
-include/synfig-0.0/synfig/valuenode_dilist.h
-include/synfig-0.0/synfig/dashitem.h
 include/synfig-0.0/synfig/activepoint.h
 include/synfig-0.0/synfig/angle.h
 include/synfig-0.0/synfig/blinepoint.h
@@ -13,6 +11,7 @@ include/synfig-0.0/synfig/color.h
 include/synfig-0.0/synfig/context.h
 include/synfig-0.0/synfig/curve_helper.h
 include/synfig-0.0/synfig/curveset.h
+include/synfig-0.0/synfig/dashitem.h
 include/synfig-0.0/synfig/distance.h
 include/synfig-0.0/synfig/exception.h
 include/synfig-0.0/synfig/gamma.h
@@ -71,27 +70,35 @@ include/synfig-0.0/synfig/uniqueid.h
 include/synfig-0.0/synfig/value.h
 include/synfig-0.0/synfig/valuenode.h
 include/synfig-0.0/synfig/valuenode_add.h
-include/synfig-0.0/synfig/valuenode_animated.h
+include/synfig-0.0/synfig/valuenode_and.h
 include/synfig-0.0/synfig/valuenode_anglestring.h
+include/synfig-0.0/synfig/valuenode_animated.h
 include/synfig-0.0/synfig/valuenode_atan2.h
 include/synfig-0.0/synfig/valuenode_bline.h
 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_compare.h
 include/synfig-0.0/synfig/valuenode_composite.h
 include/synfig-0.0/synfig/valuenode_const.h
 include/synfig-0.0/synfig/valuenode_cos.h
-include/synfig-0.0/synfig/valuenode_duplicate.h
+include/synfig-0.0/synfig/valuenode_dilist.h
 include/synfig-0.0/synfig/valuenode_dotproduct.h
+include/synfig-0.0/synfig/valuenode_duplicate.h
 include/synfig-0.0/synfig/valuenode_dynamiclist.h
 include/synfig-0.0/synfig/valuenode_exp.h
-include/synfig-0.0/synfig/valuenode_gradientrotate.h
 include/synfig-0.0/synfig/valuenode_gradientcolor.h
-include/synfig-0.0/synfig/valuenode_intstring.h
+include/synfig-0.0/synfig/valuenode_gradientrotate.h
+include/synfig-0.0/synfig/valuenode_greyed.h
 include/synfig-0.0/synfig/valuenode_integer.h
+include/synfig-0.0/synfig/valuenode_intstring.h
 include/synfig-0.0/synfig/valuenode_join.h
 include/synfig-0.0/synfig/valuenode_linear.h
+include/synfig-0.0/synfig/valuenode_log.h
+include/synfig-0.0/synfig/valuenode_not.h
+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_realstring.h
@@ -114,61 +121,35 @@ include/synfig-0.0/synfig/valuenode_vectorangle.h
 include/synfig-0.0/synfig/valuenode_vectorlength.h
 include/synfig-0.0/synfig/valuenode_vectorx.h
 include/synfig-0.0/synfig/valuenode_vectory.h
-include/synfig-0.0/synfig/valuenode_log.h
-include/synfig-0.0/synfig/valuenode_and.h
-include/synfig-0.0/synfig/valuenode_compare.h
-include/synfig-0.0/synfig/valuenode_greyed.h
-include/synfig-0.0/synfig/valuenode_not.h
-include/synfig-0.0/synfig/valuenode_or.h
-include/synfig-0.0/synfig/valuenode_pow.h
 include/synfig-0.0/synfig/valuenode_wplist.h
 include/synfig-0.0/synfig/vector.h
 include/synfig-0.0/synfig/version.h
 include/synfig-0.0/synfig/waypoint.h
 include/synfig-0.0/synfig/widthpoint.h
-lib/libsynfig.la
 lib/libsynfig.so
 lib/libsynfig.so.0
-lib/synfig/modules/liblyr_freetype.la
+lib/libsynfig.so.0.0.0
 lib/synfig/modules/liblyr_freetype.so
-lib/synfig/modules/liblyr_std.la
 lib/synfig/modules/liblyr_std.so
-lib/synfig/modules/libmod_bmp.la
 lib/synfig/modules/libmod_bmp.so
-lib/synfig/modules/libmod_dv.la
 lib/synfig/modules/libmod_dv.so
-lib/synfig/modules/libmod_ffmpeg.la
-lib/synfig/modules/libmod_ffmpeg.so
-lib/synfig/modules/libmod_filter.la
-lib/synfig/modules/libmod_filter.so
-lib/synfig/modules/libmod_geometry.la
-lib/synfig/modules/libmod_geometry.so
-lib/synfig/modules/libmod_gif.la
-lib/synfig/modules/libmod_gif.so
-lib/synfig/modules/libmod_gradient.la
-lib/synfig/modules/libmod_gradient.so
-lib/synfig/modules/libmod_imagemagick.la
-lib/synfig/modules/libmod_imagemagick.so
-lib/synfig/modules/libmod_jpeg.la
-lib/synfig/modules/libmod_jpeg.so
-lib/synfig/modules/libmod_mng.la
-lib/synfig/modules/libmod_mng.so
-lib/synfig/modules/libmod_noise.la
-lib/synfig/modules/libmod_noise.so
-lib/synfig/modules/libmod_openexr.la
-lib/synfig/modules/libmod_openexr.so
-lib/synfig/modules/libmod_particle.la
-lib/synfig/modules/libmod_particle.so
-lib/synfig/modules/libmod_png.la
-lib/synfig/modules/libmod_png.so
-lib/synfig/modules/libmod_ppm.la
-lib/synfig/modules/libmod_ppm.so
-lib/synfig/modules/libmod_yuv420p.la
-lib/synfig/modules/libmod_yuv420p.so
-lib/synfig/modules/libmod_svg.so
-lib/synfig/modules/libmod_svg.la
 lib/synfig/modules/libmod_example.so
-lib/synfig/modules/libmod_example.la
+lib/synfig/modules/libmod_ffmpeg.so
+lib/synfig/modules/libmod_filter.so
+lib/synfig/modules/libmod_geometry.so
+lib/synfig/modules/libmod_gif.so
+lib/synfig/modules/libmod_gradient.so
+lib/synfig/modules/libmod_imagemagick.so
+lib/synfig/modules/libmod_jpeg.so
+lib/synfig/modules/libmod_magickpp.so
+lib/synfig/modules/libmod_mng.so
+lib/synfig/modules/libmod_noise.so
+lib/synfig/modules/libmod_openexr.so
+lib/synfig/modules/libmod_particle.so
+lib/synfig/modules/libmod_png.so
+lib/synfig/modules/libmod_ppm.so
+lib/synfig/modules/libmod_svg.so
+lib/synfig/modules/libmod_yuv420p.so
 libdata/pkgconfig/synfig.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -176,21 +157,21 @@ libdata/pkgconfig/synfig.pc
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+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/fa_IR/LC_MESSAGES/synfig.mo
+share/locale/fr/LC_MESSAGES/synfig.mo
+share/locale/it/LC_MESSAGES/synfig.mo
 share/locale/lt/LC_MESSAGES/synfig.mo
 share/locale/nl/LC_MESSAGES/synfig.mo
-share/locale/sk/LC_MESSAGES/synfig.mo
-share/locale/de/LC_MESSAGES/synfig.mo
-share/locale/en_GB/LC_MESSAGES/synfig.mo
-share/locale/it/LC_MESSAGES/synfig.mo
-share/locale/es/LC_MESSAGES/synfig.mo
-share/locale/fr/LC_MESSAGES/synfig.mo
 share/locale/no/LC_MESSAGES/synfig.mo
 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/sk/LC_MESSAGES/synfig.mo
 share/locale/zh_CN/LC_MESSAGES/synfig.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/synfig/modules

graphics/synfigstudio/Makefile

@@ -2,43 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	synfigstudio
-DISTVERSION=	0.63.05
-PORTREVISION=	2
+PORTVERSION=	0.63.05
+PORTREVISION=	3
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	SF/synfig/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vector-based 2D animation software package
 
-BROKEN=		Fails to compile
+LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	libsynfig.so:${PORTSDIR}/devel/synfig \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
+LIB_DEPENDS=	libsynfig.so:${PORTSDIR}/devel/synfig
 
-USE_GNOME=	gnomehack gtk20
-USES=		gettext gmake
-INSTALLS_ICONS=	yes
+USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
+		shared-mime-info
+USE_GNOME=	gtkmm24
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-update-mimedb
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
-		 /optimization_flags/s|CFLAGS=|#CFLAGS=|' -e \
-		's|sk_SK|sk|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
+		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
+		 s|sk_SK|sk| ; \
+		 s|<tr1/|<| ; \
+		 s|::tr1||' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|<synfig/string_decl.h>|<synfig/string.h>|' \
+		${WRKSRC}/src/gui/preview.cpp
+	@${REINPLACE_CMD} -e \
+		's|\(get_value_node()\).\(clone()\)|\1->\2|' \
+		${WRKSRC}/src/gui/states/state_draw.cpp
+	@${REINPLACE_CMD} -e \
+		's|\(old_value_node\).\(clone()\)|\1->\2|' \
+		${WRKSRC}/src/synfigapp/actions/layerparamdisconnect.cpp
 
+post-build:
 # FIX LC_MESSAGES
-	${MV} ${WRKSRC}/po/sk_SK.gmo ${WRKSRC}/po/sk.gmo
+	@${LN} -sf sk_SK.gmo ${WRKSRC}/po/sk.gmo
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${doc} ${STAGEDIR}${DOCSDIR})
 .endfor
-.endif
 
 .include <bsd.port.mk>

graphics/synfigstudio/pkg-plist

@@ -1,6 +1,4 @@
 bin/synfigstudio
-include/synfigapp-0.0/synfigapp/canvasmetadataset.h
-include/synfigapp-0.0/synfigapp/canvasmetadataerase.h
 include/synfigapp-0.0/synfigapp/action.h
 include/synfigapp-0.0/synfigapp/action_param.h
 include/synfigapp-0.0/synfigapp/action_system.h
@@ -15,12 +13,14 @@ include/synfigapp-0.0/synfigapp/blineconvert.h
 include/synfigapp-0.0/synfigapp/blinepointtangentmerge.h
 include/synfigapp-0.0/synfigapp/blinepointtangentsplit.h
 include/synfigapp-0.0/synfigapp/canvasadd.h
-include/synfigapp-0.0/synfigapp/canvasinterface.h
-include/synfigapp-0.0/synfigapp/canvasremove.h
-include/synfigapp-0.0/synfigapp/canvasrenddescset.h
 include/synfigapp-0.0/synfigapp/canvasdescriptionset.h
 include/synfigapp-0.0/synfigapp/canvasidset.h
+include/synfigapp-0.0/synfigapp/canvasinterface.h
+include/synfigapp-0.0/synfigapp/canvasmetadataerase.h
+include/synfigapp-0.0/synfigapp/canvasmetadataset.h
 include/synfigapp-0.0/synfigapp/canvasnameset.h
+include/synfigapp-0.0/synfigapp/canvasremove.h
+include/synfigapp-0.0/synfigapp/canvasrenddescset.h
 include/synfigapp-0.0/synfigapp/colorset.h
 include/synfigapp-0.0/synfigapp/cvs.h
 include/synfigapp-0.0/synfigapp/editmode.h
@@ -48,6 +48,8 @@ include/synfigapp-0.0/synfigapp/layermove.h
 include/synfigapp-0.0/synfigapp/layerparamconnect.h
 include/synfigapp-0.0/synfigapp/layerparamdisconnect.h
 include/synfigapp-0.0/synfigapp/layerparamset.h
+include/synfigapp-0.0/synfigapp/layerparamsetstatic.h
+include/synfigapp-0.0/synfigapp/layerparamunsetstatic.h
 include/synfigapp-0.0/synfigapp/layerraise.h
 include/synfigapp-0.0/synfigapp/layerremove.h
 include/synfigapp-0.0/synfigapp/layersetdesc.h
@@ -60,15 +62,18 @@ include/synfigapp-0.0/synfigapp/timepointsdelete.h
 include/synfigapp-0.0/synfigapp/timepointsmove.h
 include/synfigapp-0.0/synfigapp/uimanager.h
 include/synfigapp-0.0/synfigapp/value_desc.h
+include/synfigapp-0.0/synfigapp/valuedescblinelink.h
 include/synfigapp-0.0/synfigapp/valuedescconnect.h
 include/synfigapp-0.0/synfigapp/valuedescconvert.h
-include/synfigapp-0.0/synfigapp/valuedescblinelink.h
 include/synfigapp-0.0/synfigapp/valuedescdisconnect.h
 include/synfigapp-0.0/synfigapp/valuedescexport.h
 include/synfigapp-0.0/synfigapp/valuedesclink.h
+include/synfigapp-0.0/synfigapp/valuedescremovesmart.h
 include/synfigapp-0.0/synfigapp/valuedescset.h
 include/synfigapp-0.0/synfigapp/valuenodeadd.h
 include/synfigapp-0.0/synfigapp/valuenodeconstset.h
+include/synfigapp-0.0/synfigapp/valuenodeconstsetstatic.h
+include/synfigapp-0.0/synfigapp/valuenodeconstunsetstatic.h
 include/synfigapp-0.0/synfigapp/valuenodedynamiclistinsert.h
 include/synfigapp-0.0/synfigapp/valuenodedynamiclistinsertsmart.h
 include/synfigapp-0.0/synfigapp/valuenodedynamiclistloop.h
@@ -81,24 +86,17 @@ include/synfigapp-0.0/synfigapp/valuenodelinkdisconnect.h
 include/synfigapp-0.0/synfigapp/valuenoderemove.h
 include/synfigapp-0.0/synfigapp/valuenoderename.h
 include/synfigapp-0.0/synfigapp/valuenodereplace.h
-include/synfigapp-0.0/synfigapp/valuedescremovesmart.h
-include/synfigapp-0.0/synfigapp/wplistconverter.h
 include/synfigapp-0.0/synfigapp/waypointadd.h
+include/synfigapp-0.0/synfigapp/waypointconnect.h
+include/synfigapp-0.0/synfigapp/waypointdisconnect.h
 include/synfigapp-0.0/synfigapp/waypointremove.h
 include/synfigapp-0.0/synfigapp/waypointset.h
 include/synfigapp-0.0/synfigapp/waypointsetsmart.h
 include/synfigapp-0.0/synfigapp/waypointsimpleadd.h
-include/synfigapp-0.0/synfigapp/waypointconnect.h
-include/synfigapp-0.0/synfigapp/waypointdisconnect.h
-include/synfigapp-0.0/synfigapp/layerparamsetstatic.h
-include/synfigapp-0.0/synfigapp/layerparamunsetstatic.h
-include/synfigapp-0.0/synfigapp/valuenodeconstsetstatic.h
-include/synfigapp-0.0/synfigapp/valuenodeconstunsetstatic.h
-lib/libsynfigapp.la
+include/synfigapp-0.0/synfigapp/wplistconverter.h
 lib/libsynfigapp.so
 lib/libsynfigapp.so.0
-share/mime/application/x-sif.xml
-share/mime/packages/synfigstudio.xml
+lib/libsynfigapp.so.0.0.0
 share/applications/synfigstudio.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -106,22 +104,6 @@ share/applications/synfigstudio.desktop
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/locale/da/LC_MESSAGES/synfigstudio.mo
-share/locale/de/LC_MESSAGES/synfigstudio.mo
-share/locale/cs/LC_MESSAGES/synfigstudio.mo
-share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
-share/locale/lt/LC_MESSAGES/synfigstudio.mo
-share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
-share/locale/it/LC_MESSAGES/synfigstudio.mo
-share/locale/ca/LC_MESSAGES/synfigstudio.mo
-share/locale/es/LC_MESSAGES/synfigstudio.mo
-share/locale/fr/LC_MESSAGES/synfigstudio.mo
-share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
-share/locale/ru/LC_MESSAGES/synfigstudio.mo
-share/locale/sk/LC_MESSAGES/synfigstudio.mo
-share/locale/zh_CN/LC_MESSAGES/synfigstudio.mo
-share/mime-info/synfigstudio.keys
-share/mime-info/synfigstudio.mime
 share/icons/hicolor/128x128/apps/synfig_icon.png
 share/icons/hicolor/16x16/apps/synfig_icon.png
 share/icons/hicolor/22x22/apps/synfig_icon.png
@@ -130,42 +112,99 @@ share/icons/hicolor/32x32/apps/synfig_icon.png
 share/icons/hicolor/48x48/apps/synfig_icon.png
 share/icons/hicolor/64x64/apps/synfig_icon.png
 share/icons/hicolor/scalable/apps/synfig_icon.svg
+share/locale/ca/LC_MESSAGES/synfigstudio.mo
+share/locale/cs/LC_MESSAGES/synfigstudio.mo
+share/locale/da/LC_MESSAGES/synfigstudio.mo
+share/locale/de/LC_MESSAGES/synfigstudio.mo
+share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
+share/locale/es/LC_MESSAGES/synfigstudio.mo
+share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
+share/locale/fr/LC_MESSAGES/synfigstudio.mo
+share/locale/it/LC_MESSAGES/synfigstudio.mo
+share/locale/lt/LC_MESSAGES/synfigstudio.mo
+share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
+share/locale/ru/LC_MESSAGES/synfigstudio.mo
+share/locale/sk/LC_MESSAGES/synfigstudio.mo
+share/locale/zh_CN/LC_MESSAGES/synfigstudio.mo
+share/mime-info/synfigstudio.keys
+share/mime-info/synfigstudio.mime
+share/mime/packages/synfigstudio.xml
 share/pixmaps/sif_icon.png
 share/pixmaps/synfig_icon.png
-share/pixmaps/synfigstudio/layer_transform_scale_icon.png
-share/pixmaps/synfigstudio/animate_pause_icon.png
-share/pixmaps/synfigstudio/animate_loop_icon.png
-share/pixmaps/synfigstudio/interpolation_type_clamped_icon.png
-share/pixmaps/synfigstudio/interpolation_type_tcb_icon.png
-share/pixmaps/synfigstudio/interpolation_type_ease_icon.png
-share/pixmaps/synfigstudio/interpolation_type_const_icon.png
-share/pixmaps/synfigstudio/interpolation_type_linear_icon.png
-share/pixmaps/synfigstudio/keyframe_lock_past_on_icon.png
-share/pixmaps/synfigstudio/keyframe_lock_past_off_icon.png
-share/pixmaps/synfigstudio/keyframe_lock_future_on_icon.png
-share/pixmaps/synfigstudio/keyframe_lock_future_off_icon.png
-share/pixmaps/synfigstudio/animate_seek_next_keyframe_icon.png
-share/pixmaps/synfigstudio/animate_seek_prev_keyframe_icon.png
-share/pixmaps/synfigstudio/animate_seek_next_frame_icon.png
-share/pixmaps/synfigstudio/animate_seek_prev_frame_icon.png
-share/pixmaps/synfigstudio/animate_seek_begin_icon.png
-share/pixmaps/synfigstudio/animate_seek_end_icon.png
-share/pixmaps/synfigstudio/animate_play_icon.png
-share/pixmaps/synfigstudio/animate_stop_icon.png
-share/pixmaps/synfigstudio/animate_mode_off_icon.png
-share/pixmaps/synfigstudio/animate_mode_on_icon.png
+share/pixmaps/synfigstudio/about_icon.png
+share/pixmaps/synfigstudio/action_add_to_group_icon.png
+share/pixmaps/synfigstudio/action_export_icon.png
 share/pixmaps/synfigstudio/action_flat_interpolation_icon.png
 share/pixmaps/synfigstudio/action_interpolate_interpolation_icon.png
 share/pixmaps/synfigstudio/action_peak_interpolation_icon.png
+share/pixmaps/synfigstudio/action_remove_from_group_icon.png
 share/pixmaps/synfigstudio/action_rounded_interpolation_icon.png
+share/pixmaps/synfigstudio/action_set_layer_description_icon.png
 share/pixmaps/synfigstudio/action_squared_interpolation_icon.png
-share/pixmaps/synfigstudio/layer_geometry_advanced_outline_icon.png
-share/pixmaps/synfigstudio/splash_screen.png
+share/pixmaps/synfigstudio/action_unexport_icon.png
+share/pixmaps/synfigstudio/animate_loop_icon.png
+share/pixmaps/synfigstudio/animate_mode_off_icon.png
+share/pixmaps/synfigstudio/animate_mode_on_icon.png
+share/pixmaps/synfigstudio/animate_pause_icon.png
+share/pixmaps/synfigstudio/animate_play_icon.png
+share/pixmaps/synfigstudio/animate_seek_begin_icon.png
+share/pixmaps/synfigstudio/animate_seek_end_icon.png
+share/pixmaps/synfigstudio/animate_seek_next_frame_icon.png
+share/pixmaps/synfigstudio/animate_seek_next_keyframe_icon.png
+share/pixmaps/synfigstudio/animate_seek_prev_frame_icon.png
+share/pixmaps/synfigstudio/animate_seek_prev_keyframe_icon.png
+share/pixmaps/synfigstudio/animate_stop_icon.png
+share/pixmaps/synfigstudio/canvas_icon.png
+share/pixmaps/synfigstudio/children_icon.png
+share/pixmaps/synfigstudio/clear_redo_icon.png
+share/pixmaps/synfigstudio/clear_undo_icon.png
+share/pixmaps/synfigstudio/curves_icon.png
+share/pixmaps/synfigstudio/decr_resolution_icon.png
+share/pixmaps/synfigstudio/duck_angle_icon.png
+share/pixmaps/synfigstudio/duck_position_icon.png
+share/pixmaps/synfigstudio/duck_radius_icon.png
+share/pixmaps/synfigstudio/duck_tangent_icon.png
+share/pixmaps/synfigstudio/duck_vertex_icon.png
+share/pixmaps/synfigstudio/duck_width_icon.png
+share/pixmaps/synfigstudio/duplicate_icon.png
+share/pixmaps/synfigstudio/encapsulate_icon.png
+share/pixmaps/synfigstudio/group_icon.png
+share/pixmaps/synfigstudio/history_icon.png
+share/pixmaps/synfigstudio/incr_resolution_icon.png
+share/pixmaps/synfigstudio/info_icon.png
+share/pixmaps/synfigstudio/installer_logo.png
+share/pixmaps/synfigstudio/installer_logo_osx.png
+share/pixmaps/synfigstudio/interpolation_type_clamped_icon.png
+share/pixmaps/synfigstudio/interpolation_type_const_icon.png
+share/pixmaps/synfigstudio/interpolation_type_ease_icon.png
+share/pixmaps/synfigstudio/interpolation_type_linear_icon.png
+share/pixmaps/synfigstudio/interpolation_type_tcb_icon.png
+share/pixmaps/synfigstudio/keyframe_icon.png
+share/pixmaps/synfigstudio/keyframe_lock_future_off_icon.png
+share/pixmaps/synfigstudio/keyframe_lock_future_on_icon.png
+share/pixmaps/synfigstudio/keyframe_lock_past_off_icon.png
+share/pixmaps/synfigstudio/keyframe_lock_past_on_icon.png
 share/pixmaps/synfigstudio/layer_blur_blur_icon.png
-share/pixmaps/synfigstudio/layer_example_metaballs_icon.png
+share/pixmaps/synfigstudio/layer_blur_motion_icon.png
+share/pixmaps/synfigstudio/layer_blur_radial_icon.png
+share/pixmaps/synfigstudio/layer_distortion_curvewarp_icon.png
+share/pixmaps/synfigstudio/layer_distortion_insideout_icon.png
+share/pixmaps/synfigstudio/layer_distortion_noise_icon.png
+share/pixmaps/synfigstudio/layer_distortion_spherize_icon.png
+share/pixmaps/synfigstudio/layer_distortion_stretch_icon.png
+share/pixmaps/synfigstudio/layer_distortion_twirl_icon.png
+share/pixmaps/synfigstudio/layer_distortion_warp_icon.png
 share/pixmaps/synfigstudio/layer_example_filledrectangle_icon.png
+share/pixmaps/synfigstudio/layer_example_metaballs_icon.png
 share/pixmaps/synfigstudio/layer_example_simplecircle_icon.png
+share/pixmaps/synfigstudio/layer_filter_clamp_icon.png
+share/pixmaps/synfigstudio/layer_filter_colorcorrect_icon.png
+share/pixmaps/synfigstudio/layer_filter_halftone2_icon.png
+share/pixmaps/synfigstudio/layer_filter_halftone3_icon.png
 share/pixmaps/synfigstudio/layer_filter_lumakey_icon.png
+share/pixmaps/synfigstudio/layer_fractal_julia_icon.png
+share/pixmaps/synfigstudio/layer_fractal_mandelbrot_icon.png
+share/pixmaps/synfigstudio/layer_geometry_advanced_outline_icon.png
 share/pixmaps/synfigstudio/layer_geometry_checkerboard_icon.png
 share/pixmaps/synfigstudio/layer_geometry_circle_icon.png
 share/pixmaps/synfigstudio/layer_geometry_outline_icon.png
@@ -174,14 +213,48 @@ share/pixmaps/synfigstudio/layer_geometry_rectangle_icon.png
 share/pixmaps/synfigstudio/layer_geometry_region_icon.png
 share/pixmaps/synfigstudio/layer_geometry_solidcolor_icon.png
 share/pixmaps/synfigstudio/layer_geometry_star_icon.png
+share/pixmaps/synfigstudio/layer_gradient_conical_icon.png
+share/pixmaps/synfigstudio/layer_gradient_curve_icon.png
 share/pixmaps/synfigstudio/layer_gradient_lineal_icon.png
+share/pixmaps/synfigstudio/layer_gradient_noise_icon.png
+share/pixmaps/synfigstudio/layer_gradient_radial_icon.png
+share/pixmaps/synfigstudio/layer_gradient_spiral_icon.png
+share/pixmaps/synfigstudio/layer_icon.png
 share/pixmaps/synfigstudio/layer_other_duplicate_icon.png
 share/pixmaps/synfigstudio/layer_other_importimage_icon.png
 share/pixmaps/synfigstudio/layer_other_pastecanvas_icon.png
 share/pixmaps/synfigstudio/layer_other_plant_icon.png
+share/pixmaps/synfigstudio/layer_other_supersample_icon.png
 share/pixmaps/synfigstudio/layer_other_text_icon.png
+share/pixmaps/synfigstudio/layer_other_timeloop_icon.png
 share/pixmaps/synfigstudio/layer_other_xorpattern_icon.png
+share/pixmaps/synfigstudio/layer_stylize_bevel_icon.png
+share/pixmaps/synfigstudio/layer_stylize_shade_icon.png
 share/pixmaps/synfigstudio/layer_transform_rotate_icon.png
+share/pixmaps/synfigstudio/layer_transform_scale_icon.png
+share/pixmaps/synfigstudio/layer_transform_translate_icon.png
+share/pixmaps/synfigstudio/meta_data_icon.png
+share/pixmaps/synfigstudio/navigator_icon.png
+share/pixmaps/synfigstudio/onion_skin_icon.png
+share/pixmaps/synfigstudio/palette_icon.png
+share/pixmaps/synfigstudio/params_icon.png
+share/pixmaps/synfigstudio/pastecanvas_icon.png
+share/pixmaps/synfigstudio/plant_icon.png
+share/pixmaps/synfigstudio/preview_options_icon.png
+share/pixmaps/synfigstudio/rename_icon.png
+share/pixmaps/synfigstudio/render_options_icon.png
+share/pixmaps/synfigstudio/reset_colors_icon.png
+share/pixmaps/synfigstudio/saveall_icon.png
+share/pixmaps/synfigstudio/select_all_child_layers_icon.png
+share/pixmaps/synfigstudio/set_fill_color.png
+share/pixmaps/synfigstudio/set_outline_color.png
+share/pixmaps/synfigstudio/show_grid_icon.png
+share/pixmaps/synfigstudio/sif_icon.png
+share/pixmaps/synfigstudio/snap_grid_icon.png
+share/pixmaps/synfigstudio/splash_screen.png
+share/pixmaps/synfigstudio/swap_colors_icon.png
+share/pixmaps/synfigstudio/synfig_icon.png
+share/pixmaps/synfigstudio/time_track_icon.png
 share/pixmaps/synfigstudio/tool_bline_icon.png
 share/pixmaps/synfigstudio/tool_circle_icon.png
 share/pixmaps/synfigstudio/tool_draw_icon.png
@@ -213,82 +286,8 @@ share/pixmaps/synfigstudio/type_segment_icon.png
 share/pixmaps/synfigstudio/type_string_icon.png
 share/pixmaps/synfigstudio/type_time_icon.png
 share/pixmaps/synfigstudio/type_vector_icon.png
-share/pixmaps/synfigstudio/history_icon.png
-share/pixmaps/synfigstudio/palette_icon.png
-share/pixmaps/synfigstudio/params_icon.png
-share/pixmaps/synfigstudio/about_icon.png
-share/pixmaps/synfigstudio/canvas_icon.png
-share/pixmaps/synfigstudio/children_icon.png
-share/pixmaps/synfigstudio/clear_redo_icon.png
-share/pixmaps/synfigstudio/clear_undo_icon.png
-share/pixmaps/synfigstudio/curves_icon.png
-share/pixmaps/synfigstudio/duplicate_icon.png
-share/pixmaps/synfigstudio/encapsulate_icon.png
-share/pixmaps/synfigstudio/group_icon.png
-share/pixmaps/synfigstudio/info_icon.png
-share/pixmaps/synfigstudio/installer_logo.png
-share/pixmaps/synfigstudio/installer_logo_osx.png
-share/pixmaps/synfigstudio/keyframe_icon.png
-share/pixmaps/synfigstudio/layer_icon.png
-share/pixmaps/synfigstudio/meta_data_icon.png
-share/pixmaps/synfigstudio/navigator_icon.png
-share/pixmaps/synfigstudio/pastecanvas_icon.png
-share/pixmaps/synfigstudio/plant_icon.png
-share/pixmaps/synfigstudio/reset_colors_icon.png
-share/pixmaps/synfigstudio/rename_icon.png
-share/pixmaps/synfigstudio/saveall_icon.png
-share/pixmaps/synfigstudio/select_all_child_layers_icon.png
-share/pixmaps/synfigstudio/sif_icon.png
-share/pixmaps/synfigstudio/layer_gradient_spiral_icon.png
-share/pixmaps/synfigstudio/layer_gradient_radial_icon.png
-share/pixmaps/synfigstudio/layer_gradient_noise_icon.png
-share/pixmaps/synfigstudio/layer_gradient_curve_icon.png
-share/pixmaps/synfigstudio/layer_gradient_conical_icon.png
-share/pixmaps/synfigstudio/layer_blur_radial_icon.png
-share/pixmaps/synfigstudio/layer_blur_motion_icon.png
-share/pixmaps/synfigstudio/layer_distortion_curvewarp_icon.png
-share/pixmaps/synfigstudio/layer_distortion_insideout_icon.png
-share/pixmaps/synfigstudio/layer_distortion_noise_icon.png
-share/pixmaps/synfigstudio/layer_distortion_spherize_icon.png
-share/pixmaps/synfigstudio/layer_distortion_stretch_icon.png
-share/pixmaps/synfigstudio/layer_distortion_twirl_icon.png
-share/pixmaps/synfigstudio/layer_distortion_warp_icon.png
-share/pixmaps/synfigstudio/layer_filter_clamp_icon.png
-share/pixmaps/synfigstudio/layer_filter_colorcorrect_icon.png
-share/pixmaps/synfigstudio/layer_filter_halftone2_icon.png
-share/pixmaps/synfigstudio/layer_filter_halftone3_icon.png
-share/pixmaps/synfigstudio/layer_fractal_mandelbrot_icon.png
-share/pixmaps/synfigstudio/layer_fractal_julia_icon.png
-share/pixmaps/synfigstudio/layer_stylize_bevel_icon.png
-share/pixmaps/synfigstudio/layer_stylize_shade_icon.png
-share/pixmaps/synfigstudio/layer_other_supersample_icon.png
-share/pixmaps/synfigstudio/layer_other_timeloop_icon.png
-share/pixmaps/synfigstudio/layer_transform_translate_icon.png
-share/pixmaps/synfigstudio/action_set_layer_description_icon.png
-share/pixmaps/synfigstudio/action_add_to_group_icon.png
-share/pixmaps/synfigstudio/action_remove_from_group_icon.png
-share/pixmaps/synfigstudio/action_export_icon.png
-share/pixmaps/synfigstudio/action_unexport_icon.png
-share/pixmaps/synfigstudio/swap_colors_icon.png
-share/pixmaps/synfigstudio/synfig_icon.png
-share/pixmaps/synfigstudio/time_track_icon.png
 share/pixmaps/synfigstudio/valuenode_icon.png
-share/pixmaps/synfigstudio/set_fill_color.png
-share/pixmaps/synfigstudio/set_outline_color.png
-share/pixmaps/synfigstudio/duck_position_icon.png
-share/pixmaps/synfigstudio/duck_vertex_icon.png
-share/pixmaps/synfigstudio/duck_tangent_icon.png
-share/pixmaps/synfigstudio/duck_radius_icon.png
-share/pixmaps/synfigstudio/duck_width_icon.png
-share/pixmaps/synfigstudio/duck_angle_icon.png
-share/pixmaps/synfigstudio/show_grid_icon.png
-share/pixmaps/synfigstudio/snap_grid_icon.png
-share/pixmaps/synfigstudio/onion_skin_icon.png
-share/pixmaps/synfigstudio/incr_resolution_icon.png
-share/pixmaps/synfigstudio/decr_resolution_icon.png
-share/pixmaps/synfigstudio/render_options_icon.png
-share/pixmaps/synfigstudio/preview_options_icon.png
 @dirrm share/pixmaps/synfigstudio
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/synfigapp-0.0/synfigapp
 @dirrm include/synfigapp-0.0
-%%PORTDOCS%%@dirrm %%DOCSDIR%%