py-beampy: Fix patch

[Kamil Rytarowski <n54%gmx.com@localhost>]

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

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

Log Message:
py-beampy: Fix patch

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

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

diffstat:
 py-beampy/distinfo                                 |  2 +-
 py-beampy/patches/patch-beampy_document.py         | 13 ++++++++++
 .../patches/patch-build_lib_beampy_document.py     | 30 ----------------------
 3 files changed, 14 insertions(+), 31 deletions(-)

diffs:
diff --git a/py-beampy/distinfo b/py-beampy/distinfo
index c239ce3cad..9427c7ba5a 100644
--- a/py-beampy/distinfo
+++ b/py-beampy/distinfo
@@ -4,4 +4,4 @@ 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-build_lib_beampy_document.py) = 40d2175c86a865f2b9f8ce3656ca2e0af202e612
+SHA1 (patch-beampy_document.py) = c78f5363c465b0ee3c434120d2f4ba58bf2c0211
diff --git a/py-beampy/patches/patch-beampy_document.py b/py-beampy/patches/patch-beampy_document.py
new file mode 100644
index 0000000000..afbb7e0921
--- /dev/null
+++ b/py-beampy/patches/patch-beampy_document.py
@@ -0,0 +1,13 @@
+$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
diff --git a/py-beampy/patches/patch-build_lib_beampy_document.py b/py-beampy/patches/patch-build_lib_beampy_document.py
deleted file mode 100644
index b18e400dbf..0000000000
--- a/py-beampy/patches/patch-build_lib_beampy_document.py
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- build/lib/beampy/document.py.orig	2017-01-26 20:59:10.000000000 +0000
-+++ build/lib/beampy/document.py
-@@ -186,24 +186,7 @@ class document():
-         missing = False
-         for progname, cmd in self.options['external_app'].items():
-             if cmd == 'auto':
--
--                #Special case of video_encoder (ffmpeg or avconv)
--                if progname == 'video_encoder':
--                    find_ffmpeg = find_executable('ffmpeg')
--                    find_avconv = find_executable('avconv')
--                    if find_ffmpeg != None:
--                        document._external_cmd[progname] = find_ffmpeg
--                    elif find_avconv != None:
--                        document._external_cmd[progname] = find_avconv
--                    else:
--                        missing = True
--                else:
--                    find_app = find_executable( progname )
--                    if find_app != None:
--                        document._external_cmd[progname] = find_app
--                    else:
--                        missing = True
--
-+                document._external_cmd[progname] = '@PREFIX@/bin/ffmpeg3'
-             else:
-                 document._external_cmd[progname] = cmd
-