Index: Makefile =================================================================== --- Makefile (revision 511952) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= argyllcms -PORTVERSION= 1.9.2 -PORTREVISION= 5 +PORTVERSION= 2.1.1 CATEGORIES= graphics MASTER_SITES= http://www.argyllcms.com/ DISTNAME= Argyll_V${PORTVERSION}_src @@ -17,11 +16,12 @@ 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 Index: distinfo =================================================================== --- distinfo (revision 511952) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479769420 -SHA256 (Argyll_V1.9.2_src.zip) = 4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90 -SIZE (Argyll_V1.9.2_src.zip) = 13624924 +TIMESTAMP = 1568377262 +SHA256 (Argyll_V2.1.1_src.zip) = 51269bcafc4d95679354b796685c3f0a41b44b78443cbe360cda4a2d72f32acb +SIZE (Argyll_V2.1.1_src.zip) = 13825860 Index: files/patch-gcc5 =================================================================== --- files/patch-gcc5 (revision 511952) +++ files/patch-gcc5 (working copy) @@ -1,20 +1,14 @@ -Description: Fix FTBFS with GCC 5 -Author: James Cowgill -Bug-Debian: https://bugs.debian.org/777779 -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- icc/icc.h -+++ icc/icc.h -@@ -100,7 +100,11 @@ - #define CF64PREC "LL" /* Constant precision specifier */ +--- icc.h.orig 2019-09-13 19:55:08 UTC ++++ icc.h +@@ -131,11 +131,7 @@ + #define CF64PREC "LL" /* Constant precision specifier */ #ifndef ATTRIBUTE_NORETURN -+#ifdef _MSC_VER +-#ifdef _MSC_VER # define ATTRIBUTE_NORETURN __declspec(noreturn) -+#else -+# define ATTRIBUTE_NORETURN __attribute__((noreturn)) -+#endif +-#else +-# define ATTRIBUTE_NORETURN __attribute__((noreturn)) +-#endif #endif - #else /* !__STDC_VERSION__ */ + #else /* !_MSC_VER */ Index: pkg-plist =================================================================== --- pkg-plist (revision 511952) +++ pkg-plist (working copy) @@ -7,6 +7,7 @@ bin/collink bin/colprof bin/colverify +bin/cxf2ti3 bin/dispcal bin/dispread bin/dispwin @@ -52,6 +53,8 @@ share/argyll/ref/CMP_Digital_Target-4.cie share/argyll/ref/CMP_Digital_Target-4.ti2 share/argyll/ref/CMP_Digital_Target-7.cht +share/argyll/ref/CMP_Digital_Target-2019.cht +share/argyll/ref/CMP_Digital_Target_Studio.cht share/argyll/ref/ClayRGB1998.icm share/argyll/ref/ColorChecker.cht share/argyll/ref/ColorChecker.cie @@ -86,6 +89,10 @@ share/argyll/ref/FograStrip3_3.ti2 share/argyll/ref/GTIPlus.sp share/argyll/ref/Hutchcolor.cht +share/argyll/ref/ISO12641_2_1.cht +share/argyll/ref/ISO12641_2_3_1.cht +share/argyll/ref/ISO12641_2_3_2.cht +share/argyll/ref/ISO12641_2_3_3.cht share/argyll/ref/LaserSoftDCPro.cht share/argyll/ref/Office.sp share/argyll/ref/ProPhoto.icm