5 files changed, 88 insertions, 91 deletions

diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 46838e121218..f79089781221 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -6,40 +6,33 @@
 #
 
 PORTNAME=	synfigstudio
-DISTVERSION=	0.61.06
+DISTVERSION=	0.61.08
 CATEGORIES=	graphics multimedia
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=synfig
+MASTER_SITES=	SF/synfig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vector-based 2D animation software package
 
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	synfig.0:${PORTSDIR}/devel/synfig \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
 
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget gtk20
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-USE_GNOME=	gtk20 gnomehack
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-
-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} 's|TARGET_MNG="no"|TARGET_MNG="yes"|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} 's|#include <sigc++\/compatibility\.h>||g ; \
-		s|SigC::Connection|sigc::connection|g ; \
-		s|SigC::slot|sigc::ptr_fun|g ; \
-		s|namespace SigC|namespace sigc|g' \
-			${WRKSRC}/src/gtkmm/*.*
+	@${REINPLACE_CMD} '/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
+		 /optimization_flags/s|CFLAGS=|#CFLAGS=|' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
+.for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
diff --git a/graphics/synfigstudio/distinfo b/graphics/synfigstudio/distinfo
index 2147badadf21..321a13187973 100644
--- a/graphics/synfigstudio/distinfo
+++ b/graphics/synfigstudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (synfigstudio-0.61.06.tar.gz) = 57ce0ce7102dfdb43d5cdb0484fa986e
-SHA256 (synfigstudio-0.61.06.tar.gz) = 9b1d37c4d6e6b4acce6d6778d435f78845b4dbcd30e389c1dc86e741c2e60cee
-SIZE (synfigstudio-0.61.06.tar.gz) = 910409
+MD5 (synfigstudio-0.61.08.tar.gz) = e75cd46d2449ad057f3e2a31b451c7b7
+SHA256 (synfigstudio-0.61.08.tar.gz) = affc1424ab179464605bd73e05cd35a22a46147dac067de5ca34d7d9c13ca137
+SIZE (synfigstudio-0.61.08.tar.gz) = 1204766
diff --git a/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp b/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
index 28b4dae65cac..c7fda7319959 100644
--- a/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
+++ b/graphics/synfigstudio/files/patch-src_synfigapp_cvs.cpp
@@ -1,24 +1,11 @@
---- src/synfigapp/cvs.cpp.orig	Sun Jun 24 17:35:08 2007
-+++ src/synfigapp/cvs.cpp	Sun Jun 24 17:38:54 2007
-@@ -39,6 +39,8 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <pthread.h>
-+#include <fcntl.h>
- //#include <unistd.h>
- 
- #include <cassert>
-@@ -60,10 +62,10 @@
+--- 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 @@
  #define HAVE_STRPTIME
  #endif
  
 -#ifdef __APPLE__
-+//#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
  time_t _daylight_() { time_t t(time(0)); return localtime(&t)->tm_gmtoff; }
  #define daylight _daylight_()
--#endif
-+//#endif
- 
- /* === G L O B A L S ======================================================= */
- 
+ #endif
diff --git a/graphics/synfigstudio/pkg-descr b/graphics/synfigstudio/pkg-descr
index 4d46f91b10f3..1c56695accd2 100644
--- a/graphics/synfigstudio/pkg-descr
+++ b/graphics/synfigstudio/pkg-descr
@@ -2,4 +2,4 @@ synfigstudio is the animation studio for synfig and provides the GUI
 interface to create synfig animations which are saved in synfig .sif
 format.
 
-WWW: http://www.synfig.com/
+WWW: http://www.synfig.org/
diff --git a/graphics/synfigstudio/pkg-plist b/graphics/synfigstudio/pkg-plist
index 1f05b9b97936..be51bd8b99af 100644
--- a/graphics/synfigstudio/pkg-plist
+++ b/graphics/synfigstudio/pkg-plist
@@ -20,6 +20,7 @@ include/synfigapp-0.0/synfigapp/colorset.h
 include/synfigapp-0.0/synfigapp/cvs.h
 include/synfigapp-0.0/synfigapp/editmode.h
 include/synfigapp-0.0/synfigapp/editmodeset.h
+include/synfigapp-0.0/synfigapp/general.h
 include/synfigapp-0.0/synfigapp/gradientset.h
 include/synfigapp-0.0/synfigapp/groupaddlayers.h
 include/synfigapp-0.0/synfigapp/groupremove.h
@@ -83,63 +84,79 @@ lib/libsynfigapp.la
 lib/libsynfigapp.so
 lib/libsynfigapp.so.0
 share/applications/synfigstudio.desktop
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/locale/es/LC_MESSAGES/synfigstudio.mo
+share/locale/fr/LC_MESSAGES/synfigstudio.mo
 share/mime-info/synfigstudio.keys
 share/mime-info/synfigstudio.mime
