pkgsrc-WIP-changes archive

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

py-beampy: Switch to SUBST framework



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Feb 25 14:07:15 2017 +0100
Changeset:	86418e2384f6bb33d90823b2e9baf00c867c659a

Modified Files:
	py-beampy/Makefile
	py-beampy/distinfo
Removed Files:
	py-beampy/patches/patch-beampy_document.py

Log Message:
py-beampy: Switch to SUBST framework

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=86418e2384f6bb33d90823b2e9baf00c867c659a

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

diffstat:
 py-beampy/Makefile                         |  5 +++++
 py-beampy/distinfo                         |  1 -
 py-beampy/patches/patch-beampy_document.py | 13 -------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diffs:
diff --git a/py-beampy/Makefile b/py-beampy/Makefile
index 5bbc469b5f..30147539c7 100644
--- a/py-beampy/Makefile
+++ b/py-beampy/Makefile
@@ -25,6 +25,11 @@ DEPENDS+=	pdfjam-[0-9]*:../../print/pdfjam # pdfjoin
 DEPENDS+=	inkscape-[0-9]*:../../graphics/inkscape
 DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
+SUBST_CLASSES+=			ffmpeg3
+SUBST_STAGE.ffmpeg3=		post-extract
+SUBST_FILES.ffmpeg3+=		beampy/document.py
+SUBST_SED.ffmpeg3=		-e "s,find_executable('ffmpeg'),find_executable('ffmpeg3'),"
+
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-beampy/distinfo b/py-beampy/distinfo
index 9427c7ba5a..fa485c1c97 100644
--- a/py-beampy/distinfo
+++ b/py-beampy/distinfo
@@ -4,4 +4,3 @@ SHA1 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = 4dac419401
 RMD160 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = cf2f15cd80d07fe755e7aeface71e93ce9f79d96
 SHA512 (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = ac88c2f8b4e1a6253d1ed4bf06faeee00ab940317d9dfd260874ac886f92d10f8a5c54d1cd21d553d08f434a19607a3bfd6119be3c6cdbffe081c95ef8a1c5a4
 Size (beampy-0.4.2-6994aa6e66f77b56e0bf6c1fa4cdd94e106e7b84.tar.gz) = 14203953 bytes
-SHA1 (patch-beampy_document.py) = c78f5363c465b0ee3c434120d2f4ba58bf2c0211
diff --git a/py-beampy/patches/patch-beampy_document.py b/py-beampy/patches/patch-beampy_document.py
deleted file mode 100644
index afbb7e0921..0000000000
--- a/py-beampy/patches/patch-beampy_document.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- beampy/document.py.orig	2017-01-26 20:59:10.000000000 +0000
-+++ beampy/document.py
-@@ -189,7 +189,7 @@ class document():
- 
-                 #Special case of video_encoder (ffmpeg or avconv)
-                 if progname == 'video_encoder':
--                    find_ffmpeg = find_executable('ffmpeg')
-+                    find_ffmpeg = find_executable('ffmpeg3')
-                     find_avconv = find_executable('avconv')
-                     if find_ffmpeg != None:
-                         document._external_cmd[progname] = find_ffmpeg


Home | Main Index | Thread Index | Old Index