Page MenuHomeFreeBSD
Files F175990106

D3660.id8732.diff
No OneTemporary
Actions

D3660.id8732.diff
View Options

Index: Mk/bsd.wx.mk
===================================================================
--- Mk/bsd.wx.mk
+++ Mk/bsd.wx.mk
@@ -46,11 +46,6 @@
# WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION
# after <bsd.port.pre.mk> (in case the port needs to manually run
# the script).
-# WX_UNICODE - Define if the port needs the Unicode version of the
-# wxWidgets library and/or contributed libraries.
-# NOTE: this should NOT be used for ports that can be compiled
-# with Unicode or not, but for the ones that require it.
-# WANT_UNICODE - Define if the port prefers Unicode, but doesn't require it.
# WANT_WX - Set to "yes" or a valid single version (no ranges, etc).
# In both cases it will detect the installed wxWidgets
# components and add them to the variable HAVE_WX. If a
@@ -66,29 +61,20 @@
#
# The following variables are intended for the user and can be defined in
# make.conf.
-# WITH_UNICODE - Define if you prefer the Unicode version when available.
-# WITHOUT_UNICODE
-# - Define if you prefer the non Unicode version (this
-# variable disables WITH_UNICODE and WANT_UNICODE).
# WITH_WX_VER - Define to the list of prefered versions in reverse order.
#
# The following variables are defined by this file, to be read from the port.
# WX_CONFIG - The path to the wx-config program (with different name).
# WXRC_CMD - The path to the wxrc program (with different name).
# WX_VERSION - The wxWidgets version that is going to be used.
-# WX_UNICODE - If this variable is not defined by the port (which means it
-# requires the Unicode version of wxWidgets), it will be
-# defined in the case the Unicode version is used (enabled by
-# WITH_UNICODE or WANT_UNICODE).
# HAVE_WX - The list of wxWidgets components installed, if WANT_WX was
# defined. The components will have version suffix if it was
# set to "yes".
#
# Examples:
-# - A port that needs wxWidgets 2.8 and contributed libraries with Unicode.
+# - A port that needs wxWidgets 2.8 and contributed libraries
# USE_WX= 2.8
# WX_COMPS= wx contrib
-# WX_UNICODE= yes
# - A port that needs WxPython 2.8 for running.
# USE_PYTHON= yes
# USE_WX= 2.8
@@ -140,13 +126,13 @@
#
# wxgtk 2.8
-_WX_PORT_wx_2.8= x11-toolkits/wxgtk28${_WX_UCL}
+_WX_PORT_wx_2.8= x11-toolkits/wxgtk28
_WX_LIB_wx_2.8= wx_base${_WX_UC}-2.8
-_WX_PORT_contrib_2.8= x11-toolkits/wxgtk28${_WX_UCL}-contrib
+_WX_PORT_contrib_2.8= x11-toolkits/wxgtk28-contrib
_WX_LIB_contrib_2.8= wx_gtk2${_WX_UC}_fl-2.8
-_WX_PORT_python_2.8= x11-toolkits/py-wxPython28${_WX_UCL}
+_WX_PORT_python_2.8= x11-toolkits/py-wxPython28
_WX_FILE_python_2.8= ${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py
# wxgtk 3.0
@@ -176,17 +162,6 @@
.endif # !_WX_Defined_Done
#
-# Check if the user/port wants Unicode.
-#
-
-.if (!defined(WITHOUT_UNICODE) && \
- (defined(WITH_UNICODE) || defined(WANT_UNICODE)))
-_WX_UC_AVAILABLE= yes
-.else
-. undef _WX_UC_AVAILABLE
-.endif
-
-#
# Check if we are going to determine the version.
#
@@ -214,28 +189,11 @@
.if defined(_WANT_WX)
-# Check if Unicode will be used.
-
-. for __WANT_WX in ${_WANT_WX}
-. if defined(_WX_UC_AVAILABLE) && \
- (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${_WANT_WX:tl} == "yes")
-_WX_WANT_UNICODE= yes
-. endif
-. endfor
-
# These variables are reprocessed later so they won't affect other parts.
-. if defined(WX_UNICODE) || defined(_WX_WANT_UNICODE)
_WX_VER_FINAL= ${_WX_VERS_UC_ALL}
_WX_UC= u
-_WX_UCL= -unicode
_WX_PYSUFX= -unicode
-. else
-_WX_VER_FINAL= ${_WX_VERS_ALL}
-_WX_UC= #
-_WX_UCL= #
-_WX_PYSUFX= -ansi
-. endif
# Fill _HAVE_WX with the installed components.
@@ -407,37 +365,11 @@
. endif
.endfor
-# Requested by the user or port (optional).
-
-.if defined(_WX_UC_AVAILABLE)
-. for ver in ${_WX_VER_UC}
-. if ${_WX_VERS_UC_ALL:M${ver}} != ""
-WX_UNICODE= yes
-. endif
-. endfor
-.endif
-
-# Requested by the port (mandatory).
-
-.if defined(WX_UNICODE)
-. if empty(_WX_VER_UC)
-IGNORE?= selected a wxWidgets version which does not support Unicode: ${_WX_VER_MERGED}
-. endif
-.endif
-
# Set Unicode variables.
-.if defined(WX_UNICODE)
_WX_VER_FINAL= ${_WX_VER_UC}
_WX_UC= u
-_WX_UCL= -unicode
_WX_PYSUFX= -unicode
-.else
-_WX_VER_FINAL= ${_WX_VER_MERGED}
-_WX_UC= #
-_WX_UCL= #
-_WX_PYSUFX= -ansi
-.endif
# Remove unusable installed versions.
Index: x11-toolkits/Makefile
===================================================================
--- x11-toolkits/Makefile
+++ x11-toolkits/Makefile
@@ -201,7 +201,6 @@
SUBDIR += py-wxPython-common
SUBDIR += py-wxPython28
SUBDIR += py-wxPython28-common
- SUBDIR += py-wxPython28-unicode
SUBDIR += py-wxPython30
SUBDIR += py-xlib
SUBDIR += pypy-tkinter
@@ -261,8 +260,6 @@
SUBDIR += wxgtk28-common
SUBDIR += wxgtk28-contrib
SUBDIR += wxgtk28-contrib-common
- SUBDIR += wxgtk28-unicode
- SUBDIR += wxgtk28-unicode-contrib
SUBDIR += wxgtk30
SUBDIR += xbae
SUBDIR += xforms
Index: x11-toolkits/py-wxPython28-unicode/Makefile
===================================================================
--- x11-toolkits/py-wxPython28-unicode/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-# $FreeBSD$
-
-WITH_WXPYTHON_UNICODE= yes
-
-MASTERDIR= ${.CURDIR}/../py-wxPython28
-
-.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/py-wxPython28/Makefile
===================================================================
--- x11-toolkits/py-wxPython28/Makefile
+++ x11-toolkits/py-wxPython28/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wxPython
PORTVERSION= 2.8.12.1
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11-toolkits python
MASTER_SITES= SF/wxpython/wxPython/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -83,19 +83,11 @@
NO_SCRIPTS=1 \
INSTALL_MULTIVERSION=1
-. if defined(WITH_WXPYTHON_UNICODE)
WX_UNICODE= yes
-PKGNAMESUFFIX= 28-unicode
-
PYDISTUTILS_BUILDARGS+= \
UNICODE=1
WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT}-unicode
-. else
-PYDISTUTILS_BUILDARGS+= \
- UNICODE=0
-WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
-. endif # defined(WITH_WXPYTHON_UNICODE)
# plist substitutions
PLIST_SUB+= WX_PYTHON_DIR=${WX_PYTHON_DIR}
Index: x11-toolkits/wxgtk28-contrib/pkg-plist
===================================================================
--- x11-toolkits/wxgtk28-contrib/pkg-plist
+++ x11-toolkits/wxgtk28-contrib/pkg-plist
@@ -1,21 +1,21 @@
-lib/libwx_gtk2_fl-2.8.so
-lib/libwx_gtk2_fl-2.8.so.0
-lib/libwx_gtk2_fl-2.8.so.0.8.0
-lib/libwx_gtk2_gizmos-2.8.so
-lib/libwx_gtk2_gizmos-2.8.so.0
-lib/libwx_gtk2_gizmos-2.8.so.0.8.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2_gizmos_xrc-2.8.so.0.8.0
-lib/libwx_gtk2_ogl-2.8.so
-lib/libwx_gtk2_ogl-2.8.so.0
-lib/libwx_gtk2_ogl-2.8.so.0.8.0
-lib/libwx_gtk2_plot-2.8.so
-lib/libwx_gtk2_plot-2.8.so.0
-lib/libwx_gtk2_plot-2.8.so.0.8.0
-lib/libwx_gtk2_stc-2.8.so
-lib/libwx_gtk2_stc-2.8.so.0
-lib/libwx_gtk2_stc-2.8.so.0.8.0
-lib/libwx_gtk2_svg-2.8.so
-lib/libwx_gtk2_svg-2.8.so.0
-lib/libwx_gtk2_svg-2.8.so.0.8.0
+lib/libwx_gtk2u_fl-2.8.so
+lib/libwx_gtk2u_fl-2.8.so.0
+lib/libwx_gtk2u_fl-2.8.so.0.8.0
+lib/libwx_gtk2u_gizmos-2.8.so
+lib/libwx_gtk2u_gizmos-2.8.so.0
+lib/libwx_gtk2u_gizmos-2.8.so.0.8.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
+lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0
+lib/libwx_gtk2u_ogl-2.8.so
+lib/libwx_gtk2u_ogl-2.8.so.0
+lib/libwx_gtk2u_ogl-2.8.so.0.8.0
+lib/libwx_gtk2u_plot-2.8.so
+lib/libwx_gtk2u_plot-2.8.so.0
+lib/libwx_gtk2u_plot-2.8.so.0.8.0
+lib/libwx_gtk2u_stc-2.8.so
+lib/libwx_gtk2u_stc-2.8.so.0
+lib/libwx_gtk2u_stc-2.8.so.0.8.0
+lib/libwx_gtk2u_svg-2.8.so
+lib/libwx_gtk2u_svg-2.8.so.0
+lib/libwx_gtk2u_svg-2.8.so.0.8.0
Index: x11-toolkits/wxgtk28-unicode-contrib/Makefile
===================================================================
--- x11-toolkits/wxgtk28-unicode-contrib/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: fjoe@FreeBSD.org
-# $FreeBSD$
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit contributed libraries (Unicode)
-
-WXGTK_FLAVOR= gtk2-unicode-contrib
-MASTERDIR= ${.CURDIR}/../wxgtk28
-
-.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
===================================================================
--- x11-toolkits/wxgtk28-unicode-contrib/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-lib/libwx_gtk2u_fl-2.8.so
-lib/libwx_gtk2u_fl-2.8.so.0
-lib/libwx_gtk2u_fl-2.8.so.0.8.0
-lib/libwx_gtk2u_gizmos-2.8.so
-lib/libwx_gtk2u_gizmos-2.8.so.0
-lib/libwx_gtk2u_gizmos-2.8.so.0.8.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0
-lib/libwx_gtk2u_gizmos_xrc-2.8.so.0.8.0
-lib/libwx_gtk2u_ogl-2.8.so
-lib/libwx_gtk2u_ogl-2.8.so.0
-lib/libwx_gtk2u_ogl-2.8.so.0.8.0
-lib/libwx_gtk2u_plot-2.8.so
-lib/libwx_gtk2u_plot-2.8.so.0
-lib/libwx_gtk2u_plot-2.8.so.0.8.0
-lib/libwx_gtk2u_stc-2.8.so
-lib/libwx_gtk2u_stc-2.8.so.0
-lib/libwx_gtk2u_stc-2.8.so.0.8.0
-lib/libwx_gtk2u_svg-2.8.so
-lib/libwx_gtk2u_svg-2.8.so.0
-lib/libwx_gtk2u_svg-2.8.so.0.8.0
Index: x11-toolkits/wxgtk28-unicode/Makefile
===================================================================
--- x11-toolkits/wxgtk28-unicode/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: fjoe@FreeBSD.org
-# $FreeBSD$
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit (Unicode)
-
-WXGTK_FLAVOR= gtk2-unicode
-MASTERDIR= ${.CURDIR}/../wxgtk28
-
-.include "${MASTERDIR}/Makefile"
Index: x11-toolkits/wxgtk28-unicode/pkg-plist
===================================================================
--- x11-toolkits/wxgtk28-unicode/pkg-plist
+++ /dev/null
@@ -1,39 +0,0 @@
-bin/wxgtk2u-2.8-config
-bin/wxrc-gtk2u-2.8
-lib/libwx_baseu-2.8.so
-lib/libwx_baseu-2.8.so.0
-lib/libwx_baseu-2.8.so.0.8.0
-lib/libwx_baseu_net-2.8.so
-lib/libwx_baseu_net-2.8.so.0
-lib/libwx_baseu_net-2.8.so.0.8.0
-lib/libwx_baseu_xml-2.8.so
-lib/libwx_baseu_xml-2.8.so.0
-lib/libwx_baseu_xml-2.8.so.0.8.0
-lib/libwx_gtk2u_adv-2.8.so
-lib/libwx_gtk2u_adv-2.8.so.0
-lib/libwx_gtk2u_adv-2.8.so.0.8.0
-lib/libwx_gtk2u_aui-2.8.so
-lib/libwx_gtk2u_aui-2.8.so.0
-lib/libwx_gtk2u_aui-2.8.so.0.8.0
-lib/libwx_gtk2u_core-2.8.so
-lib/libwx_gtk2u_core-2.8.so.0
-lib/libwx_gtk2u_core-2.8.so.0.8.0
-lib/libwx_gtk2u_gl-2.8.so
-lib/libwx_gtk2u_gl-2.8.so.0
-lib/libwx_gtk2u_gl-2.8.so.0.8.0
-lib/libwx_gtk2u_html-2.8.so
-lib/libwx_gtk2u_html-2.8.so.0
-lib/libwx_gtk2u_html-2.8.so.0.8.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0
-%%GSTREAMER%%lib/libwx_gtk2u_media-2.8.so.0.8.0
-lib/libwx_gtk2u_qa-2.8.so
-lib/libwx_gtk2u_qa-2.8.so.0
-lib/libwx_gtk2u_qa-2.8.so.0.8.0
-lib/libwx_gtk2u_richtext-2.8.so
-lib/libwx_gtk2u_richtext-2.8.so.0
-lib/libwx_gtk2u_richtext-2.8.so.0.8.0
-lib/libwx_gtk2u_xrc-2.8.so
-lib/libwx_gtk2u_xrc-2.8.so.0
-lib/libwx_gtk2u_xrc-2.8.so.0.8.0
-lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h
Index: x11-toolkits/wxgtk28/Makefile
===================================================================
--- x11-toolkits/wxgtk28/Makefile
+++ x11-toolkits/wxgtk28/Makefile
@@ -81,10 +81,7 @@
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
USE_WX= 2.8
RUN_DEPENDS= ${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
-
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
WX_UNICODE= yes
-.endif
pre-configure:
@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
@@ -95,9 +92,7 @@
.endif # !gtk2-contrib-common
.endif # *-contrib*
-.if ${WXGTK_FLAVOR:M*-unicode*} != ""
CONFIGURE_ARGS+=--enable-unicode
-.endif
.include <bsd.port.pre.mk>

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 16, 2:18 AM (20 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40879318
Default Alt Text
D3660.id8732.diff (11 KB)

Event Timeline