Received: by mail.netbsd.org (Postfix, from userid 605) id 6C67684DA9; Thu, 25 Jan 2018 14:15:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ED80A84D99 for ; Thu, 25 Jan 2018 14:15:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ASlG8lAYBwZP for ; Thu, 25 Jan 2018 14:15:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6955384D03 for ; Thu, 25 Jan 2018 14:15:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6750CFBDE; Thu, 25 Jan 2018 14:15:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151688972644250" MIME-Version: 1.0 Date: Thu, 25 Jan 2018 14:15:26 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/multimedia To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180125141526.6750CFBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151688972644250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_151688972644250 Content-Disposition: inline Content-Length: 3428 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_151688972644250--