From 5f06c72a18eea77579dbf562fa295a3cefdec29f Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 7 Jun 2014 13:24:16 +0000 Subject: - Add CONFLICTS to mplayer to prevent install conflict with mplayer2 [1] - Fix crash when trying to play certain videos with no audio in gmplayer [2] - Improve non-options variable summary during build in pre-everything [2] - Bump PORTREVISION in mplayer (the binary changes) PR: 190027 Submitted by: rfg@tristatelogic.com [1], andre@albsmeier.net[2] Approved by: mentors (implicit) --- multimedia/mencoder/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'multimedia/mencoder/Makefile') diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index aac61522be05..c3ddec07b827 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -77,9 +77,9 @@ pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" - @${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:" - @${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0" - @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0" + @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:" + @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" + @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" post-patch: .if ${OSVERSION} >= 900010 -- cgit v1.2.3