Index: head/graphics/aseprite/Makefile =================================================================== --- head/graphics/aseprite/Makefile (revision 425054) +++ head/graphics/aseprite/Makefile (revision 425055) @@ -1,65 +1,68 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= aseprite -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.9 DISTVERSIONPREFIX= v CATEGORIES= graphics MAINTAINER= yuri@rawbw.com COMMENT= Animated sprite editor & pixel art tool -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE= EULA +LICENSE_NAME= END-USER LICENSE AGREEMENT FOR ASEPRITE +LICENSE_FILE= ${WRKSRC}/EULA.txt +LICENSE_PERMS= dist-mirror pkg-mirror auto-accept EXTRACT_DEPENDS= ${NONEXISTENT}:x11/pixman:extract LIB_DEPENDS= libfreetype.so:print/freetype2 \ liballeg.so:devel/allegro \ libpng.so:graphics/png \ libgif.so:graphics/giflib \ libcurl.so:ftp/curl \ libtinyxml.so:textproc/tinyxml BROKEN_FreeBSD_9= Fails due to compiler issues OPTIONS_DEFINE= WEBP OPTIONS_DEFAULT= WEBP WEBP_LIB_DEPENDS= libwebp.so:graphics/webp USE_GITHUB= yes -GH_TUPLE= aseprite:clip:96ed960:clip/src/clip +GH_TUPLE= aseprite:clip:3e9533e:clip/src/clip GH_TUPLE+= aseprite:flic:65a6072:flic/src/flic GH_TUPLE+= aseprite:gtest:d63c625:gtest/third_party/gtest GH_TUPLE+= aseprite:simpleini:0687587:simpleini/third_party/simpleini -GH_TUPLE+= aseprite:duktape:0de771c:duk/third_party/duktape -GH_TUPLE+= dacap:observable:89c9740:observable/src/observable +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 -USES= cmake:outsource compiler:c++11-lib jpeg pkgconfig +USES= cmake:outsource compiler:c++11-lang jpeg ninja pkgconfig USE_XORG= x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm CMAKE_ARGS+= -DUSE_SHARED_ALLEGRO4=1 CMAKE_ARGS+= -DUSE_SHARED_GIFLIB=1 CMAKE_ARGS+= -DUSE_SHARED_ZLIB=1 CMAKE_ARGS+= -DUSE_SHARED_JPEGLIB=1 CMAKE_ARGS+= -DUSE_SHARED_LIBPNG=1 WEBP_CMAKE_ON+= -DWITH_WEBP_SUPPORT=1 WEBP_CMAKE_ON+= -DUSE_SHARED_LIBWEBP=1 CMAKE_ARGS+= -DUSE_SHARED_FREETYPE=1 CMAKE_ARGS+= -DUSE_SHARED_PIXMAN=1 CMAKE_ARGS+= -DUSE_SHARED_CURL=1 CMAKE_ARGS+= -DUSE_SHARED_TINYXML=1 CMAKE_ARGS+= -DFREETYPE_INCLUDE_DIR=${LOCALBASE}/include/freetype2 CXXFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include/freetype2 CXXFLAGS+= -I${LOCALBASE}/include/freetype2/freetype post-extract: @${MKDIR} ${WRKSRC}/third_party/pixman/pixman @${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \ ${WRKSRC}/third_party/pixman/pixman/ post-patch: @${REINPLACE_CMD} -e 's|1.1.6-dev|${PORTVERSION}|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml .include Index: head/graphics/aseprite/distinfo =================================================================== --- head/graphics/aseprite/distinfo (revision 425054) +++ head/graphics/aseprite/distinfo (revision 425055) @@ -1,15 +1,17 @@ -TIMESTAMP = 1469961993 -SHA256 (aseprite-aseprite-v1.1.7_GH0.tar.gz) = 441f67342e97c31a43b24b44268a73874998f3c8660f9c151357497ed290743a -SIZE (aseprite-aseprite-v1.1.7_GH0.tar.gz) = 2578676 -SHA256 (aseprite-clip-96ed960_GH0.tar.gz) = 9fc2e3f612290e44d194d2e63cdd2696f78ed0ff7403ef9a2954511325b746ac -SIZE (aseprite-clip-96ed960_GH0.tar.gz) = 10667 +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 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-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 +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 Index: head/graphics/aseprite/files/patch-src_app_app__menus.cpp =================================================================== --- head/graphics/aseprite/files/patch-src_app_app__menus.cpp (nonexistent) +++ head/graphics/aseprite/files/patch-src_app_app__menus.cpp (revision 425055) @@ -0,0 +1,29 @@ +--- src/app/app_menus.cpp.orig 2016-09-23 15:59:20 UTC ++++ src/app/app_menus.cpp +@@ -115,7 +115,7 @@ void AppMenus::reload() + } + } + +-bool AppMenus::rebuildRecentList() ++void AppMenus::rebuildRecentList() // workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213773 + { + MenuItem* list_menuitem = m_recentListMenuitem; + MenuItem* menuitem; +@@ -123,7 +123,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); + +@@ -159,8 +159,6 @@ bool AppMenus::rebuildRecentList() + submenu->addChild(menuitem); + } + } +- +- return true; + } + + Menu* AppMenus::loadMenuById(TiXmlHandle& handle, const char* id) Property changes on: head/graphics/aseprite/files/patch-src_app_app__menus.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/aseprite/files/patch-src_app_app__menus.h =================================================================== --- head/graphics/aseprite/files/patch-src_app_app__menus.h (nonexistent) +++ head/graphics/aseprite/files/patch-src_app_app__menus.h (revision 425055) @@ -0,0 +1,11 @@ +--- src/app/app_menus.h.orig 2016-09-23 15:59:20 UTC ++++ src/app/app_menus.h +@@ -35,7 +35,7 @@ namespace app { + void reload(); + + // Updates the menu of recent files. +- bool rebuildRecentList(); ++ void rebuildRecentList(); // workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213773 + + Menu* getRootMenu() { return m_rootMenu; } + MenuItem* getRecentListMenuitem() { return m_recentListMenuitem; } Property changes on: head/graphics/aseprite/files/patch-src_app_app__menus.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/aseprite/files/patch-src_base_file__handle.cpp =================================================================== --- head/graphics/aseprite/files/patch-src_base_file__handle.cpp (revision 425054) +++ head/graphics/aseprite/files/patch-src_base_file__handle.cpp (revision 425055) @@ -1,11 +1,11 @@ ---- src/base/file_handle.cpp.orig 2015-11-06 13:40:13 UTC +--- src/base/file_handle.cpp.orig 2016-09-23 15:59:20 UTC +++ src/base/file_handle.cpp -@@ -26,6 +26,8 @@ +@@ -27,6 +27,8 @@ #define O_TEXT 0 #endif +#include + using namespace std; namespace base { Index: head/graphics/aseprite/files/patch-src_base_fs__unix.h =================================================================== --- head/graphics/aseprite/files/patch-src_base_fs__unix.h (revision 425054) +++ head/graphics/aseprite/files/patch-src_base_fs__unix.h (revision 425055) @@ -1,11 +1,11 @@ ---- src/base/fs_unix.h.orig 2015-11-06 13:40:13 UTC +--- src/base/fs_unix.h.orig 2016-09-23 15:59:20 UTC +++ src/base/fs_unix.h -@@ -11,6 +11,8 @@ - +@@ -13,6 +13,8 @@ + #include // Required for rename() #include #include +#include +#include #include #include Index: head/graphics/aseprite/pkg-plist =================================================================== --- head/graphics/aseprite/pkg-plist (revision 425054) +++ head/graphics/aseprite/pkg-plist (revision 425055) @@ -1,104 +1,106 @@ bin/aseprite %%DATADIR%%/data/convmatr.def %%DATADIR%%/data/fonts/allegro.pcx %%DATADIR%%/data/fonts/anipro_fixed.pcx %%DATADIR%%/data/fonts/anipro_variable.pcx %%DATADIR%%/data/fonts/ase1.pcx %%DATADIR%%/data/fonts/ase2.pcx %%DATADIR%%/data/gui.xml %%DATADIR%%/data/icons/ase.ico %%DATADIR%%/data/icons/ase16.png %%DATADIR%%/data/icons/ase32.png %%DATADIR%%/data/icons/ase48.png %%DATADIR%%/data/icons/ase64.png %%DATADIR%%/data/icons/doc.ico %%DATADIR%%/data/icons/doc16.png %%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/edg16.gpl +%%DATADIR%%/data/palettes/edg32.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 %%DATADIR%%/data/skins/default/font.png %%DATADIR%%/data/skins/default/minifont.png %%DATADIR%%/data/skins/default/palette.png %%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 %%DATADIR%%/data/widgets/convolution_matrix.xml %%DATADIR%%/data/widgets/despeckle.xml %%DATADIR%%/data/widgets/duplicate_sprite.xml %%DATADIR%%/data/widgets/export_sprite_sheet.xml %%DATADIR%%/data/widgets/file_selector.xml %%DATADIR%%/data/widgets/font_popup.xml %%DATADIR%%/data/widgets/frame_properties.xml %%DATADIR%%/data/widgets/frame_tag_properties.xml %%DATADIR%%/data/widgets/gif_options.xml %%DATADIR%%/data/widgets/goto_frame.xml %%DATADIR%%/data/widgets/grid_settings.xml %%DATADIR%%/data/widgets/home_view.xml %%DATADIR%%/data/widgets/import_sprite_sheet.xml %%DATADIR%%/data/widgets/jpeg_options.xml %%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 %%DATADIR%%/data/widgets/options.xml %%DATADIR%%/data/widgets/palette_from_sprite.xml %%DATADIR%%/data/widgets/palette_popup.xml %%DATADIR%%/data/widgets/palette_size.xml %%DATADIR%%/data/widgets/paste_text.xml %%DATADIR%%/data/widgets/replace_color.xml %%DATADIR%%/data/widgets/select_accelerator.xml %%DATADIR%%/data/widgets/send_crash.xml %%DATADIR%%/data/widgets/sprite_properties.xml %%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 %%DATADIR%%/data/%%WWWDIR%%.png %%DATADIR%%/data/www/index.html