graphics/aseprite: Update 1.2.7.2 -> 1.2.9

Few dependencies are updated.

Reported by:	portscout

6 files changed, 88 insertions, 40 deletions

diff --git a/graphics/aseprite/Makefile b/graphics/aseprite/Makefile
index 4753c4f0f5af..beeb62bb4361 100644
--- a/graphics/aseprite/Makefile
+++ b/graphics/aseprite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		aseprite
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.2.7.2
+DISTVERSION=		1.2.9
 CATEGORIES=		graphics
 
 MAINTAINER=		yuri@FreeBSD.org
@@ -18,6 +18,7 @@ EXTRACT_DEPENDS=	${NONEXISTENT}:x11/pixman:extract
 LIB_DEPENDS=		liballeg.so:devel/allegro \
 			libcmark.so:textproc/cmark \
 			libcurl.so:ftp/curl \
+			libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libgif.so:graphics/giflib \
 			libharfbuzz.so:print/harfbuzz \
@@ -25,7 +26,8 @@ LIB_DEPENDS=		liballeg.so:devel/allegro \
 			liblz4.so:archivers/liblz4 \
 			libnettle.so:security/nettle \
 			libpng.so:graphics/png \
-			libtinyxml.so:textproc/tinyxml
+			libtinyxml.so:textproc/tinyxml \
+			libzstd.so:archivers/zstd
 
 BROKEN_aarch64=		fails to compile: undefined reference to __va_copy
 BROKEN_armv6=		fails to compile: undefined reference to __va_copy
@@ -35,19 +37,20 @@ BROKEN_sparc64=		fails to compile: vsnprintf is not a member of std
 
 USES=			cmake:outsource compiler:c++11-lib iconv:wchar_t jpeg localbase:ldflags pkgconfig ssl
 USE_GITHUB=		yes
-GH_TUPLE=		aseprite:libarchive:687e298:libarchive/third_party/libarchive
-GH_TUPLE+=		aseprite:clip:b26bf0c:clip/src/clip
+GH_TUPLE=		aseprite:libarchive:c51dbfc:libarchive/third_party/libarchive
+GH_TUPLE+=		aseprite:clip:964a64a:clip/src/clip
 GH_TUPLE+=		aseprite:flic:65a6072:flic/src/flic
 GH_TUPLE+=		aseprite:fmt:933a33a:fmt/third_party/fmt
-GH_TUPLE+=		aseprite:json11:ed35a09:json11/third_party/json11
-GH_TUPLE+=		aseprite:laf:0246ba5:laf/laf
-GH_TUPLE+=		aseprite:mujs:81388eb:mujs/third_party/mujs
-GH_TUPLE+=		aseprite:observable:f9a56dc:observable/src/observable
+GH_TUPLE+=		aseprite:json11:ec4e452:json11/third_party/json11
+GH_TUPLE+=		aseprite:laf:60e6ad7:laf/laf
+GH_TUPLE+=		aseprite:mujs:34cb617:mujs/third_party/mujs
+GH_TUPLE+=		aseprite:observable:59c3862:observable/src/observable
 GH_TUPLE+=		aseprite:simpleini:0687587:simpleini/third_party/simpleini
-GH_TUPLE+=		aseprite:stringencoders:f963507:stringencoders/laf/third_party/stringencoders
-GH_TUPLE+=		aseprite:undo:faf19f0:undo/src/undo
+GH_TUPLE+=		aseprite:tinyexpr:ca50544:tinyexpr/third_party/tinyexpr
+GH_TUPLE+=		aseprite:stringencoders:e1448a9:stringencoders/laf/third_party/stringencoders
+GH_TUPLE+=		aseprite:undo:93fc81d:undo/src/undo
 USE_GNOME=		libxml2
-USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
+USE_XORG=		x11 xcb xcursor xext xpm ice pixman sm xxf86dga xxf86vm
 
 CMAKE_ON=		USE_SHARED_ALLEGRO4 \
 			USE_SHARED_CMARK \
@@ -56,10 +59,12 @@ CMAKE_ON=		USE_SHARED_ALLEGRO4 \
 			USE_SHARED_GIFLIB \
 			USE_SHARED_HARFBUZZ \
 			USE_SHARED_JPEGLIB \
+			USE_SHARED_LIBLOADPNG \
 			USE_SHARED_LIBPNG \
 			USE_SHARED_PIXMAN \
 			USE_SHARED_TINYXML \
 			USE_SHARED_ZLIB
+CMAKE_ARGS=		-DFREEBSD_LIB_PATH=${LOCALBASE}/lib
 
 CXXFLAGS+=		-D_GLIBCXX_USE_C99 # XXX ports/193528
 