-share/pixmaps/about_dialog.png
-share/pixmaps/about_icon.png
-share/pixmaps/angle_icon.png
-share/pixmaps/bline_icon.png
-share/pixmaps/blinepoint_icon.png
-share/pixmaps/bool_icon.png
-share/pixmaps/canvas_icon.png
-share/pixmaps/canvas_pointer_icon.png
-share/pixmaps/children_icon.png
-share/pixmaps/circle_icon.png
-share/pixmaps/clear_redo_icon.png
-share/pixmaps/clear_undo_icon.png
-share/pixmaps/color_icon.png
-share/pixmaps/curves_icon.png
-share/pixmaps/draw_icon.png
-share/pixmaps/duplicate_icon.png
-share/pixmaps/eyedrop_icon.png
-share/pixmaps/fill_icon.png
-share/pixmaps/gradient_icon.png
-share/pixmaps/group_icon.png
-share/pixmaps/info_icon.png
-share/pixmaps/installer_logo.png
-share/pixmaps/installer_logo_osx.png
-share/pixmaps/integer_icon.png
-share/pixmaps/keyframe_icon.png
-share/pixmaps/keyframe_lock_all.png
-share/pixmaps/keyframe_lock_future.png
-share/pixmaps/keyframe_lock_none.png
-share/pixmaps/keyframe_lock_past.png
-share/pixmaps/layer_icon.png
-share/pixmaps/list_icon.png
-share/pixmaps/meta_data_icon.png
-share/pixmaps/mirror_icon.png
-share/pixmaps/navigator_icon.png
-share/pixmaps/normal_icon.png
-share/pixmaps/pastecanvas_icon.png
-share/pixmaps/polygon_icon.png
-share/pixmaps/real_icon.png
-share/pixmaps/rectangle_icon.png
-share/pixmaps/rotate_icon.png
-share/pixmaps/saveall_icon.png
-share/pixmaps/scale_icon.png
-share/pixmaps/segment_icon.png
 share/pixmaps/sif_icon.png
-share/pixmaps/sketch_icon.png
-share/pixmaps/smooth_move_icon.png
-share/pixmaps/string_icon.png
-share/pixmaps/swap_colors_icon.png
 share/pixmaps/synfig_icon.png
-share/pixmaps/time_track_icon.png
-share/pixmaps/valuenode_icon.png
-share/pixmaps/vector_icon.png
-share/pixmaps/width_icon.png
-share/pixmaps/zoom_icon.png
+share/pixmaps/synfigstudio/about_icon.png
+share/pixmaps/synfigstudio/angle_icon.png
+share/pixmaps/synfigstudio/bline_icon.png
+share/pixmaps/synfigstudio/blinepoint_icon.png
+share/pixmaps/synfigstudio/bool_icon.png
+share/pixmaps/synfigstudio/canvas_icon.png
+share/pixmaps/synfigstudio/canvas_pointer_icon.png
+share/pixmaps/synfigstudio/children_icon.png
+share/pixmaps/synfigstudio/circle_icon.png
+share/pixmaps/synfigstudio/clear_redo_icon.png
+share/pixmaps/synfigstudio/clear_undo_icon.png
+share/pixmaps/synfigstudio/color_icon.png
+share/pixmaps/synfigstudio/curves_icon.png
+share/pixmaps/synfigstudio/draw_icon.png
+share/pixmaps/synfigstudio/duplicate_icon.png
+share/pixmaps/synfigstudio/encapsulate_icon.png
+share/pixmaps/synfigstudio/eyedrop_icon.png
+share/pixmaps/synfigstudio/fill_icon.png
+share/pixmaps/synfigstudio/gradient_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/integer_icon.png
+share/pixmaps/synfigstudio/keyframe_icon.png
+share/pixmaps/synfigstudio/keyframe_lock_all.png
+share/pixmaps/synfigstudio/keyframe_lock_future.png
+share/pixmaps/synfigstudio/keyframe_lock_none.png
+share/pixmaps/synfigstudio/keyframe_lock_past.png
+share/pixmaps/synfigstudio/layer_icon.png
+share/pixmaps/synfigstudio/list_icon.png
+share/pixmaps/synfigstudio/meta_data_icon.png
+share/pixmaps/synfigstudio/mirror_icon.png
+share/pixmaps/synfigstudio/navigator_icon.png
+share/pixmaps/synfigstudio/normal_icon.png
+share/pixmaps/synfigstudio/pastecanvas_icon.png
+share/pixmaps/synfigstudio/polygon_icon.png
+share/pixmaps/synfigstudio/real_icon.png
+share/pixmaps/synfigstudio/rectangle_icon.png
+share/pixmaps/synfigstudio/rename_icon.png
+share/pixmaps/synfigstudio/rotate_icon.png
+share/pixmaps/synfigstudio/saveall_icon.png
+share/pixmaps/synfigstudio/scale_icon.png
+share/pixmaps/synfigstudio/segment_icon.png
+share/pixmaps/synfigstudio/select_all_child_layers_icon.png
+share/pixmaps/synfigstudio/sif_icon.png
+share/pixmaps/synfigstudio/sketch_icon.png
+share/pixmaps/synfigstudio/smooth_move_icon.png
+share/pixmaps/synfigstudio/splash_screen.png
+share/pixmaps/synfigstudio/string_icon.png
+share/pixmaps/synfigstudio/swap_colors_icon.png
+share/pixmaps/synfigstudio/synfig_icon.png
+share/pixmaps/synfigstudio/time_icon.png
+share/pixmaps/synfigstudio/time_track_icon.png
+share/pixmaps/synfigstudio/valuenode_icon.png
+share/pixmaps/synfigstudio/vector_icon.png
+share/pixmaps/synfigstudio/width_icon.png
+share/pixmaps/synfigstudio/zoom_icon.png
+@dirrm share/pixmaps/synfigstudio
 @dirrmtry share/mime-info
 @dirrmtry share/applications
 @dirrm include/synfigapp-0.0/synfigapp
 @dirrm include/synfigapp-0.0
+%%PORTDOCS%%@dirrm %%DOCSDIR%%