From owner-svn-ports-head@FreeBSD.ORG Mon Apr 6 18:49:54 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFCE84F7; Mon, 6 Apr 2015 18:49:54 +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 A109C1EA; Mon, 6 Apr 2015 18:49:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t36Insb0095325; Mon, 6 Apr 2015 18:49:54 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t36InrtY095320; Mon, 6 Apr 2015 18:49:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201504061849.t36InrtY095320@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 6 Apr 2015 18:49:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383466 - in head/x11-toolkits/wxgtk30: . files 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Apr 2015 18:49:54 -0000 Author: marino Date: Mon Apr 6 18:49:52 2015 New Revision: 383466 URL: https://svnweb.freebsd.org/changeset/ports/383466 Log: x11-toolkits/wxgtk30: Support c++11 over c++0x, plus DragonFly The wxgtk30 port will use TR1 headers if the capability is detected. These TR1 functions were experimental and not included in the same form in the final c++11 standard. This patch forcibly disabled TR1 support, which requires the explicit setting of -std=c++11 in CXXFLAGS> A private "exp-run" was performed, all 62 ports dependent on wxgtk2 successfully built before and after after the patch was applied on two separate runs (FreeBSD 10 amd64 jail). While here, remove the incorrect $PTHREAD_LIB setting and let it default to -pthread. Also bring in the configure patch fragement from DragonFly. PR: 199177 Submitted by: marino Approved by: maintainer (Chris Hutchinson) Added: head/x11-toolkits/wxgtk30/files/patch-setup.h.in (contents, props changed) Modified: head/x11-toolkits/wxgtk30/Makefile head/x11-toolkits/wxgtk30/files/patch-configure Modified: head/x11-toolkits/wxgtk30/Makefile ============================================================================== --- head/x11-toolkits/wxgtk30/Makefile Mon Apr 6 18:49:34 2015 (r383465) +++ head/x11-toolkits/wxgtk30/Makefile Mon Apr 6 18:49:52 2015 (r383466) @@ -2,7 +2,7 @@ PORTNAME= wx PORTVERSION= 3.0.2 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= 30-gtk2 @@ -39,6 +39,7 @@ CONFIGURE_ARGS= --with-libpng=sys\ 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 Modified: head/x11-toolkits/wxgtk30/files/patch-configure ============================================================================== --- head/x11-toolkits/wxgtk30/files/patch-configure Mon Apr 6 18:49:34 2015 (r383465) +++ head/x11-toolkits/wxgtk30/files/patch-configure Mon Apr 6 18:49:52 2015 (r383466) @@ -1,6 +1,15 @@ ---- configure.orig 2011-12-15 01:42:11.000000000 +0700 -+++ configure 2012-05-15 22:49:14.000000000 +0700 -@@ -27119,6 +27119,7 @@ +--- configure.orig 2014-10-06 21:33:44 UTC ++++ configure +@@ -3947,7 +3947,7 @@ case "${host}" in + + DEFAULT_DEFAULT_wxUSE_MOTIF=1 + ;; +- *-*-freebsd*) ++ *-*-dragonfly*|*-*-freebsd*) + USE_BSD=1 + USE_FREEBSD=1 + $as_echo "#define __FREEBSD__ 1" >>confdefs.h +@@ -21894,6 +21894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SEARCH_INCLUDE="\ @@ -8,16 +17,17 @@ /usr/local/include \ /usr/local/X11/include \ /usr/local/include/X11 \ -@@ -42877,7 +42878,7 @@ +@@ -31852,9 +31853,6 @@ $as_echo "$as_me: WARNING: BeOS threads + THREAD_OPTS="-pthreads $THREAD_OPTS" fi ;; - *-*-freebsd*) +- *-*-freebsd*) - THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r" -+ THREAD_OPTS="$PTHREAD_LIBS" - ;; +- ;; *-*-darwin* | *-*-cygwin* ) THREAD_OPTS="" -@@ -45535,7 +45536,7 @@ + ;; +@@ -33127,7 +33125,7 @@ else fi fi fi @@ -25,4 +35,20 @@ +OPTIMISE_CFLAGS= if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + $as_echo "#define WXWIN_COMPATIBILITY_2_6 1" >>confdefs.h +@@ -39390,6 +39388,7 @@ EOF + ;; + + powerpc-apple-macos* | \ ++ *-*-dragonfly* | \ + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ + *-*-mirbsd* | \ + *-*-sunos4* | \ +@@ -39432,6 +39431,7 @@ EOF + + case "${BAKEFILE_HOST}" in + *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ ++ *-*-dragonfly* | \ + *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* ) + if test "x$SUNCXX" = "xyes"; then + SONAME_FLAG="-h " Added: head/x11-toolkits/wxgtk30/files/patch-setup.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/wxgtk30/files/patch-setup.h.in Mon Apr 6 18:49:52 2015 (r383466) @@ -0,0 +1,20 @@ +--- setup.h.in.orig 2014-10-06 21:33:44 UTC ++++ setup.h.in +@@ -757,17 +757,14 @@ + /* + * Define if your compiler has std::tr1::unordered_map + */ +-#undef HAVE_TR1_UNORDERED_MAP + + /* + * Define if your compiler has std::tr1::unordered_set + */ +-#undef HAVE_TR1_UNORDERED_SET + + /* + * Define if your compiler has + */ +-#undef HAVE_TR1_TYPE_TRAITS + + /* + * Define if your compiler has