From owner-svn-ports-head@FreeBSD.ORG Sun Oct 27 19:40:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D3939B2F; Sun, 27 Oct 2013 19:40:19 +0000 (UTC) (envelope-from gblach@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A63D828B6; Sun, 27 Oct 2013 19:40:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RJeJR1003183; Sun, 27 Oct 2013 19:40:19 GMT (envelope-from gblach@svn.freebsd.org) Received: (from gblach@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RJeJu0003181; Sun, 27 Oct 2013 19:40:19 GMT (envelope-from gblach@svn.freebsd.org) Message-Id: <201310271940.r9RJeJu0003181@svn.freebsd.org> From: Grzegorz Blach Date: Sun, 27 Oct 2013 19:40:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331801 - in head/multimedia/mpv: . files 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.14 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, 27 Oct 2013 19:40:19 -0000 Author: gblach Date: Sun Oct 27 19:40:18 2013 New Revision: 331801 URL: http://svnweb.freebsd.org/changeset/ports/331801 Log: - Fix linking against lua Added: head/multimedia/mpv/files/patch-configure (contents, props changed) Modified: head/multimedia/mpv/Makefile Modified: head/multimedia/mpv/Makefile ============================================================================== --- head/multimedia/mpv/Makefile Sun Oct 27 19:35:12 2013 (r331800) +++ head/multimedia/mpv/Makefile Sun Oct 27 19:40:18 2013 (r331801) @@ -3,6 +3,7 @@ PORTNAME= mpv PORTVERSION= 0.2.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio @@ -166,9 +167,6 @@ post-patch: '/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .endif - @${REINPLACE_CMD} \ - -e 's|-lncurses|/usr/lib/libncurses.so|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \ -e 's|/usr/local|${PREFIX}|g' Added: head/multimedia/mpv/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mpv/files/patch-configure Sun Oct 27 19:40:18 2013 (r331801) @@ -0,0 +1,34 @@ +--- configure.bak 2013-10-26 11:34:43.000000000 +0200 ++++ configure 2013-10-26 11:43:57.000000000 +0200 +@@ -1459,7 +1459,7 @@ + echocheck "terminfo" + if test "$_terminfo" = auto ; then + _terminfo=no +- for _ld_tmp in "-lncurses" "-lncursesw"; do ++ for _ld_tmp in "/usr/lib/libncurses.so" "-lncursesw"; do + statement_check term.h 'setupterm(0, 1, 0)' $_ld_tmp && + libs_mplayer="$libs_mplayer $_ld_tmp" && _terminfo=yes && break + done +@@ -1480,7 +1480,7 @@ + echocheck "termcap" + if test "$_termcap" = auto ; then + _termcap=no +- for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do ++ for _ld_tmp in "/usr/lib/libncurses.so" "-ltinfo" "-ltermcap"; do + statement_check term.h 'tgetent(0, 0)' $_ld_tmp && + libs_mplayer="$libs_mplayer $_ld_tmp" && _termcap=yes && break + done +@@ -3100,11 +3100,11 @@ + if test "$lua" = auto ; then + + lua=no +-test_lua 51 "lua >= 5.1.0 lua < 5.2.0" ++test_lua 51 "lua-5.1 >= 5.1.0 lua-5.1 < 5.2.0" + test_lua 51deb "lua5.1 >= 5.1.0" # debian + test_lua luajit "luajit >= 2.0.0" + # assume all our dependencies (libquvi in particular) link with 5.1 +-test_lua 52 "lua >= 5.2.0" ++test_lua 52 "lua-5.2 >= 5.2.0" + test_lua 52deb "lua5.2 >= 5.2.0" # debian + + fi