@@ -69,8 +74,7 @@ OPTIONS_DEFAULT=	WEBP
 STEAM_DESC=		Compile with Steam library
 STEAM_CMAKE_BOOL=	ENABLE_STEAM
 
-WEBP_CMAKE_BOOL=	USE_SHARED_LIBWEBP
-WEBP_CMAKE_ON=		-DWITH_WEBP_SUPPORT=1
+WEBP_CMAKE_BOOL=	WITH_WEBP_SUPPORT
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 post-extract:
diff --git a/graphics/aseprite/distinfo b/graphics/aseprite/distinfo
index 58801077941f..728a01d516c1 100644
--- a/graphics/aseprite/distinfo
+++ b/graphics/aseprite/distinfo
@@ -1,25 +1,27 @@
-TIMESTAMP = 1521305435
-SHA256 (aseprite-aseprite-v1.2.7.2_GH0.tar.gz) = 286c88755773d106b811aa7cc546b67fb0a6a90da9974b34ca96f7f4f99a553f
-SIZE (aseprite-aseprite-v1.2.7.2_GH0.tar.gz) = 2636896
-SHA256 (aseprite-libarchive-687e298_GH0.tar.gz) = 58baf6c9cb05c5d34b140cdb59b3bd393cc963df4e473b0527a19a6105b6695a
-SIZE (aseprite-libarchive-687e298_GH0.tar.gz) = 4454810
-SHA256 (aseprite-clip-b26bf0c_GH0.tar.gz) = 68c5934f7d2a70f9f5f4c30aa374b6632e3e0d8f9cf52c171521cdb2552bc1a7
-SIZE (aseprite-clip-b26bf0c_GH0.tar.gz) = 11277
+TIMESTAMP = 1532640403
+SHA256 (aseprite-aseprite-v1.2.9_GH0.tar.gz) = 1697edfd44feaf833bc9636af727a243b4512024dd612844fdb3fcbef3e2b437
+SIZE (aseprite-aseprite-v1.2.9_GH0.tar.gz) = 2671772
+SHA256 (aseprite-libarchive-c51dbfc_GH0.tar.gz) = 1d33dec5e314e317b91f9fb9eff72207ecbd2d0753bda50f443d5455e63ec20d
+SIZE (aseprite-libarchive-c51dbfc_GH0.tar.gz) = 4462927
+SHA256 (aseprite-clip-964a64a_GH0.tar.gz) = ae0c8c6980e5232eba4f46ffff0b775c6fb296d56edda44acd4fb76df03463db
+SIZE (aseprite-clip-964a64a_GH0.tar.gz) = 22711
 SHA256 (aseprite-flic-65a6072_GH0.tar.gz) = 659ccc01206e94b18246c0b1cb8dd0b6e27027c8adf774f69b1fd791549f2027
 SIZE (aseprite-flic-65a6072_GH0.tar.gz) = 6558
 SHA256 (aseprite-fmt-933a33a_GH0.tar.gz) = d0c2df36f6d760cf81885e60acfaa2e21ce84b765a827a4b45938f8133f5b550
 SIZE (aseprite-fmt-933a33a_GH0.tar.gz) = 619041
-SHA256 (aseprite-json11-ed35a09_GH0.tar.gz) = 6aaf6cd42232de9d73d0d02869d5a582d7b3c484d18bacd7a1b0bdb4726c50af
-SIZE (aseprite-json11-ed35a09_GH0.tar.gz) = 13094
-SHA256 (aseprite-laf-0246ba5_GH0.tar.gz) = 58149b224b032fb931025afef3a48918df8682a55a854fd3dfb02b90d7d6135b
-SIZE (aseprite-laf-0246ba5_GH0.tar.gz) = 48258
-SHA256 (aseprite-mujs-81388eb_GH0.tar.gz) = 8d11923f6ffc6951ed5cf32b5deb83422a0c298fed3140ff93cf197d353c3dd0
-SIZE (aseprite-mujs-81388eb_GH0.tar.gz) = 117614
-SHA256 (aseprite-observable-f9a56dc_GH0.tar.gz) = 893119a3f6ce519ddc440431105984c9d451b05d5f69f0413a7e8a3f2e677d94
-SIZE (aseprite-observable-f9a56dc_GH0.tar.gz) = 9846
+SHA256 (aseprite-json11-ec4e452_GH0.tar.gz) = a107f817e0a7edd8b9d8a076d58ae34442fc45e4835d379dc03c66de23561d4f
+SIZE (aseprite-json11-ec4e452_GH0.tar.gz) = 13098
+SHA256 (aseprite-laf-60e6ad7_GH0.tar.gz) = 164e7e0155ce060b26150ed36eadbcd12f19f529d1b37c215bbcf5e6ba505bd2
+SIZE (aseprite-laf-60e6ad7_GH0.tar.gz) = 50756
+SHA256 (aseprite-mujs-34cb617_GH0.tar.gz) = d2b4fabafec7721e74534bdbf6bb6d9420aff2620ded1f0c30d83815aea5bf10
+SIZE (aseprite-mujs-34cb617_GH0.tar.gz) = 118297
+SHA256 (aseprite-observable-59c3862_GH0.tar.gz) = ff75e5882d561d0df34fac37e4cefa60a686f4d630d88bcda8b8b7764aa050a4
+SIZE (aseprite-observable-59c3862_GH0.tar.gz) = 10158
 SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b
 SIZE (aseprite-simpleini-0687587_GH0.tar.gz) = 54947
