Index: head/x11-toolkits/wxgtk30/Makefile =================================================================== --- head/x11-toolkits/wxgtk30/Makefile (revision 383465) +++ head/x11-toolkits/wxgtk30/Makefile (revision 383466) @@ -1,62 +1,63 @@ # $FreeBSD$ PORTNAME= wx PORTVERSION= 3.0.2 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= 30-gtk2 DISTNAME= wxWidgets-${PORTVERSION} MAINTAINER= portmaster@bsdforge.com COMMENT= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png\ libjpeg.so:${PORTSDIR}/graphics/jpeg\ libtiff.so:${PORTSDIR}/graphics/tiff\ libexpat.so:${PORTSDIR}/textproc/expat2\ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 USES+= compiler:c++11-lib iconv gmake 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\ --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_SUB= yes 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 # PR 196703, 197031 .if ${COMPILER_TYPE} == "gcc" CONFIGURE_ARGS+=--disable-precomp-headers .endif .include Index: head/x11-toolkits/wxgtk30/files/patch-configure =================================================================== --- head/x11-toolkits/wxgtk30/files/patch-configure (revision 383465) +++ head/x11-toolkits/wxgtk30/files/patch-configure (revision 383466) @@ -1,28 +1,54 @@ ---- 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="\ + $X11BASE/include \ /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 - +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 " Index: head/x11-toolkits/wxgtk30/files/patch-setup.h.in =================================================================== --- head/x11-toolkits/wxgtk30/files/patch-setup.h.in (nonexistent) +++ head/x11-toolkits/wxgtk30/files/patch-setup.h.in (revision 383466) @@ -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 Property changes on: head/x11-toolkits/wxgtk30/files/patch-setup.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property