From owner-svn-ports-head@freebsd.org Sun May 19 18:23:50 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB2CB158AE36; Sun, 19 May 2019 18:23:49 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F65B6F498; Sun, 19 May 2019 18:23:49 +0000 (UTC) (envelope-from fernape@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 54693AC32; Sun, 19 May 2019 18:23:49 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4JINnfL022749; Sun, 19 May 2019 18:23:49 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4JINndC022748; Sun, 19 May 2019 18:23:49 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201905191823.x4JINndC022748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Sun, 19 May 2019 18:23:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502032 - head/graphics/opennurbs X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: head/graphics/opennurbs X-SVN-Commit-Revision: 502032 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7F65B6F498 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 19 May 2019 18:23:50 -0000 Author: fernape Date: Sun May 19 18:23:48 2019 New Revision: 502032 URL: https://svnweb.freebsd.org/changeset/ports/502032 Log: graphics/opennurbs: unbreak in 13-CURRENT In r311275 zlib.h was moved to contrib/zlib/zlib.h from lib/libz/zlib.h. Update the port Makefile to reflect this possibility. PR: 237936 Submitted by: phk@ Modified: head/graphics/opennurbs/Makefile Modified: head/graphics/opennurbs/Makefile ============================================================================== --- head/graphics/opennurbs/Makefile Sun May 19 18:20:39 2019 (r502031) +++ head/graphics/opennurbs/Makefile Sun May 19 18:23:48 2019 (r502032) @@ -24,10 +24,13 @@ OPTIONS_DEFINE= EXAMPLES # In r311275 zlib.h was moved to contrib/zlib/zlib.h from lib/libz/zlib.h LIBZ= ${SRC_BASE}/contrib/zlib .if !exists(${LIBZ}/zlib.h) +LIBZ= ${SRC_BASE}/sys/contrib/zlib +.endif +.if !exists(${LIBZ}/zlib.h) LIBZ:= ${SRC_BASE}/lib/libz -. if !exists(${LIBZ}/zlib.h) +.endif +.if !exists(${LIBZ}/zlib.h) IGNORE= needs SRC_BASE to compile. Install base system sources and try again -. endif .endif .if ${ARCH} != i386