CVS commit: pkgsrc/multimedia

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan 25 14:15:26 UTC 2018

Modified Files:
        pkgsrc/multimedia/ffmpeg010: Makefile.common
        pkgsrc/multimedia/ffmpeg1: Makefile.common
        pkgsrc/multimedia/ffmpeg2: Makefile.common
        pkgsrc/multimedia/ffmpeg3: Makefile.common

Log Message:
ffmpeg*: Spell sunpro correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg010/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg1/Makefile.common
cvs rdiff -u -r1.53 -r1.54 pkgsrc/multimedia/ffmpeg2/Makefile.common
cvs rdiff -u -r1.23 -r1.24 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/ffmpeg010/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg010/Makefile.common:1.11 pkgsrc/multimedia/ffmpeg010/Makefile.common:1.12
--- pkgsrc/multimedia/ffmpeg010/Makefile.common:1.11    Sat Mar 14 16:14:43 2015
+++ pkgsrc/multimedia/ffmpeg010/Makefile.common Thu Jan 25 14:15:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2015/03/14 16:14:43 tnn Exp $
+# $NetBSD: Makefile.common,v 1.12 2018/01/25 14:15:25 jperkin Exp $
 # used by multimedia/ffmpeg010/Makefile
 
 DISTNAME=      ffmpeg-${DISTVERSION:S/-//g}
@@ -16,7 +16,7 @@ USE_TOOLS+=   gmake texi2html pod2man
 
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.
 SUBST_STAGE.sunwspro=  post-configure

Index: pkgsrc/multimedia/ffmpeg1/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg1/Makefile.common:1.6 pkgsrc/multimedia/ffmpeg1/Makefile.common:1.7
--- pkgsrc/multimedia/ffmpeg1/Makefile.common:1.6       Sun Feb 15 10:50:01 2015
+++ pkgsrc/multimedia/ffmpeg1/Makefile.common   Thu Jan 25 14:15:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2015/02/15 10:50:01 tnn Exp $
+# $NetBSD: Makefile.common,v 1.7 2018/01/25 14:15:25 jperkin Exp $
 # used by multimedia/ffplay1/Makefile
 # used by multimedia/ffmpeg1/Makefile
 
@@ -49,7 +49,7 @@ CONFIGURE_ENV+=               TMPDIR=${WRKSRC}/tmp
 
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.
 SUBST_STAGE.sunwspro=  post-configure

Index: pkgsrc/multimedia/ffmpeg2/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg2/Makefile.common:1.53 pkgsrc/multimedia/ffmpeg2/Makefile.common:1.54
--- pkgsrc/multimedia/ffmpeg2/Makefile.common:1.53      Tue Oct  3 12:20:08 2017
+++ pkgsrc/multimedia/ffmpeg2/Makefile.common   Thu Jan 25 14:15:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.53 2017/10/03 12:20:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.54 2018/01/25 14:15:26 jperkin Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -58,7 +58,7 @@ CONFIGURE_ENV+=               TMPDIR=${WRKSRC}/tmp
 
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.
 SUBST_STAGE.sunwspro=  post-configure

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.23 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.24
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.23      Mon Dec 11 09:03:25 2017
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Thu Jan 25 14:15:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2017/12/11 09:03:25 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2018/01/25 14:15:26 jperkin Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
@@ -57,7 +57,7 @@ CONFIGURE_ENV+=               TMPDIR=${WRKSRC}/tmp
 
 .include "../../mk/compiler.mk"
 
-.if ${OPSYS} == "SunOS" && empty(CC_VERSION:Mgcc*)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=                sunwspro
 SUBST_MESSAGE.sunwspro=        Fixing compiler options for SunStudio C compiler.
 SUBST_STAGE.sunwspro=  post-configure