From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 7 21:30:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3D4316A4E2 for ; Mon, 7 Aug 2006 21:30:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E60C743D53 for ; Mon, 7 Aug 2006 21:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k77LUFAI083093 for ; Mon, 7 Aug 2006 21:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k77LUFPI083092; Mon, 7 Aug 2006 21:30:15 GMT (envelope-from gnats) Resent-Date: Mon, 7 Aug 2006 21:30:15 GMT Resent-Message-Id: <200608072130.k77LUFPI083092@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 754E616A584 for ; Mon, 7 Aug 2006 21:22:14 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay03.pair.com (relay03.pair.com [209.68.5.17]) by mx1.FreeBSD.org (Postfix) with SMTP id 890EF43D45 for ; Mon, 7 Aug 2006 21:22:13 +0000 (GMT) (envelope-from alepulver@FreeBSD.org) Received: (qmail 11228 invoked from network); 7 Aug 2006 21:22:04 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 7 Aug 2006 21:22:04 -0000 Message-Id: <1154985765.46073@phobos.mars.bsd> Date: Mon, 7 Aug 2006 18:22:45 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/101613: [PATCH] bsd.wx.mk: integrate existing ports with it X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Aug 2006 21:30:16 -0000 >Number: 101613 >Category: ports >Synopsis: [PATCH] bsd.wx.mk: integrate existing ports with it >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 07 21:30:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE-p1 #3: Mon Jun 19 14:49:35 ART 2006 root@phobos.mars.bsd:/usr/obj/usr/src/sys/ATHLON-PHOBOS >Description: - Integrate existing ports that use WxWidgets with bsd.wx.mk. - Fix previous bug when using multiple components (see note about .for loop when adding dependencies). - Use ":" to separate components and dependency types instead of "_". - Add default dependency types (e.g. wx -> wx:lib but python -> python:run). - Add WX_PREMK variable instead of processing the USE_WX_* and WX_* variables on each inclusion. - Add note in bsd.wx.mk about its existence. >How-To-Repeat: >Fix: --- patch.diff begins here --- Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.539 diff -u -r1.539 bsd.port.mk --- Mk/bsd.port.mk 4 Aug 2006 12:34:41 -0000 1.539 +++ Mk/bsd.port.mk 7 Aug 2006 21:13:29 -0000 @@ -426,6 +426,9 @@ # or http://www.FreeBSD.org/gnome/docs/porting.html # for more details. ## +# USE_WX - If set, this port uses the WxWidgets library and related +# components. See bsd.wx.mk for more details. +## # USE_KDEBASE_VER # - Set to 3 to use the KDE windowing system. # Implies inclusion of bsd.kde.mk. Index: Mk/bsd.wx.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.wx.mk,v retrieving revision 1.1 diff -u -r1.1 bsd.wx.mk --- Mk/bsd.wx.mk 5 Jul 2006 02:13:12 -0000 1.1 +++ Mk/bsd.wx.mk 7 Aug 2006 21:13:29 -0000 @@ -14,7 +14,7 @@ # 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). +# limitation), at least it is manually included. # 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"). @@ -29,7 +29,7 @@ # 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 +# ":xxx" may be added to the components to determine the # dependency type. # The available components are: # wx - The WxWidgets library. @@ -41,20 +41,23 @@ # 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. +# If no suffix is present then "run" will be used for "python" +# and "lib" for others. # 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}" (absolute path of +# WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus # "--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. +# WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION +# after (in case the port needs to manually run +# the script). +# WX_UNICODE - Define if the port needs the Unicode version of the +# WxWidgets library and/or contributed libraries. # NOTE: this should NOT be used for ports that can be compiled -# with Unicode or not, but for the ones that require it. The -# first case is handled by the user variable WITH_UNICODE. +# with Unicode or not, but for the ones that require it. +# WANT_UNICODE - Define if the port prefers Unicode, but doesn't require it. # WANT_WX - Set to "yes" or a valid single version (no ranges, etc). # In both cases it will detect the installed WxWidgets # components and add them to the variable HAVE_WX. If a @@ -70,23 +73,20 @@ # # 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. +# WITH_UNICODE - Define if you prefer the Unicode version when available. +# WITHOUT_UNICODE - Define if you prefer the non Unicode version (this +# variable disables WITH_UNICODE and WANT_UNICODE). +# WITH_WX_VER - Define to the list of prefered versions in reverse order. # # The following variables are defined by this file, to be read from the port. # WX_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). +# WITH_UNICODE or WANT_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"). +# set to "yes". # # Examples: # - A port that needs WxWidgets 2.6 and contributed libraries with Unicode. @@ -96,11 +96,11 @@ # - A port that needs WxPython 2.4 for running. # USE_PYTHON= yes # USE_WX= 2.4 -# WX_COMPS= python_run +# WX_COMPS= python # - 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 +# WX_COMPS= python:build # - A port that needs WxWidgets version 2.4 or higher and contributed # libraries. # USE_WX= 2.4+ @@ -108,11 +108,6 @@ # - 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@FreeBSD.org @@ -129,20 +124,14 @@ # _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_VERS_LISTS - Reverse lists preference order. # _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 +_WX_VERS_LISTS= WANT_WX_VER WITH_WX_VER # # Variables used to determine what is needed: @@ -150,55 +139,74 @@ # _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_DEPTYPE_comp_ver - Default dependency type (optional). # -_WX_PORT_wx_2.4= wxgtk24 +_WX_PORT_wx_2.4= x11-toolkits/wxgtk24 _WX_LIB_wx_2.4= wx_gtk2-2.4 -_WX_PORT_contrib_2.4= wxgtk24-contrib +_WX_PORT_contrib_2.4= x11-toolkits/wxgtk24-contrib _WX_LIB_contrib_2.4= wx_gtk2_canvas-2.4 -_WX_PORT_python_2.4= py-wxPython24 +_WX_PORT_python_2.4= x11-toolkits/py-wxPython24 _WX_FILE_python_2.4= ${PYTHON_SITELIBDIR}/wx/__init__.py -_WX_PORT_mozilla_2.4= wxmozilla +_WX_PORT_mozilla_2.4= x11-toolkits/wxmozilla _WX_LIB_mozilla_2.4= wxmozilla_gtk2-2.4 -_WX_PORT_wx_2.6= wxgtk26${_WX_UCL} +_WX_PORT_wx_2.6= x11-toolkits/wxgtk26${_WX_UCL} _WX_LIB_wx_2.6= wx_base${_WX_UC}-2.6 -_WX_PORT_contrib_2.6= wxgtk26${_WX_UCL}-contrib +_WX_PORT_contrib_2.6= x11-toolkits/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_PORT_python_2.6= x11-toolkits/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_PORT_svg_2.6= x11-toolkits/wxsvg _WX_LIB_svg_2.6= wxsvg # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately. +# Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib". .for comp in ${_WX_COMPS_ALL} +_WX_COMP= ${comp} . 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 +. if ${_WX_COMP} == "python" +_WX_DEPTYPE_${comp}_${ver}= run +. else +_WX_DEPTYPE_${comp}_${ver}= lib +. endif . endfor .endfor .endif # !_WX_Defined_Done # +# Check if the user/port wants Unicode. +# + +.if ${OSVERSION} >= 500000 && (!defined(WITHOUT_UNICODE) && \ + (defined(WITH_UNICODE) || defined(WANT_UNICODE))) +_WX_UC_AVAILABLE= yes +.else +.undef _WX_UC_AVAILABLE +.endif + +# # Check for present components. # -.if !defined(AFTERPORTMK) && defined(WANT_WX) +.if defined(WANT_WX) && !defined(AFTERPORTMK) # Check if Unicode will be used. . for __WANT_WX in ${WANT_WX} -. if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 && \ +. if defined(_WX_UC_AVAILABLE) && \ (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${WANT_WX:L} == "yes") _WX_WANT_UNICODE= yes . endif @@ -250,47 +258,14 @@ .endif # ! AFTERPORTMK && WANT_WX # -# 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)) +.if !defined(_WX_Version_Done) && (!defined(BEFOREPORTMK) || \ + (defined(WX_PREMK) && !defined(AFTERPORTMK) && \ + (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} @@ -349,7 +324,7 @@ # Check for a null version. .if empty(_WX_VER_MERGED) -_WX_IGNORE?= selected a null or invalid WxWidgets version +IGNORE?= selected a null or invalid WxWidgets version .endif # @@ -365,9 +340,9 @@ . endif .endfor -# Requested by the user (optional). +# Requested by the user or port (optional). -.if defined(WITH_UNICODE) && ${OSVERSION} >= 500000 +.if defined(_WX_UC_AVAILABLE) . for ver in ${_WX_VER_UC} . if ${_WX_VERS_UC_ALL:M${ver}} != "" WX_UNICODE= yes @@ -379,9 +354,9 @@ .if defined(WX_UNICODE) . if ${OSVERSION} < 500000 -_WX_IGNORE?= requires FreeBSD versions >= 5.X (because of Unicode) +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} +IGNORE?= selected a WxWidgets version which does not support Unicode: ${_WX_VER_MERGED} . endif .endif @@ -410,7 +385,7 @@ # 3) _WX_VER_FINAL - Available versions. # -.for list in ${_WX_LISTS_ORDER} +.for list in _WX_VER_FINAL ${_WX_VERS_LISTS} . if defined(${list}) . for ver in ${${list}} . if ${_WX_VER_FINAL:M${ver}} != "" @@ -427,26 +402,14 @@ 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 +.endif # !_WX_Version_Done && (!BEFOREPORTMK || \ +# (WX_PREMK && !AFTERPORTMK && (USE_WX || USE_WX_NOT))) # # Process components list and add dependencies, variables, etc. # .if !defined(BEFOREPORTMK) -# Error check. - -.if defined(_WX_IGNORE) -IGNORE?= ${_WX_IGNORE} -.endif # # Component parsing. @@ -466,10 +429,11 @@ _WX_COMPS_FINAL= # .for comp in ${WX_COMPS} -_WX_COMP= ${comp:C/_([[:alpha:]]+)$//} -_WX_DEP_TYPE= ${comp:C/.+_([[:alpha:]]+)$/\1/} +_WX_COMP= ${comp:C/:([[:alpha:]]+)$//} . if ${_WX_COMP} == ${comp} -_WX_DEP_TYPE= lib +_WX_DEP_TYPE= ${_WX_DEPTYPE_${comp}_${_WX_VER}} +. else +_WX_DEP_TYPE= ${comp:C/.+:([[:alpha:]]+)$/\1/} . endif _WX_COMP_NEW= ${_WX_COMP}_${_WX_DEP_TYPE} . for __WX_COMP in ${_WX_COMP} @@ -501,16 +465,19 @@ .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}} +# XXX Need a .for loop here so the variable is expanded before the assignment. +. for comp_part in ${_WX_COMP} +. if ${_WX_DEP_TYPE} == "lib" +. if defined(_WX_LIB_${_WX_COMP}_${_WX_VER}) +LIB_DEPENDS+= ${_WX_LIB_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +. else +BUILD_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +RUN_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_WX_VER}} +. endif . 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}} +${_WX_DEP_TYPE:U}_DEPENDS+= ${_WX_FILE_${comp_part}_${_WX_VER}}:${PORTSDIR}/${_WX_PORT_${comp_part}_${_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 .endfor # 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 7 Aug 2006 21:13:30 -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 7 Aug 2006 21:13:30 -0000 @@ -12,17 +12,17 @@ MAINTAINER= ports@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 WRKSRC= ${WRKDIR}/mBox-${PORTVERSION} .include 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 7 Aug 2006 21:13:30 -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 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 7 Aug 2006 21:13:30 -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 .include 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 7 Aug 2006 21:13:30 -0000 @@ -16,8 +16,7 @@ MAINTAINER= dyeske@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 7 Aug 2006 21:13:30 -0000 @@ -15,12 +15,10 @@ MAINTAINER= fernan@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.12 diff -u -r1.12 Makefile --- cad/kicad/Makefile 29 Jun 2006 21:01:23 -0000 1.12 +++ cad/kicad/Makefile 7 Aug 2006 21:13:30 -0000 @@ -22,8 +22,6 @@ MAINTAINER= thierry@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-06-26 @@ -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 7 Aug 2006 21:13:31 -0000 @@ -16,9 +16,8 @@ MAINTAINER= ports@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 7 Aug 2006 21:13:31 -0000 @@ -16,11 +16,11 @@ MAINTAINER= db@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 7 Aug 2006 21:13:31 -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 7 Aug 2006 21:13:31 -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.27 diff -u -r1.27 Makefile --- databases/pgadmin3/Makefile 24 Jul 2006 18:39:12 -0000 1.27 +++ databases/pgadmin3/Makefile 7 Aug 2006 21:13:31 -0000 @@ -24,16 +24,10 @@ USE_WX= 2.6 WX_COMPS= wx contrib -WX_UNICODE= yes WX_CONF_ARGS= relative +WX_UNICODE= yes post-install: @${CAT} ${PKGMESSAGE} -.include - -.if ${OSVERSION} < 500000 -IGNORE= cannot install: requires wchar_t -.endif - -.include +.include 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 7 Aug 2006 21:13:31 -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 -.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 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 7 Aug 2006 21:13:32 -0000 @@ -14,11 +14,11 @@ MAINTAINER= xride@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 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 7 Aug 2006 21:13:32 -0000 @@ -15,10 +15,10 @@ MAINTAINER= danfe@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 NO_BUILD= yes MAN1= ${PORTNAME}.1 Index: deskutils/xchm/Makefile =================================================================== RCS file: /home/pcvs/ports/deskutils/xchm/Makefile,v retrieving revision 1.27 diff -u -r1.27 Makefile --- deskutils/xchm/Makefile 18 Jun 2006 22:52:51 -0000 1.27 +++ deskutils/xchm/Makefile 7 Aug 2006 21:13:32 -0000 @@ -14,12 +14,12 @@ MAINTAINER= pav@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 7 Aug 2006 21:13:32 -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 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 7 Aug 2006 21:13:32 -0000 @@ -16,12 +16,12 @@ MAINTAINER= filippo.natali@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 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 7 Aug 2006 21:13:34 -0000 @@ -17,11 +17,12 @@ 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 +WX_PREMK= yes INSTALLS_SHLIB= yes TARGETS= tinyXML scintilla sdk wxDockit src console_runner doc @@ -35,9 +36,6 @@ .include -.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 +50,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 +64,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 7 Aug 2006 21:13:36 -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 7 Aug 2006 21:13:36 -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 @@ @@ -8,7 +8,7 @@ -@@ -339,18 +340,37 @@ +@@ -339,13 +340,32 @@ @@ -29,26 +29,19 @@ + - -+ ++ -- + + + + -+ + - -- -+ - - - @@ -1052,12 +1072,78 @@