From owner-svn-ports-all@FreeBSD.ORG Wed Jun 4 09:58:35 2014 Return-Path: Delivered-To: svn-ports-all@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 901A1172; Wed, 4 Jun 2014 09:58:35 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 634252CF1; Wed, 4 Jun 2014 09:58:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s549wZ1U003743; Wed, 4 Jun 2014 09:58:35 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s549wZLN003742; Wed, 4 Jun 2014 09:58:35 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406040958.s549wZLN003742@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 4 Jun 2014 09:58:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356451 - head/x11-toolkits/wxgtk30 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jun 2014 09:58:35 -0000 Author: bapt Date: Wed Jun 4 09:58:34 2014 New Revision: 356451 URL: http://svnweb.freebsd.org/changeset/ports/356451 QAT: https://qat.redports.org/buildarchive/r356451/ Log: Activate compatibility with wxGTK 2.6 API Explicitly set compatibility for wxGTK 2.8 (already on by default) Remove dependency on inotify (not needed wxGTK do support kqueue) Prevent the configure scripts from discovering inotify if already installed Use options helpers Only enable mediactrl if GSTREAMER options is set Modified: head/x11-toolkits/wxgtk30/Makefile Modified: head/x11-toolkits/wxgtk30/Makefile ============================================================================== --- head/x11-toolkits/wxgtk30/Makefile Wed Jun 4 09:23:09 2014 (r356450) +++ head/x11-toolkits/wxgtk30/Makefile Wed Jun 4 09:58:34 2014 (r356451) @@ -2,6 +2,7 @@ PORTNAME= wx PORTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= 30-gtk2 @@ -14,7 +15,6 @@ LIB_DEPENDS+= libpng15.so:${PORTSDIR}/gr libjpeg.so:${PORTSDIR}/graphics/jpeg\ libtiff.so:${PORTSDIR}/graphics/tiff\ libexpat.so:${PORTSDIR}/textproc/expat2\ - libinotify.so:${PORTSDIR}/devel/libinotify\ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 USES+= iconv gmake pkgconfig tar:bzip2 @@ -31,12 +31,14 @@ CONFIGURE_ARGS= --with-libpng=sys\ --with-opengl\ --with-libmspack\ --with-gtk\ - --enable-mediactrl\ --disable-backtrace\ --enable-webview\ - --enable-graphics_ctx -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -pthread -linotify"\ - X11BASE="${LOCALBASE}" + --enable-graphics_ctx \ + --enable-compat26 \ + --enable-compat28 +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \ + X11BASE="${LOCALBASE}" \ + ac_cv_header_sys_inotify_h=no CPPFLAGS+= -I${LOCALBASE}/include OPTIONS_DEFINE= GSTREAMER MSPACK NLS @@ -44,25 +46,10 @@ OPTIONS_DEFAULT=GSTREAMER MSPACK MSPACK_DESC= MS archives support OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -.endif - -.if ${PORT_OPTIONS:MGSTREAMER} -CONFIGURE_ARGS+=--enable-mediactrl -USE_GNOME+= gconf2 -USE_GSTREAMER= yes -.else -CONFIGURE_ARGS+=--disable-mediactrl -.endif - -.if ${PORT_OPTIONS:MMSPACK} -CONFIGURE_ARGS+=--with-libmspack -LIB_DEPENDS+= libmspack.so:${PORTSDIR}/archivers/libmspack -.else -CONFIGURE_ARGS+=--without-libmspack -.endif +NLS_USES= gettext +GSTREAMER_ENABLE= mediactrl +GSTREAMER_USE= GNOME=gconf2 GSTREAMER=yes +MSPACK_CONFIGURE_WITH= libmspack +MSPACK_LIB_DEPENDS= libmspack.so:${PORTSDIR}/archivers/libmspack .include