[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg3 multimedia/ffmpeg3: Correct path to...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c89272b33a4
branches:  trunk
changeset: 375800:7c89272b33a4
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Feb 21 13:48:39 2018 +0000

description:
multimedia/ffmpeg3: Correct path to files with substitutions. PKGREVISION++

diffstat:

 multimedia/ffmpeg3/Makefile        |  3 ++-
 multimedia/ffmpeg3/Makefile.common |  8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r b00be4d030ce -r 7c89272b33a4 multimedia/ffmpeg3/Makefile
--- a/multimedia/ffmpeg3/Makefile       Wed Feb 21 12:33:46 2018 +0000
+++ b/multimedia/ffmpeg3/Makefile       Wed Feb 21 13:48:39 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2018/02/12 20:45:27 adam Exp $
+# $NetBSD: Makefile,v 1.28 2018/02/21 13:48:39 fhajny Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
+PKGREVISION=   1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://ffmpeg.mplayerhq.hu/
 COMMENT=       Decoding, encoding and streaming software (v3.x)
diff -r b00be4d030ce -r 7c89272b33a4 multimedia/ffmpeg3/Makefile.common
--- a/multimedia/ffmpeg3/Makefile.common        Wed Feb 21 12:33:46 2018 +0000
+++ b/multimedia/ffmpeg3/Makefile.common        Wed Feb 21 13:48:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2018/02/12 20:45:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.26 2018/02/21 13:48:39 fhajny Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -73,11 +73,11 @@
 BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
 
 REPLACE_PERL+= doc/texi2pod.pl
-REPLACE_SH+=   configure version.sh
+REPLACE_SH+=   configure ffbuild/version.sh
 
 SUBST_CLASSES+=                conf
-SUBST_STAGE.conf=      post-patch
-SUBST_FILES.conf=      ffserver.c
+SUBST_STAGE.conf=      pre-configure
+SUBST_FILES.conf=      fftools/ffserver.c
 SUBST_SED.conf=                -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
 SUBST_MESSAGE.conf=    Fixing configuration path.