Index: head/graphics/argyllcms/Makefile =================================================================== --- head/graphics/argyllcms/Makefile (revision 441489) +++ head/graphics/argyllcms/Makefile (revision 441490) @@ -1,39 +1,39 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= argyllcms PORTVERSION= 1.9.2 PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.argyllcms.com/ DISTNAME= Argyll_V${PORTVERSION}_src MAINTAINER= kwm@FreeBSD.org COMMENT= ICC compatible color management system LICENSE= AGPLv3 BUILD_DEPENDS= jam:devel/jam LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng16.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 post-patch: @${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase do-build: @cd ${WRKSRC} && ${MAKE_ENV} jam -q -fJambase -j${MAKE_JOBS_NUMBER} do-install: - @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} PREFIX=${PREFIX} \ + @cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${MAKE_ENV} \ REFSUBDIR=share/argyll/ref \ jam -q -fJambase -j${MAKE_JOBS_NUMBER} install - @${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \ + ${MV} ${STAGEDIR}${PREFIX}/bin/License.txt \ ${STAGEDIR}${PREFIX}/share/argyll/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include Index: head/graphics/argyllcms/files/patch-Jambase =================================================================== --- head/graphics/argyllcms/files/patch-Jambase (revision 441489) +++ head/graphics/argyllcms/files/patch-Jambase (revision 441490) @@ -1,15 +1,24 @@ ---- Jambase.bak 2016-09-28 02:58:53.000000000 +0000 -+++ Jambase 2017-05-11 19:43:36.780841000 +0000 -@@ -999,7 +999,11 @@ +--- Jambase.orig 2016-09-28 02:58:53 UTC ++++ Jambase +@@ -966,7 +966,7 @@ else if $(UNIX) + YACCFILES ?= y.tab ; + YACCFLAGS ?= -d ; + +- HDRS ?= /usr/local/include ; ++ HDRS ?= $(LOCALBASE)/include ; + + # Add some good defaults for OS X + if $(OS) = MACOSX { +@@ -999,7 +999,11 @@ else if $(UNIX) # General defaults; a lot like UNIX # - AR ?= ar rusc ; + if ! $(AR) { + AR = ar rusc ; + } else { + AR += rusc ; + } AS ?= as ; ASFLAGS ?= ; AWK ?= awk ; Index: head/graphics/argyllcms/files/patch-Jamtop =================================================================== --- head/graphics/argyllcms/files/patch-Jamtop (nonexistent) +++ head/graphics/argyllcms/files/patch-Jamtop (revision 441490) @@ -0,0 +1,49 @@ +--- Jamtop.orig 2017-05-22 19:09:44 UTC ++++ Jamtop +@@ -76,8 +76,8 @@ if $(UNIX) { + LibWinH = /usr/X11R6/include ; + } else if [ GLOB /usr/include/X11 : X.h ] { + LibWinH = /usr/include ; +- } else if [ GLOB /usr/local/include/X11 : X.h ] { +- LibWinH = /usr/local/include ; ++ } else if [ GLOB $(LOCALBASE)/include/X11 : X.h ] { ++ LibWinH = $(LOCALBASE)/include ; + } else { + EXIT Unable to locate the X11 include files ; + } +@@ -91,8 +91,8 @@ if $(UNIX) { + LibWinD = /usr/lib64 ; + } else if [ GLOB /usr/lib : libX11.so libX11.a ] { + LibWinD = /usr/lib ; +- } else if [ GLOB /usr/local/lib : libX11.so libX11.a ] { +- LibWinD = /usr/local/lib ; ++ } else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] { ++ LibWinD = $(LOCALBASE)/lib ; + } else { + ECHO Unable to locate the 64 bit X11 library files ; + } +@@ -103,8 +103,8 @@ if $(UNIX) { + LibWinD = /usr/lib/i386-linux-gnu ; + } else if [ GLOB /usr/lib : libX11.so libX11.a ] { + LibWinD = /usr/lib ; +- } else if [ GLOB /usr/local/lib : libX11.so libX11.a ] { +- LibWinD = /usr/local/lib ; ++ } else if [ GLOB $(LOCALBASE)/lib : libX11.so libX11.a ] { ++ LibWinD = $(LOCALBASE)/lib ; + } else { + ECHO Unable to locate the 32 bit X11 library files ; + } +@@ -140,11 +140,11 @@ rule CheckForLibrary { + + if ! $(BUILTIN_$(UCASE)) && $(UNIX) { + if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ] +- || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ] ++ || [ GLOB $(LOCALBASE)/include$(subd) : $(lcase).h $(lcase)lib.h ] + || [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] + || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] { + if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ] +- || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ] ++ || [ GLOB $(LOCALBASE)/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ] + || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ] + || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ] + || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ] Property changes on: head/graphics/argyllcms/files/patch-Jamtop ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h =================================================================== --- head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h (revision 441489) +++ head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h (revision 441490) @@ -1,11 +1,10 @@ ---- ./ccast/axTLS/os_int.h.orig -+++ ./ccast/axTLS/os_int.h -@@ -34,6 +34,7 @@ +--- ccast/axTLS/os_int.h.orig 2016-09-28 03:00:00 UTC ++++ ccast/axTLS/os_int.h +@@ -34,6 +34,7 @@ extern "C" { #if (__STDC_VERSION__ >= 199901L) /* C99 */ \ || defined(_STDINT_H_) || defined(_STDINT_H) \ || defined(_SYS_TYPES_H) \ + || defined(__powerpc64__) || defined(POWERPC64) \ || (defined(__APPLE__) && defined(__POWERPC__)) #include - Index: head/graphics/argyllcms/files/patch-spectro_dispwin.c =================================================================== --- head/graphics/argyllcms/files/patch-spectro_dispwin.c (revision 441489) +++ head/graphics/argyllcms/files/patch-spectro_dispwin.c (revision 441490) @@ -1,17 +1,16 @@ Description: Add check for NULL pointer Author: Jörg Frings-Fürst 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 @@ +--- spectro/dispwin.c.orig 2016-09-28 02:59:10 UTC ++++ spectro/dispwin.c +@@ -6055,6 +6055,7 @@ main(int argc, char *argv[]) { /* 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;