--- devel/etl/Makefile	(revision 396681)
+++ devel/etl/Makefile	(working copy)
@@ -10,13 +10,15 @@ 
 MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Voria Extended Class and Template Library
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+LICENSE=	GPLv2 # (or later)
 
+NO_ARCH=	yes
+
 OPTIONS_DEFINE=	DOCS
 
 SYNFIG_VERSION=	1.0
 
-USES=	gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 
 post-install:
--- devel/etl/files/patch-ETL___stringf.h	(revision 396681)
+++ devel/etl/files/patch-ETL___stringf.h	(working copy)
@@ -1,4 +1,4 @@ 
---- ETL/_stringf.h.orig
+--- ETL/_stringf.h.orig	2015-03-28 15:08:17 UTC
 +++ ETL/_stringf.h
 @@ -57,7 +57,7 @@
  
--- devel/etl/files/patch-ETL___surface.h	(revision 396681)
+++ devel/etl/files/patch-ETL___surface.h	(working copy)
@@ -1,4 +1,4 @@ 
---- ETL/_surface.h.orig
+--- ETL/_surface.h.orig	2015-03-28 10:15:00 UTC
 +++ ETL/_surface.h
 @@ -34,6 +34,7 @@
  #include "_misc.h"
--- devel/synfig/Makefile	(revision 396681)
+++ devel/synfig/Makefile	(working copy)
@@ -9,9 +9,9 @@ 
 MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Vector based 2D animation package
 
-LICENSE=	GPLv3
+LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
+BUILD_DEPENDS=	etl>=0.04.18:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
 		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
@@ -23,7 +23,7 @@ 
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libdv.so:${PORTSDIR}/multimedia/libdv
 
-USES=		gettext iconv jpeg libtool pathfix pkgconfig
+USES=		iconv jpeg libtool pathfix pkgconfig
 USE_GNOME=	cairo glibmm libxml++26
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
@@ -34,6 +34,12 @@ 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
@@ -43,9 +49,7 @@ 
 		 s|no_NO|no| ; \
 		 s|pl_PL|pl| ; \
 		 s|sk_SK|sk| ; \
-		 s|sv_SE|sv| ; \
-		 s|<tr1/|<| ; \
-		 s|::tr1||' \
+		 s|sv_SE|sv|' \
 		${WRKSRC}/configure
 
 post-build:
--- devel/synfig/files/patch-src__synfig__main.cpp	(revision 396681)
+++ devel/synfig/files/patch-src__synfig__main.cpp	(working copy)
@@ -1,6 +1,6 @@ 
---- src/synfig/main.cpp.orig	2015-08-21 15:38:05.415768235 +0800
-+++ src/synfig/main.cpp	2015-08-21 15:42:18.215824597 +0800
-@@ -198,7 +198,7 @@
+--- src/synfig/main.cpp.orig	2015-03-28 10:15:01 UTC
++++ src/synfig/main.cpp
+@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String&
  
  	unsigned int i;
  #ifdef _DEBUG
@@ -9,7 +9,7 @@ 
  	std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
  #endif
  #endif
-@@ -490,7 +490,11 @@
+@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fa
  
  	/* Read from /proc/self/exe (symlink) */
  	char* path2 = (char*)malloc(buf_size);
@@ -21,7 +21,7 @@ 
  
  	while (1) {
  		int i;
-@@ -524,9 +528,10 @@
+@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fa
  		/* path is a symlink. Continue loop and resolve this. */
  		strncpy(path, path2, buf_size - 1);
  	}
