From owner-svn-ports-all@freebsd.org Wed Mar 25 16:27:26 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A43A82A57E5; Wed, 25 Mar 2020 16:27:26 +0000 (UTC) (envelope-from mandree@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 48nYRx3SSWz4Vy1; Wed, 25 Mar 2020 16:27:24 +0000 (UTC) (envelope-from mandree@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 096F91DD8C; Wed, 25 Mar 2020 16:27:17 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PGRHOW003028; Wed, 25 Mar 2020 16:27:17 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PGRHXS003027; Wed, 25 Mar 2020 16:27:17 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202003251627.02PGRHXS003027@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 25 Mar 2020 16:27:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529107 - head/graphics/openexr X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/graphics/openexr X-SVN-Commit-Revision: 529107 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 16:27:28 -0000 Author: mandree Date: Wed Mar 25 16:27:17 2020 New Revision: 529107 URL: https://svnweb.freebsd.org/changeset/ports/529107 Log: graphics/openexr: fix plist in -EXAMPLES config, remove LARGE_STACK With the EXAMPLES option unset, the plist was mismatched. Fix all found combinations of DOCS/EXAMPLES dis-/enabled. While here, LARGE_STACK is apparently an ilmbase-only option as reported by cmake, remove it. Reported by: Matthias Fechner Modified: head/graphics/openexr/Makefile Modified: head/graphics/openexr/Makefile ============================================================================== --- head/graphics/openexr/Makefile Wed Mar 25 16:25:19 2020 (r529106) +++ head/graphics/openexr/Makefile Wed Mar 25 16:27:17 2020 (r529107) @@ -3,6 +3,7 @@ PORTNAME= openexr PORTVERSION= 2.4.1 +PORTREVISION= 1 CATEGORIES= graphics devel MASTER_SITES= LOCAL/mandree/:test DISTFILES= ${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test @@ -28,22 +29,19 @@ LDFLAGS+= -lpthread PORTDOCS= * PORTEXAMPLES= * -DOCSRCDIR1= ${WRKSRC}/.. +DOCSRCDIR1= ${WRKSRC:H}/ DOC_FILES1= CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \ CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md DOCSRCDIR2= ${WRKSRC}/doc DOC_FILES2= *.odt *.pdf -OPTIONS_DEFINE= DOCS EXAMPLES LARGE_STACK -LARGE_STACK_DESC= Enable sys-dependent large stack optimizations +OPTIONS_DEFINE= DOCS EXAMPLES WRKSRC_SUBDIR= OpenEXR OPTIONS_SUB= yes -LARGE_STACK_CONFIGURE_ENABLE= large-stack - .include .if ${ARCH} == powerpc @@ -79,14 +77,16 @@ post-install-EXAMPLES-on: post-install-EXAMPLES-off: ${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ + @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || : post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR} - ${MV} ${STAGEDIR}${DOCSDIR}/../OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: + ${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf @${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || : regression-test check test: