Index: branches/2017Q4/graphics/aseprite/Makefile =================================================================== --- branches/2017Q4/graphics/aseprite/Makefile (revision 451310) +++ branches/2017Q4/graphics/aseprite/Makefile (revision 451311) @@ -1,82 +1,79 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= aseprite PORTVERSION= 1.1.13 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= yuri@rawbw.com COMMENT= Animated sprite editor & pixel art tool 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 + libtinyxml.so:textproc/tinyxml \ + libcmark.so:textproc/cmark BROKEN_aarch64= fails to compile: undefined reference to __va_copy BROKEN_armv6= fails to compile: undefined reference to __va_copy BROKEN_powerpc64= fails to compile: arena.h: Failed assertion: "arena_mapbits_allocated_get(chunk, pageind) != 0" BROKEN_sparc64= fails to compile: vsnprintf is not a member of std OPTIONS_DEFINE= WEBP OPTIONS_DEFAULT= WEBP WEBP_LIB_DEPENDS= libwebp.so:graphics/webp USE_GITHUB= yes 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+= 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 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 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 CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 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 + @${REINPLACE_CMD} 's|libcmark_static|cmark|' ${WRKSRC}/src/app/CMakeLists.txt .include Index: branches/2017Q4/graphics/aseprite/distinfo =================================================================== --- branches/2017Q4/graphics/aseprite/distinfo (revision 451310) +++ branches/2017Q4/graphics/aseprite/distinfo (revision 451311) @@ -1,23 +1,21 @@ 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 (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 Index: branches/2017Q4/graphics/aseprite/files/patch-third__party_CMakeLists.txt =================================================================== --- branches/2017Q4/graphics/aseprite/files/patch-third__party_CMakeLists.txt (nonexistent) +++ branches/2017Q4/graphics/aseprite/files/patch-third__party_CMakeLists.txt (revision 451311) @@ -0,0 +1,24 @@ +--- third_party/CMakeLists.txt.orig 2017-10-04 18:41:08 UTC ++++ third_party/CMakeLists.txt +@@ -86,21 +86,3 @@ if(NOT USE_SHARED_FREETYPE) + endif() + + add_subdirectory(simpleini) +- +-# Add cmark without tests +-set(CMARK_TESTS OFF CACHE BOOL "Build cmark tests and enable testing") +-add_subdirectory(cmark) +-set(cmark_headers +- ${CMAKE_CURRENT_SOURCE_DIR}/cmark/src/cmark.h +- ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_export.h +- ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_version.h) +-foreach(fn ${cmark_headers}) +- get_filename_component(fn_name "${fn}" NAME) +- add_custom_command( +- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name} +- COMMAND ${CMAKE_COMMAND} -E copy ${fn} ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name} +- MAIN_DEPENDENCY ${fn}) +- list(APPEND copy_cmark_headers ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name}) +-endforeach() +-add_custom_target(copy_cmark_headers DEPENDS ${copy_cmark_headers}) +-add_dependencies(libcmark_static copy_cmark_headers) Property changes on: branches/2017Q4/graphics/aseprite/files/patch-third__party_CMakeLists.txt ___________________________________________________________________ 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: branches/2017Q4/graphics/aseprite/pkg-plist =================================================================== --- branches/2017Q4/graphics/aseprite/pkg-plist (revision 451310) +++ branches/2017Q4/graphics/aseprite/pkg-plist (revision 451311) @@ -1,119 +1,107 @@ 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 %%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/open_sequence.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 Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 451310) +++ branches/2017Q4 (revision 451311) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r451309