1 files changed, 2 insertions, 15 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index e8954d687362..41718ee42b9e 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6b
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -141,12 +142,8 @@ CONFIGURE_ARGS+=--disable-nls
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
-.if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/acd0c
-.else
 DEFAULT_DVD_DEVICE=/dev/acd0
 .endif
-.endif
 
 .if !defined(WITHOUT_GNOMEVFS)
 USE_GNOME+=	gnomevfs2
@@ -158,12 +155,8 @@ CONFIGURE_ARGS+=	--disable-gnomevfs
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
-.if ${OSVERSION} < 500000
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
 DEFAULT_CDROM_DEVICE=/dev/acd0
 .endif
-.endif
 
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
 LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
@@ -318,9 +311,7 @@ CONFIGURE_ARGS+=--disable-x264
 .if (defined(WITH_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
 .if !defined(WITHOUT_AALIB)
 WITH_AALIB=	yes
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-RUN_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-
+LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
 CONFIGURE_ARGS+=--enable-caca
 .endif
 .else
@@ -556,9 +547,5 @@ CONFIGURE_ARGS+=--enable-release \
 CONFIGURE_ARGS+=--enable-release
 .endif
 
-.if ${OSVERSION} < 500000
-CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
-.endif
-
 .include "${.CURDIR}/Makefile.inc"
 .include <bsd.port.post.mk>