diff options
| author | stephen <stephen@FreeBSD.org> | 2014-07-25 12:51:29 +0800 |
|---|---|---|
| committer | stephen <stephen@FreeBSD.org> | 2014-07-25 12:51:29 +0800 |
| commit | 65cc897f393a1807e653b32b81ba6e1b0a460511 (patch) | |
| tree | 8ccb66b2cc1838d9da91ec7a94e3f2b414cf5c6b /cad | |
| parent | 2d8a5a3b1300c1d57da6f388217c6df3b91c12d0 (diff) | |
| download | freebsd-ports-gnome-65cc897f393a1807e653b32b81ba6e1b0a460511.tar.gz freebsd-ports-gnome-65cc897f393a1807e653b32b81ba6e1b0a460511.tar.zst freebsd-ports-gnome-65cc897f393a1807e653b32b81ba6e1b0a460511.zip | |
- 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>
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/netgen/Makefile | 8 | ||||
| -rw-r--r-- | cad/netgen/files/patch-configure | 14 |
2 files changed, 20 insertions, 2 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index fcf7dae0d21f..e7dc85e07e97 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -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 diff --git a/cad/netgen/files/patch-configure b/cad/netgen/files/patch-configure new file mode 100644 index 000000000000..b2fa14d9f714 --- /dev/null +++ b/cad/netgen/files/patch-configure @@ -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 + |