From owner-svn-ports-head@FreeBSD.ORG  Sat Dec 28 06:37:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 29B06371;
 Sat, 28 Dec 2013 06:37:49 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 153531338;
 Sat, 28 Dec 2013 06:37:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBS6bm7Y070526;
 Sat, 28 Dec 2013 06:37:48 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBS6bmw4070525;
 Sat, 28 Dec 2013 06:37:48 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201312280637.rBS6bmw4070525@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 28 Dec 2013 06:37:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337838 - head/graphics/gd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Dec 2013 06:37:49 -0000

Author: dinoex
Date: Sat Dec 28 06:37:48 2013
New Revision: 337838
URL: http://svnweb.freebsd.org/changeset/ports/337838

Log:
  - use OPT_CONFIGURE_*

Modified:
  head/graphics/gd/Makefile

Modified: head/graphics/gd/Makefile
==============================================================================
--- head/graphics/gd/Makefile	Sat Dec 28 06:37:24 2013	(r337837)
+++ head/graphics/gd/Makefile	Sat Dec 28 06:37:48 2013	(r337838)
@@ -36,6 +36,9 @@ ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_AR
 ICONV_CONFIGURE_OFF=	--with-libiconv-prefix=no
 VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 VPX_CONFIGURE_OFF=	--without-vpx
+XPM_USE=	xorg=xpm,x11
+XPM_CONFIGURE_ON=	--with-x
+XPM_CONFIGURE_OFF=	--with-xpm=no
 
 .include <bsd.port.options.mk>
 
@@ -43,16 +46,6 @@ PKGCONFIGDIR?=	${LOCALBASE}/libdata/pkgc
 # force gdlib-config --ldflags
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-# honor global WITHOUT_X11
-.if !defined(WITHOUT_X11)
-.if ${PORT_OPTIONS:MXPM}
-USE_XORG=	xpm x11
-GNU_CONFIGURE_ARGS+=	--with-x
-.else
-GNU_CONFIGURE_ARGS+=	--with-xpm=no
-.endif
-.endif
-
 # The GD_FONTS environment variable can be set to specify the gzipped
 # tar-ball containing the fonts in bdf format and the bdf file names.
 # The tarball is the first argument, the tiny, small, medium-bold,