Sun Mar 12 17:26:25 2023 UTC ()
Sigil: major cleanup

Add missing dependencies, remove unused dependencies, use pkgsrc
versions of libraries, switch to cmake/build.mk.

Bump PKGREVISION.


(wiz)
diff -r1.160 -r1.161 pkgsrc/editors/Sigil/Makefile
diff -r1.20 -r1.21 pkgsrc/editors/Sigil/PLIST
cvs diff -r1.160 -r1.161 pkgsrc/editors/Sigil/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/Sigil/Makefile 2023/01/29 21:15:53 1.160
+++ pkgsrc/editors/Sigil/Makefile 2023/03/12 17:26:25 1.161
@@ -1,55 +1,53 @@ @@ -1,55 +1,53 @@
1# $NetBSD: Makefile,v 1.160 2023/01/29 21:15:53 ryoon Exp $ 1# $NetBSD: Makefile,v 1.161 2023/03/12 17:26:25 wiz Exp $
2 2
3DISTNAME= Sigil-1.9.20 3DISTNAME= Sigil-1.9.20
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Sigil-Ebook/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Sigil-Ebook/}
7GITHUB_PROJECT= Sigil 7GITHUB_PROJECT= Sigil
8GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://sigil-ebook.com/ 11HOMEPAGE= https://sigil-ebook.com/
12COMMENT= Multi-platform WYSIWYG ebook editor (for the ePub format) 12COMMENT= Multi-platform WYSIWYG ebook editor (for the ePub format)
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk 15DEPENDS+= ${PYPKGPREFIX}-dulwich-[0-9]*:../../devel/py-dulwich
 16DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
16DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml 17DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
17DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 
18 18
19Qt5_DIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 19Qt5_DIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
20ALL_ENV+= Qt5_DIR=${Qt5_DIR} 20ALL_ENV+= Qt5_DIR=${Qt5_DIR}
21 21
22BUILDLINK_TRANSFORM+= opt:-O2:-O0 
23#MAKE_ENV+= CXX_FLAGS="-g" 
24 
25USE_LANGUAGES= c c++0x 22USE_LANGUAGES= c c++0x
26USE_CMAKE= yes 
27USE_TOOLS+= pkg-config 23USE_TOOLS+= pkg-config
28 24
29#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug 25CMAKE_ARGS+= -DUSE_SYSTEM_LIBS=ON
 26CMAKE_ARGS+= -DPYTHON_LIBRARY=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
 27CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR=${PREFIX}/include/python${PYVERSSUFFIX}
30 28
31BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options 29BUILDLINK_TRANSFORM+= l:BoostParts:boost_date_time:boost_filesystem:boost_regex:boost_system:boost_thread:boost_program_options
32BUILDLINK_TRANSFORM+= l:Xerces:xerces-c 30BUILDLINK_TRANSFORM+= l:Xerces:xerces-c
33BUILDLINK_TRANSFORM+= l:zlib:z 31BUILDLINK_TRANSFORM+= l:zlib:z
34 32
35#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/sigil 33#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/sigil
36#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib 34#LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib
37 35
38PYTHON_VERSIONS_INCOMPATIBLE= 27 36PYTHON_VERSIONS_INCOMPATIBLE= 27
39REPLACE_PYTHON+= src/Resource_Files/*/*/*/*.py 37REPLACE_PYTHON+= src/Resource_Files/*/*/*/*.py
40REPLACE_PYTHON+= src/Resource_Files/*/*/*.py 38REPLACE_PYTHON+= src/Resource_Files/*/*/*.py
41REPLACE_PYTHON+= src/Resource_Files/*/*.py 39REPLACE_PYTHON+= src/Resource_Files/*/*.py
42 40
43.include "../../textproc/xerces-c/buildlink3.mk" 41.include "../../devel/cmake/build.mk"
 42.include "../../archivers/minizip/buildlink3.mk"
44.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
45.include "../../devel/boost-libs/buildlink3.mk" 44.include "../../devel/pcre2/buildlink3.mk"
46.include "../../devel/pcre/buildlink3.mk" 45.include "../../lang/python/pyversion.mk"
47.include "../../lang/python/application.mk" 
48.include "../../textproc/hunspell/buildlink3.mk" 46.include "../../textproc/hunspell/buildlink3.mk"
49.include "../../x11/qt5-qtbase/buildlink3.mk" 47.include "../../x11/qt5-qtbase/buildlink3.mk"
50.include "../../x11/qt5-qtsvg/buildlink3.mk" 48.include "../../x11/qt5-qtsvg/buildlink3.mk"
51.include "../../x11/qt5-qttools/buildlink3.mk" 49.include "../../x11/qt5-qttools/buildlink3.mk"
52.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 50.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
53.include "../../x11/qt5-qtwebengine/buildlink3.mk" 51.include "../../x11/qt5-qtwebengine/buildlink3.mk"
54.include "../../sysutils/desktop-file-utils/desktopdb.mk" 52.include "../../sysutils/desktop-file-utils/desktopdb.mk"
55.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/editors/Sigil/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/Sigil/PLIST 2022/09/09 15:49:32 1.20
+++ pkgsrc/editors/Sigil/PLIST 2023/03/12 17:26:25 1.21
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1@comment $NetBSD: PLIST,v 1.20 2022/09/09 15:49:32 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.21 2023/03/12 17:26:25 wiz Exp $
2bin/sigil 2bin/sigil
3lib/sigil/libhunspell.so 
4lib/sigil/libsigilgumbo.so 3lib/sigil/libsigilgumbo.so
5lib/sigil/sigil 4lib/sigil/sigil
6share/applications/sigil.desktop 5share/applications/sigil.desktop
7share/pixmaps/sigil.png 6share/pixmaps/sigil.png
8share/sigil/examples/clip_entries.ini 7share/sigil/examples/clip_entries.ini
9share/sigil/examples/search_entries.ini 8share/sigil/examples/search_entries.ini
10share/sigil/hunspell_dictionaries/About.txt 9share/sigil/hunspell_dictionaries/About.txt
11share/sigil/hunspell_dictionaries/COPYING_GPLv2.txt 10share/sigil/hunspell_dictionaries/COPYING_GPLv2.txt
12share/sigil/hunspell_dictionaries/COPYING_GPLv3.txt 11share/sigil/hunspell_dictionaries/COPYING_GPLv3.txt
13share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.0.txt 12share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.0.txt
14share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.1.txt 13share/sigil/hunspell_dictionaries/COPYING_LGPL_v2.1.txt
15share/sigil/hunspell_dictionaries/README.txt 14share/sigil/hunspell_dictionaries/README.txt
16share/sigil/hunspell_dictionaries/README_de_DE_frami.txt 15share/sigil/hunspell_dictionaries/README_de_DE_frami.txt