- Update graphics/aseprite to 1.1.13

- Add pkg-message to inform users how to workaround mouse pointer
  lag

PR:		216708
Submitted by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

8 files changed, 60 insertions, 36 deletions

diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 489035641390..d7643228c3e7 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		aseprite
-PORTVERSION=		1.1.9
+PORTVERSION=		1.1.13
 DISTVERSIONPREFIX=	v
 CATEGORIES=		graphics
 
@@ -28,16 +28,20 @@ OPTIONS_DEFAULT=	WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 USE_GITHUB=		yes
-GH_TUPLE=		aseprite:clip:3e9533e:clip/src/clip
+GH_TUPLE=		aseprite:clip:926e3cf:clip/src/clip
 GH_TUPLE+=		aseprite:flic:65a6072:flic/src/flic
 GH_TUPLE+=		aseprite:gtest:d63c625:gtest/third_party/gtest
+GH_TUPLE+=		aseprite:cmark:5255e2d:cmark/third_party/cmark
 GH_TUPLE+=		aseprite:simpleini:0687587:simpleini/third_party/simpleini
 GH_TUPLE+=		aseprite:duktape:0de771c:duktape/third_party/duktape
 GH_TUPLE+=		aseprite:undo:f39b188:undo/src/undo
-GH_TUPLE+=		dacap:observable:83dfe27:observable/src/observable
+GH_TUPLE+=		aseprite:laf:e6d79aa:laf/laf
+GH_TUPLE+=		aseprite:stringencoders:f963507:stringencoders/laf/third_party/stringencoders
+GH_TUPLE+=		dacap:observable:27fa7f6:observable/src/observable
 
 USES=			cmake:outsource compiler:c++11-lib jpeg ninja pkgconfig
 USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
+USE_LDCONFIG=		yes
 
 CMAKE_ARGS+=		-DUSE_SHARED_ALLEGRO4=1
 CMAKE_ARGS+=		-DUSE_SHARED_GIFLIB=1
@@ -60,9 +64,14 @@ BROKEN_aarch64=		Fails to build: undefined reference to __va_copy
 BROKEN_sparc64=		Fails to build: error: vsnprintf is not a member of std
 
 post-extract:
+	@${RM} -r ${WRKSRC}/src/allegro
 	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman
 	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \
 		${WRKSRC}/third_party/pixman/pixman/
+	@${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKDIR}/cmark-*/src/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_MANDIR}|${PREFIX}/man|' \
+		${WRKDIR}/cmark-*/man/CMakeLists.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|1.1.6-dev|${PORTVERSION}|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml
diff --git a/graphics/aseprite/distinfo b/graphics/aseprite/distinfo
index 8aa481be561f..83de104d1781 100644
--- a/graphics/aseprite/distinfo
+++ b/graphics/aseprite/distinfo
@@ -1,17 +1,23 @@
-TIMESTAMP = 1474731128
-SHA256 (aseprite-aseprite-v1.1.9_GH0.tar.gz) = 207a8942cc7c8b9ee56cd8be2b356a54f4c0b9a80c3f24c399d7fa6b7ea9fe01
-SIZE (aseprite-aseprite-v1.1.9_GH0.tar.gz) = 2566361
-SHA256 (aseprite-clip-3e9533e_GH0.tar.gz) = 3b88da2dbc64e868ed3820abd483dbe2e5a2fd331b2187803a2f9923dca111bf
-SIZE (aseprite-clip-3e9533e_GH0.tar.gz) = 10677
+TIMESTAMP = 1485981281
+SHA256 (aseprite-aseprite-v1.1.13_GH0.tar.gz) = 8e3198385009f9db3c731b67ad8f0cc363faf55c5c5e81bd93d97afabc5eaefc
+SIZE (aseprite-aseprite-v1.1.13_GH0.tar.gz) = 2538167
+SHA256 (aseprite-clip-926e3cf_GH0.tar.gz) = 3a4d0a07a1d3c695d85ccae0e4a3b9c423c5e6f3de84a542c72b6132889d4a2a
+SIZE (aseprite-clip-926e3cf_GH0.tar.gz) = 10671
 SHA256 (aseprite-flic-65a6072_GH0.tar.gz) = 659ccc01206e94b18246c0b1cb8dd0b6e27027c8adf774f69b1fd791549f2027
 SIZE (aseprite-flic-65a6072_GH0.tar.gz) = 6558
 SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
 SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
+SHA256 (aseprite-cmark-5255e2d_GH0.tar.gz) = c73f003354cd58c60cf963ae202c31c41e4baf450970fe9861a1acc425273d4c
+SIZE (aseprite-cmark-5255e2d_GH0.tar.gz) = 222772
 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 (aseprite-undo-f39b188_GH0.tar.gz) = adfa338452fb7af52da89d87f72a45ae6acf9f84a3b73fc1f712f69ddaabb220
 SIZE (aseprite-undo-f39b188_GH0.tar.gz) = 4114
