svn commit: r337748 - head/graphics/webp

[poyopoyo at puripuri.plala.or.jp]

At Fri, 27 Dec 2013 16:52:15 +0000 (UTC),
Johan van Selst wrote:
> Log:
>   Make implicit dependency on glut explicit (required for vwebp)

How about to stop building vwebp by default? As it is sample program
of webp-only capable image viewer, it looks not so great to have, even
when it comes with pricy DEPENDs such as X. Did you launch it at least
once? I believe it is better to leave webp port a image library and
format converter, as far as by default.

about --with-glincludedir=/dev/null: I don't find good way to disable
vwebp build with dedicated configure option. No worry to make it nicer.

-- 
kuro


- make vwebp build optional.

Index: Makefile
===================================================================
--- Makefile	(revision 337916)
+++ Makefile	(working copy)
@@ -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 @@
 		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,16 @@
 		--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
+
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 337916)
+++ pkg-plist	(working copy)
@@ -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