From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 20 23:23:37 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 3094521C;
 Thu, 20 Dec 2012 23:23:37 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 144EF8FC0C;
 Thu, 20 Dec 2012 23:23:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBKNNa0c043299;
 Thu, 20 Dec 2012 23:23:36 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBKNNaA9043298;
 Thu, 20 Dec 2012 23:23:36 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201212202323.qBKNNaA9043298@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 20 Dec 2012 23:23:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309331 - head/x11/xlockmore
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.14
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: Thu, 20 Dec 2012 23:23:37 -0000

Author: jgh
Date: Thu Dec 20 23:23:36 2012
New Revision: 309331
URL: http://svnweb.freebsd.org/changeset/ports/309331

Log:
  - add option for ImageMagick (MAGICK)
  
  PR:		174469
  Submitted by:	katsura@cc.osaka-kyoiku.ac.jp
  Approved by:	maintainer, jgh@

Modified:
  head/x11/xlockmore/Makefile

Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile	Thu Dec 20 23:13:44 2012	(r309330)
+++ head/x11/xlockmore/Makefile	Thu Dec 20 23:23:36 2012	(r309331)
@@ -27,7 +27,7 @@ MAN1=		xlock.1
 PLIST_FILES=	bin/xlock lib/X11/app-defaults/XLock
 
 OPTIONS_DEFINE=	MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \
-		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION
+		KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK
 
 MESAGL_DESC=	Mesa 3D (for GL modes)
 MB_DESC=	Xmb function series
@@ -122,6 +122,12 @@ CONFIGURE_ARGS+=	--disable-bomb
 CONFIGURE_ARGS+=	--enable-customization
 .endif
 
+.if ${PORT_OPTIONS:MMAGICK}
+LIB_DEPENDS+=	MagickCore:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=	--without-magick
+.endif
+
 CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
 
 .if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT}