CVS commit: pkgsrc/multimedia/ffmpeg2

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun May 24 02:10:55 UTC 2020

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

Log Message:
ffmpeg2: SUBST_NOOP_OK.conf=yes

If {PKG_SYSCONFDIR} = /etc  then this substitution
  's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
results in a noop, which is rejected - so allow.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/multimedia/ffmpeg2/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/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.59 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.60
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.59      Thu Apr 23 16:34:20 2020
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Sun May 24 02:10:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.59 2020/04/23 16:34:20 nia Exp $
+# $NetBSD: Makefile.common,v 1.60 2020/05/24 02:10:55 markd Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -79,6 +79,7 @@ SUBST_CLASSES+=               conf
 SUBST_STAGE.conf=      pre-configure
 SUBST_FILES.conf=      ffserver.c
 SUBST_SED.conf=                -e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
+SUBST_NOOP_OK.conf=    yes
 SUBST_MESSAGE.conf=    Fixing configuration path.
 
 PLIST_SRC+=    ${PKGDIR}/PLIST