aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2007-03-17 22:40:22 +0000
committerAde Lovett <ade@FreeBSD.org>2007-03-17 22:40:22 +0000
commit7be86f771fad2a41c09d7a8876fcb4b0303876ca (patch)
tree41dacd80a5d8f904046804d5043584396b16dc8f
parent2110a9d81db27179dcf6ee9c306a7dab2ccc561a (diff)
downloadports-7be86f771fad2a41c09d7a8876fcb4b0303876ca.tar.gz
ports-7be86f771fad2a41c09d7a8876fcb4b0303876ca.zip
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.
Notes
Notes: svn path=/head/; revision=187612
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/vlc/Makefile.inc3
2 files changed, 3 insertions, 2 deletions
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 | \