Attachment 244290 Details for Bug 273299 – graphics/povray37/Makefile: Clean up Makefile

[patch] graphics/povray37/Makefile: Clean up Makefile

graphics-povray37-Makefile.patch (text/plain), 2.99 KB, created by Philipp Ost on 2023-08-22 20:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Ost

Created: 2023-08-22 20:15:56 UTC

Size: 2.99 KB

patch

obsolete

>diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
>index e839e06e9049..4d1bb7d0abd1 100644
>--- a/graphics/povray37/Makefile
>+++ b/graphics/povray37/Makefile
>@@ -20,7 +20,7 @@ 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
> 
>@@ -30,62 +30,32 @@ 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 <bsd.port.options.mk>
>+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 <bsd.port.options.mk>
> 
> .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

Flags:

bsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 273299: 244290