From nobody Fri Aug 18 16:43:20 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS73Y0RWPz4qmCs; Fri, 18 Aug 2023 16:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS73Y01Skz3SrQ; Fri, 18 Aug 2023 16:43:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692377001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogc7xf8Vw3U0/b7HzMtWVEEoEGyAJq+JsBacaBzf3e0=; b=MNIC2719MoeKyj254DuUlw122kv70I+sEU8N5c22Q1gLBTiG8sYFG+xZgeoMpNI8FMdW2l DM2iJZRzhltm/xQyJRKASaolf+DwbO40lNLzfM6WfsvvbZzbjmPt4qjTjwUuv02EygNK4M WMlqNvF2smYoBh8RJZ7TPEdhyaHBKU22KCo2dWBwD3xH9COvMJvv9I6Lbf6qaZ3Fm7cx1f VeerrNnS+A7DhS1Y3iI2QP6oHAdAEuANdq+DfxtDaLBMfiarxXfjL3arpC67YQoCwWE05F WPhpE3TEqmuw5BqROj/I97P/mZ6OdNK/05OcTAaYvsb1mNTnUJJD4V+P8z6DWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692377001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ogc7xf8Vw3U0/b7HzMtWVEEoEGyAJq+JsBacaBzf3e0=; b=xDDLErjK4b80bKcBF4vIfRoTyYC7fOy2So1MPu+cGur6l5unj2WBSfms/4FdSdIWJoj4uB 1IDfXgIEpHvCsNP02QP6N37KWgO49JBvPD1UNr7o6nOl0ucY1UW0RueJthfl4eU4K0h5U1 ha6kDNJny/5SH5G79GAe0ODn7Yxn3HaCDnLTb8XVgZJ2opmPALljTzwW2RM0j58NG8UQ/2 6/u1KkUXsixSdQvT3l9YFkeCdDw/Ilzy2+jD8F+012SnNKo+fDgLGFPBOCiMNmZqAhCVGY Y1KgTYLHMECn2kBc35Q+tpHdcr8BroVfwzpL5fc9vjpKMLc0mNu1vR8nq9tFCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692377001; a=rsa-sha256; cv=none; b=ARsX3O2dd1JL24F8Ysq2WMQyc945y7Zq2DzL2IJJaXsLaaXByIJ4ev9o6rihtpTACk3Pt5 5lUOs65e/WyceanQ9vGZX5j3EHHgKxNQpHmM2ZM+ARCZ1hP5nBEHB/jnU9jmnRih0G1Sgr YjllEVYA26D/u/XhDTnwASW9SoLrQyZWuthUCBCd0j9wiZPufFtVHT5UuUbFu2CSO/+gn9 zpiyv3aZgWRdjYeZilo9nRgv+v1ieWTAzKrmWby3YB56IR5Tg8hjPTIS/ihaqRqWczJ+o7 ScweK46+IwTJhNlmDalXiZ6qHodIqig4voNNZRSu7jQrP22DA+7FeCaIzKX29g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS73X6DP6z85h; Fri, 18 Aug 2023 16:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IGhK5m067422; Fri, 18 Aug 2023 16:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IGhKLD067419; Fri, 18 Aug 2023 16:43:20 GMT (envelope-from git) Date: Fri, 18 Aug 2023 16:43:20 GMT Message-Id: <202308181643.37IGhKLD067419@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: ab090f2b1126 - main - textproc/pageedit: Update to 1.9.20 / Flavorize List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ab090f2b1126c38ff10282191a3447823cb0374a Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab090f2b1126c38ff10282191a3447823cb0374a commit ab090f2b1126c38ff10282191a3447823cb0374a Author: Nuno Teixeira AuthorDate: 2023-08-18 16:40:49 +0000 Commit: Nuno Teixeira 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 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