-SHA256 (aseprite-stringencoders-f963507_GH0.tar.gz) = 9ad6bae5ca2beeba45d46ec408a8e5543dec9838d7a7e8f10b9cf06694eabcc5
-SIZE (aseprite-stringencoders-f963507_GH0.tar.gz) = 142542
-SHA256 (aseprite-undo-faf19f0_GH0.tar.gz) = cbbfaaa9f9c6500dfeb82cc9ca2ee9d374195d94aeb6120576d54ea18de4ece8
-SIZE (aseprite-undo-faf19f0_GH0.tar.gz) = 5062
+SHA256 (aseprite-tinyexpr-ca50544_GH0.tar.gz) = 6f1f1d0d40e9075c8c658790d1f86a1d351ca2916fa58f1a352575854730c48a
+SIZE (aseprite-tinyexpr-ca50544_GH0.tar.gz) = 37102
+SHA256 (aseprite-stringencoders-e1448a9_GH0.tar.gz) = 7956c5527df58115ba249f0d057c14dad9cebbbf69dfc4981c269f98874a0213
+SIZE (aseprite-stringencoders-e1448a9_GH0.tar.gz) = 142431
+SHA256 (aseprite-undo-93fc81d_GH0.tar.gz) = d930c5a4649524b6fad7ad46e7a8ae47b8dff786f55dc8e5f2c6039b176e3afc
+SIZE (aseprite-undo-93fc81d_GH0.tar.gz) = 5405
diff --git a/graphics/aseprite/files/patch-CMakeLists.txt b/graphics/aseprite/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..980a25aabf08
--- /dev/null
+++ b/graphics/aseprite/files/patch-CMakeLists.txt
@@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2018-07-24 19:18:54 UTC
++++ CMakeLists.txt
+@@ -238,8 +238,8 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do 
+ # libwebp
+ if(WITH_WEBP_SUPPORT)
+   set(WEBP_LIBRARIES webp webpdemux webpmux)
+-  set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
+-  include_directories(${WEBP_INCLUDE_DIR})
++  #set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
++  #include_directories(${WEBP_INCLUDE_DIR})
+ endif()
+ 
+ # tinyxml
+@@ -391,6 +391,7 @@ if(UNIX AND NOT APPLE AND NOT BEOS)
+   find_package(X11 REQUIRED)
+   include_directories(SYSTEM ${X11_INCLUDE_DIR})
+   list(APPEND PLATFORM_LIBS ${X11_LIBRARIES})
++  set(X11_LIB_SEARCH_PATH ${FREEBSD_LIB_PATH})
+ 
+   if(X11_XShm_FOUND)
+     list(APPEND PLATFORM_LIBS ${X11_Xext_LIB})
diff --git a/graphics/aseprite/files/patch-src_app_app__menus.cpp b/graphics/aseprite/files/patch-src_app_app__menus.cpp
index bc26a72154da..4400f21d9157 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	2017-11-03 13:51:45 UTC
+--- src/app/app_menus.cpp.orig	2018-07-24 19:18:54 UTC
 +++ src/app/app_menus.cpp
-@@ -371,7 +371,7 @@ void AppMenus::initTheme()
+@@ -381,7 +381,7 @@ void AppMenus::initTheme()
        menu->initTheme();
  }
  
@@ -9,16 +9,16 @@
  {
    AppMenuItem* list_menuitem = dynamic_cast<AppMenuItem*>(m_recentListMenuitem);
    MenuItem* menuitem;
-@@ -379,7 +379,7 @@ bool AppMenus::rebuildRecentList()
+@@ -389,7 +389,7 @@ bool AppMenus::rebuildRecentList()
    // Update the recent file list menu item
    if (list_menuitem) {
      if (list_menuitem->hasSubmenuOpened())
 -      return false;
 +      return;
  
-     Command* cmd_open_file = CommandsModule::instance()->getCommandByName(CommandId::OpenFile);
- 
-@@ -426,8 +426,6 @@ bool AppMenus::rebuildRecentList()
+     Command* cmd_open_file =
+       Commands::instance()->byId(CommandId::OpenFile());
+@@ -437,8 +437,6 @@ bool AppMenus::rebuildRecentList()
        }
      }
    }