-SHA256 (dacap-observable-83dfe27_GH0.tar.gz) = df7548ebd91d9e3ad6f78dac4cf65e0bcf993e9daa2a2e8b36ce051b0d18c2fd
-SIZE (dacap-observable-83dfe27_GH0.tar.gz) = 9692
+SHA256 (aseprite-laf-e6d79aa_GH0.tar.gz) = 12f4716d310280131e902864451620651df44b18ea5f6c8f420b2f4a332a434b
+SIZE (aseprite-laf-e6d79aa_GH0.tar.gz) = 45189
+SHA256 (aseprite-stringencoders-f963507_GH0.tar.gz) = 9ad6bae5ca2beeba45d46ec408a8e5543dec9838d7a7e8f10b9cf06694eabcc5
+SIZE (aseprite-stringencoders-f963507_GH0.tar.gz) = 142542
+SHA256 (dacap-observable-27fa7f6_GH0.tar.gz) = beb87c9f4fe08d01748c6b5bea48e320e7a9e8af74655fdc2acbe362a2d796da
+SIZE (dacap-observable-27fa7f6_GH0.tar.gz) = 9684
diff --git a/graphics/aseprite/files/patch-src_app_app__menus.cpp b/graphics/aseprite/files/patch-src_app_app__menus.cpp
index c1768906e2c3..95d2ce72d532 100644
--- a/graphics/aseprite/files/patch-src_app_app__menus.cpp
+++ b/graphics/aseprite/files/patch-src_app_app__menus.cpp
@@ -1,6 +1,6 @@
---- src/app/app_menus.cpp.orig	2016-09-23 15:59:20 UTC
+--- src/app/app_menus.cpp.orig	2017-01-06 20:44:08 UTC
 +++ src/app/app_menus.cpp
-@@ -115,7 +115,7 @@ void AppMenus::reload()
+@@ -114,7 +114,7 @@ void AppMenus::reload()
    }
  }
  
@@ -9,7 +9,7 @@
  {
    MenuItem* list_menuitem = m_recentListMenuitem;
    MenuItem* menuitem;
-@@ -123,7 +123,7 @@ bool AppMenus::rebuildRecentList()
+@@ -122,7 +122,7 @@ bool AppMenus::rebuildRecentList()
    // Update the recent file list menu item
    if (list_menuitem) {
      if (list_menuitem->hasSubmenuOpened())
@@ -18,7 +18,7 @@
  
      Command* cmd_open_file = CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
  
-@@ -159,8 +159,6 @@ bool AppMenus::rebuildRecentList()
+@@ -158,8 +158,6 @@ bool AppMenus::rebuildRecentList()
        submenu->addChild(menuitem);
      }
    }
diff --git a/graphics/aseprite/files/patch-src_base_file__handle.cpp b/graphics/aseprite/files/patch-src_base_file__handle.cpp
deleted file mode 100644
index 1eaaa7b4f56b..000000000000
--- a/graphics/aseprite/files/patch-src_base_file__handle.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/base/file_handle.cpp.orig	2016-09-23 15:59:20 UTC
-+++ src/base/file_handle.cpp
-@@ -27,6 +27,8 @@
- #define O_TEXT    0
- #endif
- 
-+#include <sys/stat.h>
-+
- using namespace std;
- 
- namespace base {
diff --git a/graphics/aseprite/files/patch-src_base_fs__unix.h b/graphics/aseprite/files/patch-src_base_fs__unix.h
deleted file mode 100644
index 88640e42d4bf..000000000000
--- a/graphics/aseprite/files/patch-src_base_fs__unix.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/base/fs_unix.h.orig	2016-09-23 15:59:20 UTC
-+++ src/base/fs_unix.h
-@@ -13,6 +13,8 @@
- #include <cstdio>               // Required for rename()
- #include <cstdlib>
- #include <ctime>
-+#include <cstdio>
-+#include <climits>
- #include <stdexcept>
- #include <vector>
- 
diff --git a/graphics/aseprite/files/patch-src_config.h b/graphics/aseprite/files/patch-src_config.h
new file mode 100644
index 000000000000..a6af55a9cc70
--- /dev/null
+++ b/graphics/aseprite/files/patch-src_config.h
@@ -0,0 +1,11 @@
+--- src/config.h.orig	2017-01-06 20:44:08 UTC
++++ src/config.h
+@@ -23,7 +23,7 @@
+ 
+ // General information
+ #define PACKAGE "Aseprite"
+-#define VERSION "1.1.12-dev"
++#define VERSION "1.1.13"
+ 
+ #ifdef CUSTOM_WEBSITE_URL
+ #define WEBSITE                 CUSTOM_WEBSITE_URL // To test web server
diff --git a/graphics/aseprite/pkg-message b/graphics/aseprite/pkg-message
new file mode 100644
index 000000000000..f3e1bc6fcd6c
--- /dev/null
+++ b/graphics/aseprite/pkg-message
@@ -0,0 +1,7 @@
+======================================================================
+Some users have reported mouse lag problem with aseprite.
+
+Please add the argument -F 250 or -F 500 for moused(8) to work around
+such problems. These options  can be added in the  variable
+moused_flags in /etc/rc.conf
+======================================================================
diff --git a/graphics/aseprite/pkg-plist b/graphics/aseprite/pkg-plist
index 6538c42cb787..b1ac17bb2914 100644
--- a/graphics/aseprite/pkg-plist
+++ b/graphics/aseprite/pkg-plist
@@ -1,4 +1,16 @@
 bin/aseprite
+bin/cmark
+include/cmark.h
+include/cmark_export.h
+include/cmark_version.h
+lib/cmake/cmark-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/cmark.cmake
+lib/libcmark.a
+lib/libcmark.so
+lib/libcmark.so.0.27.1
+libdata/pkgconfig/libcmark.pc
+man/man1/cmark.1.gz
+man/man3/cmark.3.gz
 %%DATADIR%%/data/convmatr.def
 %%DATADIR%%/data/fonts/allegro.pcx
 %%DATADIR%%/data/fonts/anipro_fixed.pcx
@@ -86,6 +98,7 @@ bin/aseprite
 %%DATADIR%%/data/widgets/new_folder_window.xml
 %%DATADIR%%/data/widgets/new_layer.xml
 %%DATADIR%%/data/widgets/new_sprite.xml
+%%DATADIR%%/data/widgets/open_sequence.xml
 %%DATADIR%%/data/widgets/options.xml
 %%DATADIR%%/data/widgets/palette_from_sprite.xml
 %%DATADIR%%/data/widgets/palette_popup.xml