svn commit: r397332 - head/x11-toolkits/wxgtk30

[Alexey Dokuchaev]

Author: danfe
Date: Sat Sep 19 17:15:16 2015
New Revision: 397332
URL: https://svnweb.freebsd.org/changeset/ports/397332

Log:
  - Make dependency on `www/webkit-gtk2' optional: there's a configure switch
    for this, and it is quite heavy while not necessarily always desirable
  - Remove bogus `+=' from LIB_DEPENDS and USES: the port is not being master
    for anyone, thus those were just confusing
  - Consistently put space before trailing backslash when wrapping long lines
  - Reword MSPACK_DESC (MS -> Microsoft) while I'm here

Modified:
  head/x11-toolkits/wxgtk30/Makefile
  head/x11-toolkits/wxgtk30/pkg-plist

Modified: head/x11-toolkits/wxgtk30/Makefile
==============================================================================
--- head/x11-toolkits/wxgtk30/Makefile	Sat Sep 19 15:08:55 2015	(r397331)
+++ head/x11-toolkits/wxgtk30/Makefile	Sat Sep 19 17:15:16 2015	(r397332)
@@ -11,39 +11,38 @@ DISTNAME=	wxWidgets-${PORTVERSION}
 MAINTAINER=	portmaster at bsdforge.com
 COMMENT=	The wxWidgets GUI toolkit with GTK+ bindings
 
-LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png\
-		libtiff.so:${PORTSDIR}/graphics/tiff\
-		libexpat.so:${PORTSDIR}/textproc/expat2\
-		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES+=		compiler:c++11-lib gmake iconv jpeg pkgconfig tar:bzip2
+USES=		compiler:c++11-lib gmake iconv jpeg pkgconfig tar:bzip2
 USE_XORG=	x11 sm xxf86vm xinerama
 USE_GL=		glu
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libpng=sys\
-		--with-libjpeg=sys\
-		--with-libtiff=sys\
-		--with-zlib=sys\
-		--with-expat=sys\
-		--with-opengl\
-		--with-libmspack\
-		--with-gtk\
-		--disable-backtrace\
-		--enable-webview\
+CONFIGURE_ARGS=	--with-libpng=sys \
+		--with-libjpeg=sys \
+		--with-libtiff=sys \
+		--with-zlib=sys \
+		--with-expat=sys \
+		--with-opengl \
+		--with-libmspack \
+		--with-gtk \
+		--disable-backtrace \
 		--enable-graphics_ctx \
 		--enable-compat26 \
 		--enable-compat28
 CONFIGURE_ENV=	X11BASE="${LOCALBASE}" \
 		ac_cv_header_sys_inotify_h=no
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-std=c++11
 LIBS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	GSTREAMER MSPACK NLS
-OPTIONS_DEFAULT=GSTREAMER MSPACK
-MSPACK_DESC=	MS archives support
+OPTIONS_DEFINE=	GSTREAMER MSPACK NLS WEBKIT
+OPTIONS_DEFAULT=GSTREAMER MSPACK WEBKIT
+MSPACK_DESC=	Microsoft archives support
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
@@ -52,6 +51,9 @@ GSTREAMER_USE=	GNOME=gconf2 GSTREAMER=ye
 MSPACK_CONFIGURE_WITH=	libmspack
 MSPACK_LIB_DEPENDS=	libmspack.so:${PORTSDIR}/archivers/libmspack
 
+WEBKIT_CONFIGURE_ENABLE=	webview
+WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
+
 .include <bsd.port.pre.mk>
 
 # PR 196703, 197031

Modified: head/x11-toolkits/wxgtk30/pkg-plist
==============================================================================
--- head/x11-toolkits/wxgtk30/pkg-plist	Sat Sep 19 15:08:55 2015	(r397331)
+++ head/x11-toolkits/wxgtk30/pkg-plist	Sat Sep 19 17:15:16 2015	(r397332)
@@ -752,9 +752,9 @@ lib/libwx_gtk2u_richtext-3.0.so.0.2.0
 lib/libwx_gtk2u_stc-3.0.so
 lib/libwx_gtk2u_stc-3.0.so.0
 lib/libwx_gtk2u_stc-3.0.so.0.2.0
-lib/libwx_gtk2u_webview-3.0.so
-lib/libwx_gtk2u_webview-3.0.so.0
-lib/libwx_gtk2u_webview-3.0.so.0.2.0
+%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so
+%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0
+%%WEBKIT%%lib/libwx_gtk2u_webview-3.0.so.0.2.0
 lib/libwx_gtk2u_xrc-3.0.so
 lib/libwx_gtk2u_xrc-3.0.so.0
 lib/libwx_gtk2u_xrc-3.0.so.0.2.0