From d750615763ee2d3250de2115295079f66d813d1f Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Fri, 1 Dec 2006 07:39:02 +0000
Subject: - Use features of bsd.wx.mk, especially USE_WX

PR:		ports/101613
Submitted by:	alepulver
---
 devel/ecos-tools/Makefile                                           | 6 +++---
 .../patch-host::tools::configtool::standalone::wxwin::makefile.gnu  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'devel/ecos-tools')

diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile
index c1832b6b02fb..b1f7acd5cc2f 100644
--- a/devel/ecos-tools/Makefile
+++ b/devel/ecos-tools/Makefile
@@ -16,10 +16,10 @@ DISTNAME=	ecos-tools.${SNAPDATE}
 MAINTAINER=	tg@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 @@ SNAPDATE=	20040125
 
 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
diff --git a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
index ac96b582fd8d..a2cf829bb235 100644
--- a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
+++ b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
@@ -36,8 +36,8 @@ $FreeBSD$
    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
  
-- 
cgit v1.2.3