Attachment #207476 for bug #240568




# $FreeBSD$

PORTNAME=	argyllcms
PORTVERSION=	2.1.1
PORTREVISION=	5
CATEGORIES=	graphics
MASTER_SITES=	http://www.argyllcms.com/
DISTNAME=	Argyll_V${PORTVERSION}_src

LIB_DEPENDS=	libtiff.so:graphics/tiff \
		libpng.so:graphics/png

WRKSRC=		${WRKDIR}/Argyll_V${PORTVERSION}

USES=		compiler:c11 cpe jpeg ssl zip
USE_XORG=	x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm
USE_GCC=	yes

WRKSRC=		${WRKDIR}/Argyll_V${PORTVERSION}

post-patch:
	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1479769420	1	TIMESTAMP = 1568377262
2	SHA256 (Argyll_V1.9.2_src.zip) = 4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90	2	SHA256 (Argyll_V2.1.1_src.zip) = 51269bcafc4d95679354b796685c3f0a41b44b78443cbe360cda4a2d72f32acb
3	SIZE (Argyll_V1.9.2_src.zip) = 13624924	3	SIZE (Argyll_V2.1.1_src.zip) = 13825860




Forwarded: no
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- icc/icc.h.orig	2019-09-13 20:11:47 UTC
+++ icc/icc.h
@@ -131,8 +131,13 @@
 #define CF64PREC "LL"				/* Constant precision specifier */
 
 #ifndef ATTRIBUTE_NORETURN
+#ifdef _MSC_VER

 # define ATTRIBUTE_NORETURN __declspec(noreturn)
+#else
+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
 #endif
+#endif
+
 
 #else  /* !_MSC_VER */
 

Lines 7-12 Link Here

(-)pkg-plist (+7 lines)
7	bin/collink	7	bin/collink
8	bin/colprof	8	bin/colprof
9	bin/colverify	9	bin/colverify
		10	bin/cxf2ti3
10	bin/dispcal	11	bin/dispcal
11	bin/dispread	12	bin/dispread
12	bin/dispwin	13	bin/dispwin
Lines 52-57 Link Here
52	share/argyll/ref/CMP_Digital_Target-4.cie	53	share/argyll/ref/CMP_Digital_Target-4.cie
53	share/argyll/ref/CMP_Digital_Target-4.ti2	54	share/argyll/ref/CMP_Digital_Target-4.ti2
54	share/argyll/ref/CMP_Digital_Target-7.cht	55	share/argyll/ref/CMP_Digital_Target-7.cht
		56	share/argyll/ref/CMP_Digital_Target-2019.cht
		57	share/argyll/ref/CMP_Digital_Target_Studio.cht
55	share/argyll/ref/ClayRGB1998.icm	58	share/argyll/ref/ClayRGB1998.icm
56	share/argyll/ref/ColorChecker.cht	59	share/argyll/ref/ColorChecker.cht
57	share/argyll/ref/ColorChecker.cie	60	share/argyll/ref/ColorChecker.cie
Lines 86-91 Link Here
86	share/argyll/ref/FograStrip3_3.ti2	89	share/argyll/ref/FograStrip3_3.ti2
87	share/argyll/ref/GTIPlus.sp	90	share/argyll/ref/GTIPlus.sp
88	share/argyll/ref/Hutchcolor.cht	91	share/argyll/ref/Hutchcolor.cht
		92	share/argyll/ref/ISO12641_2_1.cht
		93	share/argyll/ref/ISO12641_2_3_1.cht
		94	share/argyll/ref/ISO12641_2_3_2.cht
		95	share/argyll/ref/ISO12641_2_3_3.cht
89	share/argyll/ref/LaserSoftDCPro.cht	96	share/argyll/ref/LaserSoftDCPro.cht
90	share/argyll/ref/Office.sp	97	share/argyll/ref/Office.sp
91	share/argyll/ref/ProPhoto.icm	98	share/argyll/ref/ProPhoto.icm

Return to bug 240568

Lines 2-9 Link Here

(-)Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= argyllcms	4	PORTNAME= argyllcms
5	PORTVERSION= 1.9.2	5	PORTVERSION= 2.1.1
6	PORTREVISION= 5
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://www.argyllcms.com/	7	MASTER_SITES= http://www.argyllcms.com/
9	DISTNAME= Argyll_V${PORTVERSION}_src	8	DISTNAME= Argyll_V${PORTVERSION}_src
Lines 17-27 Link Here
17	LIB_DEPENDS= libtiff.so:graphics/tiff \	16	LIB_DEPENDS= libtiff.so:graphics/tiff \
18	libpng.so:graphics/png	17	libpng.so:graphics/png
19		18
20	WRKSRC= ${WRKDIR}/Argyll_V${PORTVERSION}
21
22	USES= compiler:c11 cpe jpeg ssl zip	19	USES= compiler:c11 cpe jpeg ssl zip
23	USE_XORG= x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm	20	USE_XORG= x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm
		21	USE_GCC= yes
24		22
		23	WRKSRC= ${WRKDIR}/Argyll_V${PORTVERSION}
		24
25	post-patch:	25	post-patch:
26	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase	26	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase
27		27

Lines 4-13 Link Here

(-)files/patch-gcc5 (-5 / +7 lines)
4	Forwarded: no	4	Forwarded: no
5	---	5	---
6	This patch header follows DEP-3: http://dep.debian.net/deps/dep3/	6	This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7	--- icc/icc.h	7	--- icc/icc.h.orig 2019-09-13 20:11:47 UTC
8	+++ icc/icc.h	8	+++ icc/icc.h
9	@@ -100,7 +100,11 @@	9	@@ -131,8 +131,13 @@
10	#define CF64PREC "LL" /* Constant precision specifier */	10	#define CF64PREC "LL" /* Constant precision specifier */
11		11
12	#ifndef ATTRIBUTE_NORETURN	12	#ifndef ATTRIBUTE_NORETURN
13	+#ifdef _MSC_VER	13	+#ifdef _MSC_VER
Lines 14-20 Link Here
14	# define ATTRIBUTE_NORETURN __declspec(noreturn)	14	# define ATTRIBUTE_NORETURN __declspec(noreturn)
15	+#else	15	+#else
16	+# define ATTRIBUTE_NORETURN __attribute__((noreturn))	16	+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
		17	#endif
17	+#endif	18	+#endif
18	#endif	19	+
19		20
20	#else /* !__STDC_VERSION__ */	21	#else /* !_MSC_VER */
		22