From owner-svn-ports-all@FreeBSD.ORG Fri Jul 25 04:51:30 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 3D724CE4; Fri, 25 Jul 2014 04:51:30 +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 125172021; Fri, 25 Jul 2014 04:51:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6P4pTMj010888; Fri, 25 Jul 2014 04:51:29 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6P4pTos010886; Fri, 25 Jul 2014 04:51:29 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201407250451.s6P4pTos010886@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Fri, 25 Jul 2014 04:51:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362869 - in head/cad/netgen: . 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 04:51:30 -0000 Author: stephen Date: Fri Jul 25 04:51:29 2014 New Revision: 362869 URL: http://svnweb.freebsd.org/changeset/ports/362869 QAT: https://qat.redports.org/buildarchive/r362869/ Log: - Link with multimedia/ffmpeg0 instead of multimedia/ffmpeg (only applies when the option FFMPEG is set). - Bump portrevision. PR: 192074 Submitted by: Ivan Klymenko Added: head/cad/netgen/files/patch-configure (contents, props changed) Modified: head/cad/netgen/Makefile Modified: head/cad/netgen/Makefile ============================================================================== --- head/cad/netgen/Makefile Fri Jul 25 04:27:12 2014 (r362868) +++ head/cad/netgen/Makefile Fri Jul 25 04:51:29 2014 (r362869) @@ -3,7 +3,7 @@ PORTNAME= netgen PORTVERSION= 5.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:S|.0$||}/ @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-occ .endif .if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 CONFIGURE_ARGS+= --enable-ffmpeg .endif @@ -58,6 +58,10 @@ pre-configure: ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ ${WRKSRC}/ng/ngappinit.cpp +post-configure: + ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \ + ${WRKSRC}/configure + post-install: # copy some additional headers for build cad/salome-netgenplugin ${MKDIR} ${STAGEDIR}${DATADIR}/include Added: head/cad/netgen/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/netgen/files/patch-configure Fri Jul 25 04:51:29 2014 (r362869) @@ -0,0 +1,14 @@ +--- configure-orig 2014-07-24 20:42:11.000000000 -0500 ++++ configure 2014-07-24 20:43:21.000000000 -0500 +@@ -15361,9 +15361,9 @@ + ffmpegon=false + # Check whether --enable-ffmpeg was given. + if test "${enable_ffmpeg+set}" = set; then : +- enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-DFFMPEG -D__STDC_CONSTANT_MACROS" ++ enableval=$enable_ffmpeg; FFMPEG_INCLUDES="-I%%LOCALBASE%%/include/ffmpeg0 -DFFMPEG -D__STDC_CONSTANT_MACROS" + +- FFMPEG_LIBS="-lavutil -lavformat -lavcodec -lavutil -lswscale -lz -lbz2" ++ FFMPEG_LIBS="-L%%LOCALBASE%%/lib/ffmpeg0 -lavutil0 -lavformat0 -lavcodec0 -lavutil0 -lswscale -lz -lbz2" + + if test "$enableval" = yes; then ffmpegon=true; else ffmpegon=false; fi +