@@ -33,7 +33,7 @@ 
  	if (result == "")
  	{
  		/* readlink() or stat() failed; this can happen when the program is
-@@ -568,6 +573,7 @@
+@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fa
  		free(line);
  		fclose(f);
  	}
--- devel/synfig/files/patch-src__synfig__transform.cpp	(revision 396681)
+++ devel/synfig/files/patch-src__synfig__transform.cpp	(working copy)
@@ -1,4 +1,4 @@ 
---- src/synfig/transform.cpp.orig
+--- src/synfig/transform.cpp.orig	2015-03-28 10:15:01 UTC
 +++ src/synfig/transform.cpp
 @@ -31,6 +31,7 @@
  
--- devel/synfig/pkg-plist	(revision 396681)
+++ devel/synfig/pkg-plist	(working copy)
@@ -201,37 +201,37 @@ 
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/locale/ar/LC_MESSAGES/synfig.mo
-share/locale/bs/LC_MESSAGES/synfig.mo
-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/gl/LC_MESSAGES/synfig.mo
-share/locale/he/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
-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/sr_RS/LC_MESSAGES/synfig.mo
-share/locale/sv/LC_MESSAGES/synfig.mo
-share/locale/tr/LC_MESSAGES/synfig.mo
-share/locale/uz@Latn/LC_MESSAGES/synfig.mo
-share/locale/zh-Hant/LC_MESSAGES/synfig.mo
-share/locale/zh_CN/LC_MESSAGES/synfig.mo
-share/locale/zh_TW/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/da/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/de/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/el/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/es/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/eu_ES/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/he/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/it/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/no/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/si/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sr_RS/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/zh-Hant/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/synfig.mo
--- graphics/synfigstudio/Makefile	(revision 396681)
+++ graphics/synfigstudio/Makefile	(working copy)
@@ -9,14 +9,13 @@ 
 MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Vector-based 2D animation software package
 
-LICENSE=	GPLv3
+LICENSE=	GPLv2 # (or later)
 
-BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
+BUILD_DEPENDS=	etl>=0.04.18:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	libsynfig.so:${PORTSDIR}/devel/synfig
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info
+USES=		desktop-file-utils gmake libtool pathfix pkgconfig shared-mime-info
 USE_GNOME=	gtkmm30 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-update-mimedb
@@ -27,15 +26,20 @@ 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS JACK NLS
+OPTIONS_SUB=	yes
 
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_ENABLE=	jack
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
 		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 /DATADIRNAME/s|lib|share| ; \
-		 s|<tr1/|<| ; \
-		 s|::tr1||' \
+		 /DATADIRNAME/s|lib|share|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|el_GR|el| ; \
@@ -43,7 +47,8 @@ 
 		 s|no_NO|no| ; \
 		 s|pl_PL|pl| ; \
 		 s|sk_SK|sk| ; \
-		 s|sv_SE|sv|' ${WRKSRC}/po/LINGUAS
+		 s|sv_SE|sv|' \
+		${WRKSRC}/po/LINGUAS
 
 pre-build:
 # FIX LC_MESSAGES
--- graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp	(revision 396681)
+++ graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp	(working copy)
@@ -1,6 +1,6 @@ 
---- src/synfigapp/cvs.cpp.orig	2007-11-13 18:13:07.000000000 +0900
-+++ src/synfigapp/cvs.cpp	2008-03-14 19:39:08.000000000 +0900
-@@ -62,7 +62,7 @@
+--- src/synfigapp/cvs.cpp.orig	2015-03-28 10:15:01 UTC
++++ src/synfigapp/cvs.cpp
+@@ -62,7 +62,7 @@ using namespace synfigapp;
  #define HAVE_STRPTIME
  #endif
  
--- graphics/synfigstudio/pkg-plist	(revision 396681)
+++ graphics/synfigstudio/pkg-plist	(working copy)
@@ -138,40 +138,40 @@ 
 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/ar/LC_MESSAGES/synfigstudio.mo
-share/locale/bs/LC_MESSAGES/synfigstudio.mo
-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/el/LC_MESSAGES/synfigstudio.mo
-share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
-share/locale/es/LC_MESSAGES/synfigstudio.mo
-share/locale/eu/LC_MESSAGES/synfigstudio.mo
-share/locale/eu_ES/LC_MESSAGES/synfigstudio.mo
-share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
-share/locale/fr/LC_MESSAGES/synfigstudio.mo
-share/locale/gl/LC_MESSAGES/synfigstudio.mo
-share/locale/he/LC_MESSAGES/synfigstudio.mo
-share/locale/hu/LC_MESSAGES/synfigstudio.mo
-share/locale/it/LC_MESSAGES/synfigstudio.mo
-share/locale/ja/LC_MESSAGES/synfigstudio.mo
-share/locale/lt/LC_MESSAGES/synfigstudio.mo
-share/locale/nl/LC_MESSAGES/synfigstudio.mo
-share/locale/no/LC_MESSAGES/synfigstudio.mo
-share/locale/pl/LC_MESSAGES/synfigstudio.mo
-share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
-share/locale/ro/LC_MESSAGES/synfigstudio.mo
-share/locale/ru/LC_MESSAGES/synfigstudio.mo
-share/locale/si/LC_MESSAGES/synfigstudio.mo
-share/locale/sk/LC_MESSAGES/synfigstudio.mo
-share/locale/sr_RS/LC_MESSAGES/synfigstudio.mo
-share/locale/sv/LC_MESSAGES/synfigstudio.mo
-share/locale/tr/LC_MESSAGES/synfigstudio.mo
-share/locale/uz@Latn/LC_MESSAGES/synfigstudio.mo
-share/locale/zh-Hant/LC_MESSAGES/synfigstudio.mo
-share/locale/zh_CN/LC_MESSAGES/synfigstudio.mo
-share/locale/zh_TW/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/da/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/de/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/el/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/es/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/eu_ES/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/he/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/it/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/no/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/si/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sr_RS/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/uz@Latn/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/zh-Hant/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/synfigstudio.mo
 share/mime-info/synfigstudio.keys
 share/mime-info/synfigstudio.mime
 share/mime/packages/synfigstudio.xml