diff --git a/graphics/aseprite/files/patch-third__party_CMakeLists.txt b/graphics/aseprite/files/patch-third__party_CMakeLists.txt
new file mode 100644
index 000000000000..bb3cda260931
--- /dev/null
+++ b/graphics/aseprite/files/patch-third__party_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- third_party/CMakeLists.txt.orig	2018-07-26 21:59:46 UTC
++++ third_party/CMakeLists.txt
+@@ -34,8 +34,8 @@ endif()
+ 
+ if(WITH_WEBP_SUPPORT)
+   # Enable img2webp so "webpmux" library is built
+-  set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
+-  add_subdirectory(libwebp)
++  #set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.")
++  #add_subdirectory(libwebp)
+ endif()
+ 
+ if(NOT USE_SHARED_TINYXML)
diff --git a/graphics/aseprite/pkg-plist b/graphics/aseprite/pkg-plist
index d7dc083c4949..c057ddc8bc9c 100644
--- a/graphics/aseprite/pkg-plist
+++ b/graphics/aseprite/pkg-plist
@@ -1,7 +1,11 @@
 bin/aseprite
 %%DATADIR%%/data/convmatr.def
+%%DATADIR%%/data/extensions/adigunpolack-palettes/aap-64.gpl
+%%DATADIR%%/data/extensions/adigunpolack-palettes/aap-micro12.gpl
+%%DATADIR%%/data/extensions/adigunpolack-palettes/aap-splendor128.gpl
+%%DATADIR%%/data/extensions/adigunpolack-palettes/package.json
+%%DATADIR%%/data/extensions/adigunpolack-palettes/simplejpc-16.gpl
 %%DATADIR%%/data/extensions/arne-palettes/a64.gpl
-%%DATADIR%%/data/extensions/arne-palettes/arne-paldac.gpl
 %%DATADIR%%/data/extensions/arne-palettes/arne16.gpl
 %%DATADIR%%/data/extensions/arne-palettes/arne32.gpl
 %%DATADIR%%/data/extensions/arne-palettes/cg-arne.gpl
@@ -10,7 +14,7 @@ bin/aseprite
 %%DATADIR%%/data/extensions/arne-palettes/eroge-copper.gpl
 %%DATADIR%%/data/extensions/arne-palettes/jmp.gpl
 %%DATADIR%%/data/extensions/arne-palettes/package.json
-%%DATADIR%%/data/extensions/arne-palettes/psygnork.gpl
+%%DATADIR%%/data/extensions/arne-palettes/psygnosia.gpl
 %%DATADIR%%/data/extensions/aseprite-theme/LICENSE.txt
 %%DATADIR%%/data/extensions/aseprite-theme/package.json
 %%DATADIR%%/data/extensions/aseprite-theme/sheet.aseprite-data
@@ -25,6 +29,7 @@ bin/aseprite
 %%DATADIR%%/data/extensions/dawnbringer-palettes/db16.gpl
 %%DATADIR%%/data/extensions/dawnbringer-palettes/db32.gpl
 %%DATADIR%%/data/extensions/dawnbringer-palettes/package.json
+%%DATADIR%%/data/extensions/endesga-palettes/arq16.gpl
 %%DATADIR%%/data/extensions/endesga-palettes/arq4.gpl
 %%DATADIR%%/data/extensions/endesga-palettes/edg16.gpl
 %%DATADIR%%/data/extensions/endesga-palettes/edg32.gpl
@@ -62,6 +67,8 @@ bin/aseprite
 %%DATADIR%%/data/extensions/javierguerrero-palettes/package.json
 %%DATADIR%%/data/extensions/pico8-palette/package.json
 %%DATADIR%%/data/extensions/pico8-palette/pico-8.gpl
+%%DATADIR%%/data/extensions/pinetreepizza-palettes/package.json
+%%DATADIR%%/data/extensions/pinetreepizza-palettes/rosy-42.gpl
 %%DATADIR%%/data/extensions/software-palettes/google-ui.gpl
 %%DATADIR%%/data/extensions/software-palettes/monokai.gpl
 %%DATADIR%%/data/extensions/software-palettes/package.json
@@ -94,6 +101,7 @@ bin/aseprite
 %%DATADIR%%/data/pref.xml
 %%DATADIR%%/data/scripts/white_to_alpha.js
 %%DATADIR%%/data/strings/en.ini
+%%DATADIR%%/data/widgets/about.xml
 %%DATADIR%%/data/widgets/advanced_mode.xml
 %%DATADIR%%/data/widgets/brush_slot_params.xml
 %%DATADIR%%/data/widgets/canvas_size.xml