From nobody Fri Aug 25 06:50:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RX9Yk5Hhgz4qwcx; Fri, 25 Aug 2023 06:50:02 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RX9Yk3VS6z3SgS; Fri, 25 Aug 2023 06:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692946202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOhAEltlqtpA7xvWHttGMZfO8RXKExK2dMBIDI1LZmU=; b=RmCwaWIy8JpZpZl6QbWUs1DTvJH7m/4GzmZfp26crkzCszeRQBMsXnAvOliiAauIxZOE8G ZAlAbdXkUcC4A5TT1GpPMCas71/UJomVZ+PkoQ7d0fKWmIJ21e6rTmXLZCRftezEyLcHY5 qmE+h/avXSd7kcTntVGAT3FPwYiZ8m5TJEqtGmF516Hj2PHDSpeaFQN8WrK5XYPuR6F8sv oZBbauw2cU2NtDH9stEU/oP5I6raj6SdZjpByies0FgaSxQGgp6pDTYQTQi9xzFeVdKqII JHxxatV4sMehtFwhnJCDcCSbuhWjNrb/Oz3T6ITx1YRHgLqPLBzRbZTdGpffDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692946202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mOhAEltlqtpA7xvWHttGMZfO8RXKExK2dMBIDI1LZmU=; b=FSlbW9UuJWCp45bxlaEdWuN5wgQ1SIfEYk3YtyHh5g2XYa4GBG/udlZ2rv34GsDsH+/kCH /2T7cc6DaT518RZuqsWFtvyjlXqJuVWZF+6T+6qa9t5hoBg8hlST+cjr7QmkN3g9YqNZJL UShHNqLqBkPGUoAxPe3CMf8yIB53I3N60olgwFqdMmZbawxBSBVTnzm54MBaehC4klT175 otrM2bRx9Bf1B3BwhAtX7YaHSZur5AC/bEKqyozYx52FroY6uJULsvXRaTEsOX3Yw6FZoQ DM6ZPGRIAwHyt8wekbxYWvmTvhWDqp99Gmu6ezmg9T5nHTd7AtmTuIUDqe9agg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692946202; a=rsa-sha256; cv=none; b=ZB8J8oUBFulqK4QsjM4QX6SYlxCvUeli1MGy0ojcEjM9SY1GF0wavzWqWepTQoGd7tdPVk YyfqaJZt/YxyUaBHMOzMJjlzcvMHenWRvHdyG0gobP3Kvhbqt6UjpiHtzf7YzluDMk411Z Y07CS234tvN3kLoK2L1T0JI9a6WlkVQ8l7VxahMoe4vBXDX/ntVfxEuiAyUoFUzGnp4i2i eaVmXwiZZFoTFczm5TF3ZvDfZxDthKuQgCu/1VrMygEPTzUwDjuzwjCQ4rDkBTXoNkh29v VVZtTph2b4EnC0yaBqZBnw4Uh/APOIbyVri4PKO5laQ4ZTrHnyo8zjFyBZ3dbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RX9Yk2ZXszyfK; Fri, 25 Aug 2023 06:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37P6o2qF026083; Fri, 25 Aug 2023 06:50:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37P6o2V6026079; Fri, 25 Aug 2023 06:50:02 GMT (envelope-from git) Date: Fri, 25 Aug 2023 06:50:02 GMT Message-Id: <202308250650.37P6o2V6026079@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: cbf6cea662f5 - main - graphics/povray37: Clean up Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf6cea662f53deb0477cfd5f52b3dffb4cd2de5 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbf6cea662f53deb0477cfd5f52b3dffb4cd2de5 commit cbf6cea662f53deb0477cfd5f52b3dffb4cd2de5 Author: Philipp Ost AuthorDate: 2023-08-23 06:36:42 +0000 Commit: Fernando Apesteguía CommitDate: 2023-08-25 06:49:45 +0000 graphics/povray37: Clean up Makefile - set COMPILED_BY variable as proposed by diizzy@ - drop the STATIC option - make use of ports framework for options PNG, JPEG, TIFF, OPENEXR PR: 273299 Reported by: bsd@philippost.de (maintainer) --- graphics/povray37/Makefile | 72 ++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index e839e06e9049..07f3f9ef497d 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -1,7 +1,7 @@ PORTNAME= povray DISTVERSIONPREFIX= v DISTVERSION= 3.7.0.10 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics PKGNAMESUFFIX= 37 @@ -20,72 +20,42 @@ USE_GITHUB= yes GH_ACCOUNT= POV-Ray GNU_CONFIGURE= yes -CONFIGURE_ARGS= COMPILED_BY=${MAINTAINER} \ +CONFIGURE_ARGS= COMPILED_BY=${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R} \ --program-transform-name='s/povray/${PKGBASE}/' \ --disable-optimiz VERSION_BASE= ${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/} +ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE} DATADIR= ${PREFIX}/share/${PORTNAME}-${VERSION_BASE} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${VERSION_BASE} -ETCDIR= ${PREFIX}/etc/${PORTNAME}/${VERSION_BASE} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE} -OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS +OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR IO EXAMPLES DOCS OPTIONS_DEFAULT=PNG JPEG OPTIONS_SUB= yes -DOCS_DESC= Install HTML documentation -EXAMPLES_DESC= Install example scenes IO_DESC= Without I/O restrictions (security risk) IO_CONFIGURE_ON= --disable-io-restrictions -STATIC_CONFIGURE_ON= --enable-static -X11_USES= sdl xorg -X11_USE= XORG=xpm,sm,ice,x11 SDL=sdl -X11_CONFIGURE_OFF= --without-x -.include +JPEG_USES= jpeg +JPEG_CONFIGURE_OFF= --without-jpeg -.if ${PORT_OPTIONS:MPNG} -.if ${PORT_OPTIONS:MSTATIC} -BUILD_DEPENDS+= png>=1.4:graphics/png -.else -LIB_DEPENDS+= libpng.so:graphics/png -.endif -.else -CONFIGURE_ARGS+=--without-libpng -.endif +OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ + libOpenEXR.so:graphics/openexr +OPENEXR_CONFIGURE_WITH= openexr -.if ${PORT_OPTIONS:MJPEG} -.if ${PORT_OPTIONS:MSTATIC} -USES+= jpeg:build -.else -USES+= jpeg -.endif -.else -CONFIGURE_ARGS+=--without-libjpeg -.endif +PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_CONFIGURE_WITH= libpng -.if ${PORT_OPTIONS:MTIFF} -.if ${PORT_OPTIONS:MSTATIC} -BUILD_DEPENDS+= tiff>=4:graphics/tiff -.else -LIB_DEPENDS+= libtiff.so:graphics/tiff -.endif -.else -CONFIGURE_ARGS+=--without-libtiff -.endif +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CONFIGURE_WITH= libtiff -.if ${PORT_OPTIONS:MOPENEXR} -.if ${PORT_OPTIONS:MSTATIC} -BUILD_DEPENDS+= openexr>=1.6:graphics/openexr -.else -LIB_DEPENDS+= libOpenEXR.so:graphics/openexr libImath.so:math/Imath -CPPFLAGS+= -I${LOCALBASE}/include/OpenEXR -I${LOCALBASE}/include/Imath -DInt64=uint64_t -.endif -.else -CONFIGURE_ARGS+=--without-openexr -.endif +X11_USES= sdl xorg +X11_USE= XORG=xpm,sm,ice,x11 SDL=sdl +X11_CONFIGURE_OFF= --without-x + +.include .if !${PORT_OPTIONS:MPNG} || !${PORT_OPTIONS:MJPEG} || !${PORT_OPTIONS:MTIFF} CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes @@ -102,12 +72,6 @@ post-patch: pre-configure: cd ${WRKSRC}/unix && ./prebuild.sh -pre-build: -.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF} -# graphics/tiff adds dependencies on libjpeg, libjbig and liblzma - @${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig -llzma\2,' ${WRKSRC}/unix/Makefile -.endif - post-install: ${MV} ${STAGEDIR}${DATADIR}/scenes ${STAGEDIR}${EXAMPLESDIR} .for i in povray.conf povray.ini