diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2009-11-02 22:51:27 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2009-11-02 22:51:27 +0000 |
| commit | 83d2efc59d40388ab5db4d2e551a65246b7bc373 (patch) | |
| tree | abd7c9ff18cf81d8ec84f4af951149a69c8295b3 /multimedia/vlc/Makefile.inc | |
| parent | e0bcdec57e9b36272aa67b449e0d1289b42c317b (diff) | |
| download | ports-83d2efc59d40388ab5db4d2e551a65246b7bc373.tar.gz ports-83d2efc59d40388ab5db4d2e551a65246b7bc373.zip | |
Upgrade to 1.0.2 and fix a security issue: see
<http://www.videolan.org/security/sa0901.html>.
Also include fixes from PR ports/135018 to fix build when WITHOUT_X11 is
defined.
PR: ports/139114 (1) ports/135018 (2)
Submitted by: Christopher Key <cjk32 (at) cam.ac.uk> (1) Nick Triantos <nick-freebsd (at) triantos.com> (2)
Approved by: Joseph S. Atkinson <jsa.bsd (at) gmail.com> (maintainer)
Security: VideoLAN-SA-0901 (CVE Pending)
Notes
Notes:
svn path=/head/; revision=243683
Diffstat (limited to 'multimedia/vlc/Makefile.inc')
| -rw-r--r-- | multimedia/vlc/Makefile.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc index f398762e5fd3..9be9e5ade4c0 100644 --- a/multimedia/vlc/Makefile.inc +++ b/multimedia/vlc/Makefile.inc @@ -257,10 +257,12 @@ pre-install: build ${SED} -e 's|^|lib/|' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm lib/|' >> ${PLIST} +.if !defined(WITHOUT_X11) cd ${FAKEDIR}/libdata && ${FIND} -s * -type f -o -type l| \ ${SED} -e 's|^|libdata/|' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrmtry libdata/|' >> ${PLIST} +.endif .for dir in vlc cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \ @@ -285,7 +287,7 @@ pre-install: build ${SED} -e 's|^|%%WEBPLUGINS_DIR%%/|' >> ${PLIST} ${ECHO_CMD} "@dirrmtry %%WEBPLUGINS_DIR%%" >> ${PLIST} .endif -.for locale in ckb co fur km my oc ps tet tl +.for locale in ckb co fur kk km my oc ps tet tl ${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST} .endfor @@ -297,8 +299,10 @@ do-install: ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include cd ${FAKEDIR}/lib && ${FIND} . | \ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib +.if !defined(WITHOUT_X11) cd ${FAKEDIR}/libdata && ${FIND} . | \ ${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/libdata +.endif cd ${FAKEDIR}/share && ${FIND} . | \ ${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share .if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN) |