svn commit: r306502 - head/multimedia/mplayer2
Chris Rees
crees at FreeBSD.org
Sat Oct 27 14:09:44 UTC 2012
Author: crees
Date: Sat Oct 27 14:09:43 2012
New Revision: 306502
URL: http://svn.freebsd.org/changeset/ports/306502
Log:
- Fix build when multimedia/ffmpeg is already installed
- Fix pkg-plist when WITHOUT_NLS knob is set
PR: ports/173085
Submitted by: Grzegorz Blach <magik at roorback.net> (maintainer)
Feature safe: yes
Modified:
head/multimedia/mplayer2/Makefile
head/multimedia/mplayer2/pkg-plist
Modified: head/multimedia/mplayer2/Makefile
==============================================================================
--- head/multimedia/mplayer2/Makefile Sat Oct 27 13:24:45 2012 (r306501)
+++ head/multimedia/mplayer2/Makefile Sat Oct 27 14:09:43 2012 (r306502)
@@ -2,6 +2,7 @@
PORTNAME= mplayer2
PORTVERSION= ${MPLAYER2_PORT_VERSION}
+PORTREVISION= 1
CATEGORIES= multimedia audio
MASTER_SITES= http://files.roorback.net/
@@ -10,9 +11,10 @@ COMMENT= Advanced general-purpose video
LICENSE= GPLv2
-LIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg-011 \
- png15:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS= ffmpeg-011:${PORTSDIR}/multimedia/ffmpeg-011
+RUN_DEPENDS= ffmpeg-011:${PORTSDIR}/multimedia/ffmpeg-011
USE_XZ= yes
USE_GMAKE= yes
@@ -101,8 +103,10 @@ USE_GETTEXT= yes
CONFIGURE_ARGS+= --enable-translation --language=all \
--extra-libs-mplayer=-lintl
MANLANG= "" cs de es fr hu it pl ru zh_CN
+PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-translation --language=en
+PLIST_SUB+= NLS="@comment "
.endif
#On i386, gcc runs out of general purpose registers when
Modified: head/multimedia/mplayer2/pkg-plist
==============================================================================
--- head/multimedia/mplayer2/pkg-plist Sat Oct 27 13:24:45 2012 (r306501)
+++ head/multimedia/mplayer2/pkg-plist Sat Oct 27 14:09:43 2012 (r306502)
@@ -3,21 +3,21 @@ etc/mplayer/codecs.conf.sample
etc/mplayer/input.conf.sample
etc/mplayer/mplayer.conf.sample
@dirrmtry etc/mplayer
- at dirrmtry man/cs/man1
- at dirrmtry man/cs
- at dirrmtry man/de/man1
- at dirrmtry man/de
- at dirrmtry man/es/man1
- at dirrmtry man/es
- at dirrmtry man/fr/man1
- at dirrmtry man/fr
- at dirrmtry man/hu/man1
- at dirrmtry man/hu
- at dirrmtry man/it/man1
- at dirrmtry man/it
- at dirrmtry man/pl/man1
- at dirrmtry man/pl
- at dirrmtry man/ru/man1
- at dirrmtry man/ru
- at dirrmtry man/zh_CN/man1
- at dirrmtry man/zh_CN
+%%NLS%%@dirrmtry man/cs/man1
+%%NLS%%@dirrmtry man/cs
+%%NLS%%@dirrmtry man/de/man1
+%%NLS%%@dirrmtry man/de
+%%NLS%%@dirrmtry man/es/man1
+%%NLS%%@dirrmtry man/es
+%%NLS%%@dirrmtry man/fr/man1
+%%NLS%%@dirrmtry man/fr
+%%NLS%%@dirrmtry man/hu/man1
+%%NLS%%@dirrmtry man/hu
+%%NLS%%@dirrmtry man/it/man1
+%%NLS%%@dirrmtry man/it
+%%NLS%%@dirrmtry man/pl/man1
+%%NLS%%@dirrmtry man/pl
+%%NLS%%@dirrmtry man/ru/man1
+%%NLS%%@dirrmtry man/ru
+%%NLS%%@dirrmtry man/zh_CN/man1
+%%NLS%%@dirrmtry man/zh_CN
\ No newline at end of file
More information about the svn-ports-all
mailing list