Date: Sun, 9 Aug 2015 12:55:20 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393785 - in head/graphics/argyllcms: . files Message-ID: <201508091255.t79CtKNn026648@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun Aug 9 12:55:19 2015 New Revision: 393785 URL: https://svnweb.freebsd.org/changeset/ports/393785 Log: * Set USES=compiler:c11 to select clang on 9.3-R. Pass MAKE_ENV to jam in the do-build target so CC & friends get set in the enviroment so jam can pick them up. This fixes the build on 9.3-R amd64. [1] * Add patch from debian to fix segfault in dispwin with bad command line options Submitted by: pkg-fallout [1] Added: head/graphics/argyllcms/files/patch-spectro_dispwin.c (contents, props changed) Modified: head/graphics/argyllcms/Makefile Modified: head/graphics/argyllcms/Makefile ============================================================================== --- head/graphics/argyllcms/Makefile Sun Aug 9 12:43:41 2015 (r393784) +++ head/graphics/argyllcms/Makefile Sun Aug 9 12:55:19 2015 (r393785) @@ -3,6 +3,7 @@ PORTNAME= argyllcms PORTVERSION= 1.7.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.argyllcms.com/ DISTNAME= Argyll_V${PORTVERSION}_src @@ -17,14 +18,14 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/grap WRKSRC= ${WRKDIR}/Argyll_V${PORTVERSION} -USES= cpe jpeg zip +USES= compiler:c11 cpe jpeg zip USE_XORG= x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm post-patch: @${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase do-build: - @cd ${WRKSRC} && jam -q -fJambase -j${MAKE_JOBS_NUMBER} + @cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS_NUMBER} do-install: @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \ Added: head/graphics/argyllcms/files/patch-spectro_dispwin.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/argyllcms/files/patch-spectro_dispwin.c Sun Aug 9 12:55:19 2015 (r393785) @@ -0,0 +1,17 @@ +Description: Add check for NULL pointer +Author: Jörg Frings-Fürst <debian@jff-webhsoting.net> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700253 +Forwarded: http://www.freelists.org/post/argyllcms/dispwin-bad-command-line-option-makes-dispwin-segfault +Reviewed-by: +Last-Update: 2014-09-14 +--- +--- spectro/dispwin.c.orig 2015-05-01 10:15:55.000000000 +0200 ++++ spectro/dispwin.c 2015-08-09 14:48:49.778919000 +0200 +@@ -5547,6 +5547,7 @@ + + /* Display number */ + else if (argv[fa][1] == 'd') { ++ if(na == NULL) usage(0,"-d parameter missing"); + if (strncmp(na,"web",3) == 0 + || strncmp(na,"WEB",3) == 0) { + webdisp = 8080;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508091255.t79CtKNn026648>