aboutsummaryrefslogtreecommitdiff
path: root/multimedia/vlc
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2006-12-01 07:39:02 +0000
committerPav Lucistnik <pav@FreeBSD.org>2006-12-01 07:39:02 +0000
commitd750615763ee2d3250de2115295079f66d813d1f (patch)
tree05b94e79be3ac272b9b617e50fc723ea52c6cf34 /multimedia/vlc
parent767bcfc72cf9c3574739d745cff6620fa75b0e74 (diff)
downloadports-d750615763ee2d3250de2115295079f66d813d1f.tar.gz
ports-d750615763ee2d3250de2115295079f66d813d1f.zip
- Use features of bsd.wx.mk, especially USE_WX
PR: ports/101613 Submitted by: alepulver
Notes
Notes: svn path=/head/; revision=178433
Diffstat (limited to 'multimedia/vlc')
-rw-r--r--multimedia/vlc/Makefile15
-rw-r--r--multimedia/vlc/Makefile.inc8
2 files changed, 3 insertions, 20 deletions
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index c544495a7fb1..52497d64c2c8 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 ebe5196dda58..d31fcd34f14d 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:
#