Attachment 150853 Details for Bug 194284 – revised patch

[patch] revised patch

patch.txt (text/plain), 2.46 KB, created by Frank Wall on 2014-12-22 15:39:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Wall

Created: 2014-12-22 15:39:36 UTC

Size: 2.46 KB

patch

obsolete

>--- security/p5-GD-SecurityImage/Makefile.orig	2014-11-26 14:08:24.000000000 +0100
>+++ security/p5-GD-SecurityImage/Makefile	2014-12-22 16:19:20.000000000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	GD-SecurityImage
> PORTVERSION=	1.72
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	security perl5
> MASTER_SITES=	CPAN
>@@ -18,7 +18,8 @@
> BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-OPTIONS_DEFINE=	IMAGEMAGICK
>+OPTIONS_DEFINE=	IMAGEMAGICK X11
>+OPTIONS_DEFAULT=X11
> IMAGEMAGICK_DESC=	Build ImageMagick module
> 
> PORTSCOUT=	skipv:1.581
>@@ -26,7 +27,14 @@
> USES=		perl5
> USE_PERL5=	configure
> 
>-IMAGEMAGICK_BUILD_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>-IMAGEMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MX11}
>+IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+.else
>+IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
>+IMAGEMAGICK_RUN_DEPENDS=   ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
>+.endif
> 
> .include <bsd.port.mk>
>--- security/p5-GD-SecurityImage/Makefile.orig	2014-11-26 14:08:24.000000000 +0100
>+++ security/p5-GD-SecurityImage/Makefile	2014-12-22 16:38:38.000000000 +0100
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	GD-SecurityImage
> PORTVERSION=	1.72
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	security perl5
> MASTER_SITES=	CPAN
>@@ -18,7 +18,8 @@
> BUILD_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-OPTIONS_DEFINE=	IMAGEMAGICK
>+OPTIONS_DEFINE=	IMAGEMAGICK X11
>+OPTIONS_DEFAULT=	X11
> IMAGEMAGICK_DESC=	Build ImageMagick module
> 
> PORTSCOUT=	skipv:1.581
>@@ -26,7 +27,16 @@
> USES=		perl5
> USE_PERL5=	configure
> 
>-IMAGEMAGICK_BUILD_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>-IMAGEMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MIMAGEMAGICK}
>+.if ${PORT_OPTIONS:MX11}
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
>+.else
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
>+RUN_DEPENDS+=	${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11
>+.endif
>+.endif
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 194284: 148164 | 150852 | 150853