ports/89398: [PATCH] bsd.wx.mk and patches

Alejandro Pulver alepulver at FreeBSD.org
Wed Jun 14 00:51:08 UTC 2006


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello.

Here is the new diff.

The ports which have USE_WX set to "2.4-2.6" can be compiled with
WITH_WX_VER=2.4 (by default they use 2.6).

The ports which have USE_WX set to "2.6" can be compiled with
WITH_UNICODE=yes (by default, they don't use Unicode).

- ---------- BEGIN ----------
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.533
diff -u -r1.533 bsd.port.mk
- --- Mk/bsd.port.mk	23 May 2006 21:53:18 -0000	1.533
+++ Mk/bsd.port.mk	13 Jun 2006 23:22:10 -0000
@@ -1393,6 +1393,10 @@
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
 
+.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
+.include "${PORTSDIR}/Mk/bsd.wx.mk"
+.endif
+
 .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) || defined(USE_GSTREAMER80)
 .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
 .endif
@@ -1841,6 +1845,11 @@
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
 
+.if defined(WANT_WX) || defined(USE_WX) || defined(USE_WX_NOT)
+.include "${PORTSDIR}/Mk/bsd.wx.mk"
+.endif
+
+
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
 USE_SUBMAKE=	yes
Index: Mk/bsd.wx.mk
===================================================================
RCS file: Mk/bsd.wx.mk
diff -N Mk/bsd.wx.mk
- --- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Mk/bsd.wx.mk	13 Jun 2006 23:22:11 -0000
@@ -0,0 +1,499 @@
+#-*- mode: makefile; tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD$
+#
+# bsd.wx.mk - Support for WxWidgets based ports.
+#
+# Created by: Alejandro Pulver <alepulver at FreeBSD.org>
+#
+# Please view me with 4 column tabs!
+#
+# The following variables can be defined in a port that uses the WxWidgets
+# library, contributed libraries, WxPython and/or more WxWidgets related
+# components (with run and/or build dependencies). It can be used after and/or
+# before bsd.port.pre.mk, but Python components will only work if Python
+# variables (e.g. USE_PYTHON) are defined before it (this is a bsd.python.mk
+# limitation).
+# USE_WX		- Set to the list of WxWidgets versions that can be used by
+#				  the port. The syntax allows the following elements:
+#				  - Single version (e.g. "2.4").
+#				  - Range of versions (e.g. "2.4-2.6"). Must be ascending.
+#				  - Partial range: single version and upper (e.g. "2.4+").
+#				  - Partial range: single version and lower (e.g. "-2.6").
+#				  Multiple elements can be specified separated by spaces.
+# USE_WX_NOT	- Set to the list of WxWidgets versions that can't be used by
+#				  the port. In other words, it removes some versions from
+#				  USE_WX. If the latter is not defined, it will have the value
+#				  of all the possible versions. The syntax is like USE_WX.
+# WX_COMPS		- Set to the list of WxWidgets components the port uses.
+#				  Several components can be specified separated by spaces. By
+#				  default it will have the value of "wx". Suffixes in the form
+#				  "_xxx" may be added to the components to determine the
+#				  dependency type.
+#				  The available components are:
+#				  wx			- The WxWidgets library.
+#				  contrib		- The WxWidgets contributed libraries.
+#				  python		- The WxWidgets API for Python (WxPython).
+#				  mozilla		- WxMozilla (only for 2.4).
+#				  svg			- WxSVG (only for 2.6).
+#				  The available dependency types are:
+#				  build			- Requires component for building.
+#				  lib			- Requires component for building and running.
+#				  run			- Requires component for running.
+#				  If no suffix is present then "lib" will be used.
+# WX_CONF_ARGS	- Set to "absolute" or "relative" if the port needs configure
+#				  arguments in addition to the WX_CONFIG environment variable.
+#				  It determines the type of parameters that have to be passed
+#				  to the configure script. In the first case it adds
+#				  "--with-wx-config=${WX_CONFIG}" (absolute path of WX_CONFIG),
+#				  and in second one "--with-wx=${X11BASE}" and
+#				  "--with-wx-config=${WX_CONFIG:T} (prefix and name).
+# WX_UNICODE	- Set to "yes" (or anything) 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. The
+#				  first case is handled by the user variable WITH_UNICODE.
+# 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
+#				  version is selected, HAVE_WX will contain a list of
+#				  components in the other case it will contain a list of
+#				  "component-version" pairs (e.g. wx-2.6, contrib-2.4, etc).
+#				  It has to be used before bsd.port.pre.mk.
+# WANT_WX_VER	- Set to the prefered WxWidgets version for the port. It must
+#				  be present in USE_WX or missing in USE_WX_NOT. This is
+#				  overriden by the user variable WITH_WX_VER if set. It can
+#				  contain multiple versions in order of preference (last ones
+#				  are tried first).
+#
+# The following variables are intended for the user and can be defined in
+# make.conf.
+# WITH_UNICODE	- If the variable is defined and both the running FreeBSD
+#				  version and the selected WxWidgets version support Unicode,
+#				  then the Unicode version of WxWidgets is used.
+# WITH_WX_VER	- If the variable is defined the version it contains will be
+#				  used as the default for ports that support multiple
+#				  WxWidgets versions. It can contain multiple versions, and
+#				  the last possible one will be used.
+#
+# The following variables are defined by this file, to be read from the port.
+# 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
+#				  the user through WITH_UNICODE).
+# WX_VERSION	- The WxWidgets version that is going to be used.
+# 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.6 and contributed libraries with Unicode.
+#	USE_WX=		2.6
+#	WX_COMPS=	wx contrib
+#	WX_UNICODE=	yes
+# - A port that needs WxPython 2.4 for running.
+#	USE_PYTHON=	yes
+#	USE_WX=		2.4
+#	WX_COMPS=	python_run
+# - A port that needs WxPython 2.4 or 2.6 for building.
+#	USE_PYTHON=	yes
+#	USE_WX=		2.4 2.6
+#	WX_COMPS=	python_build
+# - A port that needs WxWidgets version 2.4 or higher and contributed
+#	libraries.
+#	USE_WX=		2.4+
+#	WX_COMPS=	wx contrib
+# - A port that needs WxWidgets of any version other than 2.4.
+#	USE_WX_NOT=	2.4
+#
+# Notes:
+# - The version is processed on each inclusion, so USE_WX, USE_WX_NOT and
+#	WX_UNICODE can be modified before and after including bsd.port.pre.mk.
+#	After determining the version and Unicode, WX_CONFIG will be defined.
+#
+
+WX_Include_MAINTAINER=	alepulver at FreeBSD.org
+
+#
+# Global definitions.
+#
+
+.if !defined(_WX_Definitions_Done)
+_WX_Definitions_Done=	yes
+
+#
+# Common variables:
+# _WX_COMPS_ALL			- List of valid components.
+# _WX_DEP_TYPES_ALL		- List of valid dependency types.
+# _WX_VERS_ALL			- List of supported versions.
+# _WX_VERS_UC_ALL		- List of Unicode capable versions.
+# _WX_CHANGE_VARS		- List of variables allowed to change between pre and
+#						  post inclusions (related to version).
+# _WX_LISTS_ORDER		- Reverse lists preference order.
+# _WX_AUTO_VARS			- Variables defined sometimes that may have to be
+#						  redefined later.
+#
+
+_WX_COMPS_ALL=			wx contrib python mozilla svg
+_WX_DEP_TYPES_ALL=		build lib run
+_WX_VERS_ALL=			2.4 2.6
+_WX_VERS_UC_ALL=		2.6
+_WX_CHANGE_VARS=		USE_WX USE_WX_NOT WX_UNICODE
+_WX_LISTS_ORDER=		_WX_VER_FINAL WANT_WX_VER WITH_WX_VER
+_WX_AUTO_VARS=			USE_WX WX_CONFIG
+
+#
+# Variables used to determine what is needed:
+# _WX_PORT_comp_ver		- Port directory.
+# _WX_LIB_comp_ver		- Name of the shared library (optional).
+# _WX_SHVER_comp_ver	- Shared library version (optional).
+# _WX_FILE_comp_ver		- File installed by that component.
+#
+
+_WX_PORT_wx_2.4=		wxgtk24
+_WX_LIB_wx_2.4=			wx_gtk2-2.4
+
+_WX_PORT_contrib_2.4=	wxgtk24-contrib
+_WX_LIB_contrib_2.4=	wx_gtk2_canvas-2.4
+
+_WX_PORT_python_2.4=	py-wxPython24
+_WX_FILE_python_2.4=	${PYTHON_SITELIBDIR}/wx/__init__.py
+
+_WX_PORT_mozilla_2.4=	wxmozilla
+_WX_LIB_mozilla_2.4=	wxmozilla_gtk2-2.4
+
+_WX_PORT_wx_2.6=		wxgtk26${_WX_UCL}
+_WX_LIB_wx_2.6=			wx_base${_WX_UC}-2.6
+
+_WX_PORT_contrib_2.6=	wxgtk26${_WX_UCL}-contrib
+_WX_LIB_contrib_2.6=	wx_gtk2${_WX_UC}_animate-2.6
+
+_WX_PORT_python_2.6=	py-wxPython26${_WX_UCL}
+_WX_FILE_python_2.6=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2${_WX_PYSUFX}/wx/__init__.py
+
+_WX_PORT_svg_2.6=		wxsvg
+_WX_LIB_svg_2.6=		wxsvg
+
+# Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
+
+.for comp in ${_WX_COMPS_ALL}
+.	for ver in ${_WX_VERS_ALL}
+.		if defined(_WX_LIB_${comp}_${ver})
+_WX_SHVER_${comp}_${ver}=	0
+_WX_FILE_${comp}_${ver}=	${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
+.		endif
+.	endfor
+.endfor
+
+.endif		# !_WX_Defined_Done
+
+#
+# Check if the version has changed between inclusions.
+#
+
+.if defined(_WX_Version_Done)
+.	undef _WX_HAS_CHANGED
+
+.	for var in ${_WX_CHANGE_VARS}
+.		if (defined(${var}) && !defined(_WX_OLD_${var})) || \
+		   (!defined(${var}) && defined(_WX_OLD_${var})) || \
+		   (defined(_WX_OLD_${var}) && ${_WX_OLD_${var}} != ${${var}})
+_WX_HAS_CHANGED=		yes
+.		endif
+.	endfor
+.endif		# _WX_Version_Done
+
+#
+# Select WxWidgets version.
+#
+
+.if (!defined(_WX_Version_Done) || defined(_WX_HAS_CHANGED)) && \
+	(defined(USE_WX) || defined(USE_WX_NOT))
+_WX_Version_Done=		yes
+
+# Handle automatic variables.
+
+.for var in ${_WX_AUTO_VARS}
+.	if defined(_WX_${var}_DEFINED)
+.		undef ${var}
+.	endif
+.	if !defined(${var})
+_WX_${var}_DEFINED=		yes
+.	endif
+.endfor
+
+# Reset old variable values.
+
+.if defined(_WX_HAS_CHANGED)
+.	undef _WX_VER
+.	undef _WX_IGNORE
+.endif
+
+# Set defaults (if one isn't present).
+
+USE_WX?=				${_WX_VERS_ALL}
+USE_WX_NOT?=			#
+
+#
+# Make lists of valid and invalid versions.
+#
+# The following variables are used:
+# _WX_VER_CHECK			- If the version is a single one, express in a range.
+# _WX_VER_MIN			- Lower version of the range.
+# _WX_VER_MAX			- Higher version of the range.
+# _WX_VER_LIST			- List of requested versions.
+# _WX_VER_NOT_LIST		- List of disallowed versions.
+# _WX_VER_MERGED		- List of requested version without disallowed ones.
+#
+
+.for list in VER VER_NOT
+_WX_${list}_LIST=		#
+.	for ver in ${USE_WX${list:C/VER//}}
+_WX_VER_CHECK:=			${ver:C/^([[:digit:]]+(\.[[:digit:]]+)*)$/\1-\1/}
+_WX_VER_MIN:=			${_WX_VER_CHECK:C/([[:digit:]]+(\.[[:digit:]]+)*)[-+].*/\1/}
+_WX_VER_MAX:=			${_WX_VER_CHECK:C/.*-([[:digit:]]+(\.[[:digit:]]+)*)/\1/}
+# Minimum version not specified.
+.		if ${_WX_VER_MIN} == ${_WX_VER_CHECK}
+.			undef _WX_VER_MIN
+.			for v in ${_WX_VERS_ALL}
+_WX_VER_MIN?=			${v}
+.			endfor
+.		endif
+# Maximum version not specified.
+.		if ${_WX_VER_MAX} == ${_WX_VER_CHECK}
+.			for v in ${_WX_VERS_ALL}
+_WX_VER_MAX=			${v}
+.			endfor
+.		endif
+# Expand versions and add valid ones to each list.
+.		for v in ${_WX_VERS_ALL}
+.			if ${_WX_VER_MIN} <= ${v} && ${_WX_VER_MAX} >= ${v} && \
+			   ${_WX_${list}_LIST:M${v}} == ""
+_WX_${list}_LIST+=		${v}
+.			endif
+.		endfor
+.	endfor
+.endfor
+
+# Merge the lists into a single list of valid versions.
+
+_WX_VER_MERGED=			#
+.for ver in ${_WX_VER_LIST}
+.	if ${_WX_VER_NOT_LIST:M${ver}} == ""
+_WX_VER_MERGED+=		${ver}
+.	endif
+.endfor
+
+# Check for a null version.
+
+.if empty(_WX_VER_MERGED)
+_WX_IGNORE?=			selected a null or invalid WxWidgets version
+.endif
+
+#
+# Unicode support.
+#
+
+# Create a list of capable versions.
+
+_WX_VER_UC=				#
+.for ver in ${_WX_VER_MERGED}
+.	if ${_WX_VERS_UC_ALL:M${ver}} != ""
+_WX_VER_UC+=			${ver}
+.	endif
+.endfor
+
+# Requested by the user (optional).
+
+.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000
+.	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 ${OSVERSION} < 500000
+_WX_IGNORE?=			requires FreeBSD versions >= 5.X (because of Unicode)
+.	elif empty(_WX_VER_UC)
+_WX_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
+
+#
+# Choose final version.
+#
+
+#
+# Check for the following (in order):
+# 1) WITH_WX_VER		- User preference.
+# 2) WANT_WX_VER		- Port preference.
+# 3) _WX_VER_FINAL		- Available versions.
+#
+
+.for list in ${_WX_LISTS_ORDER}
+.	if defined(${list})
+.		for ver in ${${list}}
+.			if ${_WX_VER_FINAL:M${ver}} != ""
+_WX_VER=				${ver}
+.			endif
+.		endfor
+.	endif
+.endfor
+
+#
+# Set variables.
+#
+
+WX_VERSION=				${_WX_VER}
+WX_CONFIG?=				${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
+
+# Define old values for detecting changes.
+
+.for var in ${_WX_CHANGE_VARS}
+.	if defined(${var})
+_WX_OLD_${var}:=		${${var}}
+.	endif
+.endfor
+
+.endif		# ! _WX_Version_Done || _WX_HAS_CHANGED
+
+#
+# Check for present components.
+#
+
+.if !defined(AFTERPORTMK) && defined(WANT_WX)
+HAVE_WX=				#
+.	for __WANT_WX in ${WANT_WX}
+.		if ${WANT_WX:U} == "YES"
+.			for comp in ${_WX_COMPS_ALL}
+.				for ver in ${_WX_VERS_ALL}
+.					if exists(${_WX_FILE_${comp}_${ver}})
+HAVE_WX+=				${comp}-${ver}
+.					endif
+.				endfor
+.			endfor
+.		elif ${_WX_VERS_ALL:M${__WANT_WX}}
+.			for comp in ${_WX_COMPS_ALL}
+.				if exists(${_WX_FILE_${comp}_${__WANT_WX}})
+HAVE_WX+=				${comp}
+.				endif
+.			endfor
+.		else
+IGNORE?=				selected an invalid value for WANT_WX: ${__WANT_WX}
+.		endif
+.	endfor
+.endif		# ! AFTERPORTMK && WANT_WX
+
+#
+# Process components list and add dependencies, variables, etc.
+#
+
+.if !defined(BEFOREPORTMK) && \
+	(defined(USE_WX) || defined(USE_WX_NOT))
+
+# Error check.
+
+.if defined(_WX_IGNORE)
+IGNORE?=				${_WX_IGNORE}
+.endif
+
+#
+# Component parsing.
+#
+# The variables used are:
+# _WX_COMP				- Component part.
+# _WX_DEP_TYPE			- Dependency type part.
+# _WX_COMP_NEW			- Component + dependency type.
+# _WX_COMPS_FINAL		- Final list of components with dependency types.
+#
+
+# Default components.
+
+WX_COMPS?=				wx
+
+# Detect invalid and duplicated components.
+
+_WX_COMPS_FINAL=		#
+.for comp in ${WX_COMPS}
+_WX_COMP=				${comp:C/_([[:alpha:]]+)$//}
+_WX_DEP_TYPE=			${comp:C/.+_([[:alpha:]]+)$/\1/}
+.	if ${_WX_COMP} == ${comp}
+_WX_DEP_TYPE=			lib
+.	endif
+_WX_COMP_NEW=			${_WX_COMP}_${_WX_DEP_TYPE}
+.	for __WX_COMP in ${_WX_COMP}
+.		if ${_WX_COMPS_ALL:M${__WX_COMP}} == ""
+IGNORE?=				selected an invalid WxWidgets component: ${__WX_COMP}
+.		endif
+.	endfor
+.	for __WX_DEP_TYPE in ${_WX_DEP_TYPE}
+.		if ${_WX_DEP_TYPES_ALL:M${__WX_DEP_TYPE}} == ""
+IGNORE?=				selected an invalid WxWidgets dependency type: ${__WX_DEP_TYPE}
+.		endif
+.	endfor
+.	if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER})
+IGNORE?=				selected a WxWidgets component (${_WX_COMP}) which is not available for the selected version (${_WX_VER})
+.	endif
+.	for newcomp in ${_WX_COMP_NEW}
+.		if ${_WX_COMPS_FINAL:M${newcomp}} == ""
+_WX_COMPS_FINAL+=		${newcomp}
+.		endif
+.	endfor
+.endfor
+
+# Add dependencies.
+
+.for comp in ${_WX_COMPS_FINAL}
+_WX_COMP=				${comp:C/_([[:alpha:]]+)$//}
+_WX_DEP_TYPE=			${comp:C/.+_([[:alpha:]]+)$/\1/}
+.	if ${_WX_DEP_TYPE} == "lib"
+.		if defined(_WX_LIB_${_WX_COMP}_${_WX_VER})
+LIB_DEPENDS+=			${_WX_LIB_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
+.		else
+BUILD_DEPENDS+=			${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
+RUN_DEPENDS+=			${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
+.		endif
+.	else
+${_WX_DEP_TYPE:U}_DEPENDS+=	${_WX_FILE_${_WX_COMP}_${_WX_VER}}:${PORTSDIR}/x11-toolkits/${_WX_PORT_${_WX_COMP}_${_WX_VER}}
+.	endif
+.endfor
+
+#
+# Set build related variables.
+#
+
+MAKE_ENV+=				WX_CONFIG=${WX_CONFIG}
+CONFIGURE_ENV+=			WX_CONFIG=${WX_CONFIG}
+
+.if defined(WX_CONF_ARGS)
+.	if ${WX_CONF_ARGS:L} == "absolute"
+CONFIGURE_ARGS+=		--with-wx-config=${WX_CONFIG}
+.	elif ${WX_CONF_ARGS:L} == "relative"
+CONFIGURE_ARGS+=		--with-wx=${X11BASE} \
+						--with-wx-config=${WX_CONFIG:T}
+.	else
+IGNORE?=				selected an invalid WxWidgets configure argument type: ${WX_CONF_ARGS}
+.	endif
+.endif
+
+.endif		# ! BEFOREPORTMK
Index: audio/audacity/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/audacity/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
- --- audio/audacity/Makefile	15 Apr 2006 20:10:03 -0000	1.30
+++ audio/audacity/Makefile	13 Jun 2006 23:22:11 -0000
@@ -15,13 +15,13 @@
 COMMENT=	Audacity is a GUI editor for digital audio waveforms
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
- -LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
+USE_WX=		2.6
 
 MAN1=		audacity.1
 MANCOMPRESSED=	yes
@@ -38,8 +38,7 @@
 
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
- -		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
- -		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.6-config
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}"
 
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
Index: audio/mbox/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/mbox/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
- --- audio/mbox/Makefile	12 Jan 2006 12:54:05 -0000	1.8
+++ audio/mbox/Makefile	13 Jun 2006 23:22:11 -0000
@@ -12,17 +12,17 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Program intended to help with organizing your music files
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24 \
- -		${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/__init__.py:${PORTSDIR}/audio/py-ogg \
 		${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis \
 		lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mplayer:${PORTSDIR}/multimedia/mplayer
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_BZIP2=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
 
 .include <bsd.port.mk>
Index: audio/picard/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/picard/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
- --- audio/picard/Makefile	6 May 2006 13:35:08 -0000	1.2
+++ audio/picard/Makefile	13 Jun 2006 23:22:11 -0000
@@ -15,11 +15,12 @@
 
 RUN_DEPENDS=	\
 		${PYTHON_SITELIBDIR}/tunepimp/__init__.py:${PORTSDIR}/audio/py-libtunepimp \
- -		${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz \
- -		${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode
+		${PYTHON_SITELIBDIR}/musicbrainz.py:${PORTSDIR}/audio/py-musicbrainz
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 
 SOURCEFILE=	${DISTNAME}${EXTRACT_SUFX}
 PICARD_MODULES=	browser lib ui
Index: audio/py-karaoke/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/py-karaoke/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
- --- audio/py-karaoke/Makefile	7 Apr 2006 08:36:16 -0000	1.1
+++ audio/py-karaoke/Makefile	13 Jun 2006 23:22:11 -0000
@@ -17,13 +17,14 @@
 COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \
- -		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
- -		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
 
 USE_ZIP=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_PYTHON_PREFIX=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 
 .include <bsd.port.mk>
Index: biology/L-Breeder/Makefile
===================================================================
RCS file: /home/pcvs/ports/biology/L-Breeder/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
- --- biology/L-Breeder/Makefile	3 May 2006 23:26:32 -0000	1.20
+++ biology/L-Breeder/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,8 +16,7 @@
 MAINTAINER=	dyeske at yahoo.com
 COMMENT=	Allows you to display and breed L-system forms
 
- -LIB_DEPENDS=	wx_gtk2_gl-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
- -		glut.4:${PORTSDIR}/graphics/libglut
+LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
 NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/Unix
@@ -26,8 +25,7 @@
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
- -
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
+USE_WX=		2.4
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
Index: biology/treeviewx/Makefile
===================================================================
RCS file: /home/pcvs/ports/biology/treeviewx/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
- --- biology/treeviewx/Makefile	6 Dec 2005 02:00:55 -0000	1.21
+++ biology/treeviewx/Makefile	13 Jun 2006 23:22:11 -0000
@@ -15,12 +15,10 @@
 MAINTAINER=	fernan at iib.unsam.edu.ar
 COMMENT=	A phylogenetic tree viewer
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
- -		wx_gtk2_dcsvg-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24-contrib
- -
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
- -CONFIGURE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config"
+USE_WX=		2.4
+WX_COMPS=	contrib
 
 PLIST_FILES=	bin/tv
 
Index: cad/kicad/Makefile
===================================================================
RCS file: /home/pcvs/ports/cad/kicad/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
- --- cad/kicad/Makefile	24 Apr 2006 20:58:11 -0000	1.11
+++ cad/kicad/Makefile	13 Jun 2006 23:22:11 -0000
@@ -22,8 +22,6 @@
 MAINTAINER=		thierry at FreeBSD.org
 COMMENT=		Schematic and PCB editing software
 
- -LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -
 .if !defined(NOPORTDOCS)
 DISTFILES+=	doc_components-${DOCVERSION}.tgz:dat
 DOCVERSION=	2006-04-24
@@ -36,10 +34,7 @@
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
- -
- -MAKE_ENV=	WX_CONFIG=${WX_CONFIG}
- -
- -WX_CONFIG=	wxgtk2-2.6-config
+USE_WX=		2.6
 
 INSTDIR=	${PORTNAME}
 PLIST_SUB=	INSTDIR=${INSTDIR} OPSYS=${OPSYS}
Index: chinese/BBMan/Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/BBMan/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
- --- chinese/BBMan/Makefile	1 Dec 2005 08:34:57 -0000	1.12
+++ chinese/BBMan/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,9 +16,8 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	BBMan is a BBS client for X Window System
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
 USE_ZIP=	yes
+USE_WX=		2.4
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 
@@ -35,7 +34,7 @@
 .endif
 
 do-build:
- -		cd ${WRKSRC} && ${CXX} main.cpp `wxgtk2-2.4-config --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
+		cd ${WRKSRC} && ${CXX} main.cpp `${WX_CONFIG} --libs --cxxflags` -I${LOCALBASE}/include ${CFLAGS} -o BBMan
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/BBMan ${PREFIX}/bin/BBMan
Index: comms/trustedqsl/Makefile
===================================================================
RCS file: /home/pcvs/ports/comms/trustedqsl/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
- --- comms/trustedqsl/Makefile	9 May 2006 05:51:15 -0000	1.11
+++ comms/trustedqsl/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,11 +16,11 @@
 MAINTAINER=	db at db.net
 COMMENT=	Amateur Radio Station electronic trusted logbook
 
- -LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
- -		wx_base-2.6:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_PERL5=	yes
 USE_GETOPT_LONG=	yes
+USE_WX=		2.6
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	INCDIR="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
Index: comms/trustedqsl/files/Makefile
===================================================================
RCS file: /home/pcvs/ports/comms/trustedqsl/files/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
- --- comms/trustedqsl/files/Makefile	9 May 2006 21:16:56 -0000	1.3
+++ comms/trustedqsl/files/Makefile	13 Jun 2006 23:22:11 -0000
@@ -1,7 +1,7 @@
 # $FreeBSD: ports/comms/trustedqsl/files/Makefile,v 1.3 2006/05/09 21:16:56 az Exp $
 
 all:
- -	(cd tqsllib-2.0;./configure --with-wxwindows=${X11BASE}/bin/wxgtk2-2.6-config;make;make converter;make gen_crq;make load_cert;make station_loc)
+	(cd tqsllib-2.0;./configure --with-wxwindows=${WX_CONFIG};make;make converter;make gen_crq;make load_cert;make station_loc)
 	(cd TrustedQSL-1.11;make)
 
 install:
Index: comms/trustedqsl/files/Makefile.TrustedQSL-1.11
===================================================================
RCS file: /home/pcvs/ports/comms/trustedqsl/files/Makefile.TrustedQSL-1.11,v
retrieving revision 1.2
diff -u -r1.2 Makefile.TrustedQSL-1.11
- --- comms/trustedqsl/files/Makefile.TrustedQSL-1.11	9 May 2006 21:16:56 -0000	1.2
+++ comms/trustedqsl/files/Makefile.TrustedQSL-1.11	13 Jun 2006 23:22:11 -0000
@@ -5,8 +5,8 @@
 LIBS=-lz -lexpat -lcrypto
 INCDIR = -I$(TQSLINC)
 BUILD = unofficial
- -WXFLAGS=`wxgtk2-2.6-config --cflags`
- -WXLIBS=`wxgtk2-2.6-config --libs`
+WXFLAGS=`${WX_CONFIG} --cflags`
+WXLIBS=`${WX_CONFIG} --libs`
 DEFS = -DHAVE_CONFIG_H
 CXXFLAGS +=  $(DEFS) $(INCDIR)  -DHAVE_LIBCRYPTO=1 -DSTDC_HEADERS=1 -DHAVE_MKDIR=1 -DHAVE_STRERROR=1  $(WXFLAGS)
 
Index: databases/pgadmin3/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/pgadmin3/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
- --- databases/pgadmin3/Makefile	21 May 2006 14:04:42 -0000	1.25
+++ databases/pgadmin3/Makefile	13 Jun 2006 23:22:11 -0000
@@ -17,22 +17,16 @@
 USE_GETTEXT=	yes
 USE_PGSQL=	yes
 BROKEN_WITH_PGSQL=	73
+USE_WX=		2.6
+WX_COMPS=	contrib
+WX_CONF_ARGS=	relative
+WX_UNICODE=	yes
 GNU_CONFIGURE=	yes
- -CONFIGURE_ARGS=	--with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 CONFLICTS=	pgadmin3-1.[12]*
 
- -LIB_DEPENDS+=	wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
- -WX_CONFIG=	wxgtk2u-2.6-config
- -
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
- -.include <bsd.port.pre.mk>
- -
- -.if ${OSVERSION} < 500000
- -BROKEN=		requires wchar_t
- -.endif
- -
- -.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: databases/pgadmin3-12/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/pgadmin3-12/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
- --- databases/pgadmin3-12/Makefile	4 May 2006 21:40:04 -0000	1.23
+++ databases/pgadmin3-12/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,8 +16,10 @@
 COMMENT=	PostgreSQL database design and management system
 
 USE_PGSQL=	yes
+USE_WX=		2.6
+WX_COMPS=	contrib
+WX_CONF_ARGS=	relative
 GNU_CONFIGURE=	yes
- -CONFIGURE_ARGS=	--with-wx=${X11BASE} --with-wx-config=${WX_CONFIG}
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LIBS="${PTHREAD_LIBS}"
 CONFLICTS=	pgadmin3-1.[456789]*
@@ -25,26 +27,12 @@
 
 .include <bsd.port.pre.mk>
 
- -.if ${OSVERSION} < 500000
- -WITHOUT_UNICODE=	yes
- -.endif
- -
- -pre-everything::
- -.if !defined(WITHOUT_UNICODE)
- -	@${ECHO_MSG} "You can build non-Unicode version by defining WITHOUT_UNICODE."
- -.endif
- -
- -.if !defined(WITHOUT_UNICODE)
- -LIB_DEPENDS+=	wx_gtk2u_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
- -WX_CONFIG=	wxgtk2u-2.6-config
+.if defined(WX_UNICODE)
 PKGNAMESUFFIX=	-unicode
 PKGMESSAGE=	${PKGDIR}/pkg-message-unicode
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
- -.else
- -LIB_DEPENDS+=	wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
- -WX_CONFIG=	wxgtk2-2.6-config
- -.endif # WITHOUT_UNICODE
+.endif
 
 .include <bsd.port.post.mk>
Index: databases/pydbdesigner/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/pydbdesigner/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
- --- databases/pydbdesigner/Makefile	19 Apr 2006 15:38:58 -0000	1.14
+++ databases/pydbdesigner/Makefile	13 Jun 2006 23:22:11 -0000
@@ -14,11 +14,11 @@
 MAINTAINER=	xride at x12.dk
 COMMENT=	Graphical designer for relational databases
 
- -RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
- -
 EXTRACT_AFTER_ARGS=	| ${TAR} --exclude CVS -xf -
 
 USE_PYTHON=	2.2+
+USE_WX=		2.4
+WX_COMPS=	python_run
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/PyDBDesigner
 
Index: deskutils/cycle/Makefile
===================================================================
RCS file: /home/pcvs/ports/deskutils/cycle/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
- --- deskutils/cycle/Makefile	4 May 2006 21:40:08 -0000	1.5
+++ deskutils/cycle/Makefile	13 Jun 2006 23:22:11 -0000
@@ -15,10 +15,10 @@
 MAINTAINER=	danfe at FreeBSD.org
 COMMENT=	A calendar program for women
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
 USE_BZIP2=	yes
 USE_PYTHON_RUN=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 NO_BUILD=	yes
 
 MAN1=		${PORTNAME}.1
Index: deskutils/xchm/Makefile
===================================================================
RCS file: /home/pcvs/ports/deskutils/xchm/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
- --- deskutils/xchm/Makefile	23 May 2006 08:17:29 -0000	1.26
+++ deskutils/xchm/Makefile	13 Jun 2006 23:22:11 -0000
@@ -14,12 +14,12 @@
 MAINTAINER=	pav at FreeBSD.org
 COMMENT=	Windows HTML Help (.chm) viewer for UNIX
 
- -LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib \
- -		wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
+LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chmlib
 
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
- -CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2u-2.6-config
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 post-patch:
Index: devel/agide/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/agide/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
- --- devel/agide/Makefile	7 Mar 2006 08:26:03 -0000	1.8
+++ devel/agide/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,8 +16,7 @@
 COMMENT=	A-A-P GUI IDE: a framework for software development
 
 RUN_DEPENDS=	${LOCALBASE}/bin/aap:${PORTSDIR}/devel/aap \
- -		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim \
- -		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		${LOCALBASE}/bin/vim:${PORTSDIR}/editors/vim
 
 MAN1=		agide.1
 
@@ -26,6 +25,8 @@
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 pre-install:
Index: devel/boaconstructor/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/boaconstructor/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
- --- devel/boaconstructor/Makefile	12 Jan 2006 12:54:07 -0000	1.17
+++ devel/boaconstructor/Makefile	13 Jun 2006 23:22:11 -0000
@@ -16,12 +16,12 @@
 MAINTAINER=	filippo.natali at gmail.com
 COMMENT=	A cross platform RAD GUI Building IDE for wxPython
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
 WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
 
 USE_ZIP=	yes
 USE_PYTHON=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 DATADIR=	${PREFIX}/share/Boa
 
 do-build:
Index: devel/codeblocks/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/codeblocks/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
- --- devel/codeblocks/Makefile	29 Jan 2006 22:54:28 -0000	1.2
+++ devel/codeblocks/Makefile	13 Jun 2006 23:22:11 -0000
@@ -17,11 +17,11 @@
 COMMENT=	Open source, cross-platform, free C/C++ IDE
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
- -LIB_DEPENDS=	wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	yes
+USE_WX=		2.6
 INSTALLS_SHLIB=	yes
 
 TARGETS=	tinyXML scintilla sdk wxDockit src console_runner doc
@@ -35,9 +35,6 @@
 
 .include <bsd.port.pre.mk>
 
- -.if ${OSVERSION} < 500000
- -BROKEN=		Code::Blocks is currently not supported for FreeBSD versions prior to FreeBSD 5
- -.endif
 .if ${ARCH} == ia64 && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000
 BROKEN=		Code::Blocks is currently not supported on IA64 FreeBSD 6
 .endif
@@ -52,7 +49,7 @@
 	${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
 	@(${CAT} ${WRKSRC}/update | ${TR} -d "\r" > ${WRKSRC}/update.sh)
 
- -pre-build:
+pre-patch:
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 .for t in ${TARGETS}
@@ -66,6 +63,19 @@
 . endfor
 .endfor
 
+.if exists(${WX_CONFIG})
+LIB_WXXRC!=	${WX_CONFIG} --libs xrc
+.endif
+
+pre-build:
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \
+		s|%%LIB_WXXRC%%|${LIB_WXXRC:M*xrc*:C/^-l//}|; \
+		s|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/CodeBlocks-unix.cbp \
+		${WRKSRC}/Makefile \
+		${WRKSRC}/src/app.cpp \
+		${WRKSRC}/templates/unix/wxwidgets.cbp
+
 post-build:
 	@(${FIND} -E ${WRKSRC} -type f -iregex ".*\.(orig|bak)" -exec ${RM} {} \;)
 	@${CHMOD} +x ${WRKSRC}/update.sh
Index: devel/codeblocks/files/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/codeblocks/files/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
- --- devel/codeblocks/files/Makefile	29 Jan 2006 22:54:28 -0000	1.2
+++ devel/codeblocks/files/Makefile	13 Jun 2006 23:22:12 -0000
@@ -11,13 +11,13 @@
 include ./gcc.defs
 
 ### Variables used in this Makefile
- -LIB_WXXRC=wx_gtk2_xrc-2.6
+LIB_WXXRC=%%LIB_WXXRC%%
 
 ### Compiler/linker options
 tinyXML_GLOBAL_CFLAGS=
- -tinyXML_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+tinyXML_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 tinyXML_GLOBAL_LDFLAGS=
- -tinyXML_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+tinyXML_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 tinyXML_GLOBAL_INCS= -I/usr/include
 tinyXML_PROJECT_INCS= -Isdk/wxscintilla/include
 tinyXML_GLOBAL_LIBDIRS= -L/usr/lib
@@ -25,9 +25,9 @@
 tinyXML_GLOBAL_LIBS=
 tinyXML_PROJECT_LIBS=
 scintilla_GLOBAL_CFLAGS=
- -scintilla_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+scintilla_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 scintilla_GLOBAL_LDFLAGS=
- -scintilla_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+scintilla_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 scintilla_GLOBAL_INCS= -I/usr/include
 scintilla_PROJECT_INCS= -Isdk/wxscintilla/include
 scintilla_GLOBAL_LIBDIRS= -L/usr/lib
@@ -35,9 +35,9 @@
 scintilla_GLOBAL_LIBS=
 scintilla_PROJECT_LIBS=
 sdk_GLOBAL_CFLAGS=
- -sdk_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+sdk_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 sdk_GLOBAL_LDFLAGS=
- -sdk_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+sdk_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 sdk_GLOBAL_INCS= -I/usr/include
 sdk_PROJECT_INCS= -Isdk/wxscintilla/include
 sdk_GLOBAL_LIBDIRS= -L/usr/lib
@@ -45,9 +45,9 @@
 sdk_GLOBAL_LIBS=
 sdk_PROJECT_LIBS=
 wxDockit_GLOBAL_CFLAGS=
- -wxDockit_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+wxDockit_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 wxDockit_GLOBAL_LDFLAGS=
- -wxDockit_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+wxDockit_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 wxDockit_GLOBAL_INCS= -I/usr/include
 wxDockit_PROJECT_INCS= -Isdk/wxscintilla/include
 wxDockit_GLOBAL_LIBDIRS= -L/usr/lib
@@ -55,9 +55,9 @@
 wxDockit_GLOBAL_LIBS=
 wxDockit_PROJECT_LIBS=
 src_GLOBAL_CFLAGS=
- -src_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+src_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 src_GLOBAL_LDFLAGS=
- -src_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+src_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 src_GLOBAL_INCS= -I/usr/include
 src_PROJECT_INCS= -Isdk/wxscintilla/include
 src_GLOBAL_LIBDIRS= -L/usr/lib
@@ -65,9 +65,9 @@
 src_GLOBAL_LIBS=
 src_PROJECT_LIBS=
 plugin_Astyle_GLOBAL_CFLAGS=
- -plugin_Astyle_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_Astyle_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_Astyle_GLOBAL_LDFLAGS=
- -plugin_Astyle_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_Astyle_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_Astyle_GLOBAL_INCS= -I/usr/include
 plugin_Astyle_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_Astyle_GLOBAL_LIBDIRS= -L/usr/lib
@@ -75,9 +75,9 @@
 plugin_Astyle_GLOBAL_LIBS=
 plugin_Astyle_PROJECT_LIBS=
 plugin_CompilerGCC_GLOBAL_CFLAGS=
- -plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_CompilerGCC_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_CompilerGCC_GLOBAL_LDFLAGS=
- -plugin_CompilerGCC_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_CompilerGCC_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_CompilerGCC_GLOBAL_INCS= -I/usr/include
 plugin_CompilerGCC_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_CompilerGCC_GLOBAL_LIBDIRS= -L/usr/lib
@@ -85,9 +85,9 @@
 plugin_CompilerGCC_GLOBAL_LIBS=
 plugin_CompilerGCC_PROJECT_LIBS=
 plugin_DebuggerGDB_GLOBAL_CFLAGS=
- -plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_DebuggerGDB_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_DebuggerGDB_GLOBAL_LDFLAGS=
- -plugin_DebuggerGDB_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_DebuggerGDB_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_DebuggerGDB_GLOBAL_INCS= -I/usr/include
 plugin_DebuggerGDB_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_DebuggerGDB_GLOBAL_LIBDIRS= -L/usr/lib
@@ -95,9 +95,9 @@
 plugin_DebuggerGDB_GLOBAL_LIBS=
 plugin_DebuggerGDB_PROJECT_LIBS=
 plugin_CodeCompletion_GLOBAL_CFLAGS=
- -plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_CodeCompletion_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_CodeCompletion_GLOBAL_LDFLAGS=
- -plugin_CodeCompletion_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_CodeCompletion_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_CodeCompletion_GLOBAL_INCS= -I/usr/include
 plugin_CodeCompletion_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_CodeCompletion_GLOBAL_LIBDIRS= -L/usr/lib
@@ -105,9 +105,9 @@
 plugin_CodeCompletion_GLOBAL_LIBS=
 plugin_CodeCompletion_PROJECT_LIBS=
 plugin_ClassWizard_GLOBAL_CFLAGS=
- -plugin_ClassWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_ClassWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_ClassWizard_GLOBAL_LDFLAGS=
- -plugin_ClassWizard_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_ClassWizard_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_ClassWizard_GLOBAL_INCS= -I/usr/include
 plugin_ClassWizard_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_ClassWizard_GLOBAL_LIBDIRS= -L/usr/lib
@@ -115,9 +115,9 @@
 plugin_ClassWizard_GLOBAL_LIBS=
 plugin_ClassWizard_PROJECT_LIBS=
 plugin_DefMimeHandler_GLOBAL_CFLAGS=
- -plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_DefMimeHandler_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_DefMimeHandler_GLOBAL_LDFLAGS=
- -plugin_DefMimeHandler_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_DefMimeHandler_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_DefMimeHandler_GLOBAL_INCS= -I/usr/include
 plugin_DefMimeHandler_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_DefMimeHandler_GLOBAL_LIBDIRS= -L/usr/lib
@@ -125,9 +125,9 @@
 plugin_DefMimeHandler_GLOBAL_LIBS=
 plugin_DefMimeHandler_PROJECT_LIBS=
 plugin_PluginsWizard_GLOBAL_CFLAGS=
- -plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_PluginsWizard_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_PluginsWizard_GLOBAL_LDFLAGS=
- -plugin_PluginsWizard_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_PluginsWizard_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_PluginsWizard_GLOBAL_INCS= -I/usr/include
 plugin_PluginsWizard_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_PluginsWizard_GLOBAL_LIBDIRS= -L/usr/lib
@@ -135,9 +135,9 @@
 plugin_PluginsWizard_GLOBAL_LIBS=
 plugin_PluginsWizard_PROJECT_LIBS=
 plugin_ToDo_GLOBAL_CFLAGS=
- -plugin_ToDo_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_ToDo_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_ToDo_GLOBAL_LDFLAGS=
- -plugin_ToDo_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_ToDo_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_ToDo_GLOBAL_INCS= -I/usr/include
 plugin_ToDo_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_ToDo_GLOBAL_LIBDIRS= -L/usr/lib
@@ -145,9 +145,9 @@
 plugin_ToDo_GLOBAL_LIBS=
 plugin_ToDo_PROJECT_LIBS=
 plugin_XPManifest_GLOBAL_CFLAGS=
- -plugin_XPManifest_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+plugin_XPManifest_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 plugin_XPManifest_GLOBAL_LDFLAGS=
- -plugin_XPManifest_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+plugin_XPManifest_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 plugin_XPManifest_GLOBAL_INCS= -I/usr/include
 plugin_XPManifest_PROJECT_INCS= -Isdk/wxscintilla/include
 plugin_XPManifest_GLOBAL_LIBDIRS= -L/usr/lib
@@ -155,9 +155,9 @@
 plugin_XPManifest_GLOBAL_LIBS=
 plugin_XPManifest_PROJECT_LIBS=
 update_GLOBAL_CFLAGS=
- -update_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+update_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 update_GLOBAL_LDFLAGS=
- -update_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+update_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 update_GLOBAL_INCS= -I/usr/include
 update_PROJECT_INCS= -Isdk/wxscintilla/include
 update_GLOBAL_LIBDIRS= -L/usr/lib
@@ -165,9 +165,9 @@
 update_GLOBAL_LIBS=
 update_PROJECT_LIBS=
 console_runner_GLOBAL_CFLAGS=
- -console_runner_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+console_runner_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 console_runner_GLOBAL_LDFLAGS=
- -console_runner_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+console_runner_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 console_runner_GLOBAL_INCS= -I/usr/include
 console_runner_PROJECT_INCS= -Isdk/wxscintilla/include
 console_runner_GLOBAL_LIBDIRS= -L/usr/lib
@@ -175,9 +175,9 @@
 console_runner_GLOBAL_LIBS=
 console_runner_PROJECT_LIBS=
 doc_GLOBAL_CFLAGS=
- -doc_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `wxgtk2-2.6-config --cflags`
+doc_PROJECT_CFLAGS= -Wall -fPIC -g -pipe -fno-pcc-struct-return -fno-rtti -fmessage-length=0 `$(WX_CONFIG) --cflags`
 doc_GLOBAL_LDFLAGS=
- -doc_PROJECT_LDFLAGS= `wxgtk2-2.6-config --libs`
+doc_PROJECT_LDFLAGS= `$(WX_CONFIG) --libs`
 doc_GLOBAL_INCS= -I/usr/include
 doc_PROJECT_INCS= -Isdk/wxscintilla/include
 doc_GLOBAL_LIBDIRS= -L/usr/lib
Index: devel/codeblocks/files/patch-CodeBlocks-unix.cbp
===================================================================
RCS file: /home/pcvs/ports/devel/codeblocks/files/patch-CodeBlocks-unix.cbp,v
retrieving revision 1.1
diff -u -r1.1 patch-CodeBlocks-unix.cbp
- --- devel/codeblocks/files/patch-CodeBlocks-unix.cbp	27 Dec 2005 19:59:09 -0000	1.1
+++ devel/codeblocks/files/patch-CodeBlocks-unix.cbp	13 Jun 2006 23:22:12 -0000
@@ -1,5 +1,5 @@
- ---- CodeBlocks-unix.cbp.orig	Sun Nov 27 15:12:34 2005
- -+++ CodeBlocks-unix.cbp	Sun Nov 27 15:12:46 2005
+--- CodeBlocks-unix.cbp.orig	Sun May 28 18:41:57 2006
++++ CodeBlocks-unix.cbp	Sun May 28 18:46:43 2006
 @@ -56,6 +56,7 @@
  					<Add option="-DEXPORT_EVENTS"/>
  					<Add option="-D_USRDLL"/>
@@ -8,7 +8,7 @@
  				</Compiler>
  				<Linker>
  					<Add library="libtxml.a"/>
- -@@ -339,18 +340,37 @@
+@@ -339,13 +340,32 @@
  					<Add option="-Os"/>
  				</Compiler>
  			</Target>
@@ -29,26 +29,19 @@
 +			</Target>
  			<Environment>
 -				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.4"/>
- -+				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.6"/>
++				<Variable name="LIB_WXXRC" value="%%LIB_WXXRC%%"/>
  			</Environment>
  		</Build>
  		<Compiler>
  			<Add option="-Wall"/>
  			<Add option="-g"/>
- --			<Add option="`wx-config --cflags`"/>
 +			<Add option="-pipe"/>
 +			<Add option="-fno-pcc-struct-return"/>
 +			<Add option="-fno-rtti"/>
 +			<Add option="-fmessage-length=0"/>
- -+			<Add option="`wxgtk2-2.6-config --cflags`"/>
+ 			<Add option="`wx-config --cflags`"/>
  			<Add directory="sdk/wxscintilla/include"/>
  		</Compiler>
- - 		<Linker>
- --			<Add option="`wx-config --libs`"/>
- -+			<Add option="`wxgtk2-2.6-config --libs`"/>
- - 			<Add directory="sdk/tinyxml"/>
- - 		</Linker>
- - 		<Unit filename="devel/share/CodeBlocks/images/codecompletion/README.txt">
 @@ -1052,12 +1072,78 @@
  			<Option link="0"/>
  			<Option target="plugin_CompilerGCC"/>
Index: devel/codeblocks/files/patch-src-app.cpp
===================================================================
RCS file: /home/pcvs/ports/devel/codeblocks/files/patch-src-app.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-src-app.cpp
- --- devel/codeblocks/files/patch-src-app.cpp	27 Dec 2005 19:59:09 -0000	1.1
+++ devel/codeblocks/files/patch-src-app.cpp	13 Jun 2006 23:22:12 -0000
@@ -4,7 +4,7 @@
  DDEServer* g_DDEServer = 0L;
  #endif
  
- -+#define APP_PREFIX "/usr/local"
++#define APP_PREFIX "%%PREFIX%%"
 +
  IMPLEMENT_APP(CodeBlocksApp)
  
Index: devel/codeblocks/files/patch-templates-unix-wxwidgets.cbp
===================================================================
RCS file: devel/codeblocks/files/patch-templates-unix-wxwidgets.cbp
diff -N devel/codeblocks/files/patch-templates-unix-wxwidgets.cbp
- --- devel/codeblocks/files/patch-templates-unix-wxwidgets.cbp	27 Dec 2005 19:59:09 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
- ---- templates/unix/wxwidgets.cbp.orig	Sun Nov 27 15:36:22 2005
- -+++ templates/unix/wxwidgets.cbp	Sun Nov 27 15:36:55 2005
- -@@ -14,10 +14,10 @@
- - 			<Add option="-Winvalid-pch"/>
- - 			<Add option="-include "wx_pch.h""/>
- - 			<Add option="-DUSE_PCH"/>
- --			<Add option="`wx-config --cflags`"/>
- -+			<Add option="`wxgtk2-2.6-config --cflags`"/>
- - 		</Compiler>
- - 		<Linker>
- --			<Add option="`wx-config --libs`"/>
- -+			<Add option="`wxgtk2-2.6-config --libs`"/>
- - 		</Linker>
- - 	</Project>
- - </CodeBlocks_project_file>
Index: devel/datadesigner/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/datadesigner/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
- --- devel/datadesigner/Makefile	30 Jan 2006 23:19:52 -0000	1.7
+++ devel/datadesigner/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,16 +16,15 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Database Schema Designer
 
- -LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
- -		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GNOME=	libxml2 libxslt
 USE_ICONV=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
- -WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
- -CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
Index: devel/drpython/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/drpython/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
- --- devel/drpython/Makefile	14 Apr 2006 18:14:52 -0000	1.4
+++ devel/drpython/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,11 +16,11 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Highly customizable cross-platform ide to aid programming in Python
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 
 post-install:
 	@${ECHO} '#!/bin/sh' > ${WRKDIR}/drpython.sh
Index: devel/ecos-tools/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/ecos-tools/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
- --- devel/ecos-tools/Makefile	5 Nov 2005 05:20:22 -0000	1.12
+++ devel/ecos-tools/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,10 +16,10 @@
 MAINTAINER=	tg at FreeBSD.org
 COMMENT=	Configuration tools for the eCos embedded OS
 
- -LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84 \
- -		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 
 USE_BZIP2=	yes
+USE_WX=		2.4
 WRKSRC=		${WRKDIR}/infra-build
 GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	../ecos/host/configure
@@ -31,7 +31,7 @@
 
 ECOSSRCDIR=	${WRKDIR}/ecos/host
 CFGTOOL_WRKSRC=	${WRKDIR}/configtool-build
- -CFGTOOL_MAKE_ENV=	WXDIR=${X11BASE} WX_CONFIG=wxgtk2-2.4-config \
+CFGTOOL_MAKE_ENV=	WX_CONFIG=${WX_CONFIG} \
 			ECOSSRCDIR=${ECOSSRCDIR} \
 			INSTALLDIR=${PREFIX}
 CFGTOOL_MAKEFILE=	${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu
Index: devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
===================================================================
RCS file: /home/pcvs/ports/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu,v
retrieving revision 1.1
diff -u -r1.1 patch-host::tools::configtool::standalone::wxwin::makefile.gnu
- --- devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu	17 Nov 2003 12:29:06 -0000	1.1
+++ devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu	13 Jun 2006 23:22:12 -0000
@@ -36,8 +36,8 @@
    PROGRAM=configtool
 -  CPPFLAGS=`$(WXDIR)/bin/wx-config --cppflags`
 -  LDFLAGS=`$(WXDIR)/bin/wx-config --libs`
- -+  CPPFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --cppflags`
- -+  LDFLAGS=`$(WXDIR)/bin/$(WX_CONFIG) --libs`
++  CPPFLAGS=`$(WX_CONFIG) --cppflags`
++  LDFLAGS=`$(WX_CONFIG) --libs`
    EXTRAOBJECTS=
  endif
  
Index: devel/klassmodeler/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/klassmodeler/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
- --- devel/klassmodeler/Makefile	4 May 2006 21:40:46 -0000	1.11
+++ devel/klassmodeler/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,14 +16,12 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A tool for visually creating and documenting classes
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_GNOME=	gnometarget
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	WXWINDOWS="yes"
+USE_WX=		2.4
 
 PLIST_FILES=	bin/klassmodeler
 
Index: devel/rapidsvn/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/rapidsvn/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
- --- devel/rapidsvn/Makefile	23 Feb 2006 10:36:14 -0000	1.7
+++ devel/rapidsvn/Makefile	13 Jun 2006 23:22:12 -0000
@@ -15,31 +15,22 @@
 COMMENT=	Cross-platform GUI front-end for the Subversion revision system
 
 BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr-svn \
- -		${WXCONFIG}:${PORTSDIR}/x11-toolkits/${WXPORT} \
 		neon-config:${PORTSDIR}/www/neon \
 		${SVNDEP}:${PORTSDIR}/devel/subversion \
 		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
 
 USE_X_PREFIX=	yes
+USE_WX=		2.4-2.6
+WX_COMPS=	wx_build
+WX_CONF_ARGS=	absolute
 USE_AUTOTOOLS=	autoconf:259 libtool:15
- -CONFIGURE_ARGS=	--with-wx-config=${WXCONFIG} \
- -	--with-apr-config=apr-1-config \
+CONFIGURE_ARGS=--with-apr-config=apr-1-config \
 	--with-apu-config=apu-1-config \
 	--with-docbook-xsl=${LOCALBASE}/share/xsl/docbook
 CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
 INSTALLS_SHLIB=	yes
 MAN1=		rapidsvn.1
 
- -.if exists(${X11BASE}/bin/wxgtk2-2.6-config)
- -WXPORT=		wxgtk26
- -WXCONFIG=	wxgtk2-2.6-config
- -.elif exists(${X11BASE}/bin/wxgtk2u-2.6-config)
- -WXPORT=		wxgtk26-unicode
- -WXCONFIG=	wxgtk2u-2.6-config
- -.else
- -WXPORT=		wxgtk24
- -WXCONFIG=	wxgtk2-2.4-config
- -.endif
 SVNDEP=		${LOCALBASE}/include/subversion-1/svn_types.h
 
 .include <bsd.port.mk>
Index: devel/wxGlade/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/wxGlade/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
- --- devel/wxGlade/Makefile	9 Apr 2006 13:08:02 -0000	1.16
+++ devel/wxGlade/Makefile	13 Jun 2006 23:22:12 -0000
@@ -14,17 +14,11 @@
 MAINTAINER=	alepulver at FreeBSD.org
 COMMENT=	GUI builder for wxPython/wxWindows written in Python
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
- -.if defined(WITH_UNICODE)
- -WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
- -.else
- -WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
- -.endif
- -
 WRKSRC=		${WRKDIR}/wxGlade-${PORTVERSION}
 
 USE_PYTHON=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 
 do-build:
 	@(${ECHO_CMD} "#!${SH}"; ${ECHO_CMD} 'exec ${PYTHON_CMD} \
Index: editors/poedit/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/poedit/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
- --- editors/poedit/Makefile	28 May 2006 15:54:08 -0000	1.42
+++ editors/poedit/Makefile	13 Jun 2006 23:22:12 -0000
@@ -17,13 +17,15 @@
 COMMENT=	Gettext catalogs (.po files) editor
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
- -LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell \
- -		db${LIB_SUFFIX}:${PORTSDIR}/databases/db${WITH_BDB_VER}
+LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 
 USE_X_PREFIX=	yes
+USE_BDB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
+USE_WX=		2.4-2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
@@ -33,36 +35,10 @@
 
 MAN1=		poedit.1
 
- -.if defined(WITH_BDB2) || defined(WITH_DB2)
- -WITH_BDB_VER=	2
- -.elif defined(WITH_BDB3) || defined(WITH_DB3)
- -WITH_BDB_VER=	3
- -.elif defined(WITH_BDB4) || defined(WITH_DB4)
- -WITH_BDB_VER=	4
- -.elif defined(WITH_BDB41) || defined(WITH_DB41)
- -WITH_BDB_VER=	41
- -.elif defined(WITH_BDB42) || defined(WITH_DB42)
- -WITH_BDB_VER=	42
- -LIB_SUFFIX=	-4.2
- -.elif defined(WITH_BDB43) || defined(WITH_DB43)
- -WITH_BDB_VER=	43
- -LIB_SUFFIX=	-4.3
- -.endif
- -WITH_BDB_VER?=	4
- -LIB_SUFFIX?=	${WITH_BDB_VER}
- -
- -.if defined(WITH_WXGTK24)
- -LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -CONFIGURE_ARGS+=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
- -.else
- -LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -CONFIGURE_ARGS+=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
- -.endif
- -
 post-patch:
 	@${REINPLACE_CMD} -e \
- -		's/for version in .*;/for version in ${WITH_BDB_VER};/ ; \
- -		 s/-ldb-$$version/-ldb${LIB_SUFFIX}/' ${WRKSRC}/configure
+		's/for version in .*;/for version in ${BDB_VER};/ ; \
+		 s/-ldb-$$version/-l${BDB_LIB_NAME}/' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s/ install / /' ${WRKSRC}/Makefile.in
 
Index: editors/spe/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/spe/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
- --- editors/spe/Makefile	27 Jan 2006 09:31:43 -0000	1.9
+++ editors/spe/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,10 +16,10 @@
 MAINTAINER=	nivit at email.it
 COMMENT=	Stani's Python Editor
 
- -RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/${WX_PYTHON_DIR}/wxPython/_wx.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 
 OPTIONS=	ENCRYPTED_DEBUG "Enable encrypted debug in SPE" off
 
@@ -46,12 +46,6 @@
 
 .include <bsd.port.pre.mk>
 
- -.if defined(WITH_UNICODE) && (${OSVERSION} > 500000)
- -WX_PYTHON_DIR=	wx-2.6-gtk2-unicode
- -.else
- -WX_PYTHON_DIR=	wx-2.6-gtk2-ansi
- -.endif
- -
 .if defined(WITH_ENCRYPTED_DEBUG)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
 .endif
Index: ftp/ftpcube/Makefile
===================================================================
RCS file: /home/pcvs/ports/ftp/ftpcube/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
- --- ftp/ftpcube/Makefile	7 May 2006 11:09:17 -0000	1.22
+++ ftp/ftpcube/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,7 +16,6 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A graphical FTP Client
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
 		${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
@@ -24,6 +23,8 @@
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 
 post-patch:
 	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},' ${WRKSRC}/setup.cfg
Index: games/abridge/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/abridge/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
- --- games/abridge/Makefile	5 Nov 2005 05:19:05 -0000	1.12
+++ games/abridge/Makefile	13 Jun 2006 23:22:12 -0000
@@ -14,10 +14,9 @@
 MAINTAINER=	Janos.Mohacsi at bsd.hu
 COMMENT=	Bridge game
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
- -CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
 
 MAN1=		abridge.1
 PLIST_FILES=	bin/abridge
Index: games/blokish/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/blokish/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
- --- games/blokish/Makefile	24 Jan 2006 07:50:14 -0000	1.1
+++ games/blokish/Makefile	13 Jun 2006 23:22:12 -0000
@@ -16,12 +16,11 @@
 MAINTAINER=	amdmi3 at mail.ru
 COMMENT=	Clone of the strategy board game 'Blokus'
 
- -LIB_DEPENDS=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
+USE_WX=		2.6
 
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@@ -39,6 +38,6 @@
 .endif
 
 post-patch:
- -	@${REINPLACE_CMD} -e 's|wx-config|wxgtk2-2.6-config|' ${WRKSRC}/makefile.in ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' ${WRKSRC}/makefile.in ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
Index: games/scorched3d/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/scorched3d/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
- --- games/scorched3d/Makefile	8 Jun 2006 16:07:11 -0000	1.29
+++ games/scorched3d/Makefile	13 Jun 2006 23:22:13 -0000
@@ -16,12 +16,8 @@
 MAINTAINER=		guy at device.dyndns.org
 COMMENT=		Scorched is a game based loosely on the classic DOS game
 
- -BUILD_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
- -			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
- -			openal-config:${PORTSDIR}/audio/openal
- -RUN_DEPENDS=		${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common \
- -			wxgtk2-2.6-config:${PORTSDIR}/x11-toolkits/wxgtk26 \
- -			openal-config:${PORTSDIR}/audio/openal
+BUILD_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
+RUN_DEPENDS=		openal-config:${PORTSDIR}/audio/openal
 LIB_DEPENDS=		alut.1:${PORTSDIR}/audio/freealut
 
 SCORCH_VERSION=		39.1
@@ -34,13 +30,14 @@
 USE_GL=			yes
 USE_GMAKE=		yes
 USE_AUTOTOOLS=	automake:15 autoconf:253
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 
 WRKSRC=			${WRKDIR}/scorched
 AUTOMAKE_ARGS=		--foreign
 CONFIGURE_ARGS=		--program-prefix='' \
 			--prefix=${PREFIX}/games/scorched3d \
- -			--datadir=${PREFIX}/games/scorched3d \
- -			--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
+			--datadir=${PREFIX}/games/scorched3d
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-mysql
 .endif
Index: graphics/comical/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/comical/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
- --- graphics/comical/Makefile	5 Nov 2005 05:20:48 -0000	1.3
+++ graphics/comical/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,12 +15,11 @@
 MAINTAINER=	john at mcaree.org
 COMMENT=	A sequential image viewer
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
 USE_GMAKE=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
- -CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
 
 .include <bsd.port.pre.mk>
 
Index: graphics/hugin/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/hugin/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
- --- graphics/hugin/Makefile	30 Jan 2006 14:40:58 -0000	1.13
+++ graphics/hugin/Makefile	13 Jun 2006 23:22:13 -0000
@@ -20,21 +20,20 @@
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		fftw:${PORTSDIR}/math/fftw \
- -		wx_gtk2_xrc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
 		boost_date_time:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	PTOptimizer:${PORTSDIR}/graphics/libpano12 \
 		PTStitcher:${PORTSDIR}/graphics/linux-panorama-tools
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
- -CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -ftemplate-depth-64" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_ICONV=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 
 DOCSDIR=	${PREFIX}/share/hugin/xrc/data
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
@@ -45,7 +44,7 @@
 .endif
 
 post-patch:
- -	@${REINPLACE_CMD} -e 's|-wxrc|-${X11BASE}/bin/wxrc-gtk2-2.6|' \
+	@${REINPLACE_CMD} -e 's|-wxrc|-${WX_CONFIG:S/wx/wxrc/}|' \
 		${WRKSRC}/src/hugin/xrc/Makefile.in
 
 .include <bsd.port.mk>
Index: graphics/multivideo/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/multivideo/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
- --- graphics/multivideo/Makefile	7 May 2006 23:46:18 -0000	1.19
+++ graphics/multivideo/Makefile	13 Jun 2006 23:22:13 -0000
@@ -16,19 +16,16 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	An image sequence viewer
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_WX=		2.4
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 ALL_TARGET=	default
 
 PLIST_FILES=	bin/multivideo
 
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
- -
 post-patch:
 	@${REINPLACE_CMD} -e 's|g++|\$$\(CXX)|g ; \
 		 s|-O2 -g -Wall -W|\$$\(CXXFLAGS\)|g ; \
Index: graphics/wxsvg/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/wxsvg/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
- --- graphics/wxsvg/Makefile	12 Apr 2006 17:48:11 -0000	1.6
+++ graphics/wxsvg/Makefile	13 Jun 2006 23:22:13 -0000
@@ -14,13 +14,10 @@
 MAINTAINER=	ahze at FreeBSD.org
 COMMENT=	C++ library to create, manipulate, and render SVG files
 
- -BUILD_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
- -RUN_DEPENDS=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
- -
 INSTALLS_SHLIB=	yes
- -WX_CONFIG=	wxgtk2-2.6-config
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	libartlgpl2
+USE_WX=		2.6
 
 .include <bsd.port.pre.mk>
 
Index: graphics/xaralx/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/xaralx/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
- --- graphics/xaralx/Makefile	11 Jun 2006 11:55:06 -0000	1.18
+++ graphics/xaralx/Makefile	13 Jun 2006 23:22:13 -0000
@@ -18,21 +18,16 @@
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
- -#WXDEP=	${X11BASE}/libwx_baseu-2.6.so.0.3.1
- -WXDEP=	wxgtk2-unicode>=2.6.3
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config \
- -		${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
 		xml2-config:${PORTSDIR}/textproc/libxml2 \
 		zip:${PORTSDIR}/archivers/zip
- -RUN_DEPENDS+=	${WXDEP}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
 LIB_DEPENDS+=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_AUTOTOOLS=	autoconf:259:env aclocal:19:env automake:19:env libtool:15:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
- -CONFIGURE_ARGS+=	--with-wx-config=wxgtk2u-2.6-config \
- -		--program-suffix=${PKGNAMESUFFIX}
+CONFIGURE_ARGS+=	--program-suffix=${PKGNAMESUFFIX}
 CONFIGURE_ENV+=	CPPFLAGS_APPEND="-I${LOCALBASE}/include/atk-1.0/atk \
 		-I${X11BASE}/include/gtk-2.0/gtk"
 # we're using dlmalloc because the stock libc does not have malloc_usable_size()
@@ -43,6 +38,9 @@
 MAKE_ENV?=	INCLUDES="-I../wxOil -I- -I${LOCALBASE}/include/dlmalloc"
 
 USE_GCC=	3.4+
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
+WX_UNICODE=	yes
 
 MAN1=	xaralx${PKGNAMESUFFIX}.1
 
Index: graphics/zphoto/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/zphoto/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
- --- graphics/zphoto/Makefile	7 May 2006 23:46:33 -0000	1.22
+++ graphics/zphoto/Makefile	13 Jun 2006 23:22:13 -0000
@@ -21,9 +21,6 @@
 .if !defined (WITHOUT_AVIPLAY)
 LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 .endif
- -.if defined (WITH_WXGTK2)
- -LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -.endif
 .if !defined (WITHOUT_ZIP)
 RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 .endif
@@ -32,8 +29,9 @@
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 	       	CPPFLAGS="-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}"
- -.if defined (WITH_WXGTK2)
- -CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.4-config
+.if defined (WITH_WX)
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 PLIST_FILES+=	bin/wxzphoto
 .else
 CONFIGURE_ARGS+=	--disable-wx
Index: mail/mahogany/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/mahogany/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
- --- mail/mahogany/Makefile	10 May 2006 22:36:53 -0000	1.28
+++ mail/mahogany/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,9 +15,9 @@
 MAINTAINER=		ports at FreeBSD.org
 COMMENT=		An X11 mail and news client
 
- -LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
 USE_X_PREFIX=		yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 ALL_TARGET=		all locales
@@ -25,8 +25,7 @@
 
 MAN1=			M.1 mahogany.1
 
- -CONFIGURE_ARGS=		--with-python=none \
- -			--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
+CONFIGURE_ARGS=		--with-python=none
 CONFIGURE_ENV=		OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
Index: math/fityk/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/fityk/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
- --- math/fityk/Makefile	12 Jun 2006 01:41:11 -0000	1.13
+++ math/fityk/Makefile	13 Jun 2006 23:22:13 -0000
@@ -16,16 +16,16 @@
 COMMENT=	Free peak fitting software
 
 BUILD_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
- -LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost \
- -		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	boost_thread.3:${PORTSDIR}/devel/boost
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
- -CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
 
 MAN1=		fityk.1
 PLIST_FILES=	bin/cfityk \
Index: math/gambit/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/gambit/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
- --- math/gambit/Makefile	23 Apr 2006 16:49:35 -0000	1.17
+++ math/gambit/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,14 +15,11 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A library of tools for doing computation in game theory
 
- -LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -
 USE_X_PREFIX=	yes
+USE_WX=		2.6
 USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
- -CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
- -		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
- -MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
 
 CPPFLAGS=	${PTHREAD_CFLAGS}
Index: math/graphthing/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/graphthing/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
- --- math/graphthing/Makefile	10 May 2006 22:37:08 -0000	1.26
+++ math/graphthing/Makefile	13 Jun 2006 23:22:13 -0000
@@ -14,15 +14,14 @@
 MAINTAINER=	arved at FreeBSD.org
 COMMENT=	A tool that allows you to create, manipulate and study graphs
 
- -LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk20
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
- -CONFIGURE_ARGS=	--with-wx-config=${X11BASE}/bin/wxgtk2-2.6-config
 MAKEFILE=	GNUmakefile
 
 PLIST_FILES=	bin/graphthing bin/gt
Index: math/wxMaxima/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/wxMaxima/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
- --- math/wxMaxima/Makefile	28 Apr 2006 03:19:12 -0000	1.5
+++ math/wxMaxima/Makefile	13 Jun 2006 23:22:13 -0000
@@ -14,15 +14,14 @@
 MAINTAINER=	nivit at email.it
 COMMENT=	A wxWidgets GUI for the computer algebra system maxima
 
- -LIB_DEPENDS=	wx_baseu-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
 RUN_DEPENDS=	maxima:${PORTSDIR}/math/maxima
 
 USE_GETTEXT=	yes
 USE_GNOME=	libxml2
- -WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
- -CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} \
- -		--program-prefix=
+CONFIGURE_ARGS=	--program-prefix=
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
Index: misc/diary-hercules/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/diary-hercules/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
- --- misc/diary-hercules/Makefile	18 May 2006 19:13:11 -0000	1.2
+++ misc/diary-hercules/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,11 +15,12 @@
 MAINTAINER=	infofarmer at FreeBSD.org
 COMMENT=	A personal workout diary program for bodybuilders
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-unicode/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26-unicode \
- -		${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sqlite/__init__.py:${PORTSDIR}/databases/py-PySQLite11
 
 USE_GETTEXT=	yes
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 
 .include <bsd.port.mk>
Index: misc/documancer/Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/documancer/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
- --- misc/documancer/Makefile	12 Jan 2006 12:54:24 -0000	1.12
+++ misc/documancer/Makefile	13 Jun 2006 23:22:13 -0000
@@ -18,12 +18,12 @@
 
 BUILD_DEPENDS=	wget:${PORTSDIR}/ftp/wget \
 		swish-e:${PORTSDIR}/www/swish-e
- -LIB_DEPENDS=	wxmozilla_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxmozilla
- -RUN_DEPENDS=	${BUILD_DEPENDS} \
- -		${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.4
 USE_PERL5=	yes
+USE_WX=		2.4
+WX_COMPS=	mozilla python_run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
 
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
- --- multimedia/mkvtoolnix/Makefile	10 May 2006 22:37:33 -0000	1.29
+++ multimedia/mkvtoolnix/Makefile	13 Jun 2006 23:22:13 -0000
@@ -62,13 +62,10 @@
 PLIST_FILES+=	%%DATADIR%%/images/${file}
 .endfor
 
- -WXGTK_CONFIG=	wxgtk2u-2.6-config
- -
 .include <bsd.port.pre.mk>
 
- -.ifndef(WITHOUT_WXGTK)
- -LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
- -
+.ifndef(WITHOUT_WX)
+USE_WX=		2.6
 MAN1+=		mmg.1
 PLIST_FILES+=	bin/mmg
 .endif
@@ -77,16 +74,11 @@
 BROKEN=		"Does not compile on sparc64"
 .endif
 
- -.if ${OSVERSION} < 500000
- -BROKEN=		"Does not compile on FreeBSD 4.x"
- -CFLAGS+= -DNO_WSTRING
- -.endif
- -
 pre-everything::
- -.ifndef(WITHOUT_WXGTK)
+.ifndef(WITHOUT_WX)
 	@${ECHO_MSG} "===>"
- -	@${ECHO_MSG} "===> You can disable wxGTK2 support by defining"
- -	@${ECHO_MSG} "===>  WITHOUT_WXGTK"
+	@${ECHO_MSG} "===> You can disable wxWidgets support by defining"
+	@${ECHO_MSG} "===>  WITHOUT_WX"
 	@${ECHO_MSG} "===>"
 .endif
 
@@ -95,7 +87,7 @@
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
- -	@${REINPLACE_CMD} -e 's|wx-config|${WXGTK_CONFIG}|' \
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
 		${WRKSRC}/src/common/os.cpp
Index: multimedia/tovid/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/tovid/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
- --- multimedia/tovid/Makefile	10 May 2006 22:37:37 -0000	1.10
+++ multimedia/tovid/Makefile	13 Jun 2006 23:22:13 -0000
@@ -37,11 +37,12 @@
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 RUN_DEPENDS=	\
 		${BUILD_DEPENDS} \
- -		bash:${PORTSDIR}/shells/bash \
- -		${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
+		bash:${PORTSDIR}/shells/bash
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.6
+WX_COMPS=	python_run
 GNU_CONFIGURE=	yes
 
 MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \
Index: multimedia/vlc/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/vlc/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
- --- multimedia/vlc/Makefile	9 Jun 2006 18:00:34 -0000	1.126
+++ multimedia/vlc/Makefile	13 Jun 2006 23:22:13 -0000
@@ -57,15 +57,6 @@
 MAN1=		vlc.1 \
 		vlc-config.1
 
- -.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
- -WX_CONFIG=	wxgtk2-2.4-config
- -WXGTK2_PORT=	wxgtk24
- -.else
- -WX_CONFIG=	wxgtk2-2.6-config
- -WXGTK2_PORT=	wxgtk26
- -CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
- -.endif
- -
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
@@ -142,7 +133,7 @@
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
- -WITH_WXGTK=	yes
+.undef WITHOUT_WX
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@@ -154,11 +145,9 @@
 CONFIGURE_ARGS+=--disable-loader
 .endif
 
- -.if !defined(WITHOUT_WXGTK)
- -BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
- -RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+.if !defined(WITHOUT_WX)
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
- -CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
Index: multimedia/vlc/Makefile.inc
===================================================================
RCS file: /home/pcvs/ports/multimedia/vlc/Makefile.inc,v
retrieving revision 1.1
diff -u -r1.1 Makefile.inc
- --- multimedia/vlc/Makefile.inc	7 May 2006 22:16:41 -0000	1.1
+++ multimedia/vlc/Makefile.inc	13 Jun 2006 23:22:13 -0000
@@ -22,14 +22,8 @@
 #  This Interface supports a skinned gtk2.0 interface
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
- -# WITHOUT_WXGTK=yes
- -#  WxWindows/Gtk 2.x Interface
- -#  This is the default and most supported
- -#  x11 interface
- -#
- -# WITH_WXGTK_VER=[2.4|2.6]
- -#  Choose a WxGTK version you want to use.
- -#  Defaults to 26
+# WITHOUT_WX=yes
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #
@@ -285,11 +279,11 @@
 	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
 	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
 .endif
- -.if !defined(WITHOUT_WXGTK)
+.if !defined(WITHOUT_WX)
 	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
 	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
 .endif
- -.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
+.if !defined(WITHOUT_WX) || defined(WITH_SKINS)
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
@@ -350,7 +344,7 @@
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
- -.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
+.if defined(WITH_SKINS) || !defined(WITHOUT_WX)
 	if [ ! -d ${PREFIX}/share/applications ]; then \
 		${MKDIR} ${PREFIX}/share/applications ; \
 	fi
@@ -361,7 +355,7 @@
 	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
 .endif
- -.if !defined(WITHOUT_WXGTK)
+.if !defined(WITHOUT_WX)
 	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
 .endif
Index: multimedia/vlc-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/vlc-devel/Makefile,v
retrieving revision 1.149
diff -u -r1.149 Makefile
- --- multimedia/vlc-devel/Makefile	9 Jun 2006 18:00:34 -0000	1.149
+++ multimedia/vlc-devel/Makefile	13 Jun 2006 23:22:13 -0000
@@ -63,15 +63,6 @@
 MAN1=		vlc.1 \
 		vlc-config.1
 
- -.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
- -WX_CONFIG=	wxgtk2-2.4-config
- -WXGTK2_PORT=	wxgtk24
- -.else
- -WX_CONFIG=	wxgtk2-2.6-config
- -WXGTK2_PORT=	wxgtk26
- -CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
- -.endif
- -
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
@@ -148,7 +139,7 @@
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
- -WITH_WXGTK=	yes
+.undef WITHOUT_WX
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@@ -160,11 +151,9 @@
 CONFIGURE_ARGS+=--disable-loader
 .endif
 
- -.if !defined(WITHOUT_WXGTK)
- -BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
- -RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+.if !defined(WITHOUT_WX)
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
- -CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
Index: multimedia/vlc-devel/Makefile.inc
===================================================================
RCS file: /home/pcvs/ports/multimedia/vlc-devel/Makefile.inc,v
retrieving revision 1.4
diff -u -r1.4 Makefile.inc
- --- multimedia/vlc-devel/Makefile.inc	22 May 2006 01:12:07 -0000	1.4
+++ multimedia/vlc-devel/Makefile.inc	13 Jun 2006 23:22:13 -0000
@@ -22,14 +22,8 @@
 #  This Interface supports a skinned gtk2.0 interface
 #  Skins can be found at http://www.videolan.org/vlc/download-skins.html
 #
- -# WITHOUT_WXGTK=yes
- -#  WxWindows/Gtk 2.x Interface
- -#  This is the default and most supported
- -#  x11 interface
- -#
- -# WITH_WXGTK_VER=[2.4|2.6]
- -#  Choose a WxGTK version you want to use.
- -#  Defaults to 26
+# WITHOUT_WX=yes
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #
@@ -285,11 +279,11 @@
 	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
 	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
 .endif
- -.if !defined(WITHOUT_WXGTK)
+.if !defined(WITHOUT_WX)
 	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
 	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
 .endif
- -.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
+.if !defined(WITHOUT_WX) || defined(WITH_SKINS)
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
@@ -350,7 +344,7 @@
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
- -.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
+.if defined(WITH_SKINS) || !defined(WITHOUT_WX)
 	if [ ! -d ${PREFIX}/share/applications ]; then \
 		${MKDIR} ${PREFIX}/share/applications ; \
 	fi
@@ -361,7 +355,7 @@
 	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
 .endif
- -.if !defined(WITHOUT_WXGTK)
+.if !defined(WITHOUT_WX)
 	${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
 .endif
Index: net/boinc-client/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/boinc-client/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
- --- net/boinc-client/Makefile	12 May 2006 14:00:04 -0000	1.19
+++ net/boinc-client/Makefile	13 Jun 2006 23:22:13 -0000
@@ -39,14 +39,14 @@
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_X11)
- -CONFIGURE_ARGS+=	--with-wx-config=wxgtk2-2.6-config
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 .else
- -CONFIGURE_ARGS+=	--with-wx-config=false
+CONFIGURE_ARGS+=--with-wx-config=false
 .endif
 
 .if !defined(WITHOUT_X11)
 LIB_DEPENDS+=	iconv:${PORTSDIR}/converters/libiconv \
- -		wx_base:${PORTSDIR}/x11-toolkits/wxgtk26 \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		glut:${PORTSDIR}/graphics/libglut
 .endif
Index: net/py-mp-random/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/py-mp-random/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
- --- net/py-mp-random/Makefile	12 Jan 2006 12:54:25 -0000	1.4
+++ net/py-mp-random/Makefile	13 Jun 2006 23:22:13 -0000
@@ -16,10 +16,10 @@
 MAINTAINER=	randomimage-widget at mirrorproject.com
 COMMENT=	Display random Mirror Project images on your desktop
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython24
- -
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 NO_BUILD=	yes
 
 pre-install:
Index: net-p2p/amule1/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/amule1/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
- --- net-p2p/amule1/Makefile	6 Apr 2006 13:44:57 -0000	1.19
+++ net-p2p/amule1/Makefile	13 Jun 2006 23:22:13 -0000
@@ -16,8 +16,7 @@
 MAINTAINER=	ganael.laplanche at martymac.com
 COMMENT=	The all-platform eMule p2p client
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24 \
- -		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 LATEST_LINK=	aMule1
 CONFLICTS=	aMule-2.* aMule-devel-[0-9]*
@@ -27,11 +26,12 @@
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
+USE_WX=		2.4
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
- -		--with-wx-config=${WX_CONFIG} \
 		--with-wxbase-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--program-transform-name="s/ed2k/amule-ed2k-handler/"
@@ -42,7 +42,6 @@
 OPTIONS=	OPTIMIZE "Build with optimization" on \
 		STATIC "Enable static linking" off
 
- -WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
 
 .include <bsd.port.pre.mk>
Index: net-p2p/amule2/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/amule2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
- --- net-p2p/amule2/Makefile	18 Mar 2006 17:12:23 -0000	1.8
+++ net-p2p/amule2/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,8 +15,7 @@
 MAINTAINER=	ganael.laplanche at martymac.com
 COMMENT=	The all-platform eMule p2p client
 
- -LIB_DEPENDS=	wx_gtk2u_core-2.6:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
- -		curl.3:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 #		gd.4:${PORTSDIR}/graphics/gd
 #		png.5:${PORTSDIR}/graphics/png
 
@@ -27,13 +26,14 @@
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack gnomeprefix
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--disable-debug \
 		--without-included-gettext \
 		--with-libintl-prefix=${LOCALBASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
- -		--with-wx-config=${WX_CONFIG} \
 		--with-curl-config=${CURL_CONFIG} \
 		--enable-embedded_crypto \
 		--enable-monolithic
@@ -51,7 +51,6 @@
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off
 
- -WX_CONFIG?=	${X11BASE}/bin/wxgtk2u-2.6-config
 CURL_CONFIG?=	${LOCALBASE}/bin/curl-config
 
 .include <bsd.port.pre.mk>
Index: net-p2p/mute-net/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/mute-net/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
- --- net-p2p/mute-net/Makefile	11 May 2006 22:49:49 -0000	1.18
+++ net-p2p/mute-net/Makefile	13 Jun 2006 23:22:13 -0000
@@ -29,9 +29,7 @@
 PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}
 
 .ifndef(WITHOUT_GUI)
- -LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -
- -WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
+USE_WX=		2.4
 .endif
 
 #
Index: net-p2p/py-bittornado/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/py-bittornado/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
- --- net-p2p/py-bittornado/Makefile	11 May 2006 22:49:50 -0000	1.24
+++ net-p2p/py-bittornado/Makefile	13 Jun 2006 23:22:13 -0000
@@ -47,7 +47,8 @@
 
 # required for GUI
 .ifndef(WITHOUT_GUI)
- -RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python_run
 PLIST_SUB+=	GUI=''
 EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
 .else
Index: net-p2p/py-kenosis-bittorrent/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/py-kenosis-bittorrent/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
- --- net-p2p/py-kenosis-bittorrent/Makefile	11 May 2006 22:49:50 -0000	1.28
+++ net-p2p/py-kenosis-bittorrent/Makefile	13 Jun 2006 23:22:13 -0000
@@ -47,7 +47,8 @@
 
 # required for GUI
 .ifndef(WITHOUT_GUI)
- -RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python_run
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-gui-patch-setup.py
 
Index: net-p2p/pyslsk/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/pyslsk/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
- --- net-p2p/pyslsk/Makefile	30 Jan 2006 21:36:25 -0000	1.19
+++ net-p2p/pyslsk/Makefile	13 Jun 2006 23:22:13 -0000
@@ -14,9 +14,6 @@
 MAINTAINER=	shoesoft at gmx.net
 COMMENT=	Client for SoulSeek filesharing system
 
- -BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx-2.6-gtk2-ansi/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython26
- -
 .if !defined(WITHOUT_VORBIS)
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/ogg/vorbis.so:${PORTSDIR}/audio/py-vorbis
 .endif
@@ -27,12 +24,7 @@
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+USE_WX=		2.6
+WX_COMPS=	python
 
- -.include <bsd.port.pre.mk>
- -
- -pre-install:
- -.if exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
- -BROKEN=	"pyslsk only works with py-wxPython >= 2.6, please deinstall old version first"
- -.endif
- -
- -.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: net-p2p/xmule/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-p2p/xmule/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
- --- net-p2p/xmule/Makefile	11 May 2006 22:49:51 -0000	1.46
+++ net-p2p/xmule/Makefile	13 Jun 2006 23:22:13 -0000
@@ -17,8 +17,7 @@
 COMMENT=	Port of eMule eDonkey P2P client using wxWindows class library
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
- -LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
- -		wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_GETTEXT=	yes
@@ -28,14 +27,15 @@
 		gnomehack \
 		gnomeprefix
 USE_GMAKE=	yes
+USE_WX=		2.6
+WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext \
 		--with-cryptopp-prefix=${LOCALBASE} \
 		--with-gtk-prefix=${X11BASE} \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE} \
- -		--enable-debug \
- -		--with-wx-config=${WX_CONFIG}
+		--enable-debug
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 MAKE_ARGS=	-e
@@ -44,8 +44,6 @@
 # for debugging purposes
 STRIP=
 
- -WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.6-config
- -
 FILES_ATOLL_PATCH=	src/Preferences.cpp \
 			src/otherfunctions.cpp
 FILES_STDINT_PATCH=	\
Index: science/py-scipy/Makefile
===================================================================
RCS file: /home/pcvs/ports/science/py-scipy/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
- --- science/py-scipy/Makefile	21 Mar 2006 04:39:28 -0000	1.6
+++ science/py-scipy/Makefile	13 Jun 2006 23:22:13 -0000
@@ -20,13 +20,14 @@
 
 BUILD_DEPENDS=	${PYNUMERIC} \
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
- -		f2py:${PORTSDIR}/lang/f2py \
- -		${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		f2py:${PORTSDIR}/lang/f2py
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 		atlas.1:${PORTSDIR}/math/atlas
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 
 post-patch:
 	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
Index: security/hashish/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/hashish/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
- --- security/hashish/Makefile	5 Nov 2005 05:22:06 -0000	1.27
+++ security/hashish/Makefile	13 Jun 2006 23:22:13 -0000
@@ -18,13 +18,12 @@
 COMMENT=	GUI file and string hashing utility
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
 
+USE_WX=		2.4
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
- -		LDFLAGS="-L${LOCALBASE}/lib" \
- -		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.4-config"
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 PLIST_FILES=	bin/hashish
 
Index: security/newpki-client/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/newpki-client/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
- --- security/newpki-client/Makefile	13 May 2006 04:15:07 -0000	1.6
+++ security/newpki-client/Makefile	13 Jun 2006 23:22:13 -0000
@@ -15,16 +15,15 @@
 COMMENT=	C++ PKI client from newpki project
 
 LIB_DEPENDS=	newpki.2:${PORTSDIR}/security/newpki-lib \
- -		xml2:${PORTSDIR}/textproc/libxml2 \
- -		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
+		xml2:${PORTSDIR}/textproc/libxml2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-2.0.0
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
+USE_WX=		2.4
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib" \
Index: security/newpki-client/files/patch-configure
===================================================================
RCS file: /home/pcvs/ports/security/newpki-client/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
- --- security/newpki-client/files/patch-configure	14 Jul 2005 13:24:04 -0000	1.1
+++ security/newpki-client/files/patch-configure	13 Jun 2006 23:22:13 -0000
@@ -55,8 +55,8 @@
  
 -WXCXX=`wx-config --cxxflags`
 -WXLIB=`wx-config --libs`
- -+WXCXX=`${WXCONFIG} --cxxflags`
- -+WXLIB=`${WXCONFIG} --libs`
++WXCXX=`${WX_CONFIG} --cxxflags`
++WXLIB=`${WX_CONFIG} --libs`
  
  CPPFLAGS="$WXCXX -DWXINTL_NO_GETTEXT_MACRO $CPPFLAGS"
  LIBS="$WXLIB -lnewpki $LIBS"
Index: sysutils/bacula-server/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server/Makefile,v
retrieving revision 1.68
diff -u -r1.68 Makefile
- --- sysutils/bacula-server/Makefile	12 Jun 2006 15:36:52 -0000	1.68
+++ sysutils/bacula-server/Makefile	13 Jun 2006 23:22:13 -0000
@@ -118,9 +118,8 @@
 .endif
 # Build wx-console
 .if defined(WITH_WXCONSOLE)
+USE_WX=			2.4
 CONFIGURE_ARGS+=	--enable-wx-console
- -LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 PLIST_SUB+=		WXCONS=""
 .else
 # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
Index: sysutils/bacula-server-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/bacula-server-devel/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
- --- sysutils/bacula-server-devel/Makefile	7 Jun 2006 17:30:24 -0000	1.4
+++ sysutils/bacula-server-devel/Makefile	13 Jun 2006 23:22:14 -0000
@@ -115,9 +115,8 @@
 .endif
 # Build wx-console
 .if defined(WITH_WXCONSOLE)
+USE_WX=			2.4
 CONFIGURE_ARGS+=	--enable-wx-console
- -LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -CONFIGURE_ENV+=		WXCONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 PLIST_SUB+=		WXCONS=""
 .else
 # We didn't need GTK (it's not possible to put WANT_GNOME in an .if statement!)
Index: textproc/py-dsv/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/py-dsv/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
- --- textproc/py-dsv/Makefile	20 Jul 2005 14:47:49 -0000	1.7
+++ textproc/py-dsv/Makefile	13 Jun 2006 23:22:14 -0000
@@ -17,7 +17,8 @@
 COMMENT=	A Python module to parse or write delimeter-separated (e.g. CSV) files
 
 .if defined(WITH_GUI)
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+USE_WX=		2.4
+WX_COMPS=	python_run
 .endif
 
 USE_PYTHON=	yes
Index: x11-fm/jaffm/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-fm/jaffm/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
- --- x11-fm/jaffm/Makefile	21 May 2006 19:03:44 -0000	1.2
+++ x11-fm/jaffm/Makefile	13 Jun 2006 23:22:14 -0000
@@ -14,9 +14,8 @@
 MAINTAINER=	shaun at inerd.com
 COMMENT=	A lightweight file manager inspired by MacOS Finder
 
- -WXGTK_VER?=	2.6
- -
 USE_BZIP2=	yes
+USE_WX=		2.4-2.6
 USE_X_PREFIX=	yes
 ALL_TARGET=	${PORTNAME}
 
@@ -24,19 +23,9 @@
 
 .include <bsd.port.pre.mk>
 
- -.if ${WXGTK_VER} == "2.4" || \
- -    (exists(${X11BASE}/bin/wxgtk2-2.4-config) && \
- -    !exists(${X11BASE}/bin/wxgtk2-2.6-config))
- -LIB_DEPENDS+=	wx_gtk2_core-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -WXGTK_VER=	2.4
- -.else
- -LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
- -WXGTK_VER=	2.6
- -.endif
- -
 post-patch:
 	@${REINPLACE_CMD} -e 's#^PREFIX=.*#PREFIX=${PREFIX}#' \
- -		-e 's#$$(shell wx-config \(.*\))#`${X11BASE}/bin/wxgtk2-${WXGTK_VER}-config \1`#' \
+		-e 's#$$(shell wx-config \(.*\))#`${WX_CONFIG} \1`#' \
 		-e 's#^FLAGS=-ggdb#FLAGS=${CFLAGS}#' \
 		${WRKSRC}/Makefile
 
Index: x11-toolkits/py-SciParam/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-SciParam/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
- --- x11-toolkits/py-SciParam/Makefile	12 Jan 2006 12:54:28 -0000	1.6
+++ x11-toolkits/py-SciParam/Makefile	13 Jun 2006 23:22:14 -0000
@@ -19,11 +19,11 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Scientific Parameter Dialogs in wxPython based user interfaces
 
- -RUN_DEPENDS=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
- -
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_WX=		2.4
+WX_COMPS=	python_run
 
 .if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
Index: x11-toolkits/py-wxPython24/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-wxPython24/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
- --- x11-toolkits/py-wxPython24/Makefile	20 Jan 2006 00:18:36 -0000	1.53
+++ x11-toolkits/py-wxPython24/Makefile	13 Jun 2006 23:22:14 -0000
@@ -26,6 +26,7 @@
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PYDISTUTILS_BUILDARGS=	WX_CONFIG="${WX_CONFIG}"
+USE_WX=		2.4
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 
 post-build:
@@ -52,9 +53,6 @@
 BROKEN=		"Does not build on ia64"
 .endif
 
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.4-config
- -
 CONFIGURE_ARGS+=	--enable-gtk2
 PYDISTUTILS_BUILDARGS+=	WXPORT=gtk2
 PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS} ${PYDISTUTILS_BUILDARGS}
Index: x11-toolkits/py-wxPython26/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-wxPython26/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
- --- x11-toolkits/py-wxPython26/Makefile	13 May 2006 21:38:45 -0000	1.60
+++ x11-toolkits/py-wxPython26/Makefile	13 Jun 2006 23:22:14 -0000
@@ -28,6 +28,8 @@
 			WX_CONFIG="${WX_CONFIG}" \
 			WXPORT="${WXPORT}"
 PYDISTUTILS_CONFIGUREARGS=	${PYDISTUTILS_BUILDARGS}
+USE_WX=		2.6
+WX_COMPS=	contrib
 DEMO_DIR=	${PYTHONPREFIX_SITELIBDIR}/wxPython/demo
 WXPORT=		gtk2
 
@@ -63,27 +65,15 @@
 .include <bsd.port.pre.mk>
 
 # are we ready for unicode?
- -.if defined(WITH_UNICODE)
+.if defined(WITH_WXPYTHON_UNICODE)
 . if ${OSVERSION} < 500000
 IGNORE=	systems prior to FreeBSD 5.0 do not support Unicode
 . endif
 .endif
 
- -# build dependencies
- -.if defined(WITH_UNICODE)
- -BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
- -
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
- -.else
- -BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/wxgtk26
- -
- -WX_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
- -.endif
- -
 # wx version
 .if exists(${WX_CONFIG})
 WX_VERSION!=	${WX_CONFIG} --release
- -
 PLIST_SUB+=	WX_VERSION=${WX_VERSION}
 .endif
 
@@ -103,9 +93,8 @@
 			INSTALL_MULTIVERSION=0
 INSTALLS_SHLIB=	yes
 
- -. if defined(WITH_UNICODE)
- -LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode \
- -		wx_gtk2u_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode-contrib
+. if defined(WITH_WXPYTHON_UNICODE)
+WX_UNICODE=	yes
 
 PKGNAMESUFFIX=	-unicode
 
@@ -113,11 +102,8 @@
 			UNICODE=1
 WX_PYTHON_DIR=	wx-${WX_VERSION}-${WXPORT}-unicode
 . else
- -LIB_DEPENDS+=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26 \
- -		wx_gtk2_gizmos-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
- -
 WX_PYTHON_DIR=wx-${WX_VERSION}-${WXPORT}-ansi
- -. endif # defined(WITH_UNICODE)
+. endif # defined(WITH_WXPYTHON_UNICODE)
 
 # plist substitutions and library dirs
 PLIST_SUB+=	WX_PYTHON_DIR=${WX_PYTHON_DIR}
Index: x11-toolkits/py-wxPython26-common/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-wxPython26-common/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
- --- x11-toolkits/py-wxPython26-common/Makefile	20 Apr 2006 17:04:04 -0000	1.4
+++ x11-toolkits/py-wxPython26-common/Makefile	13 Jun 2006 23:22:14 -0000
@@ -13,6 +13,4 @@
 
 PLIST=	${.CURDIR}/pkg-plist
 
- -LIB_DEPENDS+=  wx_gtk2_stc-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-contrib
- -
 .include "${MASTERDIR}/Makefile"
Index: x11-toolkits/py-wxPython26-unicode/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/py-wxPython26-unicode/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
- --- x11-toolkits/py-wxPython26-unicode/Makefile	2 Oct 2005 08:21:42 -0000	1.1
+++ x11-toolkits/py-wxPython26-unicode/Makefile	13 Jun 2006 23:22:14 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/x11-toolkits/py-wxPython26-unicode/Makefile,v 1.1 2005/10/02 08:21:42 lioux Exp $
 #
 
- -WITH_UNICODE=	yes
+WITH_WXPYTHON_UNICODE=	yes
 
 MASTERDIR=	${.CURDIR}/../py-wxPython26
 
Index: x11-toolkits/ruby-wx/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/ruby-wx/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
- --- x11-toolkits/ruby-wx/Makefile	29 May 2006 20:45:48 -0000	1.11
+++ x11-toolkits/ruby-wx/Makefile	13 Jun 2006 23:22:14 -0000
@@ -17,12 +17,11 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Ruby bindings for wxWindows (aka wxWidgets)
 
- -LIB_DEPENDS=	wx_gtk2-2.4:${PORTSDIR}/x11-toolkits/wxgtk24 \
- -		wx_gtk2_xrc-2.4:${PORTSDIR}/x11-toolkits/wxgtk24-contrib
- -
 USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
+USE_WX=		2.4
+WX_COMPS=	contrib
 
 .include <bsd.port.pre.mk>
 
@@ -36,7 +35,7 @@
 post-patch:
 	@${FIND} ${WRKSRC} -name *.t | ${XARGS} ${REINPLACE_CMD} -e 's|||'
 	@${REINPLACE_CMD} -E 's/ html(processor|window).o//' ${WRKSRC}/depend
- -	@${REINPLACE_CMD} -e 's/wx-config/wxgtk2-2.4-config/' ${WRKSRC}/extconf.rb
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG:T}|' ${WRKSRC}/extconf.rb
 
 .if !defined(NOPORTDOCS)
 post-install:
Index: x11-toolkits/wxgtk24-contrib/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/wxgtk24-contrib/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
- --- x11-toolkits/wxgtk24-contrib/Makefile	5 Nov 2005 05:19:08 -0000	1.8
+++ x11-toolkits/wxgtk24-contrib/Makefile	13 Jun 2006 23:22:14 -0000
@@ -10,9 +10,9 @@
 MAINTAINER=	fjoe at FreeBSD.org
 COMMENT=	The wxWidgets GUI toolkit contributed libraries
 
+USE_WX=		2.4
 WXGTK_FLAVOR=	gtk2-contrib
 MASTERDIR=	${.CURDIR}/../wxgtk24
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
 
 BUILD_WRKSRC=	${WRKSRC}/contrib/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
Index: x11-toolkits/wxgtk26/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/wxgtk26/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
- --- x11-toolkits/wxgtk26/Makefile	29 Apr 2006 23:03:03 -0000	1.26
+++ x11-toolkits/wxgtk26/Makefile	13 Jun 2006 23:22:14 -0000
@@ -66,6 +66,7 @@
 .endif # *-common
 
 .if ${WXGTK_FLAVOR:M*-contrib*} != ""
+USE_WX=		2.6
 BUILD_WRKSRC=	${WRKSRC}/contrib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
@@ -73,37 +74,25 @@
 RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
- -LIB_DEPENDS+=	wx_baseu-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
- -.else
- -LIB_DEPENDS+=	wx_base-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
+WX_UNICODE=	yes
 .endif
 
 pre-configure:
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
- -		-e "s|@CXXFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cxxflags`|" \
- -		-e "s|@CFLAGS@|${CFLAGS} `${WXGTK_CONFIG} --cflags`|" \
+		-e "s|@CXXFLAGS@|${CFLAGS} `${WX_CONFIG} --cxxflags`|" \
+		-e "s|@CFLAGS@|${CFLAGS} `${WX_CONFIG} --cflags`|" \
 		-e "s|@CPPFLAGS@||"
 
 .endif # !gtk2-contrib-common
 .endif # *-contrib*
 
- -post-patch:
- -	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
- -		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
- -			${WRKSRC}/configure
- -
- -.include <bsd.port.pre.mk>
- -
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
- -.if ${OSVERSION} < 500000
- -IGNORE=	systems prior to FreeBSD 5.0 currently out of support
- -.else
 CONFIGURE_ARGS+=--enable-unicode
 .endif
 
- -WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2u-2.6-config
- -.else
- -WXGTK_CONFIG=	${X11BASE}/bin/wxgtk2-2.6-config
- -.endif # *-unicode*
+post-patch:
+	@${REINPLACE_CMD} -e 's|pkg_config_args --cflags|pkg_config_args pangox --cflags|g ; \
+		s|pkg_config_args --libs|pkg_config_args pangox --libs|g' \
+			${WRKSRC}/configure
 
- -.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11-toolkits/wxmozilla/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/wxmozilla/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
- --- x11-toolkits/wxmozilla/Makefile	13 May 2006 05:00:40 -0000	1.21
+++ x11-toolkits/wxmozilla/Makefile	13 Jun 2006 23:22:14 -0000
@@ -16,16 +16,14 @@
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Embedding Mozilla in wxWidgets
 
- -BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
- -LIB_DEPENDS=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk24
- -RUN_DEPENDS=	${BUILD_DEPENDS}
- -
 USE_PYTHON=	yes
 USE_GNOME=	gnomehack gnometarget
 USE_GECKO=	mozilla
- -WXGTK_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 USE_AUTOTOOLS=	libtool:15
- -CONFIGURE_ARGS=	--with-wx-config=${WXGTK_CONFIG} --enable-python
+CONFIGURE_ARGS=	--enable-python
+USE_WX=		2.4
+WX_COMPS=	python
+WX_CONF_ARGS=	absolute
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
- ---------- END ----------

Best Regards,
Ale
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEj11xiV05EpRcP2ERAp7eAKCeTKantrV/8WAmhmtYEYFiUPQmCgCgkd1u
Y+DYX7q9ehmkIUqSpy9qL/I=
=/hXU
-----END PGP SIGNATURE-----


More information about the freebsd-ports-bugs mailing list