aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacity/Makefile1
-rw-r--r--cad/PrusaSlicer/Makefile2
-rw-r--r--comms/cubicsdr/Makefile2
-rw-r--r--graphics/electricsheep/Makefile2
-rw-r--r--lang/erlang-wx/Makefile1
-rw-r--r--science/opensph/Makefile2
-rw-r--r--x11-toolkits/wxgtk31/Makefile6
-rw-r--r--x11-toolkits/wxgtk31/distinfo8
-rw-r--r--x11-toolkits/wxgtk31/files/patch-Makefile.in20
-rw-r--r--x11-toolkits/wxgtk31/pkg-plist68
10 files changed, 56 insertions, 56 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index ca20f7476c2b..bf2dab893b01 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -3,6 +3,7 @@
PORTNAME= audacity
PORTVERSION= 2.4.2
+PORTREVISION= 1
DISTVERSIONPREFIX= Audacity-
CATEGORIES= audio
diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
index 113a93052bdf..28d6156b2029 100644
--- a/cad/PrusaSlicer/Makefile
+++ b/cad/PrusaSlicer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= PrusaSlicer
DISTVERSIONPREFIX= version_
DISTVERSION= 2.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= cad
MAINTAINER= teodorsigaev@gmail.com
diff --git a/comms/cubicsdr/Makefile b/comms/cubicsdr/Makefile
index bc0b04264776..1c37d8e387d2 100644
--- a/comms/cubicsdr/Makefile
+++ b/comms/cubicsdr/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cubicsdr
DISTVERSION= 0.2.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= comms hamradio
MAINTAINER= hamradio@FreeBSD.org
diff --git a/graphics/electricsheep/Makefile b/graphics/electricsheep/Makefile
index f6605521a78d..c376e25faa52 100644
--- a/graphics/electricsheep/Makefile
+++ b/graphics/electricsheep/Makefile
@@ -3,7 +3,7 @@
PORTNAME= electricsheep
DISTVERSION= 2.7 # configure.ac says that the version is 2.7b33
-PORTREVISION= 6
+PORTREVISION= 7
PORTEPOCH= 1
CATEGORIES= graphics
diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile
index 16abe94abda7..a0834f136d7f 100644
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= erlang
DISTVERSIONPREFIX= OTP-
DISTVERSION= 21.3.8.17
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= lang parallel
PKGNAMESUFFIX= -wx
diff --git a/science/opensph/Makefile b/science/opensph/Makefile
index 40aecd1c1d47..ab0fef8e0418 100644
--- a/science/opensph/Makefile
+++ b/science/opensph/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenSPH
DISTVERSIONPREFIX= v
DISTVERSION= g20190519
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MAINTAINER= yuri@FreeBSD.org
diff --git a/x11-toolkits/wxgtk31/Makefile b/x11-toolkits/wxgtk31/Makefile
index 0f6292240fc3..57ca5a9543ce 100644
--- a/x11-toolkits/wxgtk31/Makefile
+++ b/x11-toolkits/wxgtk31/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wx
DISTVERSIONPREFIX= v
-DISTVERSION= 3.1.3
+DISTVERSION= 3.1.4
CATEGORIES= x11-toolkits
PKGNAMESUFFIX= 31-gtk3
@@ -20,13 +20,15 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libpng.so:graphics/png \
libsecret-1.so:security/libsecret \
libsoup-2.4.so:devel/libsoup \
- libtiff.so:graphics/tiff \
+ libtiff.so:graphics/tiff
USES= compiler:c++11-lib gl gmake gnome iconv jpeg localbase \
pkgconfig xorg
USE_GITHUB= yes
GH_ACCOUNT= wxWidgets
GH_PROJECT= wxWidgets
+GH_TUPLE= wxWidgets:Catch:ee4acb6:wxWidgets_Catch/3rdparty/catch
+
GNU_CONFIGURE= yes
USE_XORG= x11 sm xxf86vm xtst
USE_GL= gl glu
diff --git a/x11-toolkits/wxgtk31/distinfo b/x11-toolkits/wxgtk31/distinfo
index 762cab26c3de..6e4c4aeb1095 100644
--- a/x11-toolkits/wxgtk31/distinfo
+++ b/x11-toolkits/wxgtk31/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1576430604
-SHA256 (wxWidgets-wxWidgets-v3.1.3_GH0.tar.gz) = a5cb5ea326d76b5e472e9400933cef17c900d5c9b549e40eef00b64fe86d7cb0
-SIZE (wxWidgets-wxWidgets-v3.1.3_GH0.tar.gz) = 20441818
+TIMESTAMP = 1595584227
+SHA256 (wxWidgets-wxWidgets-v3.1.4_GH0.tar.gz) = f2698297b2d2c6d2372c23144c133e531248a64286c78ae17179155c94971d6f
+SIZE (wxWidgets-wxWidgets-v3.1.4_GH0.tar.gz) = 20704620
+SHA256 (wxWidgets-Catch-ee4acb6_GH0.tar.gz) = 6bc6e38f3efb1aa128c0ae7bfcd8cba266f22f2c4b6433b9efa7d68ca9a44a1f
+SIZE (wxWidgets-Catch-ee4acb6_GH0.tar.gz) = 377330
diff --git a/x11-toolkits/wxgtk31/files/patch-Makefile.in b/x11-toolkits/wxgtk31/files/patch-Makefile.in
index 0ae028afd5df..6abda89d6356 100644
--- a/x11-toolkits/wxgtk31/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk31/files/patch-Makefile.in
@@ -1,14 +1,6 @@
--- Makefile.in.orig 2013-11-11 14:10:39.000000000 +0100
+++ Makefile.in 2014-01-22 10:14:26.000000000 +0100
-@@ -25,6 +25,7 @@
- SONAME_FLAG = @SONAME_FLAG@
- STRIP = @STRIP@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
- ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
-@@ -54,6 +55,7 @@
+@@ -56,6 +56,7 @@
TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
@@ -16,9 +8,9 @@
TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
-@@ -15214,9 +15215,9 @@
+@@ -13815,9 +13816,9 @@
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
@@ -28,18 +20,18 @@
$(DYLIB_RPATH_INSTALL)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
-@@ -16099,9 +16100,7 @@
+@@ -14711,9 +14712,7 @@
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16109,7 +16108,7 @@
+@@ -14721,7 +14720,7 @@
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
if test -f $(srcdir)/locale/$$l.mo ; then \
diff --git a/x11-toolkits/wxgtk31/pkg-plist b/x11-toolkits/wxgtk31/pkg-plist
index 625c3ca3b64f..5449cea71c43 100644
--- a/x11-toolkits/wxgtk31/pkg-plist
+++ b/x11-toolkits/wxgtk31/pkg-plist
@@ -162,6 +162,7 @@ include/wx-3.1/wx/gdiobj.h
include/wx-3.1/wx/generic/aboutdlgg.h
include/wx-3.1/wx/generic/accel.h
include/wx-3.1/wx/generic/activityindicator.h
+include/wx-3.1/wx/generic/animate.h
include/wx-3.1/wx/generic/bmpcbox.h
include/wx-3.1/wx/generic/busyinfo.h
include/wx-3.1/wx/generic/buttonbar.h
@@ -292,6 +293,7 @@ include/wx-3.1/wx/gtk/scrolwin.h
include/wx-3.1/wx/gtk/slider.h
include/wx-3.1/wx/gtk/spinbutt.h
include/wx-3.1/wx/gtk/spinctrl.h
+include/wx-3.1/wx/gtk/srchctrl.h
include/wx-3.1/wx/gtk/statbmp.h
include/wx-3.1/wx/gtk/statbox.h
include/wx-3.1/wx/gtk/statline.h
@@ -720,54 +722,54 @@ include/wx-3.1/wx/xtixml.h
include/wx-3.1/wx/zipstrm.h
include/wx-3.1/wx/zstream.h
lib/libwx_baseu-3.1.so
-lib/libwx_baseu-3.1.so.3
-lib/libwx_baseu-3.1.so.3.0.0
+lib/libwx_baseu-3.1.so.4
+lib/libwx_baseu-3.1.so.4.0.0
lib/libwx_baseu_net-3.1.so
-lib/libwx_baseu_net-3.1.so.3
-lib/libwx_baseu_net-3.1.so.3.0.0
+lib/libwx_baseu_net-3.1.so.4
+lib/libwx_baseu_net-3.1.so.4.0.0
lib/libwx_baseu_xml-3.1.so
-lib/libwx_baseu_xml-3.1.so.3
-lib/libwx_baseu_xml-3.1.so.3.0.0
+lib/libwx_baseu_xml-3.1.so.4
+lib/libwx_baseu_xml-3.1.so.4.0.0
lib/libwx_gtk3u_adv-3.1.so
-lib/libwx_gtk3u_adv-3.1.so.3
-lib/libwx_gtk3u_adv-3.1.so.3.0.0
+lib/libwx_gtk3u_adv-3.1.so.4
+lib/libwx_gtk3u_adv-3.1.so.4.0.0
lib/libwx_gtk3u_aui-3.1.so
-lib/libwx_gtk3u_aui-3.1.so.3
-lib/libwx_gtk3u_aui-3.1.so.3.0.0
+lib/libwx_gtk3u_aui-3.1.so.4
+lib/libwx_gtk3u_aui-3.1.so.4.0.0
lib/libwx_gtk3u_core-3.1.so
-lib/libwx_gtk3u_core-3.1.so.3
-lib/libwx_gtk3u_core-3.1.so.3.0.0
+lib/libwx_gtk3u_core-3.1.so.4
+lib/libwx_gtk3u_core-3.1.so.4.0.0
lib/libwx_gtk3u_gl-3.1.so
-lib/libwx_gtk3u_gl-3.1.so.3
-lib/libwx_gtk3u_gl-3.1.so.3.0.0
+lib/libwx_gtk3u_gl-3.1.so.4
+lib/libwx_gtk3u_gl-3.1.so.4.0.0
lib/libwx_gtk3u_html-3.1.so
-lib/libwx_gtk3u_html-3.1.so.3
-lib/libwx_gtk3u_html-3.1.so.3.0.0
+lib/libwx_gtk3u_html-3.1.so.4
+lib/libwx_gtk3u_html-3.1.so.4.0.0
%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.3
-%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.3.0.0
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.4
+%%GSTREAMER%%lib/libwx_gtk3u_media-3.1.so.4.0.0
lib/libwx_gtk3u_propgrid-3.1.so
-lib/libwx_gtk3u_propgrid-3.1.so.3
-lib/libwx_gtk3u_propgrid-3.1.so.3.0.0
+lib/libwx_gtk3u_propgrid-3.1.so.4
+lib/libwx_gtk3u_propgrid-3.1.so.4.0.0
lib/libwx_gtk3u_qa-3.1.so
-lib/libwx_gtk3u_qa-3.1.so.3
-lib/libwx_gtk3u_qa-3.1.so.3.0.0
+lib/libwx_gtk3u_qa-3.1.so.4
+lib/libwx_gtk3u_qa-3.1.so.4.0.0
lib/libwx_gtk3u_ribbon-3.1.so
-lib/libwx_gtk3u_ribbon-3.1.so.3
-lib/libwx_gtk3u_ribbon-3.1.so.3.0.0
+lib/libwx_gtk3u_ribbon-3.1.so.4
+lib/libwx_gtk3u_ribbon-3.1.so.4.0.0
lib/libwx_gtk3u_richtext-3.1.so
-lib/libwx_gtk3u_richtext-3.1.so.3
-lib/libwx_gtk3u_richtext-3.1.so.3.0.0
+lib/libwx_gtk3u_richtext-3.1.so.4
+lib/libwx_gtk3u_richtext-3.1.so.4.0.0
lib/libwx_gtk3u_stc-3.1.so
-lib/libwx_gtk3u_stc-3.1.so.3
-lib/libwx_gtk3u_stc-3.1.so.3.0.0
+lib/libwx_gtk3u_stc-3.1.so.4
+lib/libwx_gtk3u_stc-3.1.so.4.0.0
%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.3
-%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.3.0.0
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.4
+%%WEBKIT%%lib/libwx_gtk3u_webview-3.1.so.4.0.0
lib/libwx_gtk3u_xrc-3.1.so
-lib/libwx_gtk3u_xrc-3.1.so.3
-lib/libwx_gtk3u_xrc-3.1.so.3.0.0
-%%WEBKIT%%lib/wx/3.1.3/web-extensions/webkit2_extu-3.1.3.so
+lib/libwx_gtk3u_xrc-3.1.so.4
+lib/libwx_gtk3u_xrc-3.1.so.4.0.0
+%%WEBKIT%%lib/wx/3.1.4/web-extensions/webkit2_extu-3.1.4.so
lib/wx/include/gtk3-unicode-3.1/wx/setup.h
share/aclocal/wxwin31.m4
share/bakefile/presets/wx31.bkl