From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 25 20:50:02 2012 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4EF65C70 for ; Thu, 25 Oct 2012 20:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.FreeBSD.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 261308FC18 for ; Thu, 25 Oct 2012 20:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9PKo2VU003286 for ; Thu, 25 Oct 2012 20:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9PKo2cS003285; Thu, 25 Oct 2012 20:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 25 Oct 2012 20:50:02 GMT Resent-Message-Id: <201210252050.q9PKo2cS003285@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Grzegorz Blach Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0751FB51 for ; Thu, 25 Oct 2012 20:46:40 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id C957C8FC08 for ; Thu, 25 Oct 2012 20:46:39 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9PKkdO4066807 for ; Thu, 25 Oct 2012 20:46:39 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q9PKkdsY066806; Thu, 25 Oct 2012 20:46:39 GMT (envelope-from nobody) Message-Id: <201210252046.q9PKkdsY066806@red.freebsd.org> Date: Thu, 25 Oct 2012 20:46:39 GMT From: Grzegorz Blach To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/173085: multimedia/mplayer2: build fixes X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2012 20:50:02 -0000 >Number: 173085 >Category: misc >Synopsis: multimedia/mplayer2: build fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Oct 25 20:50:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Grzegorz Blach >Release: 9.1-PRERELEASE >Organization: >Environment: FreeBSD silver.nine 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #8 r241394: Wed Oct 10 19:25:27 CEST 2012 root@silver.nine:/usr/obj/usr/src/sys/SILVER amd64 >Description: - Fix build when multimedia/ffmpeg is already installed - Fix pkg-plist when WITHOUT_NLS knob is set >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN multimedia/mplayer2/Makefile multimedia/mplayer2/Makefile --- multimedia/mplayer2/Makefile 2012-10-24 18:32:17.000000000 +0200 +++ multimedia/mplayer2/Makefile 2012-10-25 22:36:04.000000000 +0200 @@ -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 @@ 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 @@ 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 diff -ruN multimedia/mplayer2/pkg-plist multimedia/mplayer2/pkg-plist --- multimedia/mplayer2/pkg-plist 2012-10-24 18:32:17.000000000 +0200 +++ multimedia/mplayer2/pkg-plist 2012-10-25 18:52:23.000000000 +0200 @@ -3,21 +3,21 @@ etc/mplayer/input.conf.sample etc/mplayer/mplayer.conf.sample @dirrmtry etc/mplayer -@dirrmtry man/cs/man1 -@dirrmtry man/cs -@dirrmtry man/de/man1 -@dirrmtry man/de -@dirrmtry man/es/man1 -@dirrmtry man/es -@dirrmtry man/fr/man1 -@dirrmtry man/fr -@dirrmtry man/hu/man1 -@dirrmtry man/hu -@dirrmtry man/it/man1 -@dirrmtry man/it -@dirrmtry man/pl/man1 -@dirrmtry man/pl -@dirrmtry man/ru/man1 -@dirrmtry man/ru -@dirrmtry man/zh_CN/man1 -@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 >Release-Note: >Audit-Trail: >Unformatted: