View | Details | Raw Unified | Return to bug 210852 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/aseprite/Makefile (-11 / +13 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=		aseprite
4
PORTNAME=		aseprite
5
PORTVERSION=		1.1.5.6
5
PORTVERSION=		1.1.6
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
CATEGORIES=		graphics
7
CATEGORIES=		graphics
8
8
Lines 28-38 Link Here
28
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
28
WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
29
29
30
USE_GITHUB=		yes
30
USE_GITHUB=		yes
31
GH_TUPLE=		aseprite:aseprite:b659747
31
GH_TUPLE=		aseprite:aseprite:${DISTVERSIONFULL}
32
GH_TUPLE+=		aseprite:clip:8e92c5d:clip
32
GH_TUPLE+=		aseprite:flic:da184cb:flic
33
GH_TUPLE+=		aseprite:flic:da184cb:flic
33
GH_TUPLE+=		aseprite:gtest:d63c625:gtest
34
GH_TUPLE+=		aseprite:gtest:d63c625:gtest
34
GH_TUPLE+=		aseprite:simpleini:d4a436a:simpleini
35
GH_TUPLE+=		aseprite:simpleini:0687587:simpleini
35
GH_TUPLE+=		aseprite:duktape:90090c7:duk
36
GH_TUPLE+=		aseprite:duktape:0de771c:duk
37
GH_TUPLE+=		dacap:observable:89c9740:observable
36
38
37
USES=			cmake:outsource compiler:c++11-lib jpeg pkgconfig
39
USES=			cmake:outsource compiler:c++11-lib jpeg pkgconfig
38
USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
40
USE_XORG=		x11 xcursor xext xpm ice pixman sm xxf86dga xxf86vm
Lines 54-72 Link Here
54
CXXFLAGS+=		-I${LOCALBASE}/include/freetype2/freetype
56
CXXFLAGS+=		-I${LOCALBASE}/include/freetype2/freetype
55
57
56
post-extract:
58
post-extract:
57
	@${RMDIR} ${WRKSRC}/src/flic ${WRKSRC}/third_party/gtest ${WRKSRC}/third_party/simpleini ${WRKSRC}/third_party/duktape
59
	@${RMDIR} ${WRKSRC}/third_party/gtest ${WRKSRC}/third_party/simpleini ${WRKSRC}/third_party/duktape \
58
	@${MV} ${WRKDIR}/flic-* ${WRKSRC}/src/flic
60
		  ${WRKSRC}/src/clip ${WRKSRC}/src/flic ${WRKSRC}/src/observable
59
	@${MV} ${WRKDIR}/gtest-* ${WRKSRC}/third_party/gtest
61
	@${MV} ${WRKDIR}/gtest-* ${WRKSRC}/third_party/gtest
60
	@${MV} ${WRKDIR}/simpleini-* ${WRKSRC}/third_party/simpleini
62
	@${MV} ${WRKDIR}/simpleini-* ${WRKSRC}/third_party/simpleini
61
	@${MV} ${WRKDIR}/duktape-* ${WRKSRC}/third_party/duktape
63
	@${MV} ${WRKDIR}/duktape-* ${WRKSRC}/third_party/duktape
64
	@${MV} ${WRKDIR}/clip-* ${WRKSRC}/src/clip
65
	@${MV} ${WRKDIR}/flic-* ${WRKSRC}/src/flic
66
	@${MV} ${WRKDIR}/observable-* ${WRKSRC}/src/observable
62
	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman
67
	@${MKDIR} ${WRKSRC}/third_party/pixman/pixman
63
	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \
68
	@${CP} `${MAKE} -C ${PORTSDIR}/x11/pixman -V WRKSRC`/pixman/pixman-combine32.h \
64
		${WRKSRC}/third_party/pixman/pixman/
69
		${WRKSRC}/third_party/pixman/pixman/
65
70
66
post-configure:
71
post-patch:
67
	@${REINPLACE_CMD} -e 's|-lXxf86dga |-L${LOCALBASE}/lib -lXxf86dga |g' \
72
	@${REINPLACE_CMD} -e 's|1.1.6-dev|${PORTVERSION}|' ${WRKSRC}/src/config.h ${WRKSRC}/data/gui.xml
68
		`find ${WRKDIR} -name link.txt`
69
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
70
		${WRKSRC}/src/app/resource_finder.cpp
71
73
72
.include <bsd.port.mk>
74
.include <bsd.port.mk>
(-)graphics/aseprite/distinfo (-7 / +11 lines)
Lines 1-11 Link Here
1
TIMESTAMP = 1463713231
1
TIMESTAMP = 1467919676
2
SHA256 (aseprite-aseprite-v1.1.5.6-b659747_GH0.tar.gz) = 45b08dcf5fd02a8759c1cfbf5cd7b2c80b988993bd2d7a1f24b8e3601a60245c
2
SHA256 (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 770c2d1a8b68264f10204d815c72df4e25de5e1aeb482348e6909b107048b3fd
3
SIZE (aseprite-aseprite-v1.1.5.6-b659747_GH0.tar.gz) = 2979354
3
SIZE (aseprite-aseprite-v1.1.6_GH0.tar.gz) = 2576949
4
SHA256 (aseprite-clip-8e92c5d_GH0.tar.gz) = 65cd36c5942fb23d4128ff31381a1170264655af8180a4e2f8c0aade489525bf
5
SIZE (aseprite-clip-8e92c5d_GH0.tar.gz) = 10561
4
SHA256 (aseprite-flic-da184cb_GH0.tar.gz) = 118f422957ea59121a14f0474471cfb09fcf62fe9834b9b683671e53fb675075
6
SHA256 (aseprite-flic-da184cb_GH0.tar.gz) = 118f422957ea59121a14f0474471cfb09fcf62fe9834b9b683671e53fb675075
5
SIZE (aseprite-flic-da184cb_GH0.tar.gz) = 6552
7
SIZE (aseprite-flic-da184cb_GH0.tar.gz) = 6552
6
SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
8
SHA256 (aseprite-gtest-d63c625_GH0.tar.gz) = 9f8be975b8672f7e2e14053744bc9433aa8d0f613378ca1a9ab99ac87ba11a39
7
SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
9
SIZE (aseprite-gtest-d63c625_GH0.tar.gz) = 989187
8
SHA256 (aseprite-simpleini-d4a436a_GH0.tar.gz) = d78bdc44396b81501c5ad1b59d06db9055b037db53ef2a30dd583194ed3133fa
10
SHA256 (aseprite-simpleini-0687587_GH0.tar.gz) = 136c942b13809f3bd3f1ff3bdcc160039217a7006d052e5f005f38a0bd80174b
9
SIZE (aseprite-simpleini-d4a436a_GH0.tar.gz) = 54668
11
SIZE (aseprite-simpleini-0687587_GH0.tar.gz) = 54947
10
SHA256 (aseprite-duktape-90090c7_GH0.tar.gz) = a188d14e622a10429588376da8d77c3a79dd268a241e15a1bc6f2a3e04d126ce
12
SHA256 (aseprite-duktape-0de771c_GH0.tar.gz) = 6983173676090b750f866ace66e1462ed1e59619632906abc26804f2e43445a7
11
SIZE (aseprite-duktape-90090c7_GH0.tar.gz) = 608122
13
SIZE (aseprite-duktape-0de771c_GH0.tar.gz) = 840744
14
SHA256 (dacap-observable-89c9740_GH0.tar.gz) = 05604ada80009d608289b7ec67cf4c47e65d430c678cc838d7fe77ffdcf80e9d
15
SIZE (dacap-observable-89c9740_GH0.tar.gz) = 10795
(-)graphics/aseprite/files/patch-src_app_resource__finder.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/app/resource_finder.cpp.orig	2015-11-06 13:40:13 UTC
2
+++ src/app/resource_finder.cpp
3
@@ -105,7 +105,7 @@ void ResourceFinder::includeDataDir(cons
4
     includeBinDir(buf);
5
   #else
6
     // $BINDIR/../share/aseprite/data/filename (installed in /usr/ or /usr/local/)
7
-    sprintf(buf, "../share/aseprite/data/%s", filename);
8
+    sprintf(buf, "%%LOCALBASE%%/share/aseprite/data/%s", filename);
9
     includeBinDir(buf);
10
   #endif
11
 
(-)graphics/aseprite/files/patch-src_app_util_freetype__utils.cpp (-11 lines)
Lines 1-11 Link Here
1
--- src/app/util/freetype_utils.cpp.orig	2015-11-06 13:40:13 UTC
2
+++ src/app/util/freetype_utils.cpp
3
@@ -21,7 +21,7 @@
4
 
5
 #include <stdexcept>
6
 
7
-#include "freetype/ftglyph.h"
8
+#include <ftglyph.h>
9
 #include "ft2build.h"
10
 #include FT_FREETYPE_H
11
 
(-)graphics/aseprite/pkg-plist (+18 lines)
Lines 16-40 Link Here
16
%%DATADIR%%/data/icons/doc32.png
16
%%DATADIR%%/data/icons/doc32.png
17
%%DATADIR%%/data/icons/doc48.png
17
%%DATADIR%%/data/icons/doc48.png
18
%%DATADIR%%/data/icons/doc64.png
18
%%DATADIR%%/data/icons/doc64.png
19
%%DATADIR%%/data/palettes/a64.gpl
19
%%DATADIR%%/data/palettes/apple-ii.gpl
20
%%DATADIR%%/data/palettes/apple-ii.gpl
21
%%DATADIR%%/data/palettes/arne-paldac.gpl
20
%%DATADIR%%/data/palettes/arne16.gpl
22
%%DATADIR%%/data/palettes/arne16.gpl
21
%%DATADIR%%/data/palettes/arne32.gpl
23
%%DATADIR%%/data/palettes/arne32.gpl
22
%%DATADIR%%/data/palettes/atari2600-ntsc.gpl
24
%%DATADIR%%/data/palettes/atari2600-ntsc.gpl
23
%%DATADIR%%/data/palettes/atari2600-pal.gpl
25
%%DATADIR%%/data/palettes/atari2600-pal.gpl
26
%%DATADIR%%/data/palettes/cg-arne.gpl
24
%%DATADIR%%/data/palettes/cga.gpl
27
%%DATADIR%%/data/palettes/cga.gpl
25
%%DATADIR%%/data/palettes/commodore-plus4.gpl
28
%%DATADIR%%/data/palettes/commodore-plus4.gpl
26
%%DATADIR%%/data/palettes/commodore-vic20.gpl
29
%%DATADIR%%/data/palettes/commodore-vic20.gpl
27
%%DATADIR%%/data/palettes/commodore64.gpl
30
%%DATADIR%%/data/palettes/commodore64.gpl
31
%%DATADIR%%/data/palettes/copper-tech.gpl
32
%%DATADIR%%/data/palettes/cpc-boy.gpl
28
%%DATADIR%%/data/palettes/db16.gpl
33
%%DATADIR%%/data/palettes/db16.gpl
29
%%DATADIR%%/data/palettes/db32.gpl
34
%%DATADIR%%/data/palettes/db32.gpl
35
%%DATADIR%%/data/palettes/eroge-copper.gpl
36
%%DATADIR%%/data/palettes/gameboy-color-type1.gpl
30
%%DATADIR%%/data/palettes/gameboy.gpl
37
%%DATADIR%%/data/palettes/gameboy.gpl
31
%%DATADIR%%/data/palettes/google-ui.gpl
38
%%DATADIR%%/data/palettes/google-ui.gpl
39
%%DATADIR%%/data/palettes/jmp.gpl
32
%%DATADIR%%/data/palettes/master-system.gpl
40
%%DATADIR%%/data/palettes/master-system.gpl
41
%%DATADIR%%/data/palettes/monokai.gpl
33
%%DATADIR%%/data/palettes/nes-ntsc.gpl
42
%%DATADIR%%/data/palettes/nes-ntsc.gpl
34
%%DATADIR%%/data/palettes/nes.gpl
43
%%DATADIR%%/data/palettes/nes.gpl
44
%%DATADIR%%/data/palettes/pico-8.gpl
45
%%DATADIR%%/data/palettes/psygnork.gpl
46
%%DATADIR%%/data/palettes/smile-basic.gpl
35
%%DATADIR%%/data/palettes/solarized.gpl
47
%%DATADIR%%/data/palettes/solarized.gpl
36
%%DATADIR%%/data/palettes/teletext.gpl
48
%%DATADIR%%/data/palettes/teletext.gpl
49
%%DATADIR%%/data/palettes/vga-13h.gpl
50
%%DATADIR%%/data/palettes/web-safe-colors.gpl
37
%%DATADIR%%/data/palettes/win16.gpl
51
%%DATADIR%%/data/palettes/win16.gpl
52
%%DATADIR%%/data/palettes/x11.gpl
38
%%DATADIR%%/data/palettes/zx-spectrum.gpl
53
%%DATADIR%%/data/palettes/zx-spectrum.gpl
39
%%DATADIR%%/data/pref.xml
54
%%DATADIR%%/data/pref.xml
40
%%DATADIR%%/data/scripts/white_to_alpha.js
55
%%DATADIR%%/data/scripts/white_to_alpha.js
Lines 44-49 Link Here
44
%%DATADIR%%/data/skins/default/sheet.png
59
%%DATADIR%%/data/skins/default/sheet.png
45
%%DATADIR%%/data/skins/default/skin.xml
60
%%DATADIR%%/data/skins/default/skin.xml
46
%%DATADIR%%/data/widgets/advanced_mode.xml
61
%%DATADIR%%/data/widgets/advanced_mode.xml
62
%%DATADIR%%/data/widgets/brush_slot_params.xml
47
%%DATADIR%%/data/widgets/canvas_size.xml
63
%%DATADIR%%/data/widgets/canvas_size.xml
48
%%DATADIR%%/data/widgets/cel_properties.xml
64
%%DATADIR%%/data/widgets/cel_properties.xml
49
%%DATADIR%%/data/widgets/color_curve_point.xml
65
%%DATADIR%%/data/widgets/color_curve_point.xml
Lines 64-69 Link Here
64
%%DATADIR%%/data/widgets/keyboard_shortcuts.xml
80
%%DATADIR%%/data/widgets/keyboard_shortcuts.xml
65
%%DATADIR%%/data/widgets/layer_properties.xml
81
%%DATADIR%%/data/widgets/layer_properties.xml
66
%%DATADIR%%/data/widgets/main_window.xml
82
%%DATADIR%%/data/widgets/main_window.xml
83
%%DATADIR%%/data/widgets/modify_selection.xml
67
%%DATADIR%%/data/widgets/new_folder_window.xml
84
%%DATADIR%%/data/widgets/new_folder_window.xml
68
%%DATADIR%%/data/widgets/new_layer.xml
85
%%DATADIR%%/data/widgets/new_layer.xml
69
%%DATADIR%%/data/widgets/new_sprite.xml
86
%%DATADIR%%/data/widgets/new_sprite.xml
Lines 79-84 Link Here
79
%%DATADIR%%/data/widgets/sprite_size.xml
96
%%DATADIR%%/data/widgets/sprite_size.xml
80
%%DATADIR%%/data/widgets/timeline_conf.xml
97
%%DATADIR%%/data/widgets/timeline_conf.xml
81
%%DATADIR%%/data/widgets/undo_history.xml
98
%%DATADIR%%/data/widgets/undo_history.xml
99
%%DATADIR%%/data/widgets/user_data.xml
82
%%DATADIR%%/data/widgets/webp_options.xml
100
%%DATADIR%%/data/widgets/webp_options.xml
83
%%DATADIR%%/data/%%WWWDIR%%.css
101
%%DATADIR%%/data/%%WWWDIR%%.css
84
%%DATADIR%%/data/%%WWWDIR%%.js
102
%%DATADIR%%/data/%%WWWDIR%%.js

Return to bug 210852