CVS commit: pkgsrc/multimedia/ffmpeg3

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Wed Feb 21 13:48:39 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile Makefile.common

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


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/ffmpeg3/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/ffmpeg3/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.27 pkgsrc/multimedia/ffmpeg3/Makefile:1.28
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.27     Mon Feb 12 20:45:27 2018
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Wed Feb 21 13:48:39 2018
@@ -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)

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.25 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.26
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.25      Mon Feb 12 20:45:27 2018
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Wed Feb 21 13:48:39 2018
@@ -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 @@ SUBST_SED.sunwspro+=        -e "s/-Wl,-rpath-li
 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.