diff options
| author | ade <ade@FreeBSD.org> | 2007-03-18 06:40:22 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2007-03-18 06:40:22 +0800 |
| commit | 550c92ba003410d590b4268f989fa26c6379f838 (patch) | |
| tree | 6194300349969a39884a388a5aba8de5c3ee5c7e /multimedia | |
| parent | 39d689d786cc6faa6db1d650afb18f177ac18a70 (diff) | |
| download | freebsd-ports-gnome-550c92ba003410d590b4268f989fa26c6379f838.tar.gz freebsd-ports-gnome-550c92ba003410d590b4268f989fa26c6379f838.tar.zst freebsd-ports-gnome-550c92ba003410d590b4268f989fa26c6379f838.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.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/vlc/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 3 |
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 | \ |