CVS commit: pkgsrc/editors/Sigil

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jul 22 22:51:24 UTC 2018

Modified Files:
        pkgsrc/editors/Sigil: Makefile distinfo
Added Files:
        pkgsrc/editors/Sigil/patches: patch-CMakeLists.txt

Log Message:
Sigil: look for python 3.7 by default (of the python 3.x versions)

While here, fix the REPLACE_PYTHON patterns.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/editors/Sigil/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/editors/Sigil/distinfo
cvs rdiff -u -r0 -r1.6 pkgsrc/editors/Sigil/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/editors/Sigil/Makefile
diff -u pkgsrc/editors/Sigil/Makefile:1.109 pkgsrc/editors/Sigil/Makefile:1.110
--- pkgsrc/editors/Sigil/Makefile:1.109 Fri Jul 20 03:34:11 2018
+++ pkgsrc/editors/Sigil/Makefile       Sun Jul 22 22:51:24 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2018/07/20 03:34:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.110 2018/07/22 22:51:24 wiz Exp $
 
 DISTNAME=      Sigil-0.9.9
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Sigil-Ebook/}
 GITHUB_PROJECT=        Sigil
@@ -38,7 +38,9 @@ BUILDLINK_TRANSFORM+= l:zlib:z
 #LDFLAGS+=     ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
-REPLACE_PYTHON+=       src/Sigil/Resource_Files/plugin_launchers/python/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*/*/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*/*.py
+REPLACE_PYTHON+=       src/Resource_Files/*/*.py
 
 .include "../../textproc/xerces-c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/editors/Sigil/distinfo
diff -u pkgsrc/editors/Sigil/distinfo:1.39 pkgsrc/editors/Sigil/distinfo:1.40
--- pkgsrc/editors/Sigil/distinfo:1.39  Sun Jan 28 15:40:10 2018
+++ pkgsrc/editors/Sigil/distinfo       Sun Jul 22 22:51:24 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.39 2018/01/28 15:40:10 wiz Exp $
+$NetBSD: distinfo,v 1.40 2018/07/22 22:51:24 wiz Exp $
 
 SHA1 (Sigil-0.9.9.tar.gz) = c38d39f47dd9b7dc761c79af835f8219e08ad147
 RMD160 (Sigil-0.9.9.tar.gz) = 5b4ab12baecbfecd30837a276b80cbff866622aa
 SHA512 (Sigil-0.9.9.tar.gz) = a860dcdf3abcd3adbff9d00a3d7f9eb547ebb20fa4aed77824501e5a75416c0f02a451a383efd94c06408f8f30525e00e57a43f232f03ebf114beae8a4eff8a5
 Size (Sigil-0.9.9.tar.gz) = 18675046 bytes
 SHA1 (patch-3rdparty_minizip_ioapi.c) = a68dead89687529b7022cda3bc8a079e5f5c1459
+SHA1 (patch-CMakeLists.txt) = c051261285dbbc3d2e2ab8b57ab678b4e4a45400

Added files:

Index: pkgsrc/editors/Sigil/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/editors/Sigil/patches/patch-CMakeLists.txt:1.6
--- /dev/null   Sun Jul 22 22:51:24 2018
+++ pkgsrc/editors/Sigil/patches/patch-CMakeLists.txt   Sun Jul 22 22:51:24 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-CMakeLists.txt,v 1.6 2018/07/22 22:51:24 wiz Exp $
+
+Try finding python 3.7
+
+--- CMakeLists.txt.orig        2018-07-22 22:41:30.657122506 +0000
++++ CMakeLists.txt
+@@ -87,8 +87,8 @@ if ( WIN32 OR APPLE )
+     find_package(PythonInterp 3.5)
+     find_package (PythonLibs 3.5)
+ else()
+-    find_package(PythonInterp 3.4)
+-    find_package (PythonLibs 3.4)
++    find_package(PythonInterp 3.7)
++    find_package (PythonLibs 3.7)
+ endif()
+ 
+ # gumbo-parser it is our main xhtml/html5 parser.