svn commit: r451309 - in head/graphics/aseprite: . files

[Tobias Kortkamp]

Author: tobik
Date: Thu Oct  5 13:09:17 2017
New Revision: 451309
URL: https://svnweb.freebsd.org/changeset/ports/451309

Log:
  graphics/aseprite: Fix conflict with textproc/cmark
  
  Link with libcmark from textproc/cmark instead of using the embedded
  cmark version and stop installing files that textproc/cmark already
  provides.
  
  PR:		222787
  Reported by:	rodrigo
  Approved by:	Yuri Victorovich <yuri at rawbw.com> (maintainer)
  MFH:		2017Q4

Added:
  head/graphics/aseprite/files/patch-third__party_CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/aseprite/Makefile
  head/graphics/aseprite/distinfo
  head/graphics/aseprite/pkg-plist

Modified: head/graphics/aseprite/Makefile
==============================================================================
--- head/graphics/aseprite/Makefile	Thu Oct  5 12:45:05 2017	(r451308)
+++ head/graphics/aseprite/Makefile	Thu Oct  5 13:09:17 2017	(r451309)
@@ -4,7 +4,7 @@
 PORTNAME=		aseprite
 PORTVERSION=		1.1.13
 DISTVERSIONPREFIX=	v
-PORTREVISION=		3
+PORTREVISION=		4
 CATEGORIES=		graphics
 
 MAINTAINER=		yuri at rawbw.com
@@ -21,7 +21,8 @@ LIB_DEPENDS=		libfreetype.so:print/freetype2 \
 			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
@@ -37,7 +38,6 @@ 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
@@ -71,12 +71,9 @@ 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/
-	@${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 <bsd.port.mk>

Modified: head/graphics/aseprite/distinfo
==============================================================================
--- head/graphics/aseprite/distinfo	Thu Oct  5 12:45:05 2017	(r451308)
+++ head/graphics/aseprite/distinfo	Thu Oct  5 13:09:17 2017	(r451309)
@@ -7,8 +7,6 @@ SHA256 (aseprite-flic-65a6072_GH0.tar.gz) = 659ccc0120
 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

Added: head/graphics/aseprite/files/patch-third__party_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/aseprite/files/patch-third__party_CMakeLists.txt	Thu Oct  5 13:09:17 2017	(r451309)
@@ -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)

Modified: head/graphics/aseprite/pkg-plist
==============================================================================
--- head/graphics/aseprite/pkg-plist	Thu Oct  5 12:45:05 2017	(r451308)
+++ head/graphics/aseprite/pkg-plist	Thu Oct  5 13:09:17 2017	(r451309)
@@ -1,16 +1,4 @@
 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