From 550c92ba003410d590b4268f989fa26c6379f838 Mon Sep 17 00:00:00 2001
From: ade <ade@FreeBSD.org>
Date: Sat, 17 Mar 2007 22:40:22 +0000
Subject: multimedia/vlc erroneously installs its own lib/charset.alias which
 conflicts with devel/gettext.

In order to prevent problems down the line, folks should first remove vlc,
then update gettext, then finally reinstall vlc, otherwise the wrong
lib/charset.alias will be present on the system.
---
 multimedia/vlc/Makefile     | 2 +-
 multimedia/vlc/Makefile.inc | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index b499ae4b8fe8..3153024302a2 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index d31fcd34f14d..698148d7612e 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -288,7 +288,8 @@ pre-install:
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
-	${RM} -f ${FAKEDIR}/share/locale/locale.alias
+	${RM} -f ${FAKEDIR}/share/locale/locale.alias \
+		 ${FAKEDIR}/lib/charset.alias
 	cd ${FAKEDIR}/bin && ${FIND} -s * | \
 		${SED} -e 's|^|bin/|' >> ${PLIST}
 	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
-- 
cgit