From owner-svn-ports-head@FreeBSD.ORG  Sun Dec 29 08:51:11 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 59D93929;
 Sun, 29 Dec 2013 08:51:11 +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 463341471;
 Sun, 29 Dec 2013 08:51:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBT8pB1u036119;
 Sun, 29 Dec 2013 08:51:11 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBT8pAYv036117;
 Sun, 29 Dec 2013 08:51:10 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201312290851.rBT8pAYv036117@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 29 Dec 2013 08:51:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337945 - 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-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: Sun, 29 Dec 2013 08:51:11 -0000

Author: johans
Date: Sun Dec 29 08:51:10 2013
New Revision: 337945
URL: http://svnweb.freebsd.org/changeset/ports/337945

Log:
  Build without vwebp demo binary (requires X) by default
  
  Submitted by:	poyopoyo@puripuri.plala.or.jp

Modified:
  head/graphics/webp/Makefile
  head/graphics/webp/pkg-plist

Modified: head/graphics/webp/Makefile
==============================================================================
--- head/graphics/webp/Makefile	Sun Dec 29 08:34:11 2013	(r337944)
+++ head/graphics/webp/Makefile	Sun Dec 29 08:51:10 2013	(r337945)
@@ -3,7 +3,7 @@
 
 PORTNAME=	webp
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 USE_LDCONFIG=	yes
-USE_GL=		glut
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -26,4 +25,19 @@ CONFIGURE_ARGS+=--with-pkgconfigdir=${PR
 		--enable-libwebpdemux  \
 		--enable-libwebpdecoder
 
+OPTIONS_DEFINE=	X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+USE_GL=		glut
+PLIST_SUB=	X11=""
+.else
+CONFIGURE_ARGS+=--with-glincludedir=/dev/null
+PLIST_SUB=	X11="@comment "
+.endif
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libwebp*.so
+
 .include <bsd.port.mk>

Modified: head/graphics/webp/pkg-plist
==============================================================================
--- head/graphics/webp/pkg-plist	Sun Dec 29 08:34:11 2013	(r337944)
+++ head/graphics/webp/pkg-plist	Sun Dec 29 08:51:10 2013	(r337945)
@@ -1,7 +1,7 @@
 bin/cwebp
 bin/dwebp
 bin/gif2webp
-bin/vwebp
+%%X11%%bin/vwebp
 bin/webpmux
 include/webp/decode.h
 include/webp/demux.h