From owner-svn-ports-head@FreeBSD.ORG Sun Nov 16 17:20:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B79DFCCF; Sun, 16 Nov 2014 17:20:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3AD2EEF; Sun, 16 Nov 2014 17:20:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGHKXG9095126; Sun, 16 Nov 2014 17:20:33 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGHKWe4095119; Sun, 16 Nov 2014 17:20:32 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201411161720.sAGHKWe4095119@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 16 Nov 2014 17:20:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372644 - in head/multimedia: mencoder mplayer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 17:20:33 -0000 Author: riggs Date: Sun Nov 16 17:20:32 2014 New Revision: 372644 URL: https://svnweb.freebsd.org/changeset/ports/372644 QAT: https://qat.redports.org/buildarchive/r372644/ Log: Correct iconv handling Bump PORTREVISION While on it: - Remove @dirrm(try) from pkg-plists PR: 195065 Submitted by: yuri@rawbw.com Reviewed by: riggs Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/pkg-plist head/multimedia/mplayer/Makefile head/multimedia/mplayer/pkg-plist Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Nov 16 16:25:46 2014 (r372643) +++ head/multimedia/mencoder/Makefile Sun Nov 16 17:20:32 2014 (r372644) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder @@ -41,7 +41,7 @@ TOOLFILES= aconvert.sh binary_codecs.sh subedit.pl subsearch.sh vobshift.py \ w32codec_dl.pl wma2ogg.pl -USES+= alias shebangfix +USES+= alias iconv shebangfix SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl \ TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \ TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \ @@ -95,6 +95,7 @@ post-patch: -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \ -e 's|-lncurses|/usr/lib/libncurses.so|' \ + -e 's|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} -E ${WRKSRC} -type f \ -iregex ".*(configure|.sh|Makefile)" -print0 | \ Modified: head/multimedia/mencoder/pkg-plist ============================================================================== --- head/multimedia/mencoder/pkg-plist Sun Nov 16 16:25:46 2014 (r372643) +++ head/multimedia/mencoder/pkg-plist Sun Nov 16 17:20:32 2014 (r372644) @@ -23,5 +23,3 @@ man/man1/mencoder.1.gz %%DATADIR%%/tools/vobshift.py %%DATADIR%%/tools/w32codec_dl.pl %%DATADIR%%/tools/wma2ogg.pl -@dirrm %%DATADIR%%/tools -@dirrmtry %%DATADIR%% Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Nov 16 16:25:46 2014 (r372643) +++ head/multimedia/mplayer/Makefile Sun Nov 16 17:20:32 2014 (r372644) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= High performance media player supporting many formats @@ -42,7 +42,7 @@ SUB_FILES= pkg-message CONFLICTS= mplayer2-2.* CONFFILES= example.conf input.conf menu.conf dvb-menu.conf -USES+= pkgconfig +USES+= iconv pkgconfig .include "${.CURDIR}/Makefile.optvars" .include @@ -142,6 +142,7 @@ post-patch: -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|-lbz2|/usr/lib/libbz2.so|' \ -e 's|-lncurses|/usr/lib/libncurses.so|' \ + -e 's|-liconv|${ICONV_LIB}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} -E ${WRKSRC} -type f \ -iregex ".*(configure|.sh|Makefile)" -print0 | \ Modified: head/multimedia/mplayer/pkg-plist ============================================================================== --- head/multimedia/mplayer/pkg-plist Sun Nov 16 16:25:46 2014 (r372643) +++ head/multimedia/mplayer/pkg-plist Sun Nov 16 17:20:32 2014 (r372644) @@ -7,6 +7,3 @@ man/man1/mplayer.1.gz %%DATADIR%%/examples/etc/input.conf %%DATADIR%%/examples/etc/menu.conf %%DATADIR%%/examples/etc/dvb-menu.conf -@dirrm %%DATADIR%%/examples/etc -@dirrm %%DATADIR%%/examples -@dirrmtry %%DATADIR%%