Date: Fri, 25 Jul 2014 04:51:29 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362869 - in head/cad/netgen: . files Message-ID: <201407250451.s6P4pTos010886@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <fidaj@ukr.net> 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 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407250451.s6P4pTos010886>