From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 22 16:53:58 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70665851;
 Mon, 22 Dec 2014 16:53:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C92C6455A;
 Mon, 22 Dec 2014 16:53:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBMGrwUw035801;
 Mon, 22 Dec 2014 16:53:58 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBMGrw7x035800;
 Mon, 22 Dec 2014 16:53:58 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201412221653.sBMGrw7x035800@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 22 Dec 2014 16:53:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375246 - head/security/p5-GD-SecurityImage
X-SVN-Group: ports-head
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Dec 2014 16:53:58 -0000

Author: pi
Date: Mon Dec 22 16:53:57 2014
New Revision: 375246
URL: https://svnweb.freebsd.org/changeset/ports/375246
QAT: https://qat.redports.org/buildarchive/r375246/

Log:
  security/p5-GD-SecurityImage: knob to allow correct DEPENDS for IMAGEMAGICK
  
  Allow to select X11 with IMAGEMAGICK (manually).
  
  PR:		194284
  Submitted by:	Frank WAll <fw@moov.de>

Modified:
  head/security/p5-GD-SecurityImage/Makefile

Modified: head/security/p5-GD-SecurityImage/Makefile
==============================================================================
--- head/security/p5-GD-SecurityImage/Makefile	Mon Dec 22 16:45:41 2014	(r375245)
+++ head/security/p5-GD-SecurityImage/Makefile	Mon Dec 22 16:53:57 2014	(r375246)
@@ -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 @@ LICENSE_COMB=	dual
 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 @@ PORTSCOUT=	skipv:1.581
 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}
+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
+.endif
 
 .include <bsd.port.mk>