aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Bartoletti <lbartoletti@FreeBSD.org>2022-09-15 13:41:26 +0000
committerLoïc Bartoletti <lbartoletti@FreeBSD.org>2022-10-25 05:44:04 +0000
commitfa02c1768b5743cac4614bd031c8a2b457df7545 (patch)
tree4ee094a244a1464238e15528da24a482d52632f1
parentf9b9014649a515ab6e4505e95e9c4f666a844cda (diff)
downloadports-fa02c1768b5743cac4614bd031c8a2b457df7545.tar.gz
ports-fa02c1768b5743cac4614bd031c8a2b457df7545.zip
multimedia/photofilmstrip: use wx 3.2
PR: 265093
-rw-r--r--Mk/bsd.wx.mk15
-rw-r--r--multimedia/photofilmstrip/Makefile4
2 files changed, 6 insertions, 13 deletions
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index b71cc5c83999..d6f57586996b 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -111,9 +111,9 @@ _WX_Definitions_Done= yes
_WX_COMPS_ALL= wx contrib python
_WX_DEP_TYPES_ALL= build lib run
-_WX_VERS_ALL= 2.8 3.0 3.1 3.2
-_WX_VERS_UC_ALL= 2.8 3.0 3.1 3.2
-_WX_VERS_SKIP= 3.0 3.1 3.2
+_WX_VERS_ALL= 2.8 3.0 3.2
+_WX_VERS_UC_ALL= 2.8 3.0 3.2
+_WX_VERS_SKIP= 3.0 3.2
_WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER _WX_VER_INSTALLED
#
@@ -136,13 +136,6 @@ _WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8
_WX_PORT_wx_3.0= x11-toolkits/wxgtk30@${_GTKFLAVOR}
_WX_LIB_wx_3.0= wx_baseu-3.0
-_WX_PORT_python_3.1= x11-toolkits/py-wxPython4@${PY_FLAVOR}
-_WX_FILE_python_3.1= ${PYTHON_SITELIBDIR}/wx/__init__.py
-
-# wxgtk 3.1
-_WX_PORT_wx_3.1= x11-toolkits/wxgtk31
-_WX_LIB_wx_3.1= wx_baseu-3.1
-
_WX_PORT_python_3.2= x11-toolkits/py-wxPython4@${PY_FLAVOR}
_WX_FILE_python_3.2= ${PYTHON_SITELIBDIR}/wx/__init__.py
@@ -413,7 +406,7 @@ _WX_VER= ${ver}
# Set variables.
#
-. if ${_WX_VER} == 3.1 || ${_WX_VER} == 3.2
+. if ${_WX_VER} == 3.2
_GTKVER= 3
. elif ${_WX_VER} == 3.0
_GTKVER= ${WANT_WXGTK_VER:U3}
diff --git a/multimedia/photofilmstrip/Makefile b/multimedia/photofilmstrip/Makefile
index cfc6bf1e7074..8a2525a36bfb 100644
--- a/multimedia/photofilmstrip/Makefile
+++ b/multimedia/photofilmstrip/Makefile
@@ -1,6 +1,6 @@
PORTNAME= photofilmstrip
PORTVERSION= 3.7.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia python
MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ RUN_DEPENDS= mencoder:multimedia/mencoder \
USES= python:3.6+ gettext gstreamer
USE_GSTREAMER= jpeg
USE_PYTHON= distutils
-USE_WX= 3.1
+USE_WX= 3.2
WX_COMPS= python:lib
ALL_TARGET= compile
NO_ARCH= yes