Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Dec 2013 08:51:10 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337945 - head/graphics/webp
Message-ID:  <201312290851.rBT8pAYv036117@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312290851.rBT8pAYv036117>