From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 28 17:40:08 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 43838106564A for ; Sat, 28 Jan 2012 17:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 150B18FC18 for ; Sat, 28 Jan 2012 17:40:08 +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 q0SHe7Cs029600 for ; Sat, 28 Jan 2012 17:40:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0SHe7GY029599; Sat, 28 Jan 2012 17:40:07 GMT (envelope-from gnats) Resent-Date: Sat, 28 Jan 2012 17:40:07 GMT Resent-Message-Id: <201201281740.q0SHe7GY029599@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas Zander Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E3BF106564A for ; Sat, 28 Jan 2012 17:35:13 +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 000548FC0C for ; Sat, 28 Jan 2012 17:35:12 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0SHZCQV082359 for ; Sat, 28 Jan 2012 17:35:12 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q0SHZCBH082358; Sat, 28 Jan 2012 17:35:12 GMT (envelope-from nobody) Message-Id: <201201281735.q0SHZCBH082358@red.freebsd.org> Date: Sat, 28 Jan 2012 17:35:12 GMT From: Thomas Zander To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/164580: Fix mplayer builds on 8.2-RELEASE-pX and earlier X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2012 17:40:08 -0000 >Number: 164580 >Category: ports >Synopsis: Fix mplayer builds on 8.2-RELEASE-pX and earlier >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 28 17:40:07 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Thomas Zander >Release: >Organization: >Environment: >Description: Update to the mplayer + mencoder ports to address the following issues: - Does not build if no log2 and log2f is present on the system (before OSVERSION 802502, that is): Introduced a new EXTRA_PATCHES in files/extra-patch-base_system_log2f to address the issue. - Remove unixfreunde.de from MASTER_SITES, since it is not used anymore. @Committer: I do have a MASTER_SITES problem here since rrr.de is not intended to serve these GET requests from around the whole world. Does the FreeBSD project have space for these distfiles and a proper way of allowing me to put them there now and in future? >How-To-Repeat: >Fix: Patch is attached. Patch attached with submission follows: diff -ruN /usr/ports/multimedia/mplayer/Makefile.options mplayer/Makefile.options --- /usr/ports/multimedia/mplayer/Makefile.options 2012-01-25 11:11:48.000000000 +0100 +++ mplayer/Makefile.options 2012-01-28 17:40:02.997772646 +0100 @@ -29,6 +29,10 @@ # Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh # +.if ${OSVERSION} < 802502 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f +.endif + .if defined(WITH_LANG) CONFIGURE_ARGS+=--language=${WITH_LANG} .endif diff -ruN /usr/ports/multimedia/mplayer/Makefile.shared mplayer/Makefile.shared --- /usr/ports/multimedia/mplayer/Makefile.shared 2012-01-15 23:31:53.000000000 +0100 +++ mplayer/Makefile.shared 2012-01-28 18:23:45.654453413 +0100 @@ -7,8 +7,7 @@ MPLAYER_SNAPSHOT_DATE= 2011-12-18 MPLAYER_PORT_VERSION= 1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio -MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ - http://www.rrr.de/~riggs/mplayer/ +MASTER_SITES= http://www.rrr.de/~riggs/mplayer/ DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/rc/g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} diff -ruN /usr/ports/multimedia/mplayer/files/extra-patch-base_system_log2f mplayer/files/extra-patch-base_system_log2f --- /usr/ports/multimedia/mplayer/files/extra-patch-base_system_log2f 1970-01-01 01:00:00.000000000 +0100 +++ mplayer/files/extra-patch-base_system_log2f 2012-01-28 17:36:15.426193356 +0100 @@ -0,0 +1,22 @@ +--- configure.orig 2011-12-15 15:01:05.000000000 +0100 ++++ configure 2012-01-28 17:33:54.674887100 +0100 +@@ -3107,7 +3107,7 @@ + echores "$_kstat" + + +-for func in cbrtf exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf trunc truncf; do ++for func in cbrtf exp2 exp2f llrint llrintf lrint lrintf round roundf trunc truncf; do + echocheck $func + eval _$func=no + statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes +@@ -3119,7 +3119,9 @@ + echores no + fi + done +- ++for func in log2 log2f; do ++ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\"" ++done + + echocheck "mkstemp" + _mkstemp=no >Release-Note: >Audit-Trail: >Unformatted: