Attachment #186912 for bug #222787

View | Details | Raw Unified | Return to bug 222787
Collapse All | Expand All




PORTNAME=		aseprite
PORTVERSION=		1.1.13
DISTVERSIONPREFIX=	v
PORTREVISION=		4
CATEGORIES=		graphics

MAINTAINER=		yuri@rawbw.com

			libpng.so:graphics/png \
			libgif.so:graphics/giflib \
			libcurl.so:ftp/curl \
			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

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

	@${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>

Lines 7-14 Link Here

(-)distinfo (-2 lines)
7	SIZE (aseprite-flic-65a6072_GH0.tar.gz) = 6558	7	SIZE (aseprite-flic-65a6072_GH0.tar.gz) = 6558
8	SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39	8	SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
9	SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187	9	SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
10	SHA256 (aseprite-cmark-5255e2d_GH0.tar.gz) = c73f003354cd58c60cf963ae202c31c41e4baf450970fe9861a1acc425273d4c
11	SIZE (aseprite-cmark-5255e2d_GH0.tar.gz) = 222772
12	SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b	10	SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b
13	SIZE (aseprite-simpleini-0687587_GH0.tar.gz) = 54947	11	SIZE (aseprite-simpleini-0687587_GH0.tar.gz) = 54947
14	SHA256 (aseprite-duktape-0de771c_GH0.tar.gz) = 6983173676090b750f866ace66e1462ed1e59619632906abc26804f2e43445a7	12	SHA256 (aseprite-duktape-0de771c_GH0.tar.gz) = 6983173676090b750f866ace66e1462ed1e59619632906abc26804f2e43445a7




--- 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)




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

Return to bug 222787

Lines 4-10 Link Here

(-)Makefile (-7 / +4 lines)
4	PORTNAME= aseprite	4	PORTNAME= aseprite
5	PORTVERSION= 1.1.13	5	PORTVERSION= 1.1.13
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= graphics	8	CATEGORIES= graphics
9		9
10	MAINTAINER= yuri@rawbw.com	10	MAINTAINER= yuri@rawbw.com
Lines 21-27 Link Here
21	libpng.so:graphics/png \	21	libpng.so:graphics/png \
22	libgif.so:graphics/giflib \	22	libgif.so:graphics/giflib \
23	libcurl.so:ftp/curl \	23	libcurl.so:ftp/curl \
24	libtinyxml.so:textproc/tinyxml	24	libtinyxml.so:textproc/tinyxml \
		25	libcmark.so:textproc/cmark
25		26
26	BROKEN_aarch64= fails to compile: undefined reference to __va_copy	27	BROKEN_aarch64= fails to compile: undefined reference to __va_copy
27	BROKEN_armv6= fails to compile: undefined reference to __va_copy	28	BROKEN_armv6= fails to compile: undefined reference to __va_copy
Lines 37-43 Link Here
37	GH_TUPLE= aseprite:clip:926e3cf:clip/src/clip	38	GH_TUPLE= aseprite:clip:926e3cf:clip/src/clip
38	GH_TUPLE+= aseprite:flic:65a6072:flic/src/flic	39	GH_TUPLE+= aseprite:flic:65a6072:flic/src/flic
39	GH_TUPLE+= aseprite:gtest:d63c625:gtest/third_party/gtest	40	GH_TUPLE+= aseprite:gtest:d63c625:gtest/third_party/gtest
40	GH_TUPLE+= aseprite:cmark:5255e2d:cmark/third_party/cmark
41	GH_TUPLE+= aseprite:simpleini:0687587:simpleini/third_party/simpleini	41	GH_TUPLE+= aseprite:simpleini:0687587:simpleini/third_party/simpleini
42	GH_TUPLE+= aseprite:duktape:0de771c:duktape/third_party/duktape	42	GH_TUPLE+= aseprite:duktape:0de771c:duktape/third_party/duktape
43	GH_TUPLE+= aseprite:undo:f39b188:undo/src/undo	43	GH_TUPLE+= aseprite:undo:f39b188:undo/src/undo
Lines 71-82 Link Here
71	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman	71	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman
72	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \	72	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \
73	${WRKSRC}/third_party/pixman/pixman/	73	${WRKSRC}/third_party/pixman/pixman/
74	@${REINPLACE_CMD} -e 's\|$${LIB_INSTALL_DIR}/pkgconfig\|${PREFIX}/libdata/pkgconfig\|' \
75	${WRKDIR}/cmark-*/src/CMakeLists.txt
76	@${REINPLACE_CMD} -e 's\|$${CMAKE_INSTALL_MANDIR}\|${PREFIX}/man\|' \
77	${WRKDIR}/cmark-*/man/CMakeLists.txt
78		74
79	post-patch:	75	post-patch:
80	@${REINPLACE_CMD} -e 's\|1.1.6-dev\|${PORTVERSION}\|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml	76	@${REINPLACE_CMD} -e 's\|1.1.6-dev\|${PORTVERSION}\|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml
		77	@${REINPLACE_CMD} 's\|libcmark_static\|cmark\|' ${WRKSRC}/src/app/CMakeLists.txt
81		78
82	.include <bsd.port.mk>	79	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-third__party_CMakeLists.txt (+24 lines)
	1	--- third_party/CMakeLists.txt.orig 2017-10-04 18:41:08 UTC
	2	+++ third_party/CMakeLists.txt
	3	@@ -86,21 +86,3 @@ if(NOT USE_SHARED_FREETYPE)
	4	endif()
	5
	6	add_subdirectory(simpleini)
	7	-
	8	-# Add cmark without tests
	9	-set(CMARK_TESTS OFF CACHE BOOL "Build cmark tests and enable testing")
	10	-add_subdirectory(cmark)
	11	-set(cmark_headers
	12	- ${CMAKE_CURRENT_SOURCE_DIR}/cmark/src/cmark.h
	13	- ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_export.h
	14	- ${CMAKE_CURRENT_BINARY_DIR}/cmark/src/cmark_version.h)
	15	-foreach(fn ${cmark_headers})
	16	- get_filename_component(fn_name "${fn}" NAME)
	17	- add_custom_command(
	18	- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name}
	19	- COMMAND ${CMAKE_COMMAND} -E copy ${fn} ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name}
	20	- MAIN_DEPENDENCY ${fn})
	21	- list(APPEND copy_cmark_headers ${CMAKE_CURRENT_BINARY_DIR}/cmark/${fn_name})
	22	-endforeach()
	23	-add_custom_target(copy_cmark_headers DEPENDS ${copy_cmark_headers})
	24	-add_dependencies(libcmark_static copy_cmark_headers)

Lines 1-16 Link Here

(-)pkg-plist (-12 lines)
1	bin/aseprite	1	bin/aseprite
2	bin/cmark
3	include/cmark.h
4	include/cmark_export.h
5	include/cmark_version.h
6	lib/cmake/cmark-%%CMAKE_BUILD_TYPE%%.cmake
7	lib/cmake/cmark.cmake
8	lib/libcmark.a
9	lib/libcmark.so
10	lib/libcmark.so.0.27.1
11	libdata/pkgconfig/libcmark.pc
12	man/man1/cmark.1.gz
13	man/man3/cmark.3.gz
14	%%DATADIR%%/data/convmatr.def	2	%%DATADIR%%/data/convmatr.def
15	%%DATADIR%%/data/fonts/allegro.pcx	3	%%DATADIR%%/data/fonts/allegro.pcx
16	%%DATADIR%%/data/fonts/anipro_fixed.pcx	4	%%DATADIR%%/data/fonts/anipro_fixed.pcx