Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Aug 2023 16:43:20 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ab090f2b1126 - main - textproc/pageedit: Update to 1.9.20 / Flavorize
Message-ID:  <202308181643.37IGhKLD067419@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ab090f2b1126c38ff10282191a3447823cb0374a

commit ab090f2b1126c38ff10282191a3447823cb0374a
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2023-08-18 16:40:49 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2023-08-18 16:42:58 +0000

    textproc/pageedit: Update to 1.9.20 / Flavorize
    
    - Switch to DISTVERSION
    - Add flavors qt5 and qt6:
      qt6 as default flavor as recomended by upstream
    
    ChangeLog:
    https://github.com/Sigil-Ebook/PageEdit/blob/master/ChangeLog.txt
    
    PR:             273159
---
 textproc/pageedit/Makefile  | 28 ++++++++++++++++++++++------
 textproc/pageedit/distinfo  |  6 +++---
 textproc/pageedit/pkg-plist | 17 +++++++++++------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/textproc/pageedit/Makefile b/textproc/pageedit/Makefile
index a2e1a142772a..6f58a645092b 100644
--- a/textproc/pageedit/Makefile
+++ b/textproc/pageedit/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	pageedit
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+DISTVERSION=	1.9.20
 CATEGORIES=	textproc
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	WYSIWYG visual XHTML editor
@@ -10,14 +10,30 @@ WWW=		https://github.com/Sigil-Ebook/PageEdit
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USES=		cmake qt:5 desktop-file-utils
+FLAVORS=	qt6 qt5
+FLAVOR?=	qt6
+qt5_CONFLICTS_INSTALL=	pageedit-qt6
+qt6_CONFLICTS_INSTALL=	pageedit-qt5
 
+USES=		cmake qt:${FLAVOR:S/qt//} ${_USES_${FLAVOR}} desktop-file-utils
 USE_GITHUB=	yes
 GH_ACCOUNT=	Sigil-Ebook
 GH_PROJECT=	PageEdit
+USE_LOCALE=	${_USE_LOCALE_${FLAVOR}}
+USE_QT=		${_USE_QT_${FLAVOR}}
+USE_GL=		${_USE_GL_${FLAVOR}}
+CMAKE_ARGS=	${_CMAKE_ARGS_${FLAVOR}}
 
-USE_QT=		concurrent core declarative gui location network \
-		printsupport webchannel webengine widgets xml \
-		buildtools:build linguisttools:build qmake:build
+_CMAKE_ARGS_qt6=	-DUSE_QT6:BOOL=TRUE
+_USE_LOCALE_qt6=	en_US.UTF-8
+_USES_qt6=	gl
+_USE_GL_qt6=	gl opengl
+_USE_QT_qt6=		5compat base webengine translations declarative webchannel positioning
+_USE_QT_qt5=		concurrent core declarative gui location network \
+			printsupport webchannel webengine widgets xml \
+			buildtools:build linguisttools:build qmake:build
+_PLIST_QT5_qt5=
+_PLIST_QT5_qt6=	"@comment "
+PLIST_SUB=	QT5_ONLY=${_PLIST_QT5_${FLAVOR}}
 
 .include <bsd.port.mk>
diff --git a/textproc/pageedit/distinfo b/textproc/pageedit/distinfo
index cad04cbcbf27..b63b23ae71c7 100644
--- a/textproc/pageedit/distinfo
+++ b/textproc/pageedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589598462
-SHA256 (Sigil-Ebook-PageEdit-1.2.0_GH0.tar.gz) = 9142741f2321e2b991fc053a4b8f1755266733adaf75705b1215e2fbf788bb17
-SIZE (Sigil-Ebook-PageEdit-1.2.0_GH0.tar.gz) = 6166911
+TIMESTAMP = 1691937741
+SHA256 (Sigil-Ebook-PageEdit-1.9.20_GH0.tar.gz) = 87c9adf784fab7e03f1cb3368fda8d817fd918de90ea7ea7ebe115f365fabb6c
+SIZE (Sigil-Ebook-PageEdit-1.9.20_GH0.tar.gz) = 8471592
diff --git a/textproc/pageedit/pkg-plist b/textproc/pageedit/pkg-plist
index 762debb6c8b7..9775352622ac 100644
--- a/textproc/pageedit/pkg-plist
+++ b/textproc/pageedit/pkg-plist
@@ -6,23 +6,28 @@ share/icons/hicolor/32x32/apps/pageedit.png
 share/icons/hicolor/48x48/apps/pageedit.png
 share/icons/hicolor/scalable/apps/pageedit.svg
 %%DATADIR%%/translations/pageedit_cs.qm
+%%DATADIR%%/translations/pageedit_da_DK.qm
 %%DATADIR%%/translations/pageedit_de.qm
 %%DATADIR%%/translations/pageedit_en.qm
 %%DATADIR%%/translations/pageedit_es.qm
 %%DATADIR%%/translations/pageedit_fr.qm
+%%DATADIR%%/translations/pageedit_hu_HU.qm
+%%DATADIR%%/translations/pageedit_it.qm
 %%DATADIR%%/translations/pageedit_ja.qm
 %%DATADIR%%/translations/pageedit_ko.qm
 %%DATADIR%%/translations/pageedit_nl.qm
 %%DATADIR%%/translations/pageedit_pl.qm
+%%DATADIR%%/translations/pageedit_pt_BR.qm
 %%DATADIR%%/translations/pageedit_ru.qm
 %%DATADIR%%/translations/pageedit_sr.qm
 %%DATADIR%%/translations/pageedit_sv.qm
+%%DATADIR%%/translations/pageedit_tr.qm
 %%DATADIR%%/translations/pageedit_uk_UA.qm
 %%DATADIR%%/translations/pageedit_zh_CN.qm
 %%DATADIR%%/translations/pageedit_zh_TW.qm
-share/pixmaps/pageedit.png
-%%QT_DATADIR%%/qtwebengine_dictionaries/de_DE.bdic
-%%QT_DATADIR%%/qtwebengine_dictionaries/en_GB.bdic
-%%QT_DATADIR%%/qtwebengine_dictionaries/en_US.bdic
-%%QT_DATADIR%%/qtwebengine_dictionaries/es.bdic
-%%QT_DATADIR%%/qtwebengine_dictionaries/fr.bdic
+@dir %%QT_DATADIR%%/qtwebengine_dictionaries
+%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/de_DE.bdic
+%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/en_GB.bdic
+%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/en_US.bdic
+%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/es.bdic
+%%QT5_ONLY%%%%QT_DATADIR%%/qtwebengine_dictionaries/fr.bdic



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308181643.37IGhKLD067419>