svn commit: r477758 - in branches/2018Q3/x11-toolkits: wxgtk30 wxgtk31

[Antoine Brodin]

Author: antoine
Date: Tue Aug 21 21:55:30 2018
New Revision: 477758
URL: https://svnweb.freebsd.org/changeset/ports/477758

Log:
  Revert r477626, it fails to build in the quarterly branch
  
  Reported by:	pkg-fallout
  With hat:	portmgr

Modified:
  branches/2018Q3/x11-toolkits/wxgtk30/Makefile
  branches/2018Q3/x11-toolkits/wxgtk31/Makefile
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/x11-toolkits/wxgtk30/Makefile
==============================================================================
--- branches/2018Q3/x11-toolkits/wxgtk30/Makefile	Tue Aug 21 21:54:18 2018	(r477757)
+++ branches/2018Q3/x11-toolkits/wxgtk30/Makefile	Tue Aug 21 21:55:30 2018	(r477758)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	wx
-PORTVERSION=	3.0.4
-PORTREVISION=	2
+PORTVERSION=	3.0.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	30-gtk2
@@ -65,11 +64,6 @@ WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include <bsd.port.pre.mk>
-
-# TLS is broken on armv6/7, PR 229396
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-CONFIGURE_ARGS+=--disable-tls
-.endif
 
 # PR 196703, 197031
 .if ${CHOSEN_COMPILER_TYPE} == gcc

Modified: branches/2018Q3/x11-toolkits/wxgtk31/Makefile
==============================================================================
--- branches/2018Q3/x11-toolkits/wxgtk31/Makefile	Tue Aug 21 21:54:18 2018	(r477757)
+++ branches/2018Q3/x11-toolkits/wxgtk31/Makefile	Tue Aug 21 21:55:30 2018	(r477758)
@@ -3,7 +3,7 @@
 PORTNAME=	wx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.1
-PORTREVISION=	3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	31-gtk3
 
@@ -70,11 +70,6 @@ WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 .include <bsd.port.pre.mk>
-
-# TLS is broken on armv6/7, PR 229396
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-CONFIGURE_ARGS+=--disable-tls
-.endif
 
 # PR 196703, 197031
 .if ${CHOSEN_COMPILER_TYPE} == gcc