From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 29 11:42:33 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 0B22DCEA;
 Sun, 29 Dec 2013 11:42:33 +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 EBA541E53;
 Sun, 29 Dec 2013 11:42:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBTBgW9Z003993;
 Sun, 29 Dec 2013 11:42:32 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBTBgWiE003992;
 Sun, 29 Dec 2013 11:42:32 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201312291142.rBTBgWiE003992@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 29 Dec 2013 11:42:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337965 - head/graphics/webp
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.17
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: Sun, 29 Dec 2013 11:42:33 -0000

Author: johans
Date: Sun Dec 29 11:42:32 2013
New Revision: 337965
URL: http://svnweb.freebsd.org/changeset/ports/337965

Log:
  Simplify conditional options
  
  Submitted by:	bapt

Modified:
  head/graphics/webp/Makefile

Modified: head/graphics/webp/Makefile
==============================================================================
--- head/graphics/webp/Makefile	Sun Dec 29 11:42:31 2013	(r337964)
+++ head/graphics/webp/Makefile	Sun Dec 29 11:42:32 2013	(r337965)
@@ -27,14 +27,8 @@ CONFIGURE_ARGS+=--with-pkgconfigdir=${PR
 
 OPTIONS_DEFINE=	X11
 OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USE_GL=		glut
-.else
-CONFIGURE_ARGS+=--with-glincludedir=/dev/null
-.endif
+X11_USE=	GL=glut
+X11_CONFIGURE_OFF=	--with-glincludedir=/dev/null
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libwebp*.so