pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2theora ffmpeg2theora: catch up with ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1284996858e
branches:  trunk
changeset: 389487:b1284996858e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 18:01:00 2019 +0000

description:
ffmpeg2theora: catch up with scons update

diffstat:

 multimedia/ffmpeg2theora/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 2e85efe9aa34 -r b1284996858e multimedia/ffmpeg2theora/Makefile
--- a/multimedia/ffmpeg2theora/Makefile Wed Jan 02 17:25:05 2019 +0000
+++ b/multimedia/ffmpeg2theora/Makefile Wed Jan 02 18:01:00 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/11/23 08:06:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2019/01/02 18:01:00 tnn Exp $
 
 DISTNAME=      ffmpeg2theora-0.30
 PKGREVISION=   6
@@ -12,7 +12,6 @@
 LICENSE=       gnu-gpl-v3
 
 USE_TOOLS+=            pkg-config
-BUILD_DEPENDS+=                scons>=1.3.1:../../devel/scons
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
@@ -20,13 +19,12 @@
 LDFLAGS.Linux+=        -lm
 LDFLAGS.SunOS+=        -lm
 
-SCONS=         ${PREFIX}/bin/scons
 SCONS_ARGS=    -C ${WRKSRC} destdir=${DESTDIR:Q} prefix=${PREFIX:Q}
 SCONS_ARGS+=   APPEND_CCFLAGS=${CFLAGS:Q}
 SCONS_ARGS+=   APPEND_LINKFLAGS=${LDFLAGS:Q}
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg2theora ${DESTDIR}${PREFIX}/bin
@@ -35,6 +33,8 @@
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+PYTHON_FOR_BUILD_ONLY?=        yes
+.include "../../devel/scons/buildlink3.mk"
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"



Home | Main Index | Thread Index | Old Index