From owner-svn-ports-head@freebsd.org Mon May 22 19:28:54 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 28DA8D7815D; Mon, 22 May 2017 19:28:54 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0437A18A8; Mon, 22 May 2017 19:28:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4MJSrlB068480; Mon, 22 May 2017 19:28:53 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4MJSqSb068473; Mon, 22 May 2017 19:28:52 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201705221928.v4MJSqSb068473@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 22 May 2017 19:28:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441490 - in head/graphics/argyllcms: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 May 2017 19:28:54 -0000 Author: kwm Date: Mon May 22 19:28:52 2017 New Revision: 441490 URL: https://svnweb.freebsd.org/changeset/ports/441490 Log: Fix hardcoded /usr/local. * Un-mute install of License.txt PR: 216236 Submitted by: John Hein Added: head/graphics/argyllcms/files/patch-Jamtop (contents, props changed) Modified: head/graphics/argyllcms/Makefile head/graphics/argyllcms/files/patch-Jambase head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h head/graphics/argyllcms/files/patch-spectro_dispwin.c Modified: head/graphics/argyllcms/Makefile ============================================================================== --- head/graphics/argyllcms/Makefile Mon May 22 19:07:16 2017 (r441489) +++ head/graphics/argyllcms/Makefile Mon May 22 19:28:52 2017 (r441490) @@ -29,10 +29,10 @@ 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/* Modified: head/graphics/argyllcms/files/patch-Jambase ============================================================================== --- head/graphics/argyllcms/files/patch-Jambase Mon May 22 19:07:16 2017 (r441489) +++ head/graphics/argyllcms/files/patch-Jambase Mon May 22 19:28:52 2017 (r441490) @@ -1,6 +1,15 @@ ---- 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 # Added: head/graphics/argyllcms/files/patch-Jamtop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/argyllcms/files/patch-Jamtop Mon May 22 19:28:52 2017 (r441490) @@ -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 ] Modified: head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h ============================================================================== --- head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h Mon May 22 19:07:16 2017 (r441489) +++ head/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h Mon May 22 19:28:52 2017 (r441490) @@ -1,6 +1,6 @@ ---- ./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) \ @@ -8,4 +8,3 @@ || (defined(__APPLE__) && defined(__POWERPC__)) #include - Modified: head/graphics/argyllcms/files/patch-spectro_dispwin.c ============================================================================== --- head/graphics/argyllcms/files/patch-spectro_dispwin.c Mon May 22 19:07:16 2017 (r441489) +++ head/graphics/argyllcms/files/patch-spectro_dispwin.c Mon May 22 19:28:52 2017 (r441490) @@ -4,10 +4,9 @@ Bug-Debian: https://bugs.debian.org/cgi- 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') {