- Use features of bsd.wx.mk, especially USE_WX

PR:		ports/101613
Submitted by:	alepulver

6 files changed, 12 insertions, 47 deletions

diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 9fe29b4af23..455f181ef75 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -61,13 +61,11 @@ PLIST_FILES+=	%%DATADIR%%/${file}
 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
-
+USE_WX=		2.6
+WX_UNICODE=	yes
 MAN1+=		mmg.1
 PLIST_FILES+=	bin/mmg
 .endif
@@ -90,7 +88,7 @@ post-patch:
 	@${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
diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile
index a738a069535..e7559517813 100644
--- a/multimedia/tovid/Makefile
+++ b/multimedia/tovid/Makefile
@@ -37,11 +37,12 @@ BUILD_DEPENDS=	\
 		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
 GNU_CONFIGURE=	yes
 
 MAN1=	idvid.1 makedvd.1 makemenu.1 makeslides.1 makexml.1 postproc.1 \
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index b5385746d84..7dd633f9633 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -99,15 +99,6 @@ CONFIGURE_ARGS+=	--enable-ffmpeg \
 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 ${ARCH} == "amd64"
@@ -188,7 +179,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
-WITH_WXGTK=	yes
+.undef WITHOUT_WXGTK
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@@ -201,10 +192,8 @@ 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}
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 11a984f7a3f..95333840310 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -22,13 +22,7 @@
 #  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
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c544495a7fb..52497d64c2c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -56,15 +56,6 @@ CONFIGURE_ARGS+=	--enable-ffmpeg \
 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 ${OSVERSION} < 500035
@@ -145,7 +136,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2
-WITH_WXGTK=	yes
+.undef WITHOUT_WXGTK
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@@ -158,10 +149,8 @@ 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}
+USE_WX=		2.6
 CONFIGURE_ARGS+=--enable-wxwidgets
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index ebe5196dda5..d31fcd34f14 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -23,13 +23,7 @@
 #  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
+#  WxWidgets Interface
 #
 # Audio Knobs:
 #