Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Mar 2020 16:27:17 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529107 - head/graphics/openexr
Message-ID:  <202003251627.02PGRHXS003027@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 
 .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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003251627.02PGRHXS003027>