5 files changed, 42 insertions, 40 deletions

diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 0899f38bf1d3..3f4fe8a33c1f 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		aseprite
-PORTVERSION=		1.1.5.6
+PORTVERSION=		1.1.6
 DISTVERSIONPREFIX=	v
 CATEGORIES=		graphics
 
@@ -28,11 +28,13 @@ OPTIONS_DEFAULT=	WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 USE_GITHUB=		yes
-GH_TUPLE=		aseprite:aseprite:b659747
+GH_TUPLE=		aseprite:aseprite:${DISTVERSIONFULL}
+GH_TUPLE+=		aseprite:clip:8e92c5d:clip
 GH_TUPLE+=		aseprite:flic:da184cb:flic
 GH_TUPLE+=		aseprite:gtest:d63c625:gtest
-GH_TUPLE+=		aseprite:simpleini:d4a436a:simpleini
-GH_TUPLE+=		aseprite:duktape:90090c7:duk
+GH_TUPLE+=		aseprite:simpleini:0687587:simpleini
+GH_TUPLE+=		aseprite:duktape:0de771c:duk
+GH_TUPLE+=		dacap:observable:89c9740:observable
 
 USES=			cmake:outsource compiler:c++11-lib jpeg pkgconfig
 USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
@@ -54,19 +56,19 @@ CXXFLAGS+=		-I${LOCALBASE}/include/freetype2
 CXXFLAGS+=		-I${LOCALBASE}/include/freetype2/freetype
 
 post-extract:
-	@${RMDIR} ${WRKSRC}/src/flic ${WRKSRC}/third_party/gtest ${WRKSRC}/third_party/simpleini ${WRKSRC}/third_party/duktape
-	@${MV} ${WRKDIR}/flic-* ${WRKSRC}/src/flic
+	@${RMDIR} ${WRKSRC}/third_party/gtest ${WRKSRC}/third_party/simpleini ${WRKSRC}/third_party/duktape \
+		  ${WRKSRC}/src/clip ${WRKSRC}/src/flic ${WRKSRC}/src/observable
 	@${MV} ${WRKDIR}/gtest-* ${WRKSRC}/third_party/gtest
 	@${MV} ${WRKDIR}/simpleini-* ${WRKSRC}/third_party/simpleini
 	@${MV} ${WRKDIR}/duktape-* ${WRKSRC}/third_party/duktape
+	@${MV} ${WRKDIR}/clip-* ${WRKSRC}/src/clip
+	@${MV} ${WRKDIR}/flic-* ${WRKSRC}/src/flic
+	@${MV} ${WRKDIR}/observable-* ${WRKSRC}/src/observable
 	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman
 	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \
 		${WRKSRC}/third_party/pixman/pixman/
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|-lXxf86dga |-L${LOCALBASE}/lib -lXxf86dga |g' \
-		`find ${WRKDIR} -name link.txt`
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/app/resource_finder.cpp
+post-patch:
+	@${REINPLACE_CMD} -e 's|1.1.6-dev|${PORTVERSION}|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml
 
 .include <bsd.port.mk>
diff --git a/graphics/aseprite/distinfo b/graphics/aseprite/distinfo
index 4270f5c7efef..328c9ed7566f 100644
--- a/graphics/aseprite/distinfo
+++ b/graphics/aseprite/distinfo
@@ -1,11 +1,15 @@
-TIMESTAMP = 1463713231
-SHA256 (aseprite-aseprite-v1.1.5.6-b659747_GH0.tar.gz) = 45b08dcf5fd02a8759c1cfbf5cd7b2c80b988993bd2d7a1f24b8e3601a60245c
-SIZE (aseprite-aseprite-v1.1.5.6-b659747_GH0.tar.gz) = 2979354
+TIMESTAMP = 1467919676
+SHA256 (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 770c2d1a8b68264f10204d815c72df4e25de5e1aeb482348e6909b107048b3fd
+SIZE (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 2576949
+SHA256 (aseprite-clip-8e92c5d_GH0.tar.gz) = 65cd36c5942fb23d4128ff31381a1170264655af8180a4e2f8c0aade489525bf
+SIZE (aseprite-clip-8e92c5d_GH0.tar.gz) = 10561
 SHA256 (aseprite-flic-da184cb_GH0.tar.gz) = 118f422957ea59121a14f0474471cfb09fcf62fe9834b9b683671e53fb675075
 SIZE (aseprite-flic-da184cb_GH0.tar.gz) = 6552
 SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
 SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
-SHA256 (aseprite-simpleini-d4a436a_GH0.tar.gz) = d78bdc44396b81501c5ad1b59d06db9055b037db53ef2a30dd583194ed3133fa
-SIZE (aseprite-simpleini-d4a436a_GH0.tar.gz) = 54668
-SHA256 (aseprite-duktape-90090c7_GH0.tar.gz) = a188d14e622a10429588376da8d77c3a79dd268a241e15a1bc6f2a3e04d126ce
-SIZE (aseprite-duktape-90090c7_GH0.tar.gz) = 608122
+SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b
+SIZE (aseprite-simpleini-0687587_GH0.tar.gz) = 54947
+SHA256 (aseprite-duktape-0de771c_GH0.tar.gz) = 6983173676090b750f866ace66e1462ed1e59619632906abc26804f2e43445a7
+SIZE (aseprite-duktape-0de771c_GH0.tar.gz) = 840744
+SHA256 (dacap-observable-89c9740_GH0.tar.gz) = 05604ada80009d608289b7ec67cf4c47e65d430c678cc838d7fe77ffdcf80e9d
+SIZE (dacap-observable-89c9740_GH0.tar.gz) = 10795
diff --git a/graphics/aseprite/files/patch-src_app_resource__finder.cpp b/graphics/aseprite/files/patch-src_app_resource__finder.cpp
deleted file mode 100644
index 03cee6632cd8..000000000000
--- a/graphics/aseprite/files/patch-src_app_resource__finder.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/app/resource_finder.cpp.orig	2015-11-06 13:40:13 UTC
-+++ src/app/resource_finder.cpp
-@@ -105,7 +105,7 @@ void ResourceFinder::includeDataDir(cons
-     includeBinDir(buf);
-   #else
-     // $BINDIR/../share/aseprite/data/filename (installed in /usr/ or /usr/local/)
--    sprintf(buf, "../share/aseprite/data/%s", filename);
-+    sprintf(buf, "%%LOCALBASE%%/share/aseprite/data/%s", filename);
-     includeBinDir(buf);
-   #endif
- 
diff --git a/graphics/aseprite/files/patch-src_app_util_freetype__utils.cpp b/graphics/aseprite/files/patch-src_app_util_freetype__utils.cpp
deleted file mode 100644
index 1887dbe6b61d..000000000000
--- a/graphics/aseprite/files/patch-src_app_util_freetype__utils.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/app/util/freetype_utils.cpp.orig	2015-11-06 13:40:13 UTC
-+++ src/app/util/freetype_utils.cpp
-@@ -21,7 +21,7 @@
- 
- #include <stdexcept>
- 
--#include "freetype/ftglyph.h"
-+#include <ftglyph.h>
- #include "ft2build.h"
- #include FT_FREETYPE_H
- 
diff --git a/graphics/aseprite/pkg-plist b/graphics/aseprite/pkg-plist
index 360b28d34f2d..5c1f2d7fe006 100644
--- a/graphics/aseprite/pkg-plist
+++ b/graphics/aseprite/pkg-plist
@@ -16,25 +16,40 @@ bin/aseprite
 %%DATADIR%%/data/icons/doc32.png
 %%DATADIR%%/data/icons/doc48.png
 %%DATADIR%%/data/icons/doc64.png
+%%DATADIR%%/data/palettes/a64.gpl
 %%DATADIR%%/data/palettes/apple-ii.gpl
+%%DATADIR%%/data/palettes/arne-paldac.gpl
 %%DATADIR%%/data/palettes/arne16.gpl
 %%DATADIR%%/data/palettes/arne32.gpl
 %%DATADIR%%/data/palettes/atari2600-ntsc.gpl
 %%DATADIR%%/data/palettes/atari2600-pal.gpl
+%%DATADIR%%/data/palettes/cg-arne.gpl
 %%DATADIR%%/data/palettes/cga.gpl
 %%DATADIR%%/data/palettes/commodore-plus4.gpl
 %%DATADIR%%/data/palettes/commodore-vic20.gpl
 %%DATADIR%%/data/palettes/commodore64.gpl
+%%DATADIR%%/data/palettes/copper-tech.gpl
+%%DATADIR%%/data/palettes/cpc-boy.gpl
 %%DATADIR%%/data/palettes/db16.gpl
 %%DATADIR%%/data/palettes/db32.gpl
+%%DATADIR%%/data/palettes/eroge-copper.gpl
+%%DATADIR%%/data/palettes/gameboy-color-type1.gpl
 %%DATADIR%%/data/palettes/gameboy.gpl
 %%DATADIR%%/data/palettes/google-ui.gpl
+%%DATADIR%%/data/palettes/jmp.gpl
 %%DATADIR%%/data/palettes/master-system.gpl
+%%DATADIR%%/data/palettes/monokai.gpl
 %%DATADIR%%/data/palettes/nes-ntsc.gpl
 %%DATADIR%%/data/palettes/nes.gpl
+%%DATADIR%%/data/palettes/pico-8.gpl
+%%DATADIR%%/data/palettes/psygnork.gpl
+%%DATADIR%%/data/palettes/smile-basic.gpl
 %%DATADIR%%/data/palettes/solarized.gpl
 %%DATADIR%%/data/palettes/teletext.gpl
+%%DATADIR%%/data/palettes/vga-13h.gpl
+%%DATADIR%%/data/palettes/web-safe-colors.gpl
 %%DATADIR%%/data/palettes/win16.gpl
+%%DATADIR%%/data/palettes/x11.gpl
 %%DATADIR%%/data/palettes/zx-spectrum.gpl
 %%DATADIR%%/data/pref.xml
 %%DATADIR%%/data/scripts/white_to_alpha.js
@@ -44,6 +59,7 @@ bin/aseprite
 %%DATADIR%%/data/skins/default/sheet.png
 %%DATADIR%%/data/skins/default/skin.xml
 %%DATADIR%%/data/widgets/advanced_mode.xml
+%%DATADIR%%/data/widgets/brush_slot_params.xml
 %%DATADIR%%/data/widgets/canvas_size.xml
 %%DATADIR%%/data/widgets/cel_properties.xml
 %%DATADIR%%/data/widgets/color_curve_point.xml
@@ -64,6 +80,7 @@ bin/aseprite
 %%DATADIR%%/data/widgets/keyboard_shortcuts.xml
 %%DATADIR%%/data/widgets/layer_properties.xml
 %%DATADIR%%/data/widgets/main_window.xml
+%%DATADIR%%/data/widgets/modify_selection.xml
 %%DATADIR%%/data/widgets/new_folder_window.xml
 %%DATADIR%%/data/widgets/new_layer.xml
 %%DATADIR%%/data/widgets/new_sprite.xml
@@ -79,6 +96,7 @@ bin/aseprite
 %%DATADIR%%/data/widgets/sprite_size.xml
 %%DATADIR%%/data/widgets/timeline_conf.xml
 %%DATADIR%%/data/widgets/undo_history.xml
+%%DATADIR%%/data/widgets/user_data.xml
 %%DATADIR%%/data/widgets/webp_options.xml
 %%DATADIR%%/data/%%WWWDIR%%.css
 %%DATADIR%%/data/%%WWWDIR%%.js