devel/etl: 0.4.18 -> 0.04.19

devel/synfig: 1.0 -> 1.0.1
graphics/synfigstudio: 1.0 -> 1.0.1

PR:		201175
Submitted by:	Ben Woods <woodsb02@gmail.com> (maintainer)

4 files changed, 67 insertions, 50 deletions

diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 52e1f2639692..10b4fb70f682 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	synfigstudio
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	SF/synfig/releases/${PORTVERSION}/source
 
 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,22 @@ INSTALLS_ICONS=	yes
 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
+
+BROKEN_FreeBSD_9=	Does not build on FreeBSD < 10.x
 
 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 +49,8 @@ post-patch:
 		 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
diff --git a/graphics/synfigstudio/distinfo b/graphics/synfigstudio/distinfo
index 05866309ca05..efc47ce6b725 100644
--- a/graphics/synfigstudio/distinfo
+++ b/graphics/synfigstudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (synfigstudio-1.0.tar.gz) = 2b23916ca0be4073edad9b0cb92fd30311dd3b8f73372c836ba735100251ee28
-SIZE (synfigstudio-1.0.tar.gz) = 5005826
+SHA256 (synfigstudio-1.0.1.tar.gz) = d179046a93c642ba056cc2b35e08242d3b9724b5f3a3709f5a0d40970d49ca49
+SIZE (synfigstudio-1.0.1.tar.gz) = 5207441
diff --git a/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp b/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
index f0453f07a08e..6cbf54847a54 100644
--- a/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
+++ b/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
@@ -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
  
diff --git a/graphics/synfigstudio/pkg-plist b/graphics/synfigstudio/pkg-plist
index 39268a9f6e7e..eec1027bef69 100644
--- a/graphics/synfigstudio/pkg-plist
+++ b/graphics/synfigstudio/pkg-plist
@@ -138,40 +138,44 @@ 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/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/cs_CZ/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_CZ/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/ur/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.Big5/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
@@ -179,6 +183,13 @@ share/pixmaps/sif_icon.png
 share/pixmaps/synfig_icon.png
 share/pixmaps/synfigstudio/about_icon.png
 share/pixmaps/synfigstudio/action_add_to_set_icon.png
+share/pixmaps/synfigstudio/action_doc_new_icon.png
+share/pixmaps/synfigstudio/action_doc_open_icon.png
+share/pixmaps/synfigstudio/action_doc_redo_icon.png
+share/pixmaps/synfigstudio/action_doc_save_icon.png
+share/pixmaps/synfigstudio/action_doc_saveall_icon.png
+share/pixmaps/synfigstudio/action_doc_saveas_icon.png
+share/pixmaps/synfigstudio/action_doc_undo_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
@@ -292,7 +303,6 @@ 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_